commit fab4f67e9dba699929f9a99577c447dcdfede9fb
Author: Paulo Veiga <pveiga@wisemapping.com>
Date:   Sun Jun 7 18:59:43 2009 +0000

    WiseMapping

diff --git a/trunk/ToDo.txt b/trunk/ToDo.txt
new file mode 100644
index 00000000..a89f863a
--- /dev/null
+++ b/trunk/ToDo.txt
@@ -0,0 +1,3 @@
+- Check mail jars
+- Google Tracking
+- Customizable JSP Replacements
\ No newline at end of file
diff --git a/trunk/core-js/pom.xml b/trunk/core-js/pom.xml
new file mode 100644
index 00000000..1e11e749
--- /dev/null
+++ b/trunk/core-js/pom.xml
@@ -0,0 +1,72 @@
+<project>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-js</artifactId>
+    <packaging>jar</packaging>
+    <name>Core JavaScript Utils Libraries</name>
+
+    <parent>
+        <groupId>org.wisemapping</groupId>
+        <artifactId>wisemapping</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>merge-js-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir  dir="${basedir}/target/classes"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>net.sf.alchim</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>compress</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>src/main/javascript/</sourceDirectory>
+                            <outputDirectory>target/tmp/</outputDirectory>
+                            <aggregations>
+                                <aggregation>
+                                    <output>${basedir}/target/classes/core.js</output>
+                                    <includes>
+                                        <include>${basedir}/target/tmp/header-min.js</include>
+                                        <include>${basedir}/target/tmp/ColorPicker-min.js</include>
+                                        <include>${basedir}/target/tmp/Loader-min.js</include>
+                                        <include>${basedir}/target/tmp/Logger-min.js</include>
+                                        <include>${basedir}/target/tmp/Monitor-min.js</include>
+                                        <include>${basedir}/target/tmp/Point-min.js</include>
+                                        <include>${basedir}/target/tmp/UserAgent-min.js</include>
+                                        <include>${basedir}/target/tmp/Utils-min.js</include>
+                                        <include>${basedir}/target/tmp/WaitDialog-min.js</include>
+                                        <include>${basedir}/target/tmp/footer-min.js</include>
+                                    </includes>
+                                </aggregation>
+                            </aggregations>
+                            <nomunge>true</nomunge>
+                            <jswarn>false</jswarn>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/trunk/core-js/src/main/javascript/ColorPicker.js b/trunk/core-js/src/main/javascript/ColorPicker.js
new file mode 100644
index 00000000..40c0ea0e
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/ColorPicker.js
@@ -0,0 +1,95 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+core.ColorPicker = function()
+{
+    this.palette = "7x10";
+    this._palettes = {"7x10": [["fff", "fcc", "fc9", "ff9", "ffc", "9f9", "9ff", "cff", "ccf", "fcf"],
+            ["ccc", "f66", "f96", "ff6", "ff3", "6f9", "3ff", "6ff", "99f", "f9f"],
+            ["c0c0c0", "f00", "f90", "fc6", "ff0", "3f3", "6cc", "3cf", "66c", "c6c"],
+            ["999", "c00", "f60", "fc3", "fc0", "3c0", "0cc", "36f", "63f", "c3c"],
+            ["666", "900", "c60", "c93", "990", "090", "399", "33f", "60c", "939"],
+            ["333", "600", "930", "963", "660", "060", "366", "009", "339", "636"],
+            ["000", "300", "630", "633", "330", "030", "033", "006", "309", "303"]],
+
+        "3x4": [["ffffff"/*white*/, "00ff00"/*lime*/, "008000"/*green*/, "0000ff"/*blue*/],
+                ["c0c0c0"/*silver*/, "ffff00"/*yellow*/, "ff00ff"/*fuchsia*/, "000080"/*navy*/],
+                ["808080"/*gray*/, "ff0000"/*red*/, "800080"/*purple*/, "000000"/*black*/]]
+        //["00ffff"/*aqua*/, "808000"/*olive*/, "800000"/*maroon*/, "008080"/*teal*/]];
+    };
+};
+
+core.ColorPicker.buildRendering = function ()
+{
+    this.domNode = document.createElement("table");
+    //		dojo.html.disableSelection(this.domNode);
+    //		dojo.event.connect(this.domNode, "onmousedown", function (e) {
+    //			e.preventDefault();
+    //		});
+    with (this.domNode) { // set the table's properties
+        cellPadding = "0";
+        cellSpacing = "1";
+        border = "1";
+        style.backgroundColor = "white";
+    }
+    var colors = this._palettes[this.palette];
+    for (var i = 0; i < colors.length; i++) {
+        var tr = this.domNode.insertRow(-1);
+        for (var j = 0; j < colors[i].length; j++) {
+            if (colors[i][j].length == 3) {
+                colors[i][j] = colors[i][j].replace(/(.)(.)(.)/, "$1$1$2$2$3$3");
+            }
+
+            var td = tr.insertCell(-1);
+            with (td.style) {
+                backgroundColor = "#" + colors[i][j];
+                border = "1px solid gray";
+                width = height = "15px";
+                fontSize = "1px";
+            }
+
+            td.color = "#" + colors[i][j];
+
+            td.onmouseover = function (e) {
+                this.style.borderColor = "white";
+            };
+            td.onmouseout = function (e) {
+                this.style.borderColor = "gray";
+            };
+            //				dojo.event.connect(td, "onmousedown", this, "onClick");
+
+            td.innerHTML = "&nbsp;";
+        }
+    }
+};
+
+core.ColorPicker.onClick = function(/*Event*/ e)
+{
+    this.onColorSelect(e.currentTarget.color);
+    e.currentTarget.style.borderColor = "gray";
+};
+
+core.ColorPicker.onColorSelect = function(color)
+{
+    // summary:
+    //		Callback when a color is selected.
+    // color: String
+    //		Hex value corresponding to color.
+};
+
diff --git a/trunk/core-js/src/main/javascript/Loader.js b/trunk/core-js/src/main/javascript/Loader.js
new file mode 100644
index 00000000..d44b6be1
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/Loader.js
@@ -0,0 +1,87 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+core.Loader =
+{
+    load: function(scriptPath, stylePath,jsFileName)
+    {
+        var headElement = document.getElementsByTagName('head');
+        var htmlDoc = headElement.item(0);
+        var baseUrl = this.baseUrl(jsFileName);
+        if (scriptPath && scriptPath.length > 0)
+        {
+            for (var i = 0; i < scriptPath.length; i++)
+            {
+                this.includeScriptNode(baseUrl + scriptPath[i]);
+            }
+        }
+        if (stylePath && stylePath.length > 0)
+        {
+            for (var i = 0; i < stylePath.length; i++)
+            {
+                this.includeStyleNode(baseUrl + stylePath[i]);
+            }
+        }
+    },
+    baseUrl: function(jsFileName)
+    {
+        var headElement = document.getElementsByTagName('head');
+        var htmlDoc = headElement.item(0);
+        var headChildren = htmlDoc.childNodes;
+        var result = null;
+        for (var i = 0; i < headChildren.length; i++)
+        {
+            var node = headChildren.item(i);
+            if (node.nodeName && node.nodeName.toLowerCase() == "script")
+            {
+                var libraryUrl = node.src;
+                if (libraryUrl.indexOf(jsFileName) != -1)
+                {
+                    var index = libraryUrl.lastIndexOf("/");
+                    index = libraryUrl.lastIndexOf("/", index - 1);
+                    result = libraryUrl.substring(0, index);
+                }
+            }
+        }
+
+        if (result == null)
+        {
+            throw "Could not obtain the base url directory.";
+        }
+        return result;
+    },
+    includeScriptNode: function(filename) {
+        var html_doc = document.getElementsByTagName('head').item(0);
+        var js = document.createElement('script');
+        js.setAttribute('language', 'javascript');
+        js.setAttribute('type', 'text/javascript');
+        js.setAttribute('src', filename);
+        html_doc.appendChild(js);
+        return false;
+    },
+    includeStyleNode: function(filename) {
+        var html_doc = document.getElementsByTagName('head').item(0);
+        var js = document.createElement('link');
+        js.setAttribute('rel', 'stylesheet');
+        js.setAttribute('type', 'text/css');
+        js.setAttribute('href', filename);
+        html_doc.appendChild(js);
+        return false;
+    }
+};
diff --git a/trunk/core-js/src/main/javascript/Logger.js b/trunk/core-js/src/main/javascript/Logger.js
new file mode 100644
index 00000000..1754686c
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/Logger.js
@@ -0,0 +1,129 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+core.Logger =
+{
+    _enabled: false,
+    setEnabled: function (enabled) {
+        this._enabled = enabled;
+    },init: function(serverLogger)
+{
+    this._serverLogger = serverLogger;
+    if (window.onerror) {
+        // Save any previously defined handler to call
+        core.Logger._origOnWindowError = window.onerror;
+    }
+    window.onerror = core.Logger._onWindowError;
+},
+    log: function(message, severity, src)
+    {
+        if (!severity)
+        {
+            severity = core.LoggerSeverity.DEBUG;
+        }
+
+        // Error messages must be loggued in the server ...
+        if (severity >= core.LoggerSeverity.ERROR)
+        {
+            if (this._serverLogger)
+            {
+                try
+                {
+                    this._serverLogger.logError(core.LoggerSeverity.ERROR, message);
+                } catch(e)
+                {
+                }
+            }
+        }
+
+        //        // Finally, log the error in debug console if it's enabled.
+        if (this._enabled)
+        {
+            this._browserLogger(message);
+        }
+    },
+    _browserLogger: function(message) {
+        // Firebug is not enabled.
+
+        if (core.Logger._origOnWindowError) {
+            core.Logger._origOnWindowError();
+        }
+
+        if (!console)
+        {
+            if (!this._isInitialized)
+            {
+                this._console = window.document.createElement("div");
+                this._console.style.position = "absolute";
+                this._console.style.width = "300px";
+                this._console.style.height = "200px";
+                this._console.style.bottom = 0;
+                this._console.style.right = 0;
+                this._console.style.border = '1px solid black';
+                this._console.style.background = 'yellow';
+                this._console.style.zIndex = 60000;
+
+                this._textArea = window.document.createElement("textarea");
+                this._textArea.cols = "40";
+                this._textArea.rows = "10";
+                this._console.appendChild(this._textArea);
+
+                window.document.body.appendChild(this._console);
+                this._isInitialized = true;
+            }
+            this._textArea.value = this._textArea.value + "\n" + msg;
+
+        } else
+        {
+            // Firebug console...
+            console.log(message);
+        }
+    },
+/**
+ * Handles logging of messages due to window error events.
+ *
+ * @method _onWindowError
+ * @param sMsg {String} The error message.
+ * @param sUrl {String} URL of the error.
+ * @param sLine {String} Line number of the error.
+ * @private
+ */
+    _onWindowError: function(sMsg, sUrl, sLine) {
+        // Logger is not in scope of this event handler
+        // http://cfis.savagexi.com/articles/2007/05/08/what-went-wrong-with-my-javascript
+        try {
+            core.Logger.log(sMsg + ' (' + sUrl + ', line ' + sLine + ')', core.LoggerSeverity.ERROR, "window");
+        }
+        catch(e) {
+            return false;
+        }
+        return true;
+    },
+    logError: function(msg) {
+        core.Logger.log(msg, core.LoggerSeverity.ERROR, "code");
+    }
+};
+
+core.LoggerSeverity =
+{
+    DEBUG: 1,
+    WARNING: 2,
+    ERROR: 3,
+    WINDOW: 4
+};
\ No newline at end of file
diff --git a/trunk/core-js/src/main/javascript/Monitor.js b/trunk/core-js/src/main/javascript/Monitor.js
new file mode 100644
index 00000000..38cd0aa8
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/Monitor.js
@@ -0,0 +1,142 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+core.Monitor = function(fadeElement, logContentElem)
+{
+    core.assert(fadeElement, "fadeElement can not be null");
+    core.assert(logContentElem, "logContentElem can not be null");
+
+    this.pendingMessages = [];
+    this.inProgress = false;
+    this._container = fadeElement;
+    this._currentMessage = null;
+    this._logContentElem = logContentElem;
+
+    this._fxOpacity = fadeElement.effect('opacity', { duration: 6000 });
+
+};
+
+core.Monitor.prototype._logMessage = function(msg, msgKind)
+{
+    this._fxOpacity.clearTimer();
+    if (msgKind == core.Monitor.MsgKind.ERROR)
+    {
+        msg = "<div id='small_error_icon'>" + msg + "</div>";
+    }
+    this._currentMessage = msg;
+    this._fxOpacity.start(1, 0);
+    this._logContentElem.innerHTML = msg;
+
+};
+
+core.Monitor.prototype.logError = function(userMsg)
+{
+    this.logMessage(userMsg, core.Monitor.MsgKind.ERROR);
+};
+
+core.Monitor.prototype.logFatal = function(userMsg)
+{
+    this.logMessage(userMsg, core.Monitor.MsgKind.FATAL);
+};
+
+core.Monitor.prototype.logMessage = function(msg, msgKind)
+{
+    if (!msgKind)
+    {
+        msgKind = core.Monitor.MsgKind.INFO;
+    }
+
+    if (msgKind == core.Monitor.MsgKind.FATAL)
+    {
+        // In this case, a modal dialog must be shown... No recovery is possible.
+        new Windoo.Alert(msg,
+        {
+            'window': {  theme:Windoo.Themes.aero,
+                title:"Outch!!. An unexpected error.",
+                'onClose':function() {
+                }
+            }
+        });
+    } else
+    {
+        var messages = this.pendingMessages;
+        var monitor = this;
+
+        if (!this.executer)
+        {
+            // Log current message ...
+            monitor._logMessage(msg, msgKind);
+
+            // Start worker thread ...
+            var disptacher = function()
+            {
+                if (messages.length > 0)
+                {
+                    var msgToDisplay = messages.shift();
+                    monitor._logMessage(msgToDisplay);
+                }
+
+                // Stop thread?
+                if (messages.length == 0)
+                {
+                    $clear(monitor.executer);
+                    monitor.executer = null;
+                    monitor._fxOpacity.hide();
+                    this._currentMessage = null;
+                }
+            };
+            this.executer = disptacher.periodical(600);
+        } else
+        {
+            if (this._currentMessage != msg)
+            {
+                messages.push(msg);
+            }
+        }
+    }
+};
+
+core.Monitor.setInstance = function(monitor)
+{
+    this.monitor = monitor;
+};
+
+core.Monitor.getInstance = function()
+{
+    var result = this.monitor;
+    if (result == null)
+    {
+        result = {
+            logError: function() {
+            },
+            logMessage: function() {
+            }
+        };
+    }
+    return result;
+};
+
+
+core.Monitor.MsgKind =
+{
+    INFO:1,
+    WARNING:2,
+    ERROR:3,
+    FATAL:4
+};
\ No newline at end of file
diff --git a/trunk/core-js/src/main/javascript/Point.js b/trunk/core-js/src/main/javascript/Point.js
new file mode 100644
index 00000000..3eec455b
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/Point.js
@@ -0,0 +1,40 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+core.Point = function(x, y)
+{
+    this.x = x;
+    this.y = y;
+};
+
+core.Point.prototype.setValue = function(x, y)
+{
+    this.x = x;
+    this.y = y;
+};
+
+core.Point.prototype.inspect = function()
+{
+    return "{x:" + this.x + ",y:" + this.y + "}";
+};
+
+core.Point.prototype.clone = function()
+{
+    return new core.Point(this.x, this.y);
+};
\ No newline at end of file
diff --git a/trunk/core-js/src/main/javascript/UserAgent.js b/trunk/core-js/src/main/javascript/UserAgent.js
new file mode 100644
index 00000000..c6586eff
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/UserAgent.js
@@ -0,0 +1,148 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+core.UserAgent = {
+    _isVMLSupported:null,
+    isVMLSupported: function()
+    {
+        if (!core.Utils.isDefined())
+        {
+            this._isVMLSupported = navigator.appVersion.match(/MSIE (\d\.\d)/);
+        }
+        return this._isVMLSupported;
+    },
+    isSVGSupported: function()
+    {
+        return !core.UserAgent.isVMLSupported();
+    },
+    isIframeWorkaroundRequired: function()
+    {
+        return core.UserAgent.OS == "Mac" && core.UserAgent.browser == "Firefox" && core.UserAgent.version < 3;
+    },
+    isMozillaFamily: function()
+    {
+        return this.browser == "Netscape" || this.browser == "Firefox";
+    },
+    isIE: function()
+    {
+        return this.browser == "Explorer";
+    },
+    init: function () {
+        this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
+        this.version = this.searchVersion(navigator.userAgent)
+                || this.searchVersion(navigator.appVersion)
+                || "an unknown version";
+        this.OS = this.searchString(this.dataOS) || "an unknown OS";
+    },
+    searchString: function (data) {
+        for (var i = 0; i < data.length; i++) {
+            var dataString = data[i].string;
+            var dataProp = data[i].prop;
+            this.versionSearchString = data[i].versionSearch || data[i].identity;
+            if (dataString) {
+                if (dataString.indexOf(data[i].subString) != -1)
+                    return data[i].identity;
+            }
+            else if (dataProp)
+                return data[i].identity;
+        }
+    },
+    searchVersion: function (dataString) {
+        var index = dataString.indexOf(this.versionSearchString);
+        if (index == -1) return;
+        return parseFloat(dataString.substring(index + this.versionSearchString.length + 1));
+    },
+    dataBrowser: [
+        {   string: navigator.userAgent,
+            subString: "OmniWeb",
+            versionSearch: "OmniWeb/",
+            identity: "OmniWeb"
+        },
+        {
+            string: navigator.vendor,
+            subString: "Apple",
+            identity: "Safari"
+        },
+        {
+            prop: window.opera,
+            identity: "Opera"
+        },
+        {
+            string: navigator.vendor,
+            subString: "iCab",
+            identity: "iCab"
+        },
+        {
+            string: navigator.vendor,
+            subString: "KDE",
+            identity: "Konqueror"
+        },
+        {
+            string: navigator.userAgent,
+            subString: "Firefox",
+            identity: "Firefox"
+        },
+        {
+            string: navigator.vendor,
+            subString: "Camino",
+            identity: "Camino"
+        },
+        {        // for newer Netscapes (6+)
+            string: navigator.userAgent,
+            subString: "Netscape",
+            identity: "Netscape"
+        },
+        {
+            string: navigator.userAgent,
+            subString: "MSIE",
+            identity: "Explorer",
+            versionSearch: "MSIE"
+        },
+        {
+            string: navigator.userAgent,
+            subString: "Gecko",
+            identity: "Mozilla",
+            versionSearch: "rv"
+        },
+        {         // for older Netscapes (4-)
+            string: navigator.userAgent,
+            subString: "Mozilla",
+            identity: "Netscape",
+            versionSearch: "Mozilla"
+        }
+    ],
+    dataOS : [
+        {
+            string: navigator.platform,
+            subString: "Win",
+            identity: "Windows"
+        },
+        {
+            string: navigator.platform,
+            subString: "Mac",
+            identity: "Mac"
+        },
+        {
+            string: navigator.platform,
+            subString: "Linux",
+            identity: "Linux"
+        }
+    ]
+};
+core.UserAgent.init();
\ No newline at end of file
diff --git a/trunk/core-js/src/main/javascript/Utils.js b/trunk/core-js/src/main/javascript/Utils.js
new file mode 100644
index 00000000..3179e3d5
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/Utils.js
@@ -0,0 +1,257 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+core.Utils =
+{
+    isDefined: function(val)
+    {
+        return val !== null && val !== undefined;
+    },
+    escapeInvalidTags: function (text)
+    {
+        //todo:Pablo. scape invalid tags in a text
+        return text;
+    }
+};
+
+/**
+ * http://kevlindev.com/tutorials/javascript/inheritance/index.htm
+ * A function used to extend one class with another
+ *
+ * @param {Object} subClass
+ * 		The inheriting class, or subclass
+ * @param {Object} baseClass
+ * 		The class from which to inherit
+ */
+objects = {};
+objects.extend = function(subClass, baseClass) {
+    function inheritance() {
+    }
+    inheritance.prototype = baseClass.prototype;
+
+    subClass.prototype = new inheritance();
+    subClass.prototype.constructor = subClass;
+    subClass.baseConstructor = baseClass;
+    subClass.superClass = baseClass.prototype;
+};
+
+core.assert = function(assert, message)
+{
+    if (!assert)
+    {
+        var stack;
+        try
+        {
+            null.eval();
+        } catch(e)
+        {
+            stack = e;
+        }
+        core.Logger.logError(message + "," + stack);
+    }
+
+};
+
+core.findElement = function(name)
+{
+    var result;
+    if (core.UserAgent.isIframeWorkaroundRequired())
+    {
+        var iframe = $('mindplotIFrame');
+        var doc = iframe.contentDocument;
+        if (doc == undefined || doc == null)
+            doc = iframe.contentWindow.document;
+        result = $(doc.getElementById(name));
+    }
+    if (!result)
+    {
+        result = $(name);
+    }
+
+    return result;
+}
+
+Math.sign = function(value)
+{
+    return (value >= 0) ? 1 : -1;
+};
+
+
+// Extensions ....
+function $import(src) {
+    var scriptElem = document.createElement('script');
+    scriptElem.setAttribute('src', src);
+    scriptElem.setAttribute('type', 'text/javascript');
+    document.getElementsByTagName('head')[0].appendChild(scriptElem);
+}
+
+/**
+ *  Retrieve the mouse position.
+ */
+core.Utils.getMousePosition = function(event)
+{
+    var xcoord = -1;
+    var ycoord = -1;
+
+    if (!event) {
+        if (window.event) {
+            //Internet Explorer
+            event = window.event;
+        } else {
+            //total failure, we have no way of referencing the event
+            throw "Could not obtain mouse position";
+        }
+    }
+    if (typeof( event.pageX ) == 'number') {
+        //most browsers
+        xcoord = event.pageX;
+        ycoord = event.pageY;
+    } else if (typeof( event.clientX ) == 'number') {
+        //Internet Explorer and older browsers
+        //other browsers provide this, but follow the pageX/Y branch
+        xcoord = event.clientX;
+        ycoord = event.clientY;
+        var badOldBrowser = ( window.navigator.userAgent.indexOf('Opera') + 1 ) ||
+                            ( window.ScriptEngine && ScriptEngine().indexOf('InScript') + 1 ) ||
+                            ( navigator.vendor == 'KDE' );
+        if (!badOldBrowser) {
+            if (document.body && ( document.body.scrollLeft || document.body.scrollTop )) {
+                //IE 4, 5 & 6 (in non-standards compliant mode)
+                xcoord += document.body.scrollLeft;
+                ycoord += document.body.scrollTop;
+            } else if (document.documentElement && ( document.documentElement.scrollLeft || document.documentElement.scrollTop )) {
+                //IE 6 (in standards compliant mode)
+                xcoord += document.documentElement.scrollLeft;
+                ycoord += document.documentElement.scrollTop;
+            }
+        }
+    } else {
+        throw "Could not obtain mouse position";
+    }
+
+
+    return {x:xcoord,y:ycoord};
+};
+
+
+/**
+ * Calculate the position of the passed element.
+ */
+core.Utils.workOutDivElementPosition = function(divElement)
+{
+    var curleft = 0;
+    var curtop = 0;
+    if (divElement.offsetParent) {
+        curleft = divElement.offsetLeft;
+        curtop = divElement.offsetTop;
+        while (divElement = divElement.offsetParent) {
+            curleft += divElement.offsetLeft;
+            curtop += divElement.offsetTop;
+        }
+    }
+    return {x:curleft,y:curtop};
+};
+
+
+core.Utils.innerXML = function(/*Node*/node) {
+    //	summary:
+    //		Implementation of MS's innerXML function.
+    if (node.innerXML) {
+        return node.innerXML;
+        //	string
+    } else if (node.xml) {
+        return node.xml;
+        //	string
+    } else if (typeof XMLSerializer != "undefined") {
+        return (new XMLSerializer()).serializeToString(node);
+        //	string
+    }
+};
+
+core.Utils.createDocument = function() {
+    //	summary:
+    //		cross-browser implementation of creating an XML document object.
+    var doc = null;
+    var _document = window.document;
+    if (window.ActiveXObject) {
+        var prefixes = [ "MSXML2", "Microsoft", "MSXML", "MSXML3" ];
+        for (var i = 0; i < prefixes.length; i++) {
+            try {
+                doc = new ActiveXObject(prefixes[i] + ".XMLDOM");
+            } catch(e) { /* squelch */
+            }
+            ;
+
+            if (doc) {
+                break;
+            }
+        }
+    } else if ((_document.implementation) &&
+               (_document.implementation.createDocument)) {
+        doc = _document.implementation.createDocument("", "", null);
+    }
+
+    return doc;
+    //	DOMDocument
+};
+
+core.Utils.createDocumentFromText = function(/*string*/str, /*string?*/mimetype) {
+    //	summary:
+    //		attempts to create a Document object based on optional mime-type,
+    //		using str as the contents of the document
+    if (!mimetype) {
+        mimetype = "text/xml";
+    }
+    if (window.DOMParser)
+    {
+        var parser = new DOMParser();
+        return parser.parseFromString(str, mimetype);
+        //	DOMDocument
+    } else if (window.ActiveXObject) {
+        var domDoc = core.Utils.createDocument();
+        if (domDoc) {
+            domDoc.async = false;
+            domDoc.loadXML(str);
+            return domDoc;
+            //	DOMDocument
+        } else {
+            //dojo.debug("toXml didn't work?");
+        }
+    } else {
+        //		var _document = dojo.doc();
+        //		if(_document.createElement){
+        //			// FIXME: this may change all tags to uppercase!
+        //			var tmp = _document.createElement("xml");
+        //			tmp.innerHTML = str;
+        //			if(_document.implementation && _document.implementation.createDocument){
+        //				var xmlDoc = _document.implementation.createDocument("foo", "", null);
+        //				for(var i = 0; i < tmp.childNodes.length; i++) {
+        //					xmlDoc.importNode(tmp.childNodes.item(i), true);
+        //				}
+        //				return xmlDoc;	//	DOMDocument
+        //			}
+        //			// FIXME: probably not a good idea to have to return an HTML fragment
+        //			// FIXME: the tmp.doc.firstChild is as tested from IE, so it may not
+        //			// work that way across the board
+        //			return ((tmp.document)&&
+        //				(tmp.document.firstChild ?  tmp.document.firstChild : tmp));	//	DOMDocument
+        //		}
+    }
+    return null;
+};
diff --git a/trunk/core-js/src/main/javascript/WaitDialog.js b/trunk/core-js/src/main/javascript/WaitDialog.js
new file mode 100644
index 00000000..9ab35f10
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/WaitDialog.js
@@ -0,0 +1,216 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/*
+Created By: Chris Campbell
+Website: http://particletree.com
+Date: 2/1/2006
+
+Inspired by the lightbox implementation found at http://www.huddletogether.com/projects/lightbox/
+*/
+
+/*-------------------------------GLOBAL VARIABLES------------------------------------*/
+
+var detect = navigator.userAgent.toLowerCase();
+var OS,browser,version,total,thestring;
+
+/*-----------------------------------------------------------------------------------------------*/
+
+//Browser detect script origionally created by Peter Paul Koch at http://www.quirksmode.org/
+
+function getBrowserInfo(evt) {
+    if (checkIt('konqueror')) {
+        browser = "Konqueror";
+        OS = "Linux";
+    }
+    else if (checkIt('safari')) browser = "Safari"
+    else if (checkIt('omniweb')) browser = "OmniWeb"
+    else if (checkIt('opera')) browser = "Opera"
+    else if (checkIt('webtv')) browser = "WebTV";
+    else if (checkIt('icab')) browser = "iCab"
+    else if (checkIt('msie')) browser = "Internet Explorer"
+    else if (!checkIt('compatible')) {
+        browser = "Netscape Navigator"
+        version = detect.charAt(8);
+    }
+    else browser = "An unknown browser";
+
+    if (!version) version = detect.charAt(place + thestring.length);
+
+    if (!OS) {
+        if (checkIt('linux')) OS = "Linux";
+        else if (checkIt('x11')) OS = "Unix";
+        else if (checkIt('mac')) OS = "Mac"
+        else if (checkIt('win')) OS = "Windows"
+        else OS = "an unknown operating system";
+    }
+}
+
+function checkIt(string) {
+    place = detect.indexOf(string) + 1;
+    thestring = string;
+    return place;
+}
+
+/*-----------------------------------------------------------------------------------------------*/
+
+$(window).addEvent('load', getBrowserInfo);
+
+core.WaitDialog = new Class({
+
+    initialize: function(contentId) {
+        this.content = $(contentId);
+    },
+
+    yPos : 0,
+
+    xPos : 0,
+
+// Turn everything on - mainly the IE fixes
+    activate: function(changeCursor)
+    {
+        //		if (browser == 'Internet Explorer'){
+        ////			this.getScroll();
+        //			this.prepareIE('100%', 'hidden');
+        ////			this.setScroll(0,0);
+        ////			this.hideSelects('hidden');
+        //		}
+        this.displayLightbox("block");
+
+        // Change to loading cursor.
+        if (changeCursor)
+        {
+            window.document.body.style.cursor = "wait";
+        }
+    },
+
+// Ie requires height to 100% and overflow hidden or else you can scroll down past the lightbox
+    prepareIE: function(height, overflow) {
+        bod = document.getElementsByTagName('body')[0];
+        bod.style.height = height;
+        bod.style.overflow = overflow;
+
+        htm = document.getElementsByTagName('html')[0];
+        htm.style.height = height;
+        htm.style.overflow = overflow;
+    },
+
+// In IE, select elements hover on top of the lightbox
+    hideSelects: function(visibility) {
+        selects = document.getElementsByTagName('select');
+        for (i = 0; i < selects.length; i++) {
+            selects[i].style.visibility = visibility;
+        }
+    },
+
+// Taken from lightbox implementation found at http://www.huddletogether.com/projects/lightbox/
+    getScroll: function() {
+        if (self.pageYOffset) {
+            this.yPos = self.pageYOffset;
+        } else if (document.documentElement && document.documentElement.scrollTop) {
+            this.yPos = document.documentElement.scrollTop;
+        } else if (document.body) {
+            this.yPos = document.body.scrollTop;
+        }
+    },
+
+    setScroll: function(x, y) {
+        window.scrollTo(x, y);
+    },
+
+    displayLightbox: function(display) {
+        $('overlay').style.display = display;
+        $('lightbox').style.display = display;
+        if (display != 'none')
+            this.processInfo();
+    },
+
+// Display Ajax response
+    processInfo: function() {
+        var info = new Element('div').setProperty('id', 'lbContent');
+        info.setHTML(this.content.innerHTML);
+        info.injectBefore($('lbLoadMessage'));
+        $('lightbox').className = "done";
+    },
+
+// Search through new links within the lightbox, and attach click event
+    actions: function() {
+        lbActions = document.getElementsByClassName('lbAction');
+
+        for (i = 0; i < lbActions.length; i++) {
+            $(lbActions[i]).addEvent('click', function() {
+                this[lbActions[i].rel].pass(this)
+            }.bind(this));
+            lbActions[i].onclick = function() {
+                return false;
+            };
+        }
+
+    },
+
+// Example of creating your own functionality once lightbox is initiated
+    insert: function(e) {
+        var event = new Event(e);
+        link = event.target;
+        if ($('lbContent'))
+            $('lbContent').remove();
+
+        var myAjax = new Ajax.Request(
+                link.href,
+        {method: 'post', parameters: "", onComplete: this.processInfo.pass(this)}
+                );
+
+    },
+
+// Example of creating your own functionality once lightbox is initiated
+    deactivate: function(time) {
+
+        if ($('lbContent'))
+            $('lbContent').remove();
+        //
+        //		if (browser == "Internet Explorer"){
+        //			this.setScroll(0,this.yPos);
+        //			this.prepareIE("auto", "auto");
+        //			this.hideSelects("visible");
+        //		}
+        this.displayLightbox("none");
+
+        window.document.body.style.cursor = "default";
+    }
+});
+
+/*-----------------------------------------------------------------------------------------------*/
+
+// Onload, make all links that need to trigger a lightbox active
+function initialize() {
+    addLightboxMarkup();
+    valid = new core.WaitDialog($('sampleDialog'));
+}
+
+// Add in markup necessary to make this work. Basically two divs:
+// Overlay holds the shadow
+// Lightbox is the centered square that the content is put into.
+function addLightboxMarkup() {
+    var body = document.getElementsByTagName('body')[0];
+    overlay = new Element('div').setProperty('id', 'overlay').injectInside(document.body);
+    var lb = new Element('div').setProperty('id', 'lightbox');
+    lb.addClass('loading');
+    var tmp = new Element('div').setProperty('id', 'lbLoadMessage').injectInside(lb);
+    lb.injectInside(document.body);
+}
\ No newline at end of file
diff --git a/trunk/core-js/src/main/javascript/footer.js b/trunk/core-js/src/main/javascript/footer.js
new file mode 100644
index 00000000..b68760ab
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/footer.js
@@ -0,0 +1,30 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+window.__coreLoad = function()
+{
+    if (window.afterCoreLoading)
+    {
+        window.afterCoreLoading();
+    } else
+    {
+        setTimeout("window.__coreLoad()", 2000);
+    }
+}
+window.__coreLoad();
\ No newline at end of file
diff --git a/trunk/core-js/src/main/javascript/header.js b/trunk/core-js/src/main/javascript/header.js
new file mode 100644
index 00000000..9208f24c
--- /dev/null
+++ b/trunk/core-js/src/main/javascript/header.js
@@ -0,0 +1,20 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+var core = {};
\ No newline at end of file
diff --git a/trunk/mindplot/pom.xml b/trunk/mindplot/pom.xml
new file mode 100644
index 00000000..cff8d57d
--- /dev/null
+++ b/trunk/mindplot/pom.xml
@@ -0,0 +1,141 @@
+<project>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>mindplot</artifactId>
+    <packaging>jar</packaging>
+    <name>Mindmap Draw JavaScript Library</name>
+
+    <parent>
+        <groupId>org.wisemapping</groupId>
+        <artifactId>wisemapping</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wisemapping</groupId>
+            <artifactId>web2d</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>merge-js-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${basedir}/target/classes"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>net.sf.alchim</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>compress</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>src/main/javascript/</sourceDirectory>
+                            <outputDirectory>target/tmp/</outputDirectory>
+
+                            <aggregations>
+                                <aggregation>
+                                    <output>${basedir}/target/tmp/mindplot-min.js</output>
+                                    <includes>
+                                        <include>header-min.js</include>
+                                        <include>Mindmap-min.js</include>
+                                        <include>NodeModel-min.js</include>
+                                        <include>MindmapDesigner-min.js</include>
+                                        <include>ScreenManager-min.js</include>
+                                        <include>Workspace-min.js</include>
+                                        <include>ShrinkConnector-min.js</include>
+                                        <include>NodeGraph-min.js</include>
+                                        <include>Topic-min.js</include>
+                                        <include>CentralTopic-min.js</include>
+                                        <include>MainTopic-min.js</include>
+                                        <include>DragTopic-min.js</include>
+                                        <include>DragManager-min.js</include>
+                                        <include>DragPivot-min.js</include>
+                                        <include>TopicBoard-min.js</include>
+                                        <include>CentralTopicBoard-min.js</include>
+                                        <include>MainTopicBoard-min.js</include>
+                                        <include>ConnectionLine-min.js</include>
+                                        <include>DragTopicPositioner-min.js</include>
+                                        <include>Board-min.js</include>
+                                        <include>TextEditor-min.js</include>
+                                        <include>VariableDistanceBoard-min.js</include>
+                                        <include>util/Shape-min.js</include>
+                                        <include>FixedDistanceBoard-min.js</include>
+                                        <include>BoardEntry-min.js</include>
+                                        <include>XMLMindmapSerializer-min.js</include>
+                                        <include>PersistanceManager-min.js</include>
+                                        <include>EditorProperties-min.js</include>
+                                        <include>IconGroup-min.js</include>
+                                        <include>BubbleTip-min.js</include>
+                                        <include>Tip-min.js</include>
+                                        <include>Icon-min.js</include>
+                                        <include>LinkIcon-min.js</include>
+                                        <include>Note-min.js</include>
+                                        <include>ImageIcon-min.js</include>
+                                        <include>IconModel-min.js</include>
+                                        <include>LinkModel-min.js</include>
+                                        <include>NoteModel-min.js</include>
+
+                                        <include>Command-min.js</include>
+                                        <include>DesignerActionRunner-min.js</include>
+                                        <include>DesignerUndoManager-min.js</include>
+
+                                        <include>commands/GenericFunctionCommand-min.js</include>
+                                        <include>commands/DeleteTopicCommand-min.js</include>
+                                        <include>commands/DragTopicCommand-min.js</include>
+                                        <include>commands/AddTopicCommand-min.js</include>
+                                        <include>commands/AddLinkToTopicCommand-min.js</include>
+                                        <include>commands/RemoveLinkFromTopicCommand-min.js</include>
+                                        <include>commands/AddIconToTopicCommand-min.js</include>
+                                        <include>commands/RemoveIconFromTopicCommand-min.js</include>
+                                        <include>commands/AddNoteToTopicCommand-min.js</include>
+                                        <include>commands/RemoveNoteFromTopicCommand-min.js</include>
+
+                                        <include>footer-min.js</include>
+
+                                    </includes>
+                                </aggregation>
+                                <aggregation>
+                                    <output>${basedir}/target/classes/mindplot.vml.js</output>
+                                    <includes>
+                                        <include>${basedir}/../web2d/target/classes/web2d.vml-min.js</include>
+                                        <include>${basedir}/target/tmp/mindplot-min.js</include>
+                                    </includes>
+                                </aggregation>
+                                <aggregation>
+                                    <output>${basedir}/target/classes/mindplot.svg.js</output>
+                                    <includes>
+                                        <include>${basedir}/../web2d/target/classes/web2d.svg-min.js</include>
+                                        <include>${basedir}/target/tmp/mindplot-min.js</include>
+                                    </includes>
+                                </aggregation>
+                            </aggregations>
+                            <nomunge>true</nomunge>
+                            <jswarn>false</jswarn>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/trunk/mindplot/src/main/javascript/Board.js b/trunk/mindplot/src/main/javascript/Board.js
new file mode 100644
index 00000000..adfb589e
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Board.js
@@ -0,0 +1,125 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Board = function(defaultHeight, referencePoint)
+{
+    this.initialize(defaultHeight, referencePoint);
+};
+
+mindplot.Board.prototype.initialize = function(defaultHeight, referencePoint)
+{
+    core.assert(referencePoint, "referencePoint can not be null");
+    this._defaultWidth = defaultHeight;
+    this._entries = new mindplot.BidirectionalArray();
+    this._referencePoint = referencePoint;
+};
+
+mindplot.Board.prototype.getReferencePoint = function()
+{
+    return this._referencePoint;
+};
+
+/**
+ * ---------------------------------------
+ */
+mindplot.BidirectionalArray = function()
+{
+    this._leftElem = [];
+    this._rightElem = [];
+};
+
+mindplot.BidirectionalArray.prototype.get = function(index, sign)
+{
+    core.assert(core.Utils.isDefined(index), 'Illegal argument, index must be passed.');
+    if (core.Utils.isDefined(sign))
+    {
+        core.assert(index >= 0, 'Illegal absIndex value');
+        index = index * sign;
+    }
+
+    var result = null;
+    if (index >= 0 && index < this._rightElem.length)
+    {
+        result = this._rightElem[index];
+    } else if (index < 0 && Math.abs(index) < this._leftElem.length)
+    {
+        result = this._leftElem[Math.abs(index)];
+    }
+    return result;
+};
+
+mindplot.BidirectionalArray.prototype.set = function(index, elem)
+{
+    core.assert(core.Utils.isDefined(index), 'Illegal index value');
+
+    var array = (index >= 0) ? this._rightElem : this._leftElem;
+    array[Math.abs(index)] = elem;
+};
+
+mindplot.BidirectionalArray.prototype.length = function(index)
+{
+    core.assert(core.Utils.isDefined(index), 'Illegal index value');
+    return (index >= 0) ? this._rightElem.length : this._leftElem.length;
+};
+
+mindplot.BidirectionalArray.prototype.upperLength = function()
+{
+    return this.length(1);
+};
+
+mindplot.BidirectionalArray.prototype.lowerLength = function()
+{
+    return this.length(-1);
+};
+
+mindplot.BidirectionalArray.prototype.inspect = function()
+{
+    var result = '{';
+    var lenght = this._leftElem.length;
+    for (var i = 0; i < lenght; i++)
+    {
+        var entry = this._leftElem[lenght - i - 1];
+        if (entry != null)
+        {
+            if (i != 0)
+            {
+                result += ', ';
+            }
+            result += entry.inspect();
+        }
+    }
+
+    lenght = this._rightElem.length;
+    for (var i = 0; i < lenght; i++)
+    {
+        var entry = this._rightElem[i];
+        if (entry != null)
+        {
+            if (i != 0)
+            {
+                result += ', ';
+            }
+            result += entry.inspect();
+        }
+    }
+    result += '}';
+
+    return result;
+
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/BoardEntry.js b/trunk/mindplot/src/main/javascript/BoardEntry.js
new file mode 100644
index 00000000..dc0ffd23
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/BoardEntry.js
@@ -0,0 +1,161 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.BoardEntry = function(lowerLimit, upperLimit, order)
+{
+    if (lowerLimit && upperLimit)
+    {
+        core.assert(lowerLimit < upperLimit, 'lowerLimit can not be greater that upperLimit');
+    }
+    this._upperLimit = upperLimit;
+    this._lowerLimit = lowerLimit;
+    this._order = order;
+    this._topic = null;
+    this._xPos = null;
+};
+
+mindplot.BoardEntry.prototype.getUpperLimit = function()
+{
+    return this._upperLimit;
+};
+
+mindplot.BoardEntry.prototype.setXPosition = function(xPosition)
+{
+    this._xPos = xPosition;
+};
+
+mindplot.BoardEntry.prototype.workoutEntryYCenter = function()
+{
+    return this._lowerLimit + ((this._upperLimit - this._lowerLimit) / 2);
+};
+
+mindplot.BoardEntry.prototype.setUpperLimit = function(value)
+{
+    core.assert(core.Utils.isDefined(value), "upper limit can not be null");
+    core.assert(!isNaN(value), "illegal value");
+    this._upperLimit = value;
+};
+
+mindplot.BoardEntry.prototype.isCoordinateIn = function(coord)
+{
+    return this._lowerLimit <= coord && coord < this._upperLimit;
+};
+
+mindplot.BoardEntry.prototype.getLowerLimit = function()
+{
+    return this._lowerLimit;
+};
+
+mindplot.BoardEntry.prototype.setLowerLimit = function(value)
+{
+    core.assert(core.Utils.isDefined(value), "upper limit can not be null");
+    core.assert(!isNaN(value), "illegal value");
+    this._lowerLimit = value;
+};
+
+mindplot.BoardEntry.prototype.setOrder = function(value)
+{
+    this._order = value;
+};
+
+mindplot.BoardEntry.prototype.getWidth = function()
+{
+    return Math.abs(this._upperLimit - this._lowerLimit);
+};
+
+
+mindplot.BoardEntry.prototype.getTopic = function()
+{
+    return this._topic;
+};
+
+
+mindplot.BoardEntry.prototype.removeTopic = function()
+{
+    core.assert(!this.isAvailable(), "Entry doesn't have a topic.");
+    var topic = this.getTopic();
+    this.setTopic(null);
+    topic.setOrder(null);
+};
+
+
+mindplot.BoardEntry.prototype.update = function()
+{
+    var topic = this.getTopic();
+    this.setTopic(topic);
+};
+
+mindplot.BoardEntry.prototype.setTopic = function(topic, updatePosition)
+{
+    if (!core.Utils.isDefined(updatePosition))
+    {
+        updatePosition = true;
+    }
+
+    this._topic = topic;
+    if (topic)
+    {
+        // Fixed positioning. Only for main topic ...
+        var position = null;
+        var topicPosition = topic.getPosition();
+
+        // Must update position base on the border limits?
+        if (this._xPos)
+        {
+            position = new core.Point();
+
+            // Update x position ...
+            var topicSize = topic.getSize();
+            var halfTopicWidh = parseInt(topicSize.width / 2);
+            halfTopicWidh = (this._xPos > 0) ? halfTopicWidh:-halfTopicWidh;
+            position.x = this._xPos + halfTopicWidh;
+            position.y = this.workoutEntryYCenter();
+        } else {
+
+            // Central topic
+            this._height = topic.getSize().height;
+            var xPos = topicPosition.x;
+            var yPos = this.workoutEntryYCenter();
+            position = new core.Point(xPos, yPos);
+        }
+
+        // @todo: No esta de mas...
+        topic.setPosition(position);
+        topic.setOrder(this._order);
+    }
+    else
+    {
+        this._height = this._defaultWidth;
+    }
+};
+
+mindplot.BoardEntry.prototype.isAvailable = function()
+{
+    return !core.Utils.isDefined(this._topic);
+};
+
+mindplot.BoardEntry.prototype.getOrder = function()
+{
+    return this._order;
+};
+
+mindplot.BoardEntry.prototype.inspect = function()
+{
+    return '(order: ' + this._order + ', lowerLimit:' + this._lowerLimit + ', upperLimit: ' + this._upperLimit + ', available:' + this.isAvailable() + ')';
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/BubbleTip.js b/trunk/mindplot/src/main/javascript/BubbleTip.js
new file mode 100644
index 00000000..b3e5ff83
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/BubbleTip.js
@@ -0,0 +1,264 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.BubbleTip = function(divContainer){
+    this.initialize(divContainer);
+    };
+mindplot.BubbleTip.prototype.initialize=function(divContainer){
+    this.options={
+        panel:null,
+        container:null,
+        divContainer:divContainer,
+        content:null,
+        onShowComplete:Class.empty,
+        onHideComplete:Class.empty,
+        width:null,
+        height:null,
+        form:null
+    };
+        if($chk(this.options.form))
+            this.scanElements(this.options.form);
+        this.buildBubble();
+        this._isMouseOver=false;
+        this._open=false;
+    };
+mindplot.BubbleTip.prototype.scanElements=function(form){
+        $$($(form).getElements('a')).each(function(el) {
+            if (el.href && el.hasClass('bubble') && !el.onclick) {
+                el.addEvent('mouseover',this.click.bindWithEvent(this,el));
+            }
+        }, this);
+    };
+mindplot.BubbleTip.prototype.buildBubble=function(invert){
+        var opts = this.options;
+
+        var panel = new Element('div').addClass('bubbleContainer');
+        if($chk(opts.height))
+            panel.setStyle('height', opts.height);
+        if($chk(opts.width))
+            panel.setStyle('width', opts.width);
+
+        var topClass="";
+        var bottomClass="Hint";
+        if($chk(invert)){
+            var tmpClass = topClass;
+            topClass=bottomClass;
+            bottomClass=tmpClass;
+        }
+
+        //build top part of bubble
+        this.topContainer = new Element('div').addClass('bublePartContainer');
+        this.topLeft = new Element('div').addClass('bubblePart').addClass('bubble'+topClass+'TopLeftBlue');
+        this.top = new Element('div').addClass('bubblePart').addClass('bubble'+topClass+'TopBlue');
+        this.topHint =new Element('div').addClass('bubblePart').addClass('bubbleTop'+topClass+'Blue').setStyle('width',58);
+        this.top2 = new Element('div').addClass('bubblePart').addClass('bubble'+topClass+'TopBlue');
+        this.topRight = new Element('div').addClass('bubblePart').addClass('bubble'+topClass+'TopRightBlue');
+        this.topLeft.inject(this.topContainer);
+        this.top.inject(this.topContainer);
+        this.topHint.inject(this.topContainer);
+        this.top2.inject(this.topContainer);
+        this.topRight.inject(this.topContainer);
+
+        //build middle part of bubble
+        this.middleContainer = new Element('div').addClass('bublePartContainer');
+        this.left = new Element('div').addClass('bubblePart').addClass('bubbleLeftBlue');
+        this.center = new Element('div').addClass('bubblePart').addClass('bubbleCenterBlue');
+        this.right = new Element('div').addClass('bubblePart').addClass('bubbleRightBlue');
+        this.left.inject(this.middleContainer);
+        this.center.inject(this.middleContainer);
+        this.right.inject(this.middleContainer);
+
+        //build bottom part of bubble
+        this.bottomContainer = new Element('div').addClass('bublePartContainer');
+        this.bottomLeft = new Element('div').addClass('bubblePart').addClass('bubble'+bottomClass+'BottomLeftBlue');
+        this.bottom = new Element('div').addClass('bubblePart').addClass('bubble'+bottomClass+'BottomBlue');
+        this.bottomHint =new Element('div').addClass('bubblePart').addClass('bubbleBottom'+bottomClass+'Blue').setStyle('width',58);
+        this.bottom2 = new Element('div').addClass('bubblePart').addClass('bubble'+bottomClass+'BottomBlue');
+        this.bottomRight = new Element('div').addClass('bubblePart').addClass('bubble'+bottomClass+'BottomRightBlue');
+        this.bottomLeft.inject(this.bottomContainer);
+        this.bottom.inject(this.bottomContainer);
+        this.bottomHint.inject(this.bottomContainer);
+        this.bottom2.inject(this.bottomContainer);
+        this.bottomRight.inject(this.bottomContainer);
+
+        this.topContainer.inject(panel);
+        this.middleContainer.inject(panel);
+        this.bottomContainer.inject(panel);
+
+        if(!$chk(opts.divContainer))
+        {
+            opts.divContainer=document.body;
+        }
+        panel.injectTop(opts.divContainer);
+        opts.panel = $(panel);
+        opts.panel.setStyle('opacity',0);
+        opts.panel.addEvent('mouseover',function(){this._isMouseOver=true;}.bind(this));
+        opts.panel.addEvent('mouseleave',function(event){this.close(event);}.bindWithEvent(this));//this.close.bindWithEvent(this)
+
+    };
+mindplot.BubbleTip.prototype.click= function(event, el) {
+        return this.open(event, el);
+    };
+mindplot.BubbleTip.prototype.open= function(event, content, source){
+        this._isMouseOver=true;
+        this._evt = new Event(event);
+        this.doOpen.delay(500, this,[content,source]);
+    };
+mindplot.BubbleTip.prototype.doOpen= function(content, source){
+        if($chk(this._isMouseOver) &&!$chk(this._open) && !$chk(this._opening))
+        {
+            this._opening=true;
+            var container = new Element('div');
+            $(content).inject(container);
+            this.options.content=content;
+            this.options.container=container;
+            $(this.options.container).inject(this.center);
+            this.init(this._evt,source);
+            $(this.options.panel).effect('opacity',{duration:500, onComplete:function(){this._open=true; this._opening = false;}.bind(this)}).start(0,100);
+        }
+    };
+mindplot.BubbleTip.prototype.updatePosition=function(event){
+        this._evt = new Event(event);
+    };
+mindplot.BubbleTip.prototype.close=function(event){
+        this._isMouseOver=false;
+        this.doClose.delay(50,this,new Event(event));
+    };
+mindplot.BubbleTip.prototype.doClose=function(event){
+
+        if(!$chk(this._isMouseOver) && $chk(this._opening))
+            this.doClose.delay(500,this,this._evt);
+        
+        if(!$chk(this._isMouseOver) && $chk(this._open))
+        {
+            this.forceClose();
+        }
+    };
+mindplot.BubbleTip.prototype.forceClose=function(){
+        this.options.panel.effect('opacity',{duration:100, onComplete:function(){
+            this._open=false;
+            $(this.options.panel).setStyles({left:0,top:0});
+            $(this.top2).setStyle('width', 3);
+            $(this.bottom2).setStyle('width', 3);
+            $(this.top).setStyle('width', 3);
+            $(this.bottom).setStyle('width', 3);
+            $(this.left).setStyle('height', 4);
+            $(this.right).setStyle('height', 4);
+            $(this.options.container).remove();
+        }.bind(this)}).start(100,0);
+    };
+mindplot.BubbleTip.prototype.init=function(event,source){
+        var opts = this.options;
+        var coordinates = $(opts.panel).getCoordinates();
+        var panelHeight = coordinates.height; //not total height, but close enough
+
+        var offset = designer.getWorkSpace().getScreenManager().getWorkspaceIconPosition(source);
+
+        var containerCoords = $(opts.divContainer).getCoordinates();
+        var screenWidth = containerCoords.width;
+        var screenHeight = containerCoords.height;
+
+        var invert = false;
+        var picoFix=20;
+
+        var centerWidth = $(this.center).getCoordinates().width;
+
+        if(offset.y > panelHeight){ //hint goes on the bottom
+            if(!$(this.topLeft).hasClass('bubbleTopLeftBlue')){
+                $(this.options.panel).remove();
+                this.buildBubble(false);
+                $(this.options.container).inject(this.center);
+            }
+        }
+        else{
+            invert=true;
+            picoFix=0;
+            if($(this.topLeft).hasClass('bubbleTopLeftBlue')){
+                $(this.options.panel).remove();
+                this.buildBubble(invert);
+                $(this.options.container).inject(this.center);
+            }
+            centerWidth = centerWidth-1;
+        }
+
+        offset.y = offset.y + picoFix;
+        var width = centerWidth - $(this.topHint).getCoordinates().width;
+
+        if((screenWidth -offset.x)>coordinates.width){
+            width= width-$(this.top).getCoordinates().width;
+            $(this.top2).setStyle('width', width);
+            $(this.bottom2).setStyle('width', width);
+        }
+        else{
+            width= width-$(this.top2).getCoordinates().width;
+            $(this.top).setStyle('width', width);
+            $(this.bottom).setStyle('width', width);
+        }
+
+        width = centerWidth + $(this.topLeft).getCoordinates().width;
+        //width = width + $(this.top).getCoordinates().width;
+        //width = width + $(this.topHint).getCoordinates().width;
+        width = width + $(this.topRight).getCoordinates().width;
+
+        var height = $(this.center).getCoordinates().height;
+        $(this.left).setStyle('height', height);
+        $(this.right).setStyle('height', height);
+
+        height = height+ $(this.topLeft).getCoordinates().height;
+        height = height+ $(this.bottomLeft).getCoordinates().height;
+        $(opts.panel).setStyles({width:width,height:height});
+
+        this.moveTopic(offset, $(opts.panel).getCoordinates().height, invert);
+    };
+mindplot.BubbleTip.prototype.moveTopic=function(offset, panelHeight, invert){
+        var f = 1;
+        if($chk(invert))
+            f=0;
+        var opts = this.options;
+        var width = $(this.bottomLeft).getCoordinates().width+$(this.bottom).getCoordinates().width-(2*(f-1));
+        $(opts.panel).setStyles({left:offset.x - width, top:offset.y - (panelHeight*f)});
+    };
+
+mindplot.BubbleTip.getInstance = function(divContainer)
+{
+    var result = mindplot.BubbleTip.instance;
+    if(!result)
+    {
+        mindplot.BubbleTip.instance = new mindplot.BubbleTip(divContainer);
+        result = mindplot.BubbleTip.instance;
+    }
+    return result;
+};
+
+
+/*
+buildAnchorContent:function(el, title){
+        var imgContainer= new Element('div');
+        var img = new Element('img');
+        img.src='http://open.thumbshots.org/image.pxf?url='+el.href;
+        img.inject(imgContainer);
+
+        var attribution = new Element('div');
+        attribution.innerHTML="<a href='http://www.thumbshots.org' target='_blank' title='About Thumbshots thumbnails'>About Thumbshots thumbnails</a>";
+
+        var element = new Element('div');
+        imgContainer.inject(element);
+        attribution.inject(element);
+        return element;
+    }*/
diff --git a/trunk/mindplot/src/main/javascript/CentralTopic.js b/trunk/mindplot/src/main/javascript/CentralTopic.js
new file mode 100644
index 00000000..38c9ce0a
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/CentralTopic.js
@@ -0,0 +1,137 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.CentralTopic = function(model)
+{
+    core.assert(model, "Model can not be null");
+    this.setModel(model);
+    var topicBoard = new mindplot.CentralTopicBoard(this);
+    mindplot.CentralTopic.superClass.initialize.call(this, topicBoard);
+    this.__onLoad = true;
+};
+
+objects.extend(mindplot.CentralTopic, mindplot.Topic);
+
+
+mindplot.CentralTopic.prototype.workoutIncomingConnectionPoint = function(sourcePosition)
+{
+    return this.getPosition();
+};
+
+mindplot.CentralTopic.prototype.getTopicType = function()
+{
+    return mindplot.NodeModel.CENTRAL_TOPIC_TYPE;
+};
+
+mindplot.CentralTopic.prototype.setCursor = function(type)
+{
+    type = (type == 'move') ? 'default' : type;
+    mindplot.CentralTopic.superClass.setCursor.call(this, type);
+};
+
+mindplot.CentralTopic.prototype.isConnectedToCentralTopic = function()
+{
+    return false;
+};
+
+mindplot.CentralTopic.prototype.createChildModel = function()
+{
+    // Create a new node ...
+    var model = this.getModel();
+    var mindmap = model.getMindmap();
+    var childModel = mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE);
+
+    if (!core.Utils.isDefined(this.___siblingDirection))
+    {
+        this.___siblingDirection = 1;
+    }
+
+    // Positionate following taking into account this internal flag ...
+    if (this.___siblingDirection == 1)
+    {
+
+        childModel.setPosition(100, 0);
+    } else
+    {
+        childModel.setPosition(-100, 0);
+    }
+    this.___siblingDirection = -this.___siblingDirection;
+
+    // Create a new node ...
+    childModel.setOrder(0);
+
+    return childModel;
+};
+
+mindplot.CentralTopic.prototype._defaultShapeType = function()
+{
+    return  mindplot.NodeModel.SHAPE_TYPE_ROUNDED_RECT;
+};
+
+
+mindplot.CentralTopic.prototype.updateTopicShape = function()
+{
+
+};
+mindplot.CentralTopic.prototype._updatePositionOnChangeSize = function(oldSize, newSize) {
+
+    // Center main topic ...
+    var zeroPoint = new core.Point(0, 0);
+    this.setPosition(zeroPoint);
+
+    // Update children position based on the new figure size ...
+    var xOffset = newSize.width - oldSize.width;
+    xOffset = Math.round(xOffset / 2);
+
+    if (!this.__onLoad)
+    {
+        // HACK: on load ignore changes of position in order to avoid adding
+        // several times the central topic distance to all the child nodes...
+
+        var topicBoard = this.getTopicBoard();
+        topicBoard.updateChildrenPosition(this, xOffset);
+        this.__onLoad = false;
+    }
+};
+
+mindplot.CentralTopic.prototype._defaultText = function()
+{
+    return "Central Topic";
+};
+
+mindplot.CentralTopic.prototype._defaultBackgroundColor = function()
+{
+    return "#f7f7f7";
+};
+
+mindplot.CentralTopic.prototype._defaultBorderColor = function()
+{
+    return "#023BB9";
+};
+
+mindplot.CentralTopic.prototype._defaultFontStyle = function()
+{
+    return {
+        font:"Verdana",
+        size: 10,
+        style:"normal",
+        weight:"bold",
+        color:"#023BB9"
+    };
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/CentralTopicBoard.js b/trunk/mindplot/src/main/javascript/CentralTopicBoard.js
new file mode 100644
index 00000000..00761c25
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/CentralTopicBoard.js
@@ -0,0 +1,123 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.CentralTopicBoard = function(centralTopic)
+{
+    var point = new core.Point(0, 0);
+    this._rightBoard = new mindplot.VariableDistanceBoard(50, point);
+    this._leftBoard = new mindplot.VariableDistanceBoard(50, point);
+    this._centralTopic = centralTopic;
+};
+
+objects.extend(mindplot.CentralTopicBoard, mindplot.TopicBoard);
+
+mindplot.CentralTopicBoard.prototype._getBoard = function(position)
+{
+    return (position.x >= 0) ? this._rightBoard : this._leftBoard;
+};
+
+mindplot.CentralTopicBoard.prototype._updateHeight = function()
+{
+
+};
+
+
+mindplot.CentralTopicBoard.prototype.positionateDragTopic = function(dragTopic)
+{
+    core.assert(dragTopic != null, 'dragTopic can not be null');
+    core.assert(dragTopic.isDragTopic, 'dragTopic must be DragTopic instance');
+
+    // This node is a main topic node. Position
+    var dragPos = dragTopic.getPosition();
+    var board = this._getBoard(dragPos);
+
+    // Look for entry  ...
+    var entry = board.lookupEntryByPosition(dragPos);
+
+    // Calculate 'y' position base on the entry ...
+    var yCoord;
+    if (!entry.isAvailable() && entry.getTopic() != dragTopic.getDraggedTopic())
+    {
+        yCoord = entry.getLowerLimit();
+    } else
+    {
+        yCoord = entry.workoutEntryYCenter();
+    }
+
+
+    // MainTopic can not be positioned over the drag topic ...
+    var centralTopic = this._centralTopic;
+    var centralTopicSize = centralTopic.getSize();
+    var halfWidth = (centralTopicSize.width / 2);
+    if (Math.abs(dragPos.x) < halfWidth + 60)
+    {
+        var distance = halfWidth + 60;
+        dragPos.x = (dragPos.x > 0)? distance:-distance;
+    }
+
+    // Update board position.
+    var pivotPos = new core.Point(dragPos.x, yCoord);
+    dragTopic.setBoardPosition(pivotPos);
+};
+
+
+mindplot.CentralTopicBoard.prototype.addBranch = function(topic)
+{
+    // Update topic position ...
+    var position = topic.getPosition();
+
+    var order = topic.getOrder();
+    var board = this._getBoard(position);
+    var entry = null;
+    if (order != null)
+    {
+        entry = board.lookupEntryByOrder(order);
+    } else
+    {
+        entry = board.lookupEntryByPosition(position);
+    }
+
+    // If the entry is not available, I must swap the the entries...
+    if (!entry.isAvailable())
+    {
+        board.freeEntry(entry);
+    }
+
+    // Add it to the board ...
+    entry.setTopic(topic);
+    board.update(entry);
+};
+
+mindplot.CentralTopicBoard.prototype.updateChildrenPosition = function(topic, xOffset)
+{
+    var board = this._rightBoard;
+    var oldReferencePosition = board.getReferencePoint();
+    var newReferencePosition = new core.Point(oldReferencePosition.x + xOffset, oldReferencePosition.y);
+    board.updateReferencePoint(newReferencePosition);
+
+    board = this._leftBoard;
+    oldReferencePosition = board.getReferencePoint();
+    newReferencePosition = new core.Point(oldReferencePosition.x - xOffset, oldReferencePosition.y);
+    board.updateReferencePoint(newReferencePosition);
+};
+
+mindplot.CentralTopicBoard.prototype.repositionate = function()
+{
+    //@todo: implement ..
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/Command.js b/trunk/mindplot/src/main/javascript/Command.js
new file mode 100644
index 00000000..354cf3a3
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Command.js
@@ -0,0 +1,49 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Command = new Class(
+{
+    initialize: function()
+    {
+        this._id = mindplot.Command._nextUUID();
+    },
+    execute: function(commandContext)
+    {
+        throw "execute must be implemented.";
+    },
+    undoExecute: function(commandContext)
+    {
+        throw "undo must be implemented.";
+    },
+    getId:function()
+    {
+        return this._id;
+    }
+});
+
+mindplot.Command._nextUUID = function()
+{
+    if (!mindplot.Command._uuid)
+    {
+        mindplot.Command._uuid = 1;
+    }
+
+    mindplot.Command._uuid = mindplot.Command._uuid + 1;
+    return mindplot.Command._uuid;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/ConnectionLine.js b/trunk/mindplot/src/main/javascript/ConnectionLine.js
new file mode 100644
index 00000000..11bf0282
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/ConnectionLine.js
@@ -0,0 +1,125 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.ConnectionLine = function(sourceNode, targetNode)
+{
+    core.assert(targetNode, 'parentNode node can not be null');
+    core.assert(sourceNode, 'childNode node can not be null');
+    core.assert(sourceNode != targetNode, 'Cilcular connection');
+
+    this._targetTopic = targetNode;
+    this._sourceTopic = sourceNode;
+
+    var strokeColor = mindplot.ConnectionLine.getStrokeColor();
+    var line;
+    if (targetNode.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        line = new web2d.Line();
+        line.setStroke(1, 'solid', strokeColor);
+    } else
+    {
+        line = new web2d.PolyLine();
+        line.setStroke(1, 'solid', strokeColor);
+    }
+
+    this._line2d = line;
+};
+
+mindplot.ConnectionLine.getStrokeColor = function()
+{
+    return '#495879';
+};
+
+mindplot.ConnectionLine.prototype.setVisibility = function(value)
+{
+    var line2d = this._line2d;
+    line2d.setVisibility(value);
+};
+
+mindplot.ConnectionLine.prototype.redraw = function()
+{
+    var line2d = this._line2d;
+    var sourceTopic = this._sourceTopic;
+    var sourcePosition = sourceTopic.getPosition();
+
+    var targetTopic = this._targetTopic;
+    var targetPosition = targetTopic.getPosition();
+
+    var sPos = sourceTopic.workoutOutgoingConnectionPoint(targetPosition);
+    line2d.setTo(sPos.x, sPos.y);
+
+    var tPos = targetTopic.workoutIncomingConnectionPoint(sourcePosition);
+    line2d.setFrom(tPos.x, tPos.y);
+
+    line2d.moveToBack();
+
+    // Add connector ...
+    this._positionateConnector(targetTopic);
+
+};
+
+mindplot.ConnectionLine.prototype._positionateConnector = function(targetTopic)
+{
+    var targetPosition = targetTopic.getPosition();
+    var offset = mindplot.Topic.CONNECTOR_WIDTH / 2;
+    var targetTopicSize = targetTopic.getSize();
+    var y;
+    if (targetTopic.getShapeType() == mindplot.NodeModel.SHAPE_TYPE_LINE)
+    {
+        y = targetTopicSize.height;
+    } else
+    {
+        y = targetTopicSize.height / 2;
+    }
+    y = y - offset;
+
+    var connector = targetTopic.getShrinkConnector();
+    if (targetPosition.x >= 0)
+    {
+        var x = targetTopicSize.width;
+        connector.setPosition(x, y);
+    }
+    else
+    {
+        var x = -mindplot.Topic.CONNECTOR_WIDTH;
+        connector.setPosition(x, y);
+    }
+};
+
+mindplot.ConnectionLine.prototype.setStroke = function(color, style, opacity)
+{
+    var line2d = this._line2d;
+    this._line2d.setStroke(null, null, color, opacity);
+};
+
+
+mindplot.ConnectionLine.prototype.addToWorkspace = function(workspace)
+{
+    workspace.appendChild(this._line2d);
+};
+
+mindplot.ConnectionLine.prototype.removeFromWorkspace = function(workspace)
+{
+    workspace.removeChild(this._line2d);
+};
+
+mindplot.ConnectionLine.prototype.getTargetTopic = function()
+{
+    return this._targetTopic;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/DesignerActionRunner.js b/trunk/mindplot/src/main/javascript/DesignerActionRunner.js
new file mode 100644
index 00000000..05d6f45a
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/DesignerActionRunner.js
@@ -0,0 +1,131 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.DesignerActionRunner = new Class({
+    execute:function(command)
+    {
+        core.assert(command, "command can not be null");
+        // Execute action ...
+        command.execute(this._context);
+
+        // Enqueue it ...
+        this._undoManager.enqueue(command);
+
+        // Fire event
+        var event = this._undoManager._buildEvent();
+        this._designer._fireEvent("change", event);
+    },
+    initialize: function(designer)
+    {
+        this._designer = designer;
+        this._undoManager = new mindplot.DesignerUndoManager();
+        this._context = new mindplot.CommandContext(this._designer);
+    },
+    undo: function()
+    {
+        this._undoManager.execUndo(this._context);
+
+        // Fire event
+        var event = this._undoManager._buildEvent();
+        this._designer._fireEvent("change", event);
+    },
+    redo: function()
+    {
+        this._undoManager.execRedo(this._context);
+
+        // Fire event
+        var event = this._undoManager._buildEvent();
+        this._designer._fireEvent("change", event);
+
+    },
+    markAsChangeBase: function()
+    {
+        return this._undoManager.markAsChangeBase();
+    },
+    hasBeenChanged: function()
+    {
+        return this._undoManager.hasBeenChanged();
+    }
+});
+
+mindplot.CommandContext = new Class({
+    initialize: function(designer)
+    {
+        this._designer = designer;
+    },
+    findTopics:function(topicsIds)
+    {
+        var designerTopics = this._designer._topics;
+        if (!(topicsIds instanceof Array))
+        {
+            topicsIds = [topicsIds];
+        }
+
+        var result = designerTopics.filter(function(topic) {
+            var found = false;
+            if (topic != null)
+            {
+                var topicId = topic.getId();
+                found = topicsIds.contains(topicId);
+            }
+            return found;
+
+        });
+        return result;
+    },
+    deleteTopic:function(topic)
+    {
+        this._designer._removeNode(topic);
+    },
+    createTopic:function(model)
+    {
+        core.assert(model, "model can not be null");
+        var topic = this._designer._nodeModelToNodeGraph(model);
+
+        // @todo: Is this required ?
+        var designer = this._designer;
+        designer.onNodeFocusEvent.attempt(topic, designer);
+
+        return topic;
+    },
+    createModel:function()
+    {
+        var mindmap = this._designer.getMindmap();
+        var model = mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE);
+        return model;
+    },
+    connect:function(childTopic, parentTopic)
+    {
+        childTopic.connectTo(parentTopic, this._designer._workspace);
+    } ,
+    disconnect:function(topic)
+    {
+        topic.disconnect(this._designer._workspace);
+    }
+});
+
+mindplot.DesignerActionRunner.setInstance = function(actionRunner)
+{
+    mindplot.DesignerActionRunner._instance = actionRunner;
+};
+
+mindplot.DesignerActionRunner.getInstance = function()
+{
+    return mindplot.DesignerActionRunner._instance;
+};
diff --git a/trunk/mindplot/src/main/javascript/DesignerUndoManager.js b/trunk/mindplot/src/main/javascript/DesignerUndoManager.js
new file mode 100644
index 00000000..f5a36ea0
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/DesignerUndoManager.js
@@ -0,0 +1,93 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.DesignerUndoManager = new Class({
+    initialize: function()
+    {
+        this._undoQueue = [];
+        this._redoQueue = [];
+        this._baseId = 0;
+    },
+    enqueue:function(command)
+    {
+        core.assert(command, "Command can  not be null");
+        var length = this._undoQueue.length;
+        if (command.discartDuplicated && length > 0)
+        {
+            // Skip duplicated events ...
+            var lastItem = this._undoQueue[length - 1];
+            if (lastItem.discartDuplicated != command.discartDuplicated)
+            {
+                this._undoQueue.push(command);
+            }
+        } else
+        {
+            this._undoQueue.push(command);
+        }
+        this._redoQueue = [];
+    },
+    execUndo: function(commandContext)
+    {
+        if (this._undoQueue.length > 0)
+        {
+            var command = this._undoQueue.pop();
+            this._redoQueue.push(command);
+
+            command.undoExecute(commandContext);
+        }
+    },
+    execRedo: function(commandContext)
+    {
+        if (this._redoQueue.length > 0)
+        {
+            var command = this._redoQueue.pop();
+            this._undoQueue.push(command);
+            command.execute(commandContext);
+        }
+    },
+    _buildEvent: function()
+    {
+        return {undoSteps: this._undoQueue.length, redoSteps:this._redoQueue.length};
+    },
+    markAsChangeBase: function()
+    {
+        var undoLenght = this._undoQueue.length;
+        if (undoLenght > 0)
+        {
+            var command = this._undoQueue[undoLenght - 1];
+            this._baseId = command.getId();
+        } else
+        {
+            this._baseId = 0;
+        }
+    },
+    hasBeenChanged: function()
+    {
+        var result = true;
+        var undoLenght = this._undoQueue.length;
+        if (undoLenght == 0 && this._baseId == 0)
+        {
+            result = false;
+        } else if(undoLenght>0)
+        {
+            var command = this._undoQueue[undoLenght - 1];
+            result = (this._baseId != command.getId());
+        }
+        return result;
+    }});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/DragManager.js b/trunk/mindplot/src/main/javascript/DragManager.js
new file mode 100644
index 00000000..69194c2e
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/DragManager.js
@@ -0,0 +1,177 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.DragManager = function(workspace)
+{
+    this._workspace = workspace;
+    this._listeners = {};
+    this._processMouseMoveEvent = true;
+    var dragManager = this;
+    this._precitionUpdater = null;
+};
+
+mindplot.DragManager.prototype.add = function(node)
+{
+    // Add behaviour ...
+    var workspace = this._workspace;
+    var screen = workspace.getScreenManager();
+    var dragManager = this;
+
+    var mouseDownListener = function(event)
+    {
+        if (workspace.isWorkspaceEventsEnabled())
+        {
+            // Disable double drag... 
+            workspace.enableWorkspaceEvents(false);
+
+            // Set initial position.
+            var dragNode = node.createDragNode();
+            var mousePos = screen.getWorkspaceMousePosition(event);
+            dragNode.setPosition(mousePos.x, mousePos.y);
+            var periodicalFunction = function() {
+                dragManager._processMouseMoveEvent = true;
+            };
+            // Start precision timer updater ...
+            dragManager._precitionUpdater = periodicalFunction.periodical(mindplot.DragManager.DRAG_PRECISION_IN_SEG);
+
+            // Register mouse move listener ...
+            var mouseMoveListener = dragManager._buildMouseMoveListener(workspace, dragNode, dragManager);
+            workspace.addEventListener('mousemove', mouseMoveListener);
+
+            // Register mouse up listeners ...
+            var mouseUpListener = dragManager._buildMouseUpListener(workspace, node, dragNode, dragManager);
+            workspace.addEventListener('mouseup', mouseUpListener);
+
+            // Execute Listeners ..
+            var startDragListener = dragManager._listeners['startdragging'];
+            startDragListener(event, node);
+
+            // Change cursor.
+            window.document.body.style.cursor = 'move';
+        }
+    };
+    dragManager._mouseMoveListener = mouseDownListener;
+
+    node.addEventListener('mousedown', mouseDownListener);
+};
+
+mindplot.DragManager.prototype.remove = function(node)
+{
+    var nodes = this._topics;
+    var contained = false;
+    var index = -1;
+    for (var i = 0; i < nodes.length; i++) {
+        if (nodes[i] == node) {
+            contained = true;
+            index = i;
+        }
+    }
+    if (contained)
+    {
+        elem = new Array();
+    }
+};
+
+mindplot.DragManager.prototype._buildMouseMoveListener = function(workspace, dragNode, dragManager)
+{
+    var screen = workspace.getScreenManager();
+    var result = function(event) {
+        if (dragManager._processMouseMoveEvent)
+        {
+            // Disable mouse move rendering ...
+            dragManager._processMouseMoveEvent = false;
+            if (!dragNode._isInTheWorkspace)
+            {
+                // Add shadow node to the workspace.
+                workspace.appendChild(dragNode);
+                dragNode._isInTheWorkspace = true;
+            }
+
+            var pos = screen.getWorkspaceMousePosition(event);
+            dragNode.setPosition(pos.x, pos.y);
+
+            // Call mouse move listeners ...
+            var dragListener = dragManager._listeners['dragging'];
+            if (dragListener)
+            {
+                dragListener(event, dragNode);
+            }
+        }
+    };
+    dragManager._mouseMoveListener = result;
+    return result;
+};
+
+mindplot.DragManager.prototype._buildMouseUpListener = function(workspace, node, dragNode, dragManager)
+{
+    var screen = workspace.getScreenManager();
+    var result = function(event) {
+
+        core.assert(dragNode.isDragTopic, 'dragNode must be an DragTopic');
+
+        // Remove drag node from the workspace.
+        var hasBeenDragged = dragNode._isInTheWorkspace;
+        if (dragNode._isInTheWorkspace)
+        {
+            dragNode.removeFromWorkspace(workspace);
+        }
+
+        // Remove all the events.
+        workspace.removeEventListener('mousemove', dragManager._mouseMoveListener);
+        workspace.removeEventListener('mouseup', dragManager._mouseUpListener);
+
+        // Help GC
+        dragManager._mouseMoveListener = null;
+        dragManager._mouseUpListener = null;
+
+        // Execute Listeners only if the node has been moved.
+        var endDragListener = dragManager._listeners['enddragging'];
+        endDragListener(event, dragNode);
+
+        if (hasBeenDragged)
+        {
+            dragNode._isInTheWorkspace = false;
+        }
+
+        // Stop presition updater listener ...
+        $clear(dragManager._precitionUpdater);
+        dragManager._precitionUpdater = null;
+
+        // Change the cursor to the default.
+        window.document.body.style.cursor = 'default';
+
+        workspace.enableWorkspaceEvents(true);
+
+    };
+    dragManager._mouseUpListener = result;
+    return result;
+};
+
+/**
+ * type:
+ *  - startdragging.
+ *  - dragging
+ *  - enddragging
+ */
+mindplot.DragManager.prototype. addEventListener = function(type, listener)
+{
+    this._listeners[type] = listener;
+};
+
+mindplot.DragManager.DRAG_PRECISION_IN_SEG = 100;
diff --git a/trunk/mindplot/src/main/javascript/DragPivot.js b/trunk/mindplot/src/main/javascript/DragPivot.js
new file mode 100644
index 00000000..b603ab22
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/DragPivot.js
@@ -0,0 +1,252 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.DragPivot = function()
+{
+    this._position = new core.Point();
+    this._size = mindplot.DragTopic.PIVOT_SIZE;
+    this._line = null;
+
+    this._straightLine = this._buildStraightLine();
+    this._curvedLine = this._buildCurvedLine();
+    this._dragPivot = this._buildRect();
+    this._connectRect = this._buildRect();
+    this._targetTopic = null;
+};
+
+mindplot.DragPivot.prototype.getTargetTopic = function()
+{
+    return this._targetTopic;
+};
+
+mindplot.DragPivot.prototype._buildStraightLine = function()
+{
+    var line = new web2d.Line();
+    line.setStroke(1, 'solid', '#CC0033');
+    line.setOpacity(0.4);
+    line.setVisibility(false);
+    return line;
+};
+
+mindplot.DragPivot.prototype._buildCurvedLine = function()
+{
+    var line = new web2d.PolyLine();
+    line.setStroke(1, 'solid', '#CC0033');
+    line.setOpacity(0.4);
+    line.setVisibility(false);
+    return line;
+};
+
+mindplot.DragPivot.prototype._redraw = function(pivotPosition)
+{
+    // Update line position.
+    core.assert(this.getTargetTopic(), 'Illegal invocation. Target node can not be null');
+
+    var pivotRect = this._getPivotRect();
+    var currentPivotPositon = pivotRect.getPosition();
+
+    // Pivot position has not changed. In this case, position change is not required.
+    var targetTopic = this.getTargetTopic();
+    if (currentPivotPositon.x != pivotPosition.x || currentPivotPositon.y != pivotPosition.y)
+    {
+        var position = this._position;
+        var fromPoint = targetTopic.workoutIncomingConnectionPoint(position);
+
+        // Calculate pivot connection point ...
+        var size = this._size;
+        var targetPosition = targetTopic.getPosition();
+        var line = this._line;
+
+        // Update Line position.
+        var isAtRight = mindplot.util.Shape.isAtRight(targetPosition, position);
+        var pivotPoint = mindplot.util.Shape.calculateRectConnectionPoint(position, size, isAtRight);
+        line.setFrom(pivotPoint.x, pivotPoint.y);
+
+        // Update rect position
+        pivotRect.setPosition(pivotPosition.x, pivotPosition.y);
+
+        // Display elements if it's requiered...
+        if (!pivotRect.isVisible())
+        {
+            // Make line visible only when the position has been already changed.
+            // This solve several strange effects ;)
+            var targetPoint = targetTopic.workoutIncomingConnectionPoint(pivotPoint);
+            line.setTo(targetPoint.x, targetPoint.y);
+
+            this.setVisibility(true);
+        }
+    }
+};
+
+mindplot.DragPivot.prototype.setPosition = function(point)
+{
+    this._position = point;
+
+    // Update visual position.
+    var pivotRect = this._getPivotRect();
+    var size = this.getSize();
+
+    var cx = point.x - (parseInt(size.width) / 2);
+    var cy = point.y - (parseInt(size.height) / 2);
+
+    // Update line  ...
+    if (this.getTargetTopic())
+    {
+        var pivotPosition = {x:cx,y:cy};
+        this._redraw(pivotPosition);
+    }
+};
+
+mindplot.DragPivot.prototype.getPosition = function()
+{
+    return this._position;
+};
+
+mindplot.DragPivot.prototype._buildRect = function()
+{
+    var size = this._size;
+    var rectAttributes = {fillColor:'#CC0033',opacity:0.4,width:size.width,height:size.height,strokeColor:'#FF9933'};
+    var rect = new web2d.Rect(0, rectAttributes);
+    rect.setVisibility(false);
+    return rect;
+};
+
+mindplot.DragPivot.prototype._buildConnectRect = function()
+{
+    var size = this._size;
+    var rectAttributes = {fillColor:'#CC0033',opacity:0.4,width:size.width,height:size.height,strokeColor:'#FF9933'};
+    var result = new web2d.Rect(0, rectAttributes);
+    return result;
+};
+
+mindplot.DragPivot.prototype._getPivotRect = function()
+{
+    return this._dragPivot;
+};
+
+mindplot.DragPivot.prototype.getSize = function()
+{
+    var elem2d = this._getPivotRect();
+    return elem2d.getSize();
+};
+
+mindplot.DragPivot.prototype.setVisibility = function(value)
+{
+    var pivotRect = this._getPivotRect();
+    pivotRect.setVisibility(value);
+
+    var connectRect = this._connectRect;
+    connectRect.setVisibility(value);
+    if (this._line)
+    {
+        this._line.setVisibility(value);
+    }
+};
+
+mindplot.DragPivot.prototype.addToWorkspace = function(workspace)
+{
+    var pivotRect = this._getPivotRect();
+    workspace.appendChild(pivotRect);
+
+    var connectToRect = this._connectRect;
+    workspace.appendChild(connectToRect);
+
+    // Add a hidden straight line ...
+    var straighLine = this._straightLine;
+    straighLine.setVisibility(false);
+    workspace.appendChild(straighLine);
+    straighLine.moveToBack();
+
+    // Add a hidden curved line ...
+    var curvedLine = this._curvedLine;
+    curvedLine.setVisibility(false);
+    workspace.appendChild(curvedLine);
+    curvedLine.moveToBack();
+
+    // Add a connect rect ...
+    var connectRect = this._connectRect;
+    connectRect.setVisibility(false);
+    workspace.appendChild(connectRect);
+    connectRect.moveToBack();
+};
+
+mindplot.DragPivot.prototype.removeFromWorkspace = function(workspace)
+{
+    var shape = this._getPivotRect();
+    workspace.removeChild(shape);
+
+    var connectToRect = this._connectRect;
+    workspace.removeChild(connectToRect);
+
+    if (this._straightLine)
+    {
+        workspace.removeChild(this._straightLine);
+    }
+
+    if (this._curvedLine)
+    {
+        workspace.removeChild(this._curvedLine);
+    }
+};
+
+mindplot.DragPivot.prototype.connectTo = function(targetTopic)
+{
+    core.assert(!this._outgoingLine, 'Could not connect an already connected node');
+    core.assert(targetTopic != this, 'Cilcular connection are not allowed');
+    core.assert(targetTopic, 'parent can not be null');
+
+    this._targetTopic = targetTopic;
+    if (targetTopic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        this._line = this._straightLine;
+    } else
+    {
+        this._line = this._curvedLine;
+    }
+
+    // Show pivot ...
+    var line = this._line;
+
+    // Connected to Rect ...
+    var connectRect = this._connectRect;
+    var targetSize = targetTopic.getSize();
+    var width = targetSize.width + 6;
+    var height = targetSize.height + 6;
+    connectRect.setSize(width, height);
+
+    var targetPosition = targetTopic.getPosition();
+    var cx = Math.round(targetPosition.x - (width / 2));
+    var cy = Math.round(targetPosition.y - (height / 2));
+    connectRect.setPosition(cx, cy);
+
+    // Change elements position ...
+    var pivotRect = this._getPivotRect();
+    pivotRect.moveToFront();
+
+};
+
+mindplot.DragPivot.prototype.disconnect = function(workspace)
+{
+    core.assert(workspace, 'workspace can not be null.');
+    core.assert(this._targetTopic, 'There are not connected topic.');
+
+    this.setVisibility(false);
+    this._targetTopic = null;
+    this._line = null;
+};
diff --git a/trunk/mindplot/src/main/javascript/DragTopic.js b/trunk/mindplot/src/main/javascript/DragTopic.js
new file mode 100644
index 00000000..a35389bf
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/DragTopic.js
@@ -0,0 +1,242 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.DragTopic = function(dragShape, draggedNode)
+{
+    core.assert(core.Utils.isDefined(dragShape), 'Rect can not be null.');
+    core.assert(core.Utils.isDefined(draggedNode), 'draggedNode can not be null.');
+
+    this._elem2d = dragShape;
+    this._order = null;
+    this._draggedNode = draggedNode;
+    this._position = new core.Point();
+};
+
+mindplot.DragTopic.initialize = function(workspace)
+{
+    var pivot = mindplot.DragTopic.__getDragPivot();
+    workspace.appendChild(pivot);
+};
+
+mindplot.DragTopic.prototype.setOrder = function(order)
+{
+    this._order = order;
+};
+
+mindplot.DragTopic.prototype.setPosition = function(x, y)
+{
+    this._position.setValue(x, y);
+
+    // Elements are positioned in the center.
+    // All topic element must be positioned based on the innerShape.
+    var draggedNode = this._draggedNode;
+    var size = draggedNode.getSize();
+
+    var cx = x - (size.width / 2);
+    var cy = y - (size.height / 2);
+
+    // Update visual position.
+    this._elem2d.setPosition(cx, cy);
+};
+
+mindplot.DragTopic.prototype.getInnerShape = function()
+{
+    return this._elem2d;
+};
+
+mindplot.DragTopic.prototype.disconnect = function(workspace)
+{
+    // Clear connection line ...
+    var dragPivot = this._getDragPivot();
+    dragPivot.disconnect(workspace);
+};
+
+mindplot.DragTopic.prototype.canBeConnectedTo = function(targetTopic)
+{
+    core.assert(core.Utils.isDefined(targetTopic), 'parent can not be null');
+
+    var result = true;
+    if (!targetTopic.areChildrenShrinked() && !targetTopic.isCollapsed())
+    {
+        // Dragged node can not be connected to himself.
+        if (targetTopic == this._draggedNode)
+        {
+            result = false;
+        } else
+        {
+            var draggedNode = this.getDraggedTopic();
+            var topicPosition = this.getPosition();
+
+            var targetTopicModel = targetTopic.getModel();
+            var childTopicModel = draggedNode.getModel();
+
+            var targetTopicBoard = targetTopic.getTopicBoard();
+            var height = targetTopicBoard.getHeight();
+            result = targetTopicModel.canBeConnected(childTopicModel, topicPosition, height);
+        }
+    } else
+    {
+        result = false;
+    }
+    return result;
+};
+
+mindplot.DragTopic.prototype.connectTo = function(parent)
+{
+    core.assert(parent, 'Parent connection node can not be null.');
+
+    var dragPivot = this._getDragPivot();
+    dragPivot.connectTo(parent);
+};
+
+mindplot.DragTopic.prototype.getDraggedTopic = function()
+{
+    return  this._draggedNode;
+};
+
+
+mindplot.DragTopic.prototype.removeFromWorkspace = function(workspace)
+{
+    // Remove drag shadow.
+    workspace.removeChild(this._elem2d);
+
+    // Remove pivot shape. To improve performace it will not be removed. Only the visilility will be changed.
+    var dragPivot = this._getDragPivot();
+    dragPivot.setVisibility(false);
+};
+
+mindplot.DragTopic.prototype.addToWorkspace = function(workspace)
+{
+    workspace.appendChild(this._elem2d);
+    var dragPivot = this._getDragPivot();
+
+    dragPivot.addToWorkspace(workspace);
+    dragPivot.setVisibility(true);
+};
+
+mindplot.DragTopic.prototype._getDragPivot = function()
+{
+    return mindplot.DragTopic.__getDragPivot();
+};
+
+mindplot.DragTopic.__getDragPivot = function()
+{
+    var result = mindplot.DragTopic._dragPivot;
+    if (!result)
+    {
+        result = new mindplot.DragPivot();
+        mindplot.DragTopic._dragPivot = result;
+    }
+    return result;
+};
+
+
+mindplot.DragTopic.prototype.getPosition = function()
+{
+    return this._position;
+};
+
+mindplot.DragTopic.prototype.isDragTopic = function()
+{
+    return true;
+};
+
+mindplot.DragTopic.prototype.updateDraggedTopic = function(workspace)
+{
+    core.assert(workspace, 'workspace can not be null');
+
+    var dragPivot = this._getDragPivot();
+    var draggedTopic = this.getDraggedTopic();
+
+    var isDragConnected = this.isConnected();
+    var actionRunner = mindplot.DesignerActionRunner.getInstance();
+    var topicId = draggedTopic.getId();
+    var command = new mindplot.commands.DragTopicCommand(topicId);
+
+  if (isDragConnected)
+    {
+
+        var targetTopic = this.getConnectedToTopic();
+        if (targetTopic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            // Update topic position ...
+            var dragPivotPosition = dragPivot.getPosition();
+
+            // Must positionate the dragged topic taking into account the current node size.
+            var pivotSize = dragPivot.getSize();
+            var draggedTopicSize = draggedTopic.getSize();
+            var xOffset = draggedTopicSize.width - pivotSize.width;
+            xOffset = Math.round(xOffset / 2);
+
+            if (dragPivotPosition.x > 0)
+            {
+                dragPivotPosition.x = parseInt(dragPivotPosition.x) + xOffset;
+            }
+            else
+            {
+                dragPivotPosition.x = parseInt(dragPivotPosition.x) - xOffset;
+            }
+            // Set new position ...
+            command.setPosition(dragPivotPosition);
+
+        } else
+        {
+            // Main topic connections can be positioned only with the order ...
+            command.setOrder(this._order);
+        }
+
+        // Set new parent topic ..
+        command.setParetTopic(targetTopic);
+    } else {
+
+        // If the node is not connected, positionate based on the original drag topic position.
+        var dragPosition = this.getPosition();
+        command = new mindplot.commands.DragTopicCommand(topicId, dragPosition);
+        command.setPosition(dragPosition);
+    }
+    actionRunner.execute(command)
+};
+
+mindplot.DragTopic.prototype.setBoardPosition = function(point)
+{
+    core.assert(point, 'point can not be null');
+    var dragPivot = this._getDragPivot();
+    dragPivot.setPosition(point);
+};
+
+
+mindplot.DragTopic.prototype.getBoardPosition = function(point)
+{
+    core.assert(point, 'point can not be null');
+    var dragPivot = this._getDragPivot();
+    return dragPivot.getPosition();
+};
+
+mindplot.DragTopic.prototype.getConnectedToTopic = function()
+{
+    var dragPivot = this._getDragPivot();
+    return dragPivot.getTargetTopic();
+};
+
+mindplot.DragTopic.prototype.isConnected = function()
+{
+    return this.getConnectedToTopic() != null;
+};
+
+mindplot.DragTopic.PIVOT_SIZE = {width:50,height:10};
diff --git a/trunk/mindplot/src/main/javascript/DragTopicPositioner.js b/trunk/mindplot/src/main/javascript/DragTopicPositioner.js
new file mode 100644
index 00000000..967a582f
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/DragTopicPositioner.js
@@ -0,0 +1,121 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.DragTopicPositioner = function(workspace, topics)
+{
+    core.assert(workspace, 'workspace can not be null');
+    core.assert(topics, 'topics can not be null');
+
+    this._workspace = workspace;
+    this._topics = topics;
+};
+
+mindplot.DragTopicPositioner.prototype.positionateDragTopic = function(dragTopic)
+{
+    // Workout the real position of the element on the board.
+    var dragTopicPosition = dragTopic.getPosition();
+    var draggedTopic = dragTopic.getDraggedTopic();
+
+    // Topic can be connected ?
+    this._checkDragTopicConnection(dragTopic);
+
+    // Position topic in the board
+    if (dragTopic.isConnected())
+    {
+        var targetTopic = dragTopic.getConnectedToTopic();
+        var topicBoard = targetTopic.getTopicBoard();
+        topicBoard.positionateDragTopic(dragTopic);
+    }
+};
+
+mindplot.DragTopicPositioner.CENTRAL_TO_MAINTOPIC_MAX_HORIZONTAL_DISTANCE = 300;
+
+mindplot.DragTopicPositioner.prototype._checkDragTopicConnection = function(dragTopic)
+{
+    var topics = this._topics;
+
+    // Must be disconnected from their current connection ?.
+    var mainTopicToMainTopicConnection = this._lookUpForMainTopicToMainTopicConnection(dragTopic);
+    var currentConnection = dragTopic.getConnectedToTopic();
+    if (currentConnection)
+    {
+        // MainTopic->MainTopicConnection.
+        if (currentConnection.getType()==mindplot.NodeModel.MAIN_TOPIC_TYPE)
+        {
+            if(mainTopicToMainTopicConnection != currentConnection)
+            {
+                dragTopic.disconnect(this._workspace);
+            }
+        }
+        else if (currentConnection.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            // Distance if greater that the allowed.
+            var dragXPosition = dragTopic.getPosition().x;
+            var currentXPosition = currentConnection.getPosition().x;
+
+            if(mainTopicToMainTopicConnection)
+            {
+                // I have to change the current connection to a main topic.
+                dragTopic.disconnect(this._workspace);
+            }else
+            if (Math.abs(dragXPosition-currentXPosition) > mindplot.DragTopicPositioner.CENTRAL_TO_MAINTOPIC_MAX_HORIZONTAL_DISTANCE)
+            {
+                dragTopic.disconnect(this._workspace);
+            }
+        }
+    }
+
+    // Finally, connect nodes ...
+    if (!dragTopic.isConnected())
+    {
+        var centalTopic = topics[0];
+        if (mainTopicToMainTopicConnection)
+        {
+            dragTopic.connectTo(mainTopicToMainTopicConnection);
+        } else if (Math.abs(dragTopic.getPosition().x - centalTopic.getPosition().x) <= mindplot.DragTopicPositioner.CENTRAL_TO_MAINTOPIC_MAX_HORIZONTAL_DISTANCE)
+        {
+            dragTopic.connectTo(centalTopic);
+        }
+    }
+};
+
+mindplot.DragTopicPositioner.prototype._lookUpForMainTopicToMainTopicConnection = function(dragTopic)
+{
+    var topics = this._topics;
+    var result = null;
+    var clouserDistance = -1;
+    var draggedNode = dragTopic.getDraggedTopic();
+
+    // Check MainTopic->MainTopic connection...
+    for (var i = 0; i < topics.length; i++)
+    {
+        var targetTopic = topics[i];
+        var position = dragTopic.getPosition();
+        if (targetTopic.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE && targetTopic != draggedNode)
+        {
+            var canBeConnected = dragTopic.canBeConnectedTo(targetTopic);
+            if (canBeConnected)
+            {
+                result = targetTopic;
+                break;
+            }
+        }
+    }
+    return result;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/EditorProperties.js b/trunk/mindplot/src/main/javascript/EditorProperties.js
new file mode 100644
index 00000000..fa153911
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/EditorProperties.js
@@ -0,0 +1,43 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.EditorProperties = function()
+{
+    this._zoom = 0;
+    this._position = 0;
+};
+
+mindplot.EditorProperties.prototype.setZoom = function(zoom)
+{
+    this._zoom = zoom;
+};
+
+mindplot.EditorProperties.prototype.getZoom = function()
+{
+    return this._zoom;
+};
+
+mindplot.EditorProperties.prototype.asProperties = function()
+{
+    return "zoom=" + this._zoom + "\n";
+};
+
+
+
+
diff --git a/trunk/mindplot/src/main/javascript/FixedDistanceBoard.js b/trunk/mindplot/src/main/javascript/FixedDistanceBoard.js
new file mode 100644
index 00000000..9346d032
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/FixedDistanceBoard.js
@@ -0,0 +1,317 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.FixedDistanceBoard = function(defaultHeight, topic)
+{
+    this._topic = topic;
+    var reference = topic.getPosition();
+    mindplot.FixedDistanceBoard.superClass.initialize.call(this, defaultHeight, reference);
+    this._height = defaultHeight;
+    this._entries = [];
+};
+
+objects.extend(mindplot.FixedDistanceBoard, mindplot.Board);
+
+mindplot.FixedDistanceBoard.prototype.getHeight = function()
+{
+    return this._height;
+};
+
+mindplot.FixedDistanceBoard.prototype.lookupEntryByOrder = function(order)
+{
+    var result = null;
+    var entries = this._entries;
+    if (order < entries.length)
+    {
+        result = entries[order];
+    }
+
+    if (result == null)
+    {
+        var defaultHeight = this._defaultWidth;
+        var reference = this.getReferencePoint();
+        if (entries.length == 0)
+        {
+            var yReference = reference.y;
+            result = this.createBoardEntry(yReference - (defaultHeight / 2), yReference + (defaultHeight / 2), 0);
+        } else
+        {
+            var entriesLenght = entries.length;
+            var lastEntry = entries[entriesLenght - 1];
+            var lowerLimit = lastEntry.getUpperLimit();
+            var upperLimit = lowerLimit + defaultHeight;
+            result = this.createBoardEntry(lowerLimit, upperLimit, entriesLenght + 1);
+        }
+    }
+    return result;
+};
+
+mindplot.FixedDistanceBoard.prototype.createBoardEntry = function(lowerLimit, upperLimit, order)
+{
+    var result = new mindplot.BoardEntry(lowerLimit, upperLimit, order);
+    var xPos = this.workoutXBorderDistance();
+    result.setXPosition(xPos);
+    return result;
+};
+
+mindplot.FixedDistanceBoard.prototype.updateReferencePoint = function()
+{
+    var entries = this._entries;
+    var parentTopic = this.getTopic();
+    var parentPosition = parentTopic.workoutIncomingConnectionPoint(parentTopic);
+    var referencePoint = this.getReferencePoint();
+    var yOffset = parentPosition.y - referencePoint.y;
+
+    for (var i = 0; i < entries.length; i++)
+    {
+        var entry = entries[i];
+
+        var upperLimit = entry.getUpperLimit() + yOffset;
+        var lowerLimit = entry.getLowerLimit() + yOffset;
+        entry.setUpperLimit(upperLimit);
+        entry.setLowerLimit(lowerLimit);
+
+        // Fix x position ...
+        var xPos = this.workoutXBorderDistance();
+        entry.setXPosition(xPos);
+        entry.update();
+    }
+    this._referencePoint = parentPosition.clone();
+
+};
+
+mindplot.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE = 20;
+
+
+/**
+ * This x distance does't take into account the size of the shape.
+ */
+mindplot.FixedDistanceBoard.prototype.workoutXBorderDistance = function()
+{
+    var topic = this.getTopic();
+
+    var topicPosition = topic.getPosition();
+    var topicSize = topic.getSize();
+    var halfTargetWidth = topicSize.width / 2;
+    var result;
+    if (topicPosition.x >= 0)
+    {
+        // It's at right.
+        result = topicPosition.x + halfTargetWidth + mindplot.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE;
+    } else
+    {
+        result = topicPosition.x - (halfTargetWidth + mindplot.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE);
+    }
+    return result;
+};
+
+mindplot.FixedDistanceBoard.prototype.getTopic = function()
+{
+    return this._topic;
+};
+
+mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE = 6;
+
+mindplot.FixedDistanceBoard.prototype.freeEntry = function(entry)
+{
+    var newEntries = [];
+    var entries = this._entries;
+    var order = 0;
+    for (var i = 0; i < entries.length; i++)
+    {
+        var e = entries[i];
+        if (e == entry)
+        {
+            order++;
+        }
+        newEntries[order] = e;
+        order++;
+    }
+    this._entries = newEntries;
+};
+
+mindplot.FixedDistanceBoard.prototype.repositionate = function()
+{
+    // Workout width and update topic height.
+    var entries = this._entries;
+    var height = 0;
+    var model = this._topic.getModel();
+    if (entries.length >= 1 && !model.areChildrenShrinked())
+    {
+        for (var i = 0; i < entries.length; i++)
+        {
+            var e = entries[i];
+            if (e && e.getTopic())
+            {
+                var topic = e.getTopic();
+                var topicBoard = topic.getTopicBoard();
+                var topicBoardHeight = topicBoard.getHeight();
+
+
+                height += topicBoardHeight + mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE;
+            }
+        }
+    }
+    else {
+        var topic = this._topic;
+        height = topic.getSize().height + mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE;
+    }
+
+    var oldHeight = this._height;
+    this._height = height;
+
+    // I must update all the parent nodes first...
+    if (oldHeight != this._height)
+    {
+        var topic = this._topic;
+        var parentTopic = topic.getParent();
+        if (parentTopic != null)
+        {
+            var board = parentTopic.getTopicBoard();
+            board.repositionate();
+        }
+    }
+
+
+    // @todo: Esto hace backtraking. Hay que cambiar la implementacion del set position de
+    // forma tal que no se mande a hacer el update de todos los hijos.
+
+    // Workout center the new topic center...
+    var refence = this.getReferencePoint();
+    var lowerLimit;
+    if (entries.length > 0)
+    {
+        var topic = entries[0].getTopic();
+        var firstNodeHeight = topic.getSize().height;
+        lowerLimit = refence.y - (height / 2) - (firstNodeHeight / 2) + 1;
+    }
+
+    var upperLimit = null;
+
+    // Start moving all the elements ...
+    var newEntries = [];
+    var order = 0;
+    for (var i = 0; i < entries.length; i++)
+    {
+        var e = entries[i];
+        if (e && e.getTopic())
+        {
+
+            var currentTopic = e.getTopic();
+            e.setLowerLimit(lowerLimit);
+
+            // Update entry ...
+            var topicBoard = currentTopic.getTopicBoard();
+            var topicBoardHeight = topicBoard.getHeight();
+
+            upperLimit = lowerLimit + topicBoardHeight + mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE;
+            e.setUpperLimit(upperLimit);
+            lowerLimit = upperLimit;
+
+            e.setOrder(order);
+            currentTopic.setOrder(order);
+
+            e.update();
+            newEntries[order] = e;
+            order++;
+        }
+    }
+    this._entries = newEntries;
+};
+
+mindplot.FixedDistanceBoard.prototype.removeTopic = function(topic)
+{
+    var order = topic.getOrder();
+    var entry = this.lookupEntryByOrder(order);
+    core.assert(!entry.isAvailable(), "Illegal state");
+
+    entry.setTopic(null);
+    topic.setOrder(null);
+    this._entries.remove(entry);
+
+    // Repositionate all elements ...
+    this.repositionate();
+};
+
+mindplot.FixedDistanceBoard.prototype.addTopic = function(order, topic)
+{
+
+    // If the entry is not available, I must swap the the entries...
+    var entry = this.lookupEntryByOrder(order);
+    if (!entry.isAvailable())
+    {
+        this.freeEntry(entry);
+        // Create a dummy entry ...
+        // Puaj, do something with this...
+        entry = this.createBoardEntry(-1, 0, order);
+        this._entries[order] = entry;
+    }
+    this._entries[order] = entry;
+
+    // Add to the board ...
+    entry.setTopic(topic, false);
+
+    // Repositionate all elements ...
+    this.repositionate();
+};
+
+mindplot.FixedDistanceBoard.prototype.lookupEntryByPosition = function(pos)
+{
+    core.assert(core.Utils.isDefined(pos), 'position can not be null');
+
+    var entries = this._entries;
+    var result = null;
+    for (var i = 0; i < entries.length; i++)
+    {
+        var entry = entries[i];
+        if (pos.y < entry.getUpperLimit() && pos.y >= entry.getLowerLimit())
+        {
+            result = entry;
+        }
+    }
+
+    if (result == null)
+    {
+        var defaultHeight = this._defaultWidth;
+        if (entries.length == 0)
+        {
+            var reference = this.getReferencePoint();
+            var yReference = reference.y;
+            result = this.createBoardEntry(yReference - (defaultHeight / 2), yReference + (defaultHeight / 2), 0);
+        } else
+        {
+            var firstEntry = entries[0];
+            if (pos.y < firstEntry.getLowerLimit())
+            {
+                var upperLimit = firstEntry.getLowerLimit();
+                var lowerLimit = upperLimit + defaultHeight;
+                result = this.createBoardEntry(lowerLimit, upperLimit, -1);
+            } else
+            {
+                var entriesLenght = entries.length;
+                var lastEntry = entries[entriesLenght - 1];
+                var lowerLimit = lastEntry.getUpperLimit();
+                var upperLimit = lowerLimit + defaultHeight;
+                result = this.createBoardEntry(lowerLimit, upperLimit, entriesLenght);
+            }
+        }
+    }
+
+    return result;
+};
diff --git a/trunk/mindplot/src/main/javascript/Icon.js b/trunk/mindplot/src/main/javascript/Icon.js
new file mode 100644
index 00000000..eaf6df03
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Icon.js
@@ -0,0 +1,42 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Icon = function(url){
+    this._image = new web2d.Image();
+    this._image.setHref(url);
+    this._image.setSize(12,12);
+};
+
+mindplot.Icon.prototype.getImage= function(){
+    return this._image;
+};
+
+mindplot.Icon.prototype.setGroup= function(group){
+    this._group=group;
+};
+
+mindplot.Icon.prototype.getGroup= function() {
+    return this._group;
+};
+
+mindplot.Icon.prototype.getSize=function(){
+    return this._image.getSize();
+};
+
+
diff --git a/trunk/mindplot/src/main/javascript/IconGroup.js b/trunk/mindplot/src/main/javascript/IconGroup.js
new file mode 100644
index 00000000..b9e4312a
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/IconGroup.js
@@ -0,0 +1,183 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.IconGroup = function(topic) {
+    var offset = topic.getOffset();
+    this.options = {
+        width:0,
+        height:0,
+        x:offset / 2,
+        y:offset / 2,
+        icons:[],
+        topic:topic,
+        nativeElem:new web2d.Group({width: 2, height:2,x: offset / 2, y:offset / 2, coordSizeWidth:1,coordSizeHeight:1})
+    };
+    this.registerListeners();
+};
+
+mindplot.IconGroup.prototype.setPosition = function(x, y) {
+    this.options.x = x;
+    this.options.y = y;
+    this.options.nativeElem.setPosition(x, y);
+};
+
+mindplot.IconGroup.prototype.getPosition = function() {
+    return {x:this.options.x, y:this.options.y};
+};
+
+mindplot.IconGroup.prototype.setSize = function(width, height) {
+    this.options.width = width;
+    this.options.height = height;
+    this.options.nativeElem.setSize(width, height);
+    this.options.nativeElem.setCoordSize(width, height);
+};
+
+mindplot.IconGroup.prototype.getSize = function()
+{
+    return {width:this.options.width, height:this.options.height};
+};
+
+mindplot.IconGroup.prototype.addIcon = function(icon) {
+    icon.setGroup(this);
+    var newIcon = icon.getImage();
+    var nativeElem = this.options.nativeElem;
+    var iconSize = newIcon.getSize();
+    var size = nativeElem.getSize();
+    newIcon.setPosition(size.width, 0);
+    this.options.icons.extend([icon]);
+
+    nativeElem.appendChild(newIcon);
+
+    size.width = size.width + iconSize.width;
+    if (iconSize.height > size.height)
+    {
+        size.height = iconSize.height;
+    }
+
+    nativeElem.setCoordSize(size.width, size.height);
+    nativeElem.setSize(size.width, size.height);
+    this.options.width = size.width;
+    this.options.height = size.height;
+};
+mindplot.IconGroup.prototype.getIcons = function() {
+    return this.options.icons;
+};
+mindplot.IconGroup.prototype.removeIcon = function(url) {
+    this._removeIcon(this.getIcon(url));
+};
+
+mindplot.IconGroup.prototype.removeImageIcon = function(icon) {
+
+    var imgIcon = this.getImageIcon(icon);
+    this._removeIcon(imgIcon);
+};
+
+mindplot.IconGroup.prototype.getIcon = function(url) {
+    var result = null;
+    this.options.icons.each(function(el, index) {
+        var nativeImage = el.getImage();
+        if (nativeImage.getHref() == url)
+        {
+            result = el;
+        }
+    }, this);
+    return result;
+};
+
+mindplot.IconGroup.prototype.getImageIcon=function(icon){
+    var result = null;
+    this.options.icons.each(function(el,index){
+        if(result == null && $chk(el.getModel().isIconModel) && el.getId()==icon.getId() && el.getUiId() == icon.getUiId())
+        {
+            result = el;
+        }
+    },this);
+    return result;
+};
+
+mindplot.IconGroup.prototype.findIconFromModel=function(iconModel){
+    var result = null;
+    this.options.icons.each(function(el,index){
+        var elModel = el.getModel();
+        if(result == null && $chk(elModel.isIconModel) && elModel.getId()==iconModel.getId())
+        {
+            result = el;
+        }
+    },this);
+
+    if(result==null)
+    {
+        throw "Icon can no be found.";
+    }
+
+    return result;
+};
+
+
+mindplot.IconGroup.prototype._removeIcon = function(icon) {
+    var nativeImage = icon.getImage();
+    this.options.icons.remove(icon);
+    var iconSize = nativeImage.getSize();
+    var size = this.options.nativeElem.getSize();
+    var position = nativeImage.getPosition();
+    var childs = this.options.nativeElem.removeChild(nativeImage);
+    this.options.icons.each(function(icon,index){
+        var img = icon.getImage();
+        var pos = img.getPosition();
+        if(pos.x > position.x){
+            img.setPosition(pos.x-iconSize.width, 0);
+        }
+    }.bind(this));
+    size.width = size.width - iconSize.width;
+    this.setSize(size.width, size.height);
+};
+mindplot.IconGroup.prototype.getNativeElement = function() {
+    return this.options.nativeElem;
+};
+mindplot.IconGroup.prototype.moveToFront = function() {
+    this.options.nativeElem.moveToFront();
+}
+mindplot.IconGroup.prototype.registerListeners = function() {
+    this.options.nativeElem.addEventListener('click', function(event) {
+        // Avoid node creation ...
+        if (event.stopPropagation)
+        {
+            event.stopPropagation(true);
+        } else
+        {
+            event.cancelBubble = true;
+        }
+
+    });
+    this.options.nativeElem.addEventListener('dblclick', function(event)
+    {
+        // Avoid node creation ...
+        if (event.stopPropagation)
+        {
+            event.stopPropagation(true);
+        } else
+        {
+            event.cancelBubble = true;
+        }
+
+    });
+};
+mindplot.IconGroup.prototype.getTopic = function() {
+    return this.options.topic;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/IconModel.js b/trunk/mindplot/src/main/javascript/IconModel.js
new file mode 100644
index 00000000..f934cb6b
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/IconModel.js
@@ -0,0 +1,69 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.IconModel = function(iconType, topic)
+{
+    core.assert(iconType, 'Icon id can not be null');
+    core.assert(topic, 'topic can not be null');
+    this._iconType = iconType;
+    this._id = mindplot.IconModel._nextUUID();
+    this._topic = topic;
+};
+
+mindplot.IconModel.prototype.getId = function()
+{
+    return this._id;
+};
+
+mindplot.IconModel.prototype.getIconType = function()
+{
+    return this._iconType;
+};
+
+
+mindplot.IconModel.prototype.setIconType = function(iconType)
+{
+    this._iconType = iconType;
+};
+
+mindplot.IconModel.prototype.getTopic = function()
+{
+    return this._topic;
+};
+
+mindplot.IconModel.prototype.isIconModel = function()
+{
+    return true;
+};
+
+
+/**
+ * @todo: This method must be implemented.
+ */
+mindplot.IconModel._nextUUID = function()
+{
+    if (!this._uuid)
+    {
+        this._uuid = 0;
+    }
+
+    this._uuid = this._uuid + 1;
+    return this._uuid;
+};
+
diff --git a/trunk/mindplot/src/main/javascript/ImageIcon.js b/trunk/mindplot/src/main/javascript/ImageIcon.js
new file mode 100644
index 00000000..a4cb9917
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/ImageIcon.js
@@ -0,0 +1,369 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.ImageIcon = function(iconModel, topic, designer) {
+
+    core.assert(iconModel, 'iconModel can not be null');
+    core.assert(topic, 'topic can not be null');
+    core.assert(designer, 'designer can not be null');
+    this._topic = topic;
+    this._iconModel = iconModel;
+    this._designer = designer;
+
+    // Build graph image representation ...
+    var iconType = iconModel.getIconType();
+    var imgUrl = this._getImageUrl(iconType);
+    mindplot.Icon.call(this, imgUrl);
+
+    //Remove
+    var divContainer = designer.getWorkSpace().getScreenManager().getContainer();
+    var tip = mindplot.Tip.getInstance(divContainer);
+
+    var container = new Element('div');
+    var removeImage = new Element('img');
+    removeImage.src = "../images/bin.png";
+    removeImage.inject(container);
+
+    if (!designer._viewMode)
+    {
+
+        removeImage.addEvent('click', function(event) {
+            // @Todo: actionRunner should not be exposed ...
+            var actionRunner = designer._actionRunner;
+            var command = new mindplot.commands.RemoveIconFromTopicCommand(this._topic.getId(), iconModel);
+            actionRunner.execute(command);
+            tip.forceClose();
+        }.bindWithEvent(this));
+
+        //Icon
+        var image = this.getImage();
+        image.addEventListener('click', function(event) {
+            var iconType = iconModel.getIconType();
+            var newIconType = this._getNextFamilyIconId(iconType);
+            iconModel.setIconType(newIconType);
+
+            var imgUrl = this._getImageUrl(newIconType);
+            this._image.setHref(imgUrl);
+
+            //        // @Todo: Support revert of change icon ...
+            //        var actionRunner = designer._actionRunner;
+            //        var command = new mindplot.commands.ChangeIconFromTopicCommand(this._topic.getId());
+            //        this._actionRunner.execute(command);
+
+
+        }.bindWithEvent(this));
+
+        var imageIcon = this;
+        image.addEventListener('mouseover', function(event) {
+            tip.open(event, container, imageIcon);
+        });
+        image.addEventListener('mouseout', function(event) {
+            tip.close(event);
+        });
+        image.addEventListener('mousemove', function(event) {
+            tip.updatePosition(event);
+        });
+
+    }
+};
+
+objects.extend(mindplot.ImageIcon, mindplot.Icon);
+
+mindplot.ImageIcon.prototype.initialize = function() {
+
+};
+
+mindplot.ImageIcon.prototype._getImageUrl = function(id) {
+    return mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[id];
+};
+
+mindplot.ImageIcon.prototype.getModel = function() {
+    return this._iconModel;
+};
+
+
+mindplot.ImageIcon.prototype._getNextFamilyIconId = function(id) {
+
+    var familyIcons = this._getFamilyIcons(id);
+    core.assert(familyIcons != null, "Family Icon not found!");
+
+    var result = null;
+    for (var i = 0; i < familyIcons.length && result == null; i++)
+    {
+        if (familyIcons[i] == id) {
+            var nextIconId;
+            //Is last one?
+            if (i == (familyIcons.length - 1)) {
+                result = familyIcons[0];
+            } else {
+                result = familyIcons[i + 1];
+            }
+            break;
+        }
+    }
+
+    return result;
+};
+
+mindplot.ImageIcon.prototype._getFamilyIcons = function(id) {
+    core.assert(id != null, "id must not be null");
+    core.assert(id.indexOf("_") != -1, "Invalid icon id (it must contain '_')");
+    var result = null;
+    for (var i = 0; i < mindplot.ImageIcon.prototype.ICON_FAMILIES.length; i++)
+    {
+        var family = mindplot.ImageIcon.prototype.ICON_FAMILIES[i];
+        var familyPrefix = id.substr(0, id.indexOf("_"));
+        if (family[0].match(familyPrefix) != null) {
+            result = family;
+            break;
+        }
+    }
+    return result;
+};
+
+mindplot.ImageIcon.prototype.getId = function()
+{
+    return this._iconType;
+};
+
+mindplot.ImageIcon.prototype.getUiId = function()
+{
+    return this._uiId;
+};
+
+mindplot.ImageIcon.ICON_FAMILIY_FLAG_PREFIX = 'flag_';
+mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX = 'bullet_';
+mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX = 'tag_';
+mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX = 'face_';
+mindplot.ImageIcon.ICON_FAMILIY_FACE_FUNY_PREFIX = 'facefuny_';
+mindplot.ImageIcon.ICON_FAMILIY_ARROW_PREFIX = 'arrow_';
+mindplot.ImageIcon.ICON_FAMILIY_ARROWC_PREFIX = 'arrowc_';
+
+mindplot.ImageIcon.ICON_FAMILIY_CHART_PREFIX = 'chart_';
+mindplot.ImageIcon.ICON_FAMILIY_ONOFF_PREFIX = 'onoff_';
+mindplot.ImageIcon.ICON_FAMILIY_THUMB_PREFIX = 'thumb_';
+mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX = 'money_';
+mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX = 'number_';
+mindplot.ImageIcon.ICON_FAMILIY_TICK_PREFIX = 'tick_';
+mindplot.ImageIcon.ICON_FAMILIY_CONNECT_PREFIX = 'conn_';
+mindplot.ImageIcon.ICON_FAMILIY_BULB_PREFIX = 'bulb_'
+mindplot.ImageIcon.ICON_FAMILIY_TASK_PREFIX = 'task_';
+
+mindplot.ImageIcon.ICON_TYPE_ARROW_UP = mindplot.ImageIcon.ICON_FAMILIY_ARROW_PREFIX + 'up';
+mindplot.ImageIcon.ICON_TYPE_ARROW_DOWN = mindplot.ImageIcon.ICON_FAMILIY_ARROW_PREFIX + 'down';
+mindplot.ImageIcon.ICON_TYPE_ARROW_LEFT = mindplot.ImageIcon.ICON_FAMILIY_ARROW_PREFIX + 'left';
+mindplot.ImageIcon.ICON_TYPE_ARROW_RIGHT = mindplot.ImageIcon.ICON_FAMILIY_ARROW_PREFIX + 'right';
+
+mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_LEFT = mindplot.ImageIcon.ICON_FAMILIY_ARROWC_PREFIX + 'turn_left';
+mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_RIGHT = mindplot.ImageIcon.ICON_FAMILIY_ARROWC_PREFIX + 'turn_right';
+mindplot.ImageIcon.ICON_TYPE_ARROWC_UNDO = mindplot.ImageIcon.ICON_FAMILIY_ARROWC_PREFIX + 'undo';
+mindplot.ImageIcon.ICON_TYPE_ARROWC_ANTICLOCKWISE = mindplot.ImageIcon.ICON_FAMILIY_ARROWC_PREFIX + 'rotate_anticlockwise';
+mindplot.ImageIcon.ICON_TYPE_ARROWC_CLOCKWISE = mindplot.ImageIcon.ICON_FAMILIY_ARROWC_PREFIX + 'rotate_clockwise';
+
+mindplot.ImageIcon.ICON_TYPE_FACE_PLAIN = mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX + 'plain';
+mindplot.ImageIcon.ICON_TYPE_FACE_SAD = mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX + 'sad';
+mindplot.ImageIcon.ICON_TYPE_FACE_SMILE_BIG = mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX + 'smilebig';
+mindplot.ImageIcon.ICON_TYPE_FACE_SMILE = mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX + 'smile';
+mindplot.ImageIcon.ICON_TYPE_FACE_SURPRISE = mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX + 'surprise';
+mindplot.ImageIcon.ICON_TYPE_FACE_WINK = mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX + 'wink';
+mindplot.ImageIcon.ICON_TYPE_FACE_CRYING = mindplot.ImageIcon.ICON_FAMILIY_FACE_PREFIX + 'crying';
+
+mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_ANGEL = mindplot.ImageIcon.ICON_FAMILIY_FACE_FUNY_PREFIX + 'angel';
+mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_DEVIL = mindplot.ImageIcon.ICON_FAMILIY_FACE_FUNY_PREFIX + 'devilish';
+mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GLASSES = mindplot.ImageIcon.ICON_FAMILIY_FACE_FUNY_PREFIX + 'glasses';
+mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GRIN = mindplot.ImageIcon.ICON_FAMILIY_FACE_FUNY_PREFIX + 'grin';
+mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_KISS = mindplot.ImageIcon.ICON_FAMILIY_FACE_FUNY_PREFIX + 'kiss';
+mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_MONKEY = mindplot.ImageIcon.ICON_FAMILIY_FACE_FUNY_PREFIX + 'monkey';
+
+mindplot.ImageIcon.ICON_TYPE_CHART_BAR = mindplot.ImageIcon.ICON_FAMILIY_CHART_PREFIX + 'bar';
+mindplot.ImageIcon.ICON_TYPE_CHART_LINE = mindplot.ImageIcon.ICON_FAMILIY_CHART_PREFIX + 'line';
+mindplot.ImageIcon.ICON_TYPE_CHART_CURVE = mindplot.ImageIcon.ICON_FAMILIY_CHART_PREFIX + 'curve';
+mindplot.ImageIcon.ICON_TYPE_CHART_PIE = mindplot.ImageIcon.ICON_FAMILIY_CHART_PREFIX + 'pie';
+mindplot.ImageIcon.ICON_TYPE_CHART_ORGANISATION = mindplot.ImageIcon.ICON_FAMILIY_CHART_PREFIX + 'organisation';
+
+mindplot.ImageIcon.ICON_TYPE_FLAG_BLUE = mindplot.ImageIcon.ICON_FAMILIY_FLAG_PREFIX + 'blue';
+mindplot.ImageIcon.ICON_TYPE_FLAG_GREEN = mindplot.ImageIcon.ICON_FAMILIY_FLAG_PREFIX + 'green';
+mindplot.ImageIcon.ICON_TYPE_FLAG_ORANGE = mindplot.ImageIcon.ICON_FAMILIY_FLAG_PREFIX + 'orange';
+mindplot.ImageIcon.ICON_TYPE_FLAG_PINK = mindplot.ImageIcon.ICON_FAMILIY_FLAG_PREFIX + 'pink';
+mindplot.ImageIcon.ICON_TYPE_FLAG_PURPLE = mindplot.ImageIcon.ICON_FAMILIY_FLAG_PREFIX + 'purple';
+mindplot.ImageIcon.ICON_TYPE_FLAG_YELLOW = mindplot.ImageIcon.ICON_FAMILIY_FLAG_PREFIX + 'yellow';
+
+mindplot.ImageIcon.ICON_TYPE_BULLET_BLACK = mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX + 'black';
+mindplot.ImageIcon.ICON_TYPE_BULLET_BLUE = mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX + 'blue';
+mindplot.ImageIcon.ICON_TYPE_BULLET_GREEN = mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX + 'green';
+mindplot.ImageIcon.ICON_TYPE_BULLET_ORANGE = mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX + 'orange';
+mindplot.ImageIcon.ICON_TYPE_BULLET_RED = mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX + 'red';
+mindplot.ImageIcon.ICON_TYPE_BULLET_PINK = mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX + 'pink';
+mindplot.ImageIcon.ICON_TYPE_BULLET_PURPLE = mindplot.ImageIcon.ICON_FAMILIY_BULLET_PREFIX + 'purple';
+
+mindplot.ImageIcon.ICON_TYPE_TAG_BLUE = mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX + 'blue';
+mindplot.ImageIcon.ICON_TYPE_TAG_GREEN = mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX + 'green';
+mindplot.ImageIcon.ICON_TYPE_TAG_ORANGE = mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX + 'orange';
+mindplot.ImageIcon.ICON_TYPE_TAG_RED = mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX + 'red';
+mindplot.ImageIcon.ICON_TYPE_TAG_PINK = mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX + 'pink';
+mindplot.ImageIcon.ICON_TYPE_TAG_YELLOW = mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX + 'yellow';
+mindplot.ImageIcon.ICON_TYPE_TAG_PURPLE = mindplot.ImageIcon.ICON_FAMILIY_TAG_PREFIX + 'purple';
+
+mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_UP = mindplot.ImageIcon.ICON_FAMILIY_THUMB_PREFIX + 'thumb_up';
+mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_DOWN = mindplot.ImageIcon.ICON_FAMILIY_THUMB_PREFIX + 'thumb_down';
+
+mindplot.ImageIcon.ICON_TYPE_TICK_ON = mindplot.ImageIcon.ICON_FAMILIY_TICK_PREFIX + 'tick';
+mindplot.ImageIcon.ICON_TYPE_TICK_OFF = mindplot.ImageIcon.ICON_FAMILIY_TICK_PREFIX + 'cross';
+
+mindplot.ImageIcon.ICON_TYPE_BULB_ON = mindplot.ImageIcon.ICON_FAMILIY_BULB_PREFIX + 'light_on';
+mindplot.ImageIcon.ICON_TYPE_BULB_OFF = mindplot.ImageIcon.ICON_FAMILIY_BULB_PREFIX + 'light_off';
+
+mindplot.ImageIcon.ICON_TYPE_CONNECT_ON = mindplot.ImageIcon.ICON_FAMILIY_CONNECT_PREFIX + 'connect';
+mindplot.ImageIcon.ICON_TYPE_CONNECT_OFF = mindplot.ImageIcon.ICON_FAMILIY_CONNECT_PREFIX + 'disconnect';
+
+mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK = mindplot.ImageIcon.ICON_FAMILIY_ONOFF_PREFIX + 'clock';
+mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK_RED = mindplot.ImageIcon.ICON_FAMILIY_ONOFF_PREFIX + 'clock_red';
+mindplot.ImageIcon.ICON_TYPE_ONOFF_ADD = mindplot.ImageIcon.ICON_FAMILIY_ONOFF_PREFIX + 'add';
+mindplot.ImageIcon.ICON_TYPE_ONOFF_DELETE = mindplot.ImageIcon.ICON_FAMILIY_ONOFF_PREFIX + 'delete';
+
+mindplot.ImageIcon.ICON_TYPE_MONEY_MONEY = mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX + 'money';
+mindplot.ImageIcon.ICON_TYPE_MONEY_DOLLAR = mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX + 'dollar';
+mindplot.ImageIcon.ICON_TYPE_MONEY_EURO = mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX + 'euro';
+mindplot.ImageIcon.ICON_TYPE_MONEY_POUND = mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX + 'pound';
+mindplot.ImageIcon.ICON_TYPE_MONEY_YEN = mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX + 'yen';
+mindplot.ImageIcon.ICON_TYPE_MONEY_COINS = mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX + 'coins';
+mindplot.ImageIcon.ICON_TYPE_MONEY_RUBY = mindplot.ImageIcon.ICON_FAMILIY_MONEY_PREFIX + 'ruby';
+
+mindplot.ImageIcon.ICON_TYPE_NUMBER_ONE = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'one';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_TWO = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'two';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_THREE = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'three';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_FOUR = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'four';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_FIVE = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'five';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_SIX = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'six';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_SEVEN = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'seven';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_EIGHT = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'eight';
+mindplot.ImageIcon.ICON_TYPE_NUMBER_NINE = mindplot.ImageIcon.ICON_FAMILIY_NUMBER_PREFIX + 'nine';
+
+mindplot.ImageIcon.ICON_TYPE_TASK_ONE = mindplot.ImageIcon.ICON_FAMILIY_TASK_PREFIX + 'one';
+mindplot.ImageIcon.ICON_TYPE_TASK_TWO = mindplot.ImageIcon.ICON_FAMILIY_TASK_PREFIX + 'two';
+mindplot.ImageIcon.ICON_TYPE_TASK_THREE = mindplot.ImageIcon.ICON_FAMILIY_TASK_PREFIX + 'three';
+mindplot.ImageIcon.ICON_TYPE_TASK_FOUR = mindplot.ImageIcon.ICON_FAMILIY_TASK_PREFIX + 'four';
+mindplot.ImageIcon.ICON_TYPE_TASK_FIVE = mindplot.ImageIcon.ICON_FAMILIY_TASK_PREFIX + 'five';
+
+
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP = new Object();
+//FLAG
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_BLUE] = "../images/flag_blue.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_GREEN] = "../images/flag_green.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_ORANGE] = "../images/flag_orange.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_PINK] = "../images/flag_pink.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_PURPLE] = "../images/flag_purple.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FLAG_YELLOW] = "../images/flag_yellow.png";
+//BULLET
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_BLACK] = "../images/bullet_black.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_BLUE] = "../images/bullet_blue.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_GREEN] = "../images/bullet_blue.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_ORANGE] = "../images/bullet_green.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_RED] = "../images/bullet_orange.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_PINK] = "../images/bullet_pink.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULLET_PURPLE] = "../images/bullet_purple.png";
+//TAGS
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_BLUE] = "../images/tag_blue.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_GREEN] = "../images/tag_green.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_ORANGE] = "../images/tag_orange.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_RED] = "../images/tag_red.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PINK] = "../images/tag_pink.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_YELLOW] = "../images/tag_yellow.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PURPLE] = "../images/tag_purple.png";
+//FACES
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_ANGEL] = "../images/face-angel.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_DEVIL] = "../images/face-devilish.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GLASSES] = "../images/face-glasses.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_KISS] = "../images/face-kiss.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_MONKEY] = "../images/face-monkey.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_PLAIN] = "../images/face-plain.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_CRYING] = "../images/face-crying.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SAD] = "../images/face-sad.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SMILE] = "../images/face-smile.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SURPRISE] = "../images/face-surprise.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_WINK] = "../images/face-wink.png";
+
+//ARROWS
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_UP] = "../images/arrow_up.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_DOWN] = "../images/arrow_down.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_LEFT] = "../images/arrow_left.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_RIGHT] = "../images/arrow_right.png";
+
+// ARROWS COMPLEX.
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_LEFT] = "../images/arrow_turn_left.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_RIGHT] = "../images/arrow_turn_right.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_UNDO] = "../images/arrow_undo.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_ANTICLOCKWISE] = "../images/arrow_rotate_anticlockwise.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROWC_CLOCKWISE] = "../images/arrow_rotate_clockwise.png";
+
+//CHARTS
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_BAR] = "../images/chart_bar.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_LINE] = "../images/chart_line.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_CURVE] = "../images/chart_curve.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_PIE] = "../images/chart_pie.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CHART_ORGANISATION] = "../images/chart_organisation.png";
+
+// THUMB
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_UP] = "../images/thumb_up.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_DOWN] = "../images/thumb_down.png";
+
+// ON OFF
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TICK_ON] = "../images/tick.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TICK_OFF] = "../images/cross.png";
+
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULB_ON] = "../images/lightbulb.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_BULB_OFF] = "../images/lightbulb_off.png";
+
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CONNECT_ON] = "../images/connect.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_CONNECT_OFF] = "../images/disconnect.png";
+
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK] = "../images/clock.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK_RED] = "../images/clock_red.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_ADD] = "../images/add.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ONOFF_DELETE] = "../images/delete.png";
+//MONEY
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_MONEY] = "../images/money.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_DOLLAR] = "../images/money_dollar.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_EURO] = "../images/money_euro.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_POUND] = "../images/money_pound.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_YEN] = "../images/money_yen.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_COINS] = "../images/coins.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_MONEY_RUBY] = "../images/ruby.png";
+
+
+//FAMILIES
+mindplot.ImageIcon.prototype.ICON_FLAG_FAMILY = [mindplot.ImageIcon.ICON_TYPE_FLAG_BLUE, mindplot.ImageIcon.ICON_TYPE_FLAG_GREEN,mindplot.ImageIcon.ICON_TYPE_FLAG_ORANGE,mindplot.ImageIcon.ICON_TYPE_FLAG_PINK, mindplot.ImageIcon.ICON_TYPE_FLAG_PURPLE, mindplot.ImageIcon.ICON_TYPE_FLAG_YELLOW];
+mindplot.ImageIcon.prototype.ICON_TAG_FAMILY = [mindplot.ImageIcon.ICON_TYPE_TAG_BLUE, mindplot.ImageIcon.ICON_TYPE_TAG_GREEN,mindplot.ImageIcon.ICON_TYPE_TAG_ORANGE,mindplot.ImageIcon.ICON_TYPE_TAG_PINK, mindplot.ImageIcon.ICON_TYPE_TAG_PURPLE, mindplot.ImageIcon.ICON_TYPE_TAG_YELLOW];
+mindplot.ImageIcon.prototype.ICON_BULLET_FAMILY = [mindplot.ImageIcon.ICON_TYPE_BULLET_BLACK, mindplot.ImageIcon.ICON_TYPE_BULLET_BLUE, mindplot.ImageIcon.ICON_TYPE_BULLET_GREEN,mindplot.ImageIcon.ICON_TYPE_BULLET_ORANGE,mindplot.ImageIcon.ICON_TYPE_BULLET_RED, mindplot.ImageIcon.ICON_TYPE_BULLET_PINK, mindplot.ImageIcon.ICON_TYPE_BULLET_PURPLE];
+mindplot.ImageIcon.prototype.ICON_FUNY_FACE_FAMILY = [mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_ANGEL, mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_DEVIL, mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GLASSES, mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_KISS, mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_MONKEY];
+mindplot.ImageIcon.prototype.ICON_FACE_FAMILY = [mindplot.ImageIcon.ICON_TYPE_FACE_PLAIN, mindplot.ImageIcon.ICON_TYPE_FACE_SAD, mindplot.ImageIcon.ICON_TYPE_FACE_CRYING, mindplot.ImageIcon.ICON_TYPE_FACE_SMILE, mindplot.ImageIcon.ICON_TYPE_FACE_SURPRISE, mindplot.ImageIcon.ICON_TYPE_FACE_WINK];
+mindplot.ImageIcon.prototype.ICON_ARROW_FAMILY = [mindplot.ImageIcon.ICON_TYPE_ARROW_UP, mindplot.ImageIcon.ICON_TYPE_ARROW_DOWN, mindplot.ImageIcon.ICON_TYPE_ARROW_LEFT, mindplot.ImageIcon.ICON_TYPE_ARROW_RIGHT];
+mindplot.ImageIcon.prototype.ICON_COMPLEX_ARROW_FAMILY = [mindplot.ImageIcon.ICON_TYPE_ARROWC_UNDO, mindplot.ImageIcon.ICON_TYPE_ARROWC_ANTICLOCKWISE, mindplot.ImageIcon.ICON_TYPE_ARROWC_CLOCKWISE,mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_LEFT, mindplot.ImageIcon.ICON_TYPE_ARROWC_TURN_RIGHT];
+mindplot.ImageIcon.prototype.ICON_CHART_FAMILY = [mindplot.ImageIcon.ICON_TYPE_CHART_BAR, mindplot.ImageIcon.ICON_TYPE_CHART_LINE, mindplot.ImageIcon.ICON_TYPE_CHART_CURVE, mindplot.ImageIcon.ICON_TYPE_CHART_PIE, mindplot.ImageIcon.ICON_TYPE_CHART_ORGANISATION];
+mindplot.ImageIcon.prototype.ICON_TICK_FAMILY = [ mindplot.ImageIcon.ICON_TYPE_TICK_ON, mindplot.ImageIcon.ICON_TYPE_TICK_OFF];
+
+mindplot.ImageIcon.prototype.ICON_CONNECT_FAMILY = [ mindplot.ImageIcon.ICON_TYPE_CONNECT_ON, mindplot.ImageIcon.ICON_TYPE_CONNECT_OFF];
+mindplot.ImageIcon.prototype.ICON_BULB_FAMILY = [ mindplot.ImageIcon.ICON_TYPE_BULB_ON, mindplot.ImageIcon.ICON_TYPE_BULB_OFF];
+mindplot.ImageIcon.prototype.ICON_ONOFF_FAMILY = [ mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK, mindplot.ImageIcon.ICON_TYPE_ONOFF_CLOCK_RED, mindplot.ImageIcon.ICON_TYPE_ONOFF_ADD, mindplot.ImageIcon.ICON_TYPE_ONOFF_DELETE];
+
+mindplot.ImageIcon.prototype.ICON_THUMB_FAMILY = [mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_UP, mindplot.ImageIcon.ICON_TYPE_ONOFF_THUMB_DOWN];
+mindplot.ImageIcon.prototype.ICON_MONEY_FAMILY = [mindplot.ImageIcon.ICON_TYPE_MONEY_MONEY,mindplot.ImageIcon.ICON_TYPE_MONEY_DOLLAR,mindplot.ImageIcon.ICON_TYPE_MONEY_EURO,mindplot.ImageIcon.ICON_TYPE_MONEY_POUND,mindplot.ImageIcon.ICON_TYPE_MONEY_YEN,mindplot.ImageIcon.ICON_TYPE_MONEY_COINS,mindplot.ImageIcon.ICON_TYPE_MONEY_RUBY];
+
+
+mindplot.ImageIcon.prototype.ICON_FAMILIES = [mindplot.ImageIcon.prototype.ICON_FACE_FAMILY, mindplot.ImageIcon.prototype.ICON_FUNY_FACE_FAMILY,mindplot.ImageIcon.prototype.ICON_ARROW_FAMILY,mindplot.ImageIcon.prototype.ICON_COMPLEX_ARROW_FAMILY,  mindplot.ImageIcon.prototype.ICON_CONNECT_FAMILY,mindplot.ImageIcon.prototype.ICON_BULB_FAMILY,mindplot.ImageIcon.prototype.ICON_THUMB_FAMILY, mindplot.ImageIcon.prototype.ICON_TICK_FAMILY,mindplot.ImageIcon.prototype.ICON_ONOFF_FAMILY, mindplot.ImageIcon.prototype.ICON_MONEY_FAMILY, mindplot.ImageIcon.prototype.ICON_CHART_FAMILY, mindplot.ImageIcon.prototype.ICON_FLAG_FAMILY, mindplot.ImageIcon.prototype.ICON_BULLET_FAMILY, mindplot.ImageIcon.prototype.ICON_TAG_FAMILY];
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/Issue.txt b/trunk/mindplot/src/main/javascript/Issue.txt
new file mode 100644
index 00000000..155b8213
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Issue.txt
@@ -0,0 +1,19 @@
+
+Pablo
+----------
+
+Paulo
+------
+* El mouse over se rompe una vez que se hace el select de algun node. Debe estar rompiendo el
+ lister o algo parecido.
+** Evitar los cambios de size inecesarios y posicion inecesarios, de esta manera menos flick. Esto en el updater.
+* Queda un ratro raro cuando se hace drag and drop en explorer.
+
+
+
+Later
+-------
+* Cuanto mas grande el grafo, mas lento de hace el primer momento del drag. Con lo cual, es conveniente reutilizar los
+nodos en vez de borrarlos.
+* Menu contextual para agregar nodos.
+* Es necesario manejar para los central topic to main topic correctamente el concepto de height.
diff --git a/trunk/mindplot/src/main/javascript/LinkIcon.js b/trunk/mindplot/src/main/javascript/LinkIcon.js
new file mode 100644
index 00000000..932cea28
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/LinkIcon.js
@@ -0,0 +1,196 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.LinkIcon = function(urlModel, topic, designer) {
+    var divContainer=designer.getWorkSpace().getScreenManager().getContainer();
+    var bubbleTip = mindplot.BubbleTip.getInstance(divContainer);
+    mindplot.Icon.call(this, mindplot.LinkIcon.IMAGE_URL);
+    this._linkModel = urlModel;
+    this._topic = topic;
+    this._designer = designer;
+    var image = this.getImage();
+    var imgContainer = new Element('div').setStyles({textAlign:'center', cursor:'pointer'});
+    this._img = new Element('img');
+    var url = urlModel.getUrl();
+    this._img.src = 'http://open.thumbshots.org/image.pxf?url=' + url;
+
+    if (url.indexOf('http:') == -1)
+    {
+        url = 'http://' + url;
+    }
+    this._img.alt = url;
+    this._url=url;
+    var openWindow = function() {
+        var wOpen;
+        var sOptions;
+
+        sOptions = 'status=yes,menubar=yes,scrollbars=yes,resizable=yes,toolbar=yes';
+        sOptions = sOptions + ',width=' + (screen.availWidth - 10).toString();
+        sOptions = sOptions + ',height=' + (screen.availHeight - 122).toString();
+        sOptions = sOptions + ',screenX=0,screenY=0,left=0,top=0';
+        var url = this._img.alt;
+        wOpen = window.open(url, "link", "width=100px, height=100px");
+        wOpen.focus();
+        wOpen.moveTo(0, 0);
+        wOpen.resizeTo(screen.availWidth, screen.availHeight);
+    };
+    this._img.addEvent('click', openWindow.bindWithEvent(this));
+    this._img.inject(imgContainer);
+
+    var attribution = new Element('div').setStyles({fontSize:10, textAlign:"center"});
+    attribution.innerHTML = "<a href='http://www.thumbshots.org' target='_blank' title='About Thumbshots thumbnails' style='color:#08468F'>About Thumbshots thumbnails</a>";
+
+    var container = new Element('div');
+    var element = new Element('div').setStyles({borderBottom:'1px solid #e5e5e5'});
+
+    var title = new Element('div').setStyles({fontSize:12, textAlign:'center'});
+    this._link = new Element('span');
+    this._link.href = url;
+    this._link.innerHTML = url;
+    this._link.setStyle("text-decoration", "underline");
+    this._link.setStyle("cursor", "pointer");
+    this._link.inject(title);
+    this._link.addEvent('click', openWindow.bindWithEvent(this));
+    title.inject(element);
+
+    imgContainer.inject(element);
+    attribution.inject(element);
+    element.inject(container);
+    
+    if(!designer._viewMode){
+        var buttonContainer = new Element('div').setStyles({paddingTop:5, textAlign:'center'});
+        var editBtn = new Element('input', {type:'button', 'class':'btn-primary', value:'Edit','class':'btn-primary'}).addClass('button').inject(buttonContainer);
+        var removeBtn = new Element('input', {type:'button', value:'Remove','class':'btn-primary'}).addClass('button').inject(buttonContainer);
+
+        editBtn.setStyle("margin-right", "3px");
+        removeBtn.setStyle("margin-left", "3px");
+
+        removeBtn.addEvent('click', function(event) {
+            var command = new mindplot.commands.RemoveLinkFromTopicCommand(this._topic.getId());
+            designer._actionRunner.execute(command);
+            bubbleTip.forceClose();
+        }.bindWithEvent(this));
+
+        var okButtonId = 'okLinkButtonId'
+        editBtn.addEvent('click', function(event) {
+            var topic = this._topic;
+            var designer = this._designer;
+            var link = this;
+            var okFunction = function(e) {
+                var result = false;
+                var url = urlInput.value;
+                if ("" != url.trim())
+                {
+                    link._img.src = 'http://open.thumbshots.org/image.pxf?url=' + url;
+                    link._img.alt = url;
+                    link._link.href = url;
+                    link._link.innerHTML = url;
+                    this._linkModel.setUrl(url);
+                    result = true;
+                }
+                return result;
+            };
+            var msg = new Element('div');
+            var urlText = new Element('div').inject(msg);
+            urlText.innerHTML = "URL:"
+
+            var formElem = new Element('form', {'action': 'none', 'id':'linkFormId'});
+            var urlInput = new Element('input', {'type': 'text', 'size':30,'value':url});
+            urlInput.inject(formElem);
+            formElem.inject(msg)
+
+            formElem.addEvent('submit', function(e)
+            {
+                $(okButtonId).fireEvent('click', e);
+                e = new Event(e);
+                e.stop();
+            });
+
+
+            var dialog = mindplot.LinkIcon.buildDialog(designer, okFunction, okButtonId);
+            dialog.adopt(msg).show();
+
+        }.bindWithEvent(this));
+        buttonContainer.inject(container);
+    }
+
+
+    var linkIcon = this;
+    image.addEventListener('mouseover', function(event) {
+        bubbleTip.open(event, container, linkIcon);
+    });
+    image.addEventListener('mousemove', function(event) {
+        bubbleTip.updatePosition(event);
+    });
+    image.addEventListener('mouseout', function(event) {
+        bubbleTip.close(event);
+    });
+};
+
+objects.extend(mindplot.LinkIcon, mindplot.Icon);
+
+mindplot.LinkIcon.prototype.initialize = function() {
+
+};
+
+mindplot.LinkIcon.prototype.getUrl=function(){
+    return this._url;
+};
+
+mindplot.LinkIcon.prototype.getModel=function(){
+    return this._linkModel;
+};
+
+mindplot.LinkIcon.buildDialog = function(designer, okFunction, okButtonId) {
+    var windoo = new Windoo({
+        title: 'Write link URL',
+        theme: Windoo.Themes.wise,
+        modal:true,
+        buttons:{'menu':false, 'close':false, 'minimize':false, 'roll':false, 'maximize':false},
+        destroyOnClose:true,
+        height:130
+    });
+
+    var cancel = new Element('input', {'type': 'button', 'class':'btn-primary', 'value': 'Cancel','class':'btn-primary'}).setStyle('margin-right', "5px");
+    cancel.setStyle('margin-left', "5px");
+    cancel.addEvent('click', function(event) {
+        $(document).addEvent('keydown', designer.keyEventHandler.bindWithEvent(designer));
+        windoo.close();
+    }.bindWithEvent(this));
+
+    var ok = new Element('input', {'type': 'button', 'class':'btn-primary','value': 'Ok','class':'btn-primary','id':okButtonId}).setStyle('marginRight', 10);
+    ok.addEvent('click', function(event) {
+        var couldBeUpdated = okFunction.attempt();
+        if (couldBeUpdated)
+        {
+            $(document).addEvent('keydown', designer.keyEventHandler.bindWithEvent(designer));
+            windoo.close();
+        }
+    }.bindWithEvent(this));
+
+    var panel = new Element('div', {'styles': {'padding-top': 10, 'text-align': 'right'}}).adopt(ok, cancel);
+
+    windoo.addPanel(panel);
+    $(document).removeEvents('keydown');
+    return windoo;
+};
+
+mindplot.LinkIcon.IMAGE_URL = "../images/world_link.png";
+
+ 
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/LinkModel.js b/trunk/mindplot/src/main/javascript/LinkModel.js
new file mode 100644
index 00000000..759cad9b
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/LinkModel.js
@@ -0,0 +1,45 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.LinkModel = function(url, topic)
+{
+    core.assert(url, 'link url can not be null');
+    core.assert(topic, 'mindmap can not be null');
+    this._url = url;
+    this._topic = topic;
+};
+
+mindplot.LinkModel.prototype.getUrl = function()
+{
+    return this._url;
+};
+
+mindplot.LinkModel.prototype.setUrl = function(url){
+    this._url = url;
+}
+
+mindplot.LinkModel.prototype.getTopic = function()
+{
+    return this._topic;
+};
+
+mindplot.LinkModel.prototype.isLinkModel = function()
+{
+    return true;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/MainTopic.js b/trunk/mindplot/src/main/javascript/MainTopic.js
new file mode 100644
index 00000000..69279bb6
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/MainTopic.js
@@ -0,0 +1,355 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.MainTopic = function(model)
+{
+    core.assert(model, "Model can not be null");
+    this.setModel(model);
+    var topicBoard = new mindplot.MainTopicBoard(this);
+    mindplot.MainTopic.superClass.initialize.call(this, topicBoard);
+};
+
+objects.extend(mindplot.MainTopic, mindplot.Topic);
+
+mindplot.MainTopic.prototype.INNER_RECT_ATTRIBUTES = {stroke:'0.5 solid #009900'};
+
+mindplot.MainTopic.prototype.createSiblingModel = function()
+{
+    var siblingModel = null;
+    var parentTopic = this.getOutgoingConnectedTopic();
+    if (parentTopic != null)
+    {
+        // Create a new node ...
+        var model = this.getModel();
+        var mindmap = model.getMindmap();
+        siblingModel = mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE);
+
+        // Positionate following taking into account the sibling positon.
+        if (parentTopic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            var pos = this.getPosition();
+            siblingModel.setPosition(pos.x, pos.y);
+        }
+
+        // Create a new node ...
+        var order = this.getOrder() + 1;
+        siblingModel.setOrder(order);
+    }
+    return siblingModel;
+};
+
+mindplot.MainTopic.prototype.createChildModel = function()
+{
+    // Create a new node ...
+    var model = this.getModel();
+    var mindmap = model.getMindmap();
+    var childModel = mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE);
+
+    // Get the hights model order position ...
+    var children = this._getChildren();
+    var order = -1;
+    for (var i = 0; i < children.length; i++)
+    {
+        var child = children[i];
+        if (child.getOrder() > order)
+        {
+            order = child.getOrder();
+        }
+    }
+    // Create a new node ...
+    childModel.setOrder(order + 1);
+    return childModel;
+};
+
+
+mindplot.MainTopic.prototype._buildDragShape = function()
+{
+    var innerShape = this.buildShape(this.INNER_RECT_ATTRIBUTES);
+    var size = this.getSize();
+    innerShape.setSize(size.width, size.height);
+    innerShape.setPosition(0, 0);
+    innerShape.setOpacity(0.5);
+    innerShape.setCursor('default');
+    innerShape.setVisibility(true);
+
+    var brColor = this.getBorderColor();
+    innerShape.setAttribute("strokeColor", brColor);
+
+    var bgColor = this.getBackgroundColor();
+    innerShape.setAttribute("fillColor", bgColor);
+
+    //  Create group ...
+    var groupAttributes = {width: 100, height:100,coordSizeWidth:100,coordSizeHeight:100};
+    var group = new web2d.Group(groupAttributes);
+    group.appendChild(innerShape);
+
+    // Add Text ...
+    var textShape = this._buildTextShape(true);
+    var text = this.getText();
+    textShape.setText(text);
+    textShape.setOpacity(0.5);
+    group.appendChild(textShape);
+
+    return group;
+};
+
+
+mindplot.MainTopic.prototype._defaultShapeType = function()
+{
+    var targetTopic = this.getOutgoingConnectedTopic();
+    var result;
+    if (targetTopic)
+    {
+        if (targetTopic.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            result = mindplot.NodeModel.SHAPE_TYPE_LINE;
+
+        } else
+        {
+            result = mindplot.NodeModel.SHAPE_TYPE_ROUNDED_RECT;
+        }
+    } else
+    {
+        result = mindplot.NodeModel.SHAPE_TYPE_ROUNDED_RECT;
+    }
+    return result;
+};
+
+mindplot.MainTopic.prototype.updateTopicShape = function(targetTopic, workspace)
+{
+    // Change figure based on the connected topic ...
+    if (targetTopic.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        var model = this.getModel();
+        var shapeType = model.getShapeType();
+        if (!shapeType)
+        {
+            // Get the real shape type ...
+            shapeType = this.getShapeType();
+            this._setShapeType(mindplot.NodeModel.SHAPE_TYPE_LINE, false);
+        }
+    }
+};
+
+mindplot.MainTopic.prototype.disconnect = function(workspace)
+{
+    mindplot.MainTopic.superClass.disconnect.call(this, workspace);
+    var size = this.getSize();
+
+    var model = this.getModel();
+    var shapeType = model.getShapeType();
+    if (!shapeType)
+    {
+        // Change figure ...
+        shapeType = this.getShapeType();
+        this._setShapeType(mindplot.NodeModel.SHAPE_TYPE_ROUNDED_RECT, false);
+    }
+};
+
+mindplot.MainTopic.prototype.getTopicType = function()
+{
+    return "MainTopic";
+};
+
+
+mindplot.MainTopic.prototype._updatePositionOnChangeSize = function(oldSize, newSize) {
+
+    var xOffset = (newSize.width - oldSize.width) / 2;
+    var pos = this.getPosition();
+    if (core.Utils.isDefined(pos))
+    {
+        if (pos.x > 0)
+        {
+            pos.x = pos.x + xOffset;
+        } else
+        {
+            pos.x = pos.x - xOffset;
+        }
+        this.setPosition(pos);
+
+        // If height has changed, I must repositionate all elements ...
+        if (oldSize.height != newSize.height)
+        {
+            var topicBoard = this.getTopicBoard();
+            // topicBoard.repositionate();
+        }
+    }
+};
+
+mindplot.MainTopic.prototype.setPosition = function(point)
+{
+    mindplot.MainTopic.superClass.setPosition.call(this, point);
+
+    // Update board zero entry position...
+    var topicBoard = this.getTopicBoard();
+    topicBoard.updateChildrenPosition(this);
+};
+
+mindplot.MainTopic.prototype.workoutIncomingConnectionPoint = function(sourcePosition)
+{
+    core.assert(sourcePosition, 'sourcePoint can not be null');
+    var pos = this.getPosition();
+    var size = this.getSize();
+
+    var isAtRight = mindplot.util.Shape.isAtRight(sourcePosition, pos);
+    var result = mindplot.util.Shape.calculateRectConnectionPoint(pos, size, isAtRight);
+    if (this.getShapeType() == mindplot.NodeModel.SHAPE_TYPE_LINE)
+    {
+        result.y = result.y + (this.getSize().height / 2);
+    }
+
+    // Move a little the position...
+    var offset = mindplot.Topic.CONNECTOR_WIDTH / 2;
+    if (this.getPosition().x > 0)
+    {
+        result.x = result.x + offset;
+    } else
+    {
+        result.x = result.x - offset;
+    }
+    return result;
+
+};
+
+mindplot.MainTopic.prototype.workoutOutgoingConnectionPoint = function(targetPosition)
+{
+    core.assert(targetPosition, 'targetPoint can not be null');
+    var pos = this.getPosition();
+    var size = this.getSize();
+
+    var isAtRight = mindplot.util.Shape.isAtRight(targetPosition, pos);
+    var result;
+    if (this.getShapeType() == mindplot.NodeModel.SHAPE_TYPE_LINE)
+    {
+        if (!this.isConnectedToCentralTopic())
+        {
+            result = new core.Point();
+            if (!isAtRight)
+            {
+                result.x = pos.x - (size.width / 2);
+            } else
+            {
+                result.x = pos.x + (size.width / 2);
+            }
+            result.y = pos.y + (size.height / 2);
+        } else
+        {
+            // In this case, connetion line is not used as shape figure.
+            result = mindplot.util.Shape.calculateRectConnectionPoint(pos, size, isAtRight, true);
+            result.y = pos.y + (size.height / 2);
+
+            // Correction factor ...
+            if (!isAtRight)
+            {
+                result.x = result.x + 2;
+            } else
+            {
+                result.x = result.x - 2;
+            }
+
+        }
+    } else
+    {
+        result = mindplot.util.Shape.calculateRectConnectionPoint(pos, size, isAtRight, true);
+    }
+    return result;
+};
+
+
+mindplot.MainTopic.prototype.isConnectedToCentralTopic = function()
+{
+    var model = this.getModel();
+    var parent = model.getParent();
+
+    return parent && parent.getType() === mindplot.NodeModel.CENTRAL_TOPIC_TYPE;
+};
+
+mindplot.MainTopic.prototype._defaultText = function()
+{
+    var targetTopic = this.getOutgoingConnectedTopic();
+    var result = "";
+    if (targetTopic)
+    {
+        if (targetTopic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            result = "Main Topic";
+        } else
+        {
+            result = "Sub Topic";
+        }
+    } else
+    {
+        result = "Isolated Topic";
+    }
+    return result;
+};
+
+mindplot.MainTopic.prototype._defaultFontStyle = function()
+{
+    var targetTopic = this.getOutgoingConnectedTopic();
+    var result;
+    if (targetTopic)
+    {
+        if (targetTopic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            result = {
+                font:"Arial",
+                size: 8,
+                style:"normal",
+                weight:"normal",
+                color:"#525c61"
+            };
+        } else
+        {
+            result = {
+                font:"Arial",
+                size: 6,
+                style:"normal",
+                weight:"normal",
+                color:"#525c61"
+            };
+        }
+    } else
+    {
+        result = {
+            font:"Verdana",
+            size: 8,
+            style:"normal",
+            weight:"normal",
+            color:"#525c61"
+        };
+    }
+    return result;
+};
+
+mindplot.MainTopic.prototype._defaultBackgroundColor = function()
+{
+    return "#E0E5EF";
+};
+
+mindplot.MainTopic.prototype._defaultBorderColor = function()
+{
+    return '#023BB9';
+};
+mindplot.MainTopic.prototype.addSibling = function()
+{
+    var order = this.getOrder();
+
+
+};
diff --git a/trunk/mindplot/src/main/javascript/MainTopicBoard.js b/trunk/mindplot/src/main/javascript/MainTopicBoard.js
new file mode 100644
index 00000000..96d625f6
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/MainTopicBoard.js
@@ -0,0 +1,144 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.MainTopicBoard = function(topic)
+{
+    this._topic = topic;
+    this._board = null;
+    this._height = 0;
+};
+
+objects.extend(mindplot.MainTopicBoard, mindplot.TopicBoard);
+
+mindplot.MainTopicBoard.DEFAULT_MAIN_TOPIC_HEIGHT = 18;
+
+mindplot.MainTopicBoard.prototype._getBoard = function()
+{
+    if (!this._board)
+    {
+        var topic = this._topic;
+        this._board = new mindplot.FixedDistanceBoard(mindplot.MainTopicBoard.DEFAULT_MAIN_TOPIC_HEIGHT, topic);
+    }
+    return this._board;
+};
+
+mindplot.MainTopicBoard.prototype.updateReferencePoint = function(position)
+{
+    this._board.updateReferencePoint(position);
+};
+
+mindplot.MainTopicBoard.prototype.updateChildrenPosition = function(topic)
+{
+    var board = this._getBoard();
+    board.updateReferencePoint();
+};
+
+mindplot.MainTopicBoard.prototype.positionateDragTopic = function(dragTopic)
+{
+    core.assert(dragTopic != null, 'dragTopic can not be null');
+    core.assert(dragTopic.isDragTopic, 'dragTopic must be DragTopic instance');
+
+    // This node is a main topic node. Position
+    var dragPos = dragTopic.getPosition();
+    var board = this._getBoard();
+
+    // Look for entry  ...
+    var entry = board.lookupEntryByPosition(dragPos);
+
+    // Calculate 'y' position base on the entry ...
+    var yCoord;
+    if (!entry.isAvailable() && entry.getTopic() != dragTopic.getDraggedTopic())
+    {
+        yCoord = entry.getLowerLimit();
+    } else
+    {
+        yCoord = entry.workoutEntryYCenter();
+    }
+
+    // Update board position.
+    var targetTopic = dragTopic.getConnectedToTopic();
+    var xCoord = this._workoutXBorderDistance(targetTopic);
+
+    // Add the size of the pivot to the distance ...
+    var halfPivotWidth = mindplot.DragTopic.PIVOT_SIZE.width / 2;
+    xCoord = xCoord + ((dragPos.x > 0) ? halfPivotWidth : -halfPivotWidth);
+
+    var pivotPos = new core.Point(xCoord, yCoord);
+    dragTopic.setBoardPosition(pivotPos);
+
+    var order = entry.getOrder();
+    dragTopic.setOrder(order);
+};
+
+/**
+ * This x distance does't take into account the size of the shape.
+ */
+mindplot.MainTopicBoard.prototype._workoutXBorderDistance = function(topic)
+{
+    core.assert(topic, 'topic can not be null');
+    var board = this._getBoard();
+    return board.workoutXBorderDistance(topic);
+};
+
+mindplot.MainTopicBoard.prototype.addBranch = function(topic)
+{
+    var order = topic.getOrder();
+    core.assert(core.Utils.isDefined(order), "Order must be defined");
+
+    // If the entry is not available, I must swap the the entries...
+    var board = this._getBoard();
+    var entry = board.lookupEntryByOrder(order);
+    if (!entry.isAvailable())
+    {
+        board.freeEntry(entry);
+    }
+
+    // Add the topic to the board ...
+    board.addTopic(order, topic);
+
+    // Repositionate all the parent topics ...
+    var currentTopic = this._topic;
+    if (currentTopic.getOutgoingConnectedTopic())
+    {
+        var parentTopic = currentTopic.getOutgoingConnectedTopic();
+        var parentTopicBoard = parentTopic.getTopicBoard();
+        parentTopicBoard.repositionate();
+    }
+};
+
+mindplot.MainTopicBoard.prototype.repositionate = function()
+{
+    var board = this._getBoard();
+    board.repositionate();
+};
+
+mindplot.MainTopicBoard.prototype.removeTopicFromBoard = function(topic)
+{
+    var board = this._getBoard();
+    board.removeTopic(topic);
+
+    // Repositionate all the parent topics ...
+    var parentTopic = this._topic;
+    if (parentTopic.getOutgoingConnectedTopic())
+    {
+        var connectedTopic = parentTopic.getOutgoingConnectedTopic();
+        var topicBoard = connectedTopic.getTopicBoard();
+        topicBoard.repositionate();
+    }
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/Mindmap.js b/trunk/mindplot/src/main/javascript/Mindmap.js
new file mode 100644
index 00000000..f268b3a1
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Mindmap.js
@@ -0,0 +1,171 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Mindmap = function()
+{
+    this._branches = [];
+    this._name = null;
+    this._description = null;
+};
+
+mindplot.Mindmap.prototype.getCentralTopic = function()
+{
+    return this._branches[0];
+};
+
+mindplot.Mindmap.prototype.getDescription = function()
+{
+    return this._description;
+};
+
+mindplot.Mindmap.prototype.getId = function()
+{
+    return this._iconType;
+};
+
+
+mindplot.Mindmap.prototype.setId = function(id)
+{
+    this._iconType = id;
+};
+
+mindplot.Mindmap.prototype.addBranch = function(nodeModel)
+{
+    core.assert(nodeModel && nodeModel.isNodeModel(), 'Add node must be invoked with model objects');
+    if (this._branches.length == 0)
+    {
+        core.assert(nodeModel.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE, "First element must be the central topic");
+        nodeModel.setPosition(0, 0);
+    } else
+    {
+        core.assert(nodeModel.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE, "Mindmaps only have one cental topic");
+    }
+
+    this._branches.push(nodeModel);
+};
+
+mindplot.Mindmap.prototype.getBranches = function()
+{
+    return this._branches;
+};
+
+mindplot.Mindmap.prototype.connect = function(parent, child)
+{
+    // Child already has a parent ?
+    var branches = this.getBranches();
+    core.assert(!child.getParent(), 'Child model seems to be already connected');
+
+    //  Connect node...
+    parent._appendChild(child);
+
+    // Remove from the branch ...
+    branches.remove(child);
+};
+
+mindplot.Mindmap.prototype.disconnect = function(child)
+{
+    var parent = child.getParent();
+    core.assert(child, 'Child can not be null.');
+    core.assert(parent, 'Child model seems to be already connected');
+
+    parent._removeChild(child);
+
+    var branches = this.getBranches();
+    branches.push(child);
+
+};
+
+mindplot.Mindmap.prototype.hasAlreadyAdded = function(node)
+{
+    var result = false;
+
+    // Check in not connected nodes.
+    var branches = this._branches;
+    for (var i = 0; i < branches.length; i++)
+    {
+        result = branches[i]._isChildNode(node);
+        if (result)
+        {
+            break;
+        }
+    }
+};
+
+mindplot.Mindmap.prototype.createNode = function(type)
+{
+    core.assert(type, "node type can not be null");
+    return this._createNode(type);
+};
+
+mindplot.Mindmap.prototype._createNode = function(type)
+{
+    core.assert(type, 'Node type must be specified.');
+    var result = new mindplot.NodeModel(type, this);
+    return result;
+};
+
+mindplot.Mindmap.prototype.inspect = function()
+{
+    var result = '';
+    result = '{ ';
+
+    var branches = this.getBranches();
+    for (var i = 0; i < branches.length; i++)
+    {
+        var node = branches[i];
+        if (i != 0)
+        {
+            result = result + ', ';
+        }
+
+        result = result + this._toString(node);
+    }
+
+    result = result + ' } ';
+
+    return result;
+};
+
+mindplot.Mindmap.prototype._toString = function(node)
+{
+    var result = node.inspect();
+    var children = node.getChildren();
+
+    for (var i = 0; i < children.length; i++)
+    {
+        var child = children[i];
+
+        if (i == 0)
+        {
+            result = result + '-> {';
+        } else
+        {
+            result = result + ', ';
+        }
+
+        result = result + this._toString(child);
+
+        if (i == children.length - 1)
+        {
+            result = result + '}';
+        }
+    }
+
+    return result;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/MindmapDesigner.js b/trunk/mindplot/src/main/javascript/MindmapDesigner.js
new file mode 100644
index 00000000..d4b7c9d3
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/MindmapDesigner.js
@@ -0,0 +1,1230 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.MindmapDesigner = function(profile, divElement, persistanManager)
+{
+    core.assert(persistanManager, "Persistant manager must be defined");
+    core.assert(core.Utils.isDefined(profile.zoom), "zoom must be defined");
+
+    // Undo manager ...
+    this._actionRunner = new mindplot.DesignerActionRunner(this);
+    mindplot.DesignerActionRunner.setInstance(this._actionRunner);
+
+    // Initial Zoom
+    this._zoom = profile.zoom;
+    this._viewMode = profile.viewMode;
+
+    // Init Screen manager..
+    var screenManager = new mindplot.ScreenManager(profile.width, profile.height, divElement);
+
+    //create editor
+    this._editor = new mindplot.TextEditor(screenManager, this._actionRunner);
+
+    var workspace = new mindplot.Workspace(profile, screenManager, this._zoom);
+    this._workspace = workspace;
+
+
+    // Init layout managers ...
+    this._topics = [];
+    this._dragTopicPositioner = new mindplot.DragTopicPositioner(this._workspace, this._topics);
+
+    // Register handlers..
+    this._registerEvents();
+
+    // Selected node
+    this._nodeOnFocus = null;
+
+    // Init dragger manager.
+    this._dragger = this._buildDragManager(workspace);
+
+    this._persistantManager = persistanManager;
+
+    // Add shapes to speed up the loading process ...
+    mindplot.DragTopic.initialize(workspace);
+
+    this._events = {};
+};
+
+
+mindplot.MindmapDesigner.prototype.getDragTopicPositioner = function()
+{
+    return this._dragTopicPositioner;
+};
+
+mindplot.MindmapDesigner.prototype._getTopics = function()
+{
+    return this._topics;
+};
+
+mindplot.MindmapDesigner.prototype.getCentralTopic = function()
+{
+    var topics = this._getTopics();
+    return topics[0];
+};
+
+
+mindplot.MindmapDesigner.prototype.addEventListener = function(eventType, listener)
+{
+
+    this._events[eventType] = listener;
+
+}
+
+mindplot.MindmapDesigner.prototype._fireEvent = function(eventType, event)
+{
+    var listener = this._events[eventType];
+    if (listener != null)
+    {
+        listener(event);
+    }
+}
+
+mindplot.MindmapDesigner.prototype._buildDragManager = function(workspace)
+{
+    // Init dragger manager.
+    var dragger = new mindplot.DragManager(workspace);
+    var screen = workspace.getScreenManager();
+    var topics = this._getTopics();
+
+    var dragTopicPositioner = this.getDragTopicPositioner();
+    var mindmapDesigner = this;
+    var elem = this;
+
+    dragger.addEventListener('startdragging', function(event, node)
+    {
+        // Enable all mouse events.
+        for (var i = 0; i < topics.length; i++)
+        {
+            topics[i].setMouseEventsEnabled(false);
+        }
+    });
+
+    dragger.addEventListener('dragging', function(event, dragTopic)
+    {
+        // Update the state and connections of the topic ...
+        dragTopicPositioner.positionateDragTopic(dragTopic);
+    });
+
+    dragger.addEventListener('enddragging', function(event, dragTopic)
+    {
+        // Enable all mouse events.
+        for (var i = 0; i < topics.length; i++)
+        {
+            topics[i].setMouseEventsEnabled(true);
+        }
+        // Topic must be positioned in the real board postion.
+        if (dragTopic._isInTheWorkspace)
+        {
+            var draggedTopic = dragTopic.getDraggedTopic();
+
+            // Hide topic during draw ...
+            draggedTopic.setBranchVisibility(false);
+            var parentNode = draggedTopic.getParent();
+            dragTopic.updateDraggedTopic(workspace);
+
+
+            // Make all node visible ...
+            draggedTopic.setVisibility(true);
+            if (parentNode != null)
+            {
+                parentNode.setBranchVisibility(true);
+            }
+        }
+    });
+
+    return dragger;
+};
+
+mindplot.MindmapDesigner.prototype._registerEvents = function()
+{
+    var mindmapDesigner = this;
+    var workspace = this._workspace;
+    var screenManager = workspace.getScreenManager();
+
+    if (!this._viewMode)
+    {
+
+        // Initialize workspace event listeners.
+        // Create nodes on double click...
+        workspace.addEventListener('click', function(event)
+        {
+            mindmapDesigner.getEditor().lostFocus();
+            // @todo: Puaj hack...
+            mindmapDesigner._cleanScreen();
+        });
+
+        workspace.addEventListener('dblclick', function(event)
+        {
+            mindmapDesigner.getEditor().lostFocus();
+            // Get mouse position
+            var pos = screenManager.getWorkspaceMousePosition(event);
+
+            // Create a new topic model ...
+            var mindmap = mindmapDesigner.getMindmap();
+            var model = mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE);
+            model.setPosition(pos.x, pos.y);
+
+            // Get central topic ...
+            var centralTopic = mindmapDesigner.getCentralTopic();
+            var centralTopicId = centralTopic.getId();
+
+            // Execute action ...
+            var command = new mindplot.commands.AddTopicCommand(model, centralTopicId);
+            this._actionRunner.execute(command);
+        }.bind(this));
+    }
+    ;
+};
+
+mindplot.MindmapDesigner.prototype._buildNodeGraph = function(model)
+{
+    var workspace = this._workspace;
+    var elem = this;
+
+    // Create node graph ...
+    var topic = mindplot.NodeGraph.create(model);
+
+    // Append it to the workspace ...
+    var topics = this._topics;
+    topics.push(topic);
+
+    // Add Topic events ...
+    this._registerListenersOnNode(topic);
+
+    // Connect Topic ...
+    var isConnected = model.isConnected();
+    if (isConnected)
+    {
+        // Improve this ...
+        var targetTopicModel = model.getParent();
+        var targetTopicId = targetTopicModel.getId();
+        var targetTopic = null;
+
+        for (var i = 0; i < topics.length; i++)
+        {
+            var t = topics[i];
+            if (t.getModel() == targetTopicModel)
+            {
+                targetTopic = t;
+                // Disconnect the node. It will be connected again later ...
+                model.disconnect();
+                break;
+            }
+        }
+        core.assert(targetTopic, "Could not find a topic to connect");
+        topic.connectTo(targetTopic, workspace);
+    }
+
+    return  topic;
+};
+
+mindplot.MindmapDesigner.prototype.onNodeFocusEvent = function(topicGraph, event)
+{
+    this.getEditor().lostFocus();
+    var topics = this._topics;
+    // Disable all nodes on focus but not the current if Ctrl key isn't being pressed
+    if (!core.Utils.isDefined(event) || event.ctrlKey == false)
+    {
+        for (var i = 0; i < topics.length; i++)
+        {
+            var node = topics[i];
+            if (node.isOnFocus() && node != topicGraph)
+            {
+                node.setOnFocus(false);
+            }
+        }
+    }
+};
+
+mindplot.MindmapDesigner.prototype._registerListenersOnNode = function(topic)
+{
+    // Register node listeners ...
+    var elem = this;
+    var topics = this._topics;
+    topic.addEventListener('onfocus', function(event)
+    {
+        elem.onNodeFocusEvent.attempt([topic, event], elem);
+    });
+
+    // Add drag behaviour ...
+    if (topic.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+
+        // Central Topic doesn't support to be dragged
+        var dragger = this._dragger;
+        dragger.add(topic);
+    }
+
+    // Register editor events ...
+    if (!this._viewMode)
+    {
+        this._editor.listenEventOnNode(topic, 'dblclick', true);
+    }
+
+};
+mindplot.MindmapDesigner.prototype.zoomOut = function()
+{
+    var scale = this._zoom * 1.2;
+    if (scale <= 4)
+    {
+        this._zoom = scale;
+        this._workspace.setZoom(this._zoom);
+    }
+    else
+    {
+        core.Monitor.getInstance().logMessage('Sorry, no more zoom can be applied. \n Why do you need more?');
+    }
+
+};
+
+mindplot.MindmapDesigner.prototype.zoomIn = function()
+{
+    var scale = this._zoom / 1.2;
+    if (scale >= 0.3)
+    {
+        this._zoom = scale;
+        this._workspace.setZoom(this._zoom);
+    }
+    else
+    {
+        core.Monitor.getInstance().logMessage('Sorry, no more zoom can be applied. \n Why do you need more?');
+    }
+};
+
+mindplot.MindmapDesigner.prototype.createChildForSelectedNode = function()
+{
+
+    var nodes = this._getSelectedNodes();
+    if (nodes.length <= 0)
+    {
+        // If there are more than one node selected,
+        core.Monitor.getInstance().logMessage('Could not create a topic. Only one node must be selected.');
+        return;
+
+    }
+    if (nodes.length > 1)
+    {
+
+        // If there are more than one node selected,
+        core.Monitor.getInstance().logMessage('Could not create a topic. One topic must be selected.');
+        return;
+    }
+
+    // Add new node ...
+    var centalTopic = nodes[0];
+    var parentTopicId = centalTopic.getId();
+    var childModel = centalTopic.createChildModel();
+
+    var command = new mindplot.commands.AddTopicCommand(childModel, parentTopicId);
+    this._actionRunner.execute(command);
+};
+
+mindplot.MindmapDesigner.prototype.createSiblingForSelectedNode = function()
+{
+    var nodes = this._getSelectedNodes();
+    if (nodes.length <= 0)
+    {
+        // If there are more than one node selected,
+        core.Monitor.getInstance().logMessage('Could not create a topic. Only one node must be selected.');
+        return;
+
+    }
+    if (nodes.length > 1)
+    {
+        // If there are more than one node selected,
+        core.Monitor.getInstance().logMessage('Could not create a topic. One topic must be selected.');
+        return;
+    }
+
+    var topic = nodes[0];
+    if (topic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        // Central topic doesn't have siblings ...
+        this.createChildForSelectedNode();
+
+    } else
+    {
+        var parentTopic = topic.getOutgoingConnectedTopic();
+        var siblingModel = topic.createSiblingModel();
+        var parentTopicId = parentTopic.getId();
+        var command = new mindplot.commands.AddTopicCommand(siblingModel, parentTopicId);
+
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.needsSave = function()
+{
+    return this._actionRunner.hasBeenChanged();
+}
+
+mindplot.MindmapDesigner.prototype.autoSaveEnabled = function(value)
+{
+    if (value)
+    {
+        var autosave = function() {
+
+            if (this.needsSave())
+            {
+                this.save(null, false);
+            }
+        };
+        autosave.bind(this).periodical(30000);
+    }
+}
+
+mindplot.MindmapDesigner.prototype.save = function(onSavedHandler, saveHistory)
+{
+    var persistantManager = this._persistantManager;
+    var mindmap = this._mindmap;
+
+    var xmlChart = this._workspace.dumpNativeChart();
+    var chatType = core.UserAgent.isVMLSupported() ? "VML" : "SVG";
+    if (core.UserAgent.isVMLSupported())
+    {
+        // Remove first line: "<?xml:namespace prefix = v ns = "urn:schemas-microsoft-com:vml" />"
+        xmlChart = xmlChart.replace('<?xml:namespace prefix = v ns = "urn:schemas-microsoft-com:vml" />', "");
+    }
+
+    var properties = {zoom:this._zoom};
+    persistantManager.save(mindmap, chatType, xmlChart, properties, onSavedHandler, saveHistory);
+    this._fireEvent("save", {type:saveHistory});
+
+    // Refresh undo state...
+    this._actionRunner.markAsChangeBase();
+};
+
+mindplot.MindmapDesigner.prototype.loadFromXML = function(mapId, xmlContent)
+{
+    core.assert(xmlContent, 'mindmapId can not be null');
+    core.assert(xmlContent, 'xmlContent can not be null');
+
+    // Explorer Hack with local files ...
+    var domDocument = core.Utils.createDocumentFromText(xmlContent);
+
+    var serializer = new mindplot.XMLMindmapSerializer();
+    var mindmap = serializer.loadFromDom(domDocument);
+
+    this._loadMap(mapId, mindmap);
+
+    // Place the focus on the Central Topic
+    var centralTopic = this.getCentralTopic();
+    this._goToNode.attempt(centralTopic, this);
+};
+
+mindplot.MindmapDesigner.prototype.load = function(mapId)
+{
+    core.assert(mapId, 'mapName can not be null');
+
+    // Build load function ...
+    var persistantManager = this._persistantManager;
+
+    // Loading mindmap ...
+    var mindmap = persistantManager.load(mapId);
+
+    // Finally, load the map in the editor ...
+    this._loadMap(mapId, mindmap);
+
+    // Place the focus on the Central Topic
+    var centralTopic = this.getCentralTopic();
+    this._goToNode.attempt(centralTopic, this);
+};
+
+mindplot.MindmapDesigner.prototype._loadMap = function(mapId, mindmapModel)
+{
+    var designer = this;
+    if (mindmapModel != null)
+    {
+        mindmapModel.setId(mapId);
+        designer._mindmap = mindmapModel;
+
+        // Building node graph ...
+        var branches = mindmapModel.getBranches();
+        for (var i = 0; i < branches.length; i++)
+        {
+            // NodeModel -> NodeGraph ...
+            var nodeModel = branches[i];
+            var nodeGraph = this._nodeModelToNodeGraph(nodeModel);
+
+            // Update shrink render state...
+            nodeGraph.setBranchVisibility(true);
+        }
+    }
+};
+
+
+mindplot.MindmapDesigner.prototype.getMindmap = function()
+{
+    return this._mindmap;
+};
+
+mindplot.MindmapDesigner.prototype.undo = function()
+{
+    this._actionRunner.undo();
+};
+
+mindplot.MindmapDesigner.prototype.redo = function()
+{
+    this._actionRunner.redo();
+};
+
+mindplot.MindmapDesigner.prototype._nodeModelToNodeGraph = function(nodeModel)
+{
+    core.assert(nodeModel, "Node model can not be null");
+    var nodeGraph = this._buildNodeGraph(nodeModel);
+
+    var children = nodeModel.getChildren().slice();
+
+    // Sort children by order to solve adding order ...
+    if (children.length > 0)
+    {
+        var oldChildren = children;
+        children = [];
+        for (var i = 0; i < oldChildren.length; i++)
+        {
+            var child = oldChildren[i];
+            var order = child.getOrder();
+            if (order != null)
+            {
+                children[order] = child;
+            } else
+            {
+                children.push(child);
+            }
+        }
+    }
+
+    for (var i = 0; i < children.length; i++)
+    {
+        var child = children[i];
+        this._nodeModelToNodeGraph(children[i]);
+    }
+
+    var workspace = this._workspace;
+    workspace.appendChild(nodeGraph);
+    return nodeGraph;
+};
+
+mindplot.MindmapDesigner.prototype.getEditor = function()
+{
+    return this._editor;
+};
+
+mindplot.MindmapDesigner.prototype._removeNode = function(node)
+{
+    if (node.getTopicType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        var parent = node._parent;
+        node.disconnect(this._workspace);
+
+        //remove children
+        while (node._getChildren().length > 0)
+        {
+            this._removeNode(node._getChildren()[0]);
+        }
+
+        this._workspace.removeChild(node);
+        this._topics.remove(node);
+
+        // Delete this node from the model...
+        var model = node.getModel();
+        model.deleteNode();
+
+        if (parent)
+        {
+            this._goToNode(parent);
+        }
+    }
+};
+
+mindplot.MindmapDesigner.prototype.deleteCurrentNode = function()
+{
+
+    var validateFunc = function(topic) {
+        return topic.getTopicType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE
+    };
+    var validateError = 'Central topic can not be deleted.';
+    var topicsIds = this._setValidSelectedTopicsIds(validateFunc, validateError);
+    if (topicsIds.length > 0)
+    {
+        var command = new mindplot.commands.DeleteTopicCommand(topicsIds);
+        this._actionRunner.execute(command);
+    }
+
+};
+
+mindplot.MindmapDesigner.prototype.setFont2SelectedNode = function(font)
+{
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic, font)
+        {
+            var result = topic.getFontFamily();
+            topic.setFontFamily(font, true);
+
+            var updated = function() {
+                topic.updateNode();
+            };
+            updated.delay(0);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, font, topicsIds);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.setStyle2SelectedNode = function()
+{
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic)
+        {
+            var result = topic.getFontStyle();
+            var style = (result == "italic") ? "normal" : "italic";
+            topic.setFontStyle(style, true);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, "", topicsIds);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.setFontColor2SelectedNode = function(color)
+{
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic, color)
+        {
+            var result = topic.getFontColor();
+            topic.setFontColor(color, true);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, color, topicsIds);
+        command.discartDuplicated = "fontColorCommandId";
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.setBackColor2SelectedNode = function(color)
+{
+
+    var validateFunc = function(topic) {
+        return topic.getShapeType() != mindplot.NodeModel.SHAPE_TYPE_LINE
+    };
+    var validateError = 'Color can not be setted to line topics.';
+    var topicsIds = this._setValidSelectedTopicsIds(validateFunc, validateError);
+
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic, color)
+        {
+            var result = topic.getBackgroundColor();
+            topic.setBackgroundColor(color);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, color, topicsIds);
+        command.discartDuplicated = "backColor";
+        this._actionRunner.execute(command);
+    }
+};
+
+
+mindplot.MindmapDesigner.prototype._setValidSelectedTopicsIds = function(validate, errorMsg)
+{
+    var result = [];
+    var selectedNodes = this._getSelectedNodes();
+    if (selectedNodes.length == 0)
+    {
+        core.Monitor.getInstance().logMessage('At least one topic must be selected to execute this operation.');
+    } else
+    {
+        for (var i = 0; i < selectedNodes.length; i++)
+        {
+            var selectedNode = selectedNodes[i];
+            var isValid = true;
+            if (validate)
+            {
+                isValid = validate(selectedNode);
+            }
+
+            // Add node only if it's valid.
+            if (isValid)
+            {
+                result.push(selectedNode.getId());
+            } else
+            {
+                core.Monitor.getInstance().logMessage(errorMsg);
+            }
+        }
+    }
+    return result;
+}
+
+mindplot.MindmapDesigner.prototype.setBorderColor2SelectedNode = function(color)
+{
+    var validateFunc = function(topic) {
+        return topic.getShapeType() != mindplot.NodeModel.SHAPE_TYPE_LINE
+    };
+    var validateError = 'Color can not be setted to line topics.';
+    var topicsIds = this._setValidSelectedTopicsIds(validateFunc, validateError);
+
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic, color)
+        {
+            var result = topic.getBorderColor();
+            topic.setBorderColor(color);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, color, topicsIds);
+        command.discartDuplicated = "borderColorCommandId";
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.setFontSize2SelectedNode = function(size)
+{
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic, size)
+        {
+            var result = topic.getFontSize();
+            topic.setFontSize(size, true);
+
+            var updated = function() {
+                topic.updateNode();
+            };
+            updated.delay(0);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, size, topicsIds);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.setShape2SelectedNode = function(shape)
+{
+    var validateFunc = function(topic) {
+        return !(topic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE && shape == mindplot.NodeModel.SHAPE_TYPE_LINE)
+    };
+    var validateError = 'Central Topic shape can not be changed to line figure.';
+    var topicsIds = this._setValidSelectedTopicsIds(validateFunc, validateError);
+
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic, size)
+        {
+            var result = topic.getShapeType();
+            topic.setShapeType(size, true);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, shape, topicsIds);
+        this._actionRunner.execute(command);
+    }
+};
+
+
+mindplot.MindmapDesigner.prototype.setWeight2SelectedNode = function()
+{
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+        var commandFunc = function(topic)
+        {
+            var result = topic.getFontWeight();
+            var weight = (result == "bold") ? "normal" : "bold";
+            topic.setFontWeight(weight, true);
+
+            var updated = function() {
+                topic.updateNode();
+            };
+            updated.delay(0);
+            return result;
+        }
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, "", topicsIds);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.addImage2SelectedNode = function(iconType)
+{
+
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+
+        var command = new mindplot.commands.AddIconToTopicCommand(topicsIds[0], iconType);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.addLink2Node = function(url)
+{
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+        var command = new mindplot.commands.AddLinkToTopicCommand(topicsIds[0], url);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.addLink2SelectedNode = function()
+{
+    var selectedTopics = this.getSelectedNodes();
+        var topic = null;
+        if (selectedTopics.length > 0)
+        {
+            topic = selectedTopics[0];
+            if (!$chk(topic._hasLink)) {
+                var msg = new Element('div');
+                var urlText = new Element('div').inject(msg);
+                urlText.innerHTML = "URL:"
+                var formElem = new Element('form', {'action': 'none', 'id':'linkFormId'});
+                var urlInput = new Element('input', {'type': 'text', 'size':30});
+                urlInput.inject(formElem);
+                formElem.inject(msg)
+
+                var okButtonId = "linkOkButtonId";
+                formElem.addEvent('submit', function(e)
+                {
+                    $(okButtonId).fireEvent('click', e);
+                    e = new Event(e);
+                    e.stop();
+                });
+
+
+                var okFunction = function() {
+                    var url = urlInput.value;
+                    var result = false;
+                    if ("" != url.trim())
+                    {
+                        this.addLink2Node(url);
+                        result = true;
+                    }
+                    return result;
+                }.bind(this);
+                var dialog = mindplot.LinkIcon.buildDialog(this, okFunction, okButtonId);
+                dialog.adopt(msg).show();
+
+                // IE doesn't like too much this focus action...
+                if(!core.UserAgent.isIE())
+                {
+                    urlInput.focus();
+                }
+            }
+        } else
+        {
+            core.Monitor.getInstance().logMessage('At least one topic must be selected to execute this operation.');
+        }
+};
+
+mindplot.MindmapDesigner.prototype.addNote2Node = function(text)
+{
+    var topicsIds = this._setValidSelectedTopicsIds();
+    if (topicsIds.length > 0)
+    {
+        var command = new mindplot.commands.AddNoteToTopicCommand(topicsIds[0], text);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.addNote2SelectedNode = function()
+{
+    var selectedTopics = this.getSelectedNodes();
+        var topic = null;
+        if (selectedTopics.length > 0)
+        {
+            topic = selectedTopics[0];
+            if (!$chk(topic._hasNote)) {
+                var msg = new Element('div');
+                var text = new Element('div').inject(msg);
+                var formElem = new Element('form', {'action': 'none', 'id':'noteFormId'});
+                var textInput = new Element('textarea').setStyles({'width':280, 'height':50});
+                textInput.inject(formElem);
+                formElem.inject(msg);
+
+                var okButtonId = "noteOkButtonId";
+                formElem.addEvent('submit', function(e)
+                {
+                    $(okButtonId).fireEvent('click', e);
+                    e = new Event(e);
+                    e.stop();
+                });
+
+
+                var okFunction = function() {
+                    var text = textInput.value;
+                    var result = false;
+                    if ("" != text.trim())
+                    {
+                        this.addNote2Node(text);
+                        result = true;
+                    }
+                    return result;
+                }.bind(this);
+                var dialog = mindplot.Note.buildDialog(this, okFunction, okButtonId);
+                dialog.adopt(msg).show();
+
+                // IE doesn't like too much this focus action...
+                if(!core.UserAgent.isIE())
+                {
+                    textInput.focus();
+                }
+            }
+        } else
+        {
+            core.Monitor.getInstance().logMessage('At least one topic must be selected to execute this operation.');
+        }
+};
+
+mindplot.MindmapDesigner.prototype.removeLastImageFromSelectedNode = function()
+{
+    var nodes = this._getSelectedNodes();
+    if (nodes.length == 0)
+    {
+        core.Monitor.getInstance().logMessage('A topic must be selected in order to execute this operation.');
+    } else
+    {
+        var elem = nodes[0];
+        elem.removeLastIcon(this);
+        var executor = function(editor)
+        {
+            return function()
+            {
+                elem.updateNode();
+            };
+        };
+
+        setTimeout(executor(this), 0);
+    }
+};
+
+
+mindplot.MindmapDesigner.prototype._getSelectedNodes = function()
+{
+    var result = new Array();
+    for (var i = 0; i < this._topics.length; i++)
+    {
+        if (this._topics[i].isOnFocus())
+        {
+            result.push(this._topics[i]);
+        }
+    }
+    return result;
+};
+
+mindplot.MindmapDesigner.prototype.getSelectedNodes = function()
+{
+    return this._getSelectedNodes();
+};
+
+
+mindplot.MindmapDesigner.prototype.keyEventHandler = function(event)
+{
+    var evt = (event) ? event : window.event;
+
+    if (evt.keyCode == 8)
+    {
+        if (event)
+        {
+            if (event.preventDefault) {
+                event.preventDefault();
+            } else {
+                event.returnValue = false;
+            }
+            new Event(event).stop();
+        }
+        else
+            evt.returnValue = false;
+    }
+    else
+    {
+        evt = new Event(event);
+        var key = evt.key;
+        if (!this._editor._isVisible())
+        {
+            if (((evt.code >= 65 && evt.code <= 90) || (evt.code >= 48 && evt.code <= 57)) && !(evt.control || evt.meta))
+            {
+                if($chk(evt.shift)){
+                    key = key.toUpperCase();
+                }
+                this._showEditor(key);
+            }
+            else
+            {
+                switch (key)
+                        {
+                    case 'delete':
+                        this.deleteCurrentNode();
+                        break;
+                    case 'enter':
+                        if (!evt.meta)
+                        {
+                            this.createSiblingForSelectedNode();
+                            break;
+                        }
+                    case 'insert':
+                        this.createChildForSelectedNode();
+                        break;
+                    case 'right':
+                        var nodes = this._getSelectedNodes();
+                        if (nodes.length > 0)
+                        {
+                            var node = nodes[0];
+                            if (node.getTopicType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+                            {
+                                this._goToSideChild(node, 'RIGHT');
+                            }
+                            else
+                            {
+                                if (node.getPosition().x < 0)
+                                {
+                                    this._goToParent(node);
+                                }
+                                else if (!node.areChildrenShrinked())
+                                {
+                                    this._goToChild(node);
+                                }
+                            }
+                        }
+                        break;
+                    case 'left':
+                        var nodes = this._getSelectedNodes();
+                        if (nodes.length > 0)
+                        {
+                            var node = nodes[0];
+                            if (node.getTopicType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+                            {
+                                this._goToSideChild(node, 'LEFT');
+                            }
+                            else
+                            {
+                                if (node.getPosition().x > 0)
+                                {
+                                    this._goToParent(node);
+                                }
+                                else if (!node.areChildrenShrinked())
+                                {
+                                    this._goToChild(node);
+                                }
+                            }
+                        }
+                        break;
+                    case'up':
+                        var nodes = this._getSelectedNodes();
+                        if (nodes.length > 0)
+                        {
+                            var node = nodes[0];
+                            if (node.getTopicType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+                            {
+                                this._goToBrother(node, 'UP');
+                            }
+                        }
+                        break;
+                    case 'down':
+                        var nodes = this._getSelectedNodes();
+                        if (nodes.length > 0)
+                        {
+                            var node = nodes[0];
+                            if (node.getTopicType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+                            {
+                                this._goToBrother(node, 'DOWN');
+                            }
+                        }
+                        break;
+                    case 'f2':
+                        this._showEditor();
+                        break;
+                    case 'space':
+
+                        var nodes = this._getSelectedNodes();
+                        if (nodes.length > 0)
+                        {
+                            var topic = nodes[0];
+
+                            var model = topic.getModel();
+                            var isShrink = !model.areChildrenShrinked();
+                            topic.setChildrenShrinked(isShrink);
+                        }
+                        break;
+                    case 'backspace':
+                        evt.preventDefault();
+                        break;
+                    case 'esc':
+                        var nodes = this._getSelectedNodes();
+                        for (var i = 0; i < nodes.length; i++)
+                        {
+                            var node = nodes[i];
+                            node.setOnFocus(false);
+                        }
+                        break;
+                    case 'z':
+                        if (evt.control || evt.meta)
+                        {
+                            if (evt.shift)
+                            {
+                                this.redo();
+                            }
+                            else
+                            {
+                                this.undo();
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+            evt.stop();
+        }
+    }
+};
+
+mindplot.MindmapDesigner.prototype._showEditor = function(key)
+{
+    var nodes = this._getSelectedNodes();
+    if (nodes.length == 1)
+    {
+        var node = nodes[0];
+        if (key && key != "")
+        {
+            this._editor.setInitialText(key);
+        }
+        this._editor.getFocusEvent.attempt(node, this._editor);
+    }
+};
+
+mindplot.MindmapDesigner.prototype._goToBrother = function(node, direction)
+{
+    var brothers = node._parent._getChildren();
+    var target = node;
+    var y = node.getPosition().y;
+    var x = node.getPosition().x;
+    var dist = null;
+    for (var i = 0; i < brothers.length; i++)
+    {
+        var sameSide = (x * brothers[i].getPosition().x) >= 0;
+        if (brothers[i] != node && sameSide)
+        {
+            var brother = brothers[i];
+            var brotherY = brother.getPosition().y;
+            if (direction == "DOWN" && brotherY > y)
+            {
+                var distancia = y - brotherY;
+                if (distancia < 0)
+                {
+                    distancia = distancia * (-1);
+                }
+                if (dist == null || dist > distancia)
+                {
+                    dist = distancia;
+                    target = brothers[i];
+                }
+            }
+            else if (direction == "UP" && brotherY < y)
+            {
+                var distancia = y - brotherY;
+                if (distancia < 0)
+                {
+                    distancia = distancia * (-1);
+                }
+                if (dist == null || dist > distancia)
+                {
+                    dist = distancia;
+                    target = brothers[i];
+                }
+            }
+        }
+    }
+    this._goToNode(target);
+};
+
+mindplot.MindmapDesigner.prototype._goToNode = function(node)
+{
+    node.setOnFocus(true);
+    this.onNodeFocusEvent.attempt(node, this);
+};
+
+mindplot.MindmapDesigner.prototype._goToSideChild = function(node, side)
+{
+    var children = node._getChildren();
+    if (children.length > 0)
+    {
+        var target = children[0];
+        var top = null;
+        for (var i = 0; i < children.length; i++)
+        {
+            var child = children[i];
+            var childY = child.getPosition().y;
+            if (side == 'LEFT' && child.getPosition().x < 0)
+            {
+                if (top == null || childY < top)
+                {
+                    target = child;
+                    top = childY;
+                }
+            }
+            if (side == 'RIGHT' && child.getPosition().x > 0)
+            {
+                if (top == null || childY < top)
+                {
+                    target = child;
+                    top = childY;
+                }
+            }
+        }
+
+        this._goToNode(target);
+    }
+};
+
+mindplot.MindmapDesigner.prototype._goToParent = function(node)
+{
+    var parent = node._parent;
+    this._goToNode(parent);
+};
+
+mindplot.MindmapDesigner.prototype._goToChild = function(node)
+{
+    var children = node._getChildren();
+    if (children.length > 0)
+    {
+        var target = children[0];
+        var top = target.getPosition().y;
+        for (var i = 0; i < children.length; i++)
+        {
+            var child = children[i];
+            if (child.getPosition().y < top)
+            {
+                top = child.getPosition().y;
+                target = child;
+            }
+        }
+        this._goToNode(target);
+    }
+};
+
+mindplot.MindmapDesigner.prototype.getWorkSpace = function()
+{
+    return this._workspace;
+};
diff --git a/trunk/mindplot/src/main/javascript/NodeGraph.js b/trunk/mindplot/src/main/javascript/NodeGraph.js
new file mode 100644
index 00000000..d23b9937
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/NodeGraph.js
@@ -0,0 +1,178 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.NodeGraph = function(nodeModel)
+{
+    this._mouseEvents = true;
+    this.setModel(nodeModel);
+    this._onFocus = false;
+};
+
+
+mindplot.NodeGraph.prototype.getType = function()
+{
+    var model = this.getModel();
+    return model.getType();
+};
+
+mindplot.NodeGraph.prototype.getId = function()
+{
+    return this.getModel().getId();
+};
+
+mindplot.NodeGraph.prototype.setId = function(id)
+{
+    this.getModel().setId(id);
+};
+
+mindplot.NodeGraph.prototype._set2DElement = function(elem2d)
+{
+    this._elem2d = elem2d;
+};
+
+mindplot.NodeGraph.prototype.get2DElement = function()
+{
+    core.assert(this._elem2d, 'NodeGraph has not been initialized propertly');
+    return this._elem2d;
+};
+
+mindplot.NodeGraph.prototype.setPosition = function(point)
+{
+    // Elements are positioned in the center.
+    var size = this._model.getSize();
+    this._elem2d.setPosition(point.x - (size.width / 2), point.y - (size.height / 2));
+    this._model.setPosition(point.x, point.y);
+};
+
+mindplot.NodeGraph.prototype.addEventListener = function(type, listener)
+{
+    var elem = this.get2DElement();
+    elem.addEventListener(type, listener);
+};
+
+mindplot.NodeGraph.prototype.isNodeGraph = function()
+{
+    return true;
+};
+
+mindplot.NodeGraph.prototype.setMouseEventsEnabled = function(isEnabled)
+{
+    this._mouseEvents = isEnabled;
+};
+
+mindplot.NodeGraph.prototype.isMouseEventsEnabled = function()
+{
+    return this._mouseEvents;
+};
+
+mindplot.NodeGraph.prototype.getSize = function()
+{
+    return this._model.getSize();
+};
+
+mindplot.NodeGraph.prototype.setSize = function(size)
+{
+    this._model.setSize(size.width, size.height);
+};
+
+mindplot.NodeGraph.create = function(nodeModel)
+{
+    core.assert(nodeModel, 'Model can not be null');
+
+    var type = nodeModel.getType();
+    core.assert(type, 'Node model type can not be null');
+
+    var result;
+    if (type == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        result = new mindplot.CentralTopic(nodeModel);
+    } else
+        if (type == mindplot.NodeModel.MAIN_TOPIC_TYPE)
+        {
+            result = new mindplot.MainTopic(nodeModel);
+        } else
+        {
+            assert(false, "unsupported node type:" + type);
+        }
+
+    return result;
+};
+
+mindplot.NodeGraph.prototype.getModel = function()
+{
+    core.assert(this._model, 'Model has not been initialized yet');
+    return  this._model;
+};
+
+mindplot.NodeGraph.prototype.setModel = function(model)
+{
+    core.assert(model, 'Model can not be null');
+    this._model = model;
+};
+
+mindplot.NodeGraph.prototype.getId = function()
+{
+    return this._model.getId();
+};
+
+mindplot.NodeGraph.prototype.setOnFocus = function(focus)
+{
+    this._onFocus = focus;
+    var outerShape = this.getOuterShape();
+    if (focus)
+    {
+        outerShape.setFill('#c7d8ff');
+        outerShape.setOpacity(1);
+
+    } else
+    {
+        // @todo: node must not know about the topic.
+
+        outerShape.setFill(mindplot.Topic.OUTER_SHAPE_ATTRIBUTES.fillColor);
+        outerShape.setOpacity(0);
+    }
+    this.setCursor('move');
+};
+
+mindplot.NodeGraph.prototype.isOnFocus = function()
+{
+    return this._onFocus;
+};
+
+mindplot.NodeGraph.prototype.dispose = function(workspace)
+{
+    workspace.removeChild(this);
+};
+
+mindplot.NodeGraph.prototype.createDragNode = function()
+{
+    var dragShape = this._buildDragShape();
+    return  new mindplot.DragTopic(dragShape, this);
+};
+
+mindplot.NodeGraph.prototype._buildDragShape = function()
+{
+    core.assert(false, '_buildDragShape must be implemented by all nodes.');
+};
+
+mindplot.NodeGraph.prototype.getPosition = function()
+{
+    var model = this.getModel();
+    return model.getPosition();
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/NodeModel.js b/trunk/mindplot/src/main/javascript/NodeModel.js
new file mode 100644
index 00000000..2ab25521
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/NodeModel.js
@@ -0,0 +1,507 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.NodeModel = function(type, mindmap)
+{
+    core.assert(type, 'Node type can not be null');
+    core.assert(mindmap, 'mindmap can not be null');
+
+    this._order = null;
+    this._type = type;
+    this._children = [];
+    this._icons = [];
+    this._links = [];
+    this._notes = [];
+    this._size = {width:50,height:20};
+    this._position = null;
+    this._id = mindplot.NodeModel._nextUUID();
+    this._mindmap = mindmap;
+    this._text = null;
+    this._shapeType = null;
+    this._fontFamily = null;
+    this._fontSize = null;
+    this._fontStyle = null;
+    this._fontWeight = null;
+    this._fontColor = null;
+    this._borderColor = null;
+    this._backgroundColor = null;
+    this._areChildrenShrinked = false;
+};
+
+mindplot.NodeModel.prototype.clone = function()
+{
+    var result = new mindplot.NodeModel(this._type, this._mindmap);
+    result._order = this._order;
+    result._type = this._type;
+    result._children = this._children.map(function(item,index)
+    {
+        var model = item.clone();
+        model._parent = result;
+        return model;
+    });
+
+
+    result._icons = this._icons;
+    result._links = this._links;
+    result._notes = this._notes;
+    result._size = this._size;
+    result._position = this._position;
+    result._id = this._id;
+    result._mindmap = this._mindmap;
+    result._text = this._text;
+    result._shapeType = this._shapeType;
+    result._fontFamily = this._fontFamily;
+    result._fontSize = this._fontSize;
+    result._fontStyle = this._fontStyle;
+    result._fontWeight = this._fontWeight;
+    result._fontColor = this._fontColor;
+    result._borderColor = this._borderColor;
+    result._backgroundColor = this._backgroundColor;
+    result._areChildrenShrinked = this._areChildrenShrinked;
+    return result;
+};
+
+mindplot.NodeModel.prototype.areChildrenShrinked = function()
+{
+    return this._areChildrenShrinked;
+};
+
+mindplot.NodeModel.prototype.setChildrenShrinked = function(value)
+{
+    this._areChildrenShrinked = value;
+};
+
+mindplot.NodeModel.prototype.getId = function()
+{
+    return this._id;
+};
+
+
+mindplot.NodeModel.prototype.setId = function(id)
+{
+    this._id = id;
+};
+
+mindplot.NodeModel.prototype.getType = function()
+{
+    return this._type;
+};
+
+mindplot.NodeModel.prototype.setText = function(text)
+{
+    this._text = text;
+};
+
+mindplot.NodeModel.prototype.getText = function()
+{
+    return this._text;
+};
+
+mindplot.NodeModel.prototype.isNodeModel = function()
+{
+    return true;
+};
+
+mindplot.NodeModel.prototype.isConnected = function()
+{
+    return this._parent != null;
+};
+
+mindplot.NodeModel.prototype.createLink = function(url)
+{
+    core.assert(url, 'Link URL must be specified.');
+    return new mindplot.LinkModel(url, this);
+};
+
+mindplot.NodeModel.prototype.addLink = function(link)
+{
+    core.assert(link && link.isLinkModel(), 'Only LinkModel can be appended to Mindmap object as links');
+    this._links.push(link);
+};
+
+mindplot.NodeModel.prototype._removeLink = function(link)
+{
+    core.assert(link && link.isLinkModel(), 'Only LinkModel can be appended to Mindmap object as links');
+    this._links.remove(link);
+};
+
+mindplot.NodeModel.prototype.createNote = function(text)
+{
+    core.assert(text, 'note text must be specified.');
+    return new mindplot.NoteModel(text, this);
+};
+
+mindplot.NodeModel.prototype.addNote = function(note)
+{
+    core.assert(note && note.isNoteModel(), 'Only NoteModel can be appended to Mindmap object as links');
+    this._notes.push(note);
+};
+
+mindplot.NodeModel.prototype._removeNote = function(note)
+{
+    core.assert(note && note.isNoteModel(), 'Only NoteModel can be appended to Mindmap object as links');
+    this._notes.remove(note);
+};
+
+mindplot.NodeModel.prototype.createIcon = function(iconType)
+{
+    core.assert(iconType, 'IconType must be specified.');
+    return new mindplot.IconModel(iconType, this);
+};
+
+mindplot.NodeModel.prototype.addIcon = function(icon)
+{
+    core.assert(icon && icon.isIconModel(), 'Only IconModel can be appended to Mindmap object as icons');
+    this._icons.push(icon);
+};
+
+mindplot.NodeModel.prototype._removeIcon = function(icon)
+{
+    core.assert(icon && icon.isIconModel(), 'Only IconModel can be appended to Mindmap object as icons');
+    this._icons.remove(icon);
+};
+
+mindplot.NodeModel.prototype.removeLastIcon = function()
+{
+    this._icons.pop();
+};
+
+mindplot.NodeModel.prototype._appendChild = function(child)
+{
+    core.assert(child && child.isNodeModel(), 'Only NodeModel can be appended to Mindmap object');
+    this._children.push(child);
+    child._parent = this;
+};
+
+mindplot.NodeModel.prototype._removeChild = function(child)
+{
+    core.assert(child && child.isNodeModel(), 'Only NodeModel can be appended to Mindmap object.');
+    this._children.remove(child);
+    child._parent = null;
+};
+
+mindplot.NodeModel.prototype.setPosition = function(x, y)
+{
+    core.assert(core.Utils.isDefined(x), "x coordinate must be defined");
+    core.assert(core.Utils.isDefined(y), "y coordinate must be defined");
+
+    if (!core.Utils.isDefined(this._position))
+    {
+        this._position = new core.Point();
+    }
+    this._position.x = parseInt(x);
+    this._position.y = parseInt(y);
+};
+
+mindplot.NodeModel.prototype.getPosition = function()
+{
+    return this._position;
+};
+
+mindplot.NodeModel.prototype.setSize = function(width, height)
+{
+    this._size.width = width;
+    this._size.height = height;
+};
+
+mindplot.NodeModel.prototype.getSize = function()
+{
+    return {width:this._size.width,height:this._size.height};
+};
+
+mindplot.NodeModel.prototype.getChildren = function()
+{
+    return this._children;
+};
+
+mindplot.NodeModel.prototype.getIcons = function()
+{
+    return this._icons;
+};
+
+mindplot.NodeModel.prototype.getLinks = function()
+{
+    return this._links;
+};
+
+mindplot.NodeModel.prototype.getNotes = function()
+{
+    return this._notes;
+};
+
+mindplot.NodeModel.prototype.getParent = function()
+{
+    return this._parent;
+};
+
+mindplot.NodeModel.prototype.getMindmap = function()
+{
+    return this._mindmap;
+};
+
+mindplot.NodeModel.prototype.setParent = function(parent)
+{
+    core.assert(parent != this, 'The same node can not be parent and child if itself.');
+    this._parent = parent;
+};
+
+mindplot.NodeModel.prototype.canBeConnected = function(sourceModel, sourcePosition, targetTopicHeight)
+{
+    core.assert(sourceModel != this, 'The same node can not be parent and child if itself.');
+    core.assert(sourcePosition, 'childPosition can not be null.');
+    core.assert(core.Utils.isDefined(targetTopicHeight), 'childrenWidth can not be null.');
+
+    // Only can be connected if the node is in the left or rigth.
+    var targetModel = this;
+    var mindmap = targetModel.getMindmap();
+    var targetPosition = targetModel.getPosition();
+    var result = false;
+
+    if (sourceModel.getType() == mindplot.NodeModel.MAIN_TOPIC_TYPE)
+    {
+        // Finally, check current node ubication.
+        var targetTopicSize = targetModel.getSize();
+        var yDistance = Math.abs(sourcePosition.y - targetPosition.y);
+
+        if (yDistance <= targetTopicHeight / 2)
+        {
+            // Circular connection ?
+            if (!sourceModel._isChildNode(this))
+            {
+                var toleranceDistance = (targetTopicSize.width / 2) + targetTopicHeight;
+
+                var xDistance = sourcePosition.x - targetPosition.x;
+                var isTargetAtRightFromCentral = targetPosition.x >= 0;
+
+                if (isTargetAtRightFromCentral)
+                {
+                    if (xDistance >= 0 && xDistance <= mindplot.NodeModel.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE + (targetTopicSize.width / 2))
+                    {
+                        result = true;
+                    }
+
+                } else
+                {
+                    if (xDistance <= 0 && Math.abs(xDistance) <= mindplot.NodeModel.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE + (targetTopicSize.width / 2))
+                    {
+                        result = true;
+                    }
+                }
+            }
+        }
+    } else
+    {
+        throw "No implemented yet";
+    }
+    return result;
+};
+
+mindplot.NodeModel.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE = 60;
+
+mindplot.NodeModel.prototype._isChildNode = function(node)
+{
+    var result = false;
+    if (node == this)
+    {
+        result = true;
+    } else
+    {
+        var children = this.getChildren();
+        for (var i = 0; i < children.length; i++)
+        {
+            var child = children[i];
+            result = child._isChildNode(node);
+            if (result)
+            {
+                break;
+            }
+        }
+    }
+    return result;
+
+};
+
+mindplot.NodeModel.prototype.connectTo = function(parent)
+{
+    var mindmap = this.getMindmap();
+    mindmap.connect(parent, this);
+    this._parent = parent;
+};
+
+mindplot.NodeModel.prototype.disconnect = function()
+{
+    var mindmap = this.getMindmap();
+    mindmap.disconnect(this);
+};
+
+mindplot.NodeModel.prototype.getOrder = function()
+{
+    return this._order;
+};
+
+mindplot.NodeModel.prototype.getShapeType = function()
+{
+    return this._shapeType;
+};
+
+mindplot.NodeModel.prototype.setShapeType = function(type)
+{
+    this._shapeType = type;
+};
+
+mindplot.NodeModel.prototype.setOrder = function(value)
+{
+    this._order = value;
+};
+
+mindplot.NodeModel.prototype.setFontFamily = function(value)
+{
+    this._fontFamily = value;
+};
+
+mindplot.NodeModel.prototype.getOrder = function()
+{
+    return this._order;
+};
+
+mindplot.NodeModel.prototype.setFontFamily = function(value)
+{
+    this._fontFamily = value;
+};
+
+mindplot.NodeModel.prototype.getFontFamily = function()
+{
+    return this._fontFamily;
+};
+
+mindplot.NodeModel.prototype.setFontStyle = function(value)
+{
+    this._fontStyle = value;
+};
+
+mindplot.NodeModel.prototype.getFontStyle = function()
+{
+    return this._fontStyle;
+};
+
+mindplot.NodeModel.prototype.setFontWeight = function(value)
+{
+    this._fontWeight = value;
+};
+
+mindplot.NodeModel.prototype.getFontWeight = function()
+{
+    return this._fontWeight;
+};
+
+mindplot.NodeModel.prototype.setFontColor = function(value)
+{
+    this._fontColor = value;
+};
+
+mindplot.NodeModel.prototype.getFontColor = function()
+{
+    return this._fontColor;
+};
+
+mindplot.NodeModel.prototype.setFontSize = function(value)
+{
+    this._fontSize = value;
+};
+
+mindplot.NodeModel.prototype.getFontSize = function()
+{
+    return this._fontSize;
+};
+
+mindplot.NodeModel.prototype.getBorderColor = function()
+{
+    return this._borderColor;
+};
+
+mindplot.NodeModel.prototype.setBorderColor = function(color)
+{
+    this._borderColor = color;
+};
+
+mindplot.NodeModel.prototype.getBackgroundColor = function()
+{
+    return this._backgroundColor;
+};
+
+mindplot.NodeModel.prototype.setBackgroundColor = function(color)
+{
+    this._backgroundColor = color;
+};
+
+mindplot.NodeModel.prototype.deleteNode = function()
+{
+    var mindmap = this._mindmap;
+
+    // if it has children nodes, Their must be disconnected.
+    var lenght = this._children;
+    for (var i = 0; i < lenght; i++)
+    {
+        var child = this._children[i];
+        mindmap.disconnect(child);
+    }
+
+    var parent = this._parent;
+    if (parent)
+    {
+        // if it is connected, I must remove it from the parent..
+        mindmap.disconnect(this);
+    }
+
+    // It's an isolated node. It must be a hole branch ...
+    var branches = mindmap.getBranches();
+    branches.remove(this);
+
+};
+
+/**
+ * @todo: This method must be implemented.
+ */
+mindplot.NodeModel._nextUUID = function()
+{
+    if (!this._uuid)
+    {
+        this._uuid = 0;
+    }
+
+    this._uuid = this._uuid + 1;
+    return this._uuid;
+};
+
+
+mindplot.NodeModel.prototype.inspect = function()
+{
+    return '(type:' + this.getType() + ' , id: ' + this.getId() + ')';
+};
+
+mindplot.NodeModel.CENTRAL_TOPIC_TYPE = 'CentralTopic';
+mindplot.NodeModel.MAIN_TOPIC_TYPE = 'MainTopic';
+mindplot.NodeModel.DRAGGED_TOPIC_TYPE = 'DraggedTopic';
+
+mindplot.NodeModel.SHAPE_TYPE_RECT = 'rectagle';
+mindplot.NodeModel.SHAPE_TYPE_ROUNDED_RECT = 'rounded rectagle';
+mindplot.NodeModel.SHAPE_TYPE_ELIPSE = 'elipse';
+mindplot.NodeModel.SHAPE_TYPE_LINE = 'line';
+
+
diff --git a/trunk/mindplot/src/main/javascript/Note.js b/trunk/mindplot/src/main/javascript/Note.js
new file mode 100644
index 00000000..493f1839
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Note.js
@@ -0,0 +1,166 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Note = function(textModel, topic, designer) {
+    var divContainer=designer.getWorkSpace().getScreenManager().getContainer();
+    var bubbleTip = mindplot.BubbleTip.getInstance(divContainer);
+    mindplot.Icon.call(this, mindplot.Note.IMAGE_URL);
+    this._noteModel = textModel;
+    this._topic = topic;
+    this._designer = designer;
+    var image = this.getImage();
+    var imgContainer = new Element('div').setStyles({textAlign:'center'});
+    this._textElem = new Element('div').setStyles({'max-height':100,'max-width':300, 'overflow':'auto'});
+    var text = unescape(textModel.getText());
+    text = text.replace(/\n/ig,"<br/>");
+    text = text.replace(/<script/ig, "&lt;script");
+    text = text.replace(/<\/script/ig, "&lt;\/script");
+    this._textElem.innerHTML = text;
+    this._text=textModel.getText();
+
+    this._textElem.inject(imgContainer);
+
+    var container = new Element('div');
+
+    imgContainer.inject(container);
+
+    if(!designer._viewMode){
+        var buttonContainer = new Element('div').setStyles({paddingTop:5, textAlign:'center'});
+        var editBtn = new Element('input', {type:'button', value:'Edit','class':'btn-primary'}).addClass('button').inject(buttonContainer);
+        var removeBtn = new Element('input', {type:'button', value:'Remove','class':'btn-primary'}).addClass('button').inject(buttonContainer);
+
+        editBtn.setStyle("margin-right", "3px");
+        removeBtn.setStyle("margin-left", "3px");
+
+        removeBtn.addEvent('click', function(event) {
+            var command = new mindplot.commands.RemoveNoteFromTopicCommand(this._topic.getId());
+            designer._actionRunner.execute(command);
+            bubbleTip.forceClose();
+        }.bindWithEvent(this));
+
+        var okButtonId = 'okNoteButtonId';
+        editBtn.addEvent('click', function(event) {
+            var topic = this._topic;
+            var designer = this._designer;
+            var note = this;
+
+            var msg = new Element('div');
+            var textarea = new Element('div').inject(msg);
+            textarea.innerHTML = "Text"
+
+            var formElem = new Element('form', {'action': 'none', 'id':'noteFormId'});
+            var text = textModel.getText();
+            text = unescape(text);
+            var textInput = new Element('textarea', {'value':text}).setStyles({'width':280, 'height':50});
+            textInput.inject(formElem);
+            formElem.inject(msg)
+
+            var okFunction = function(e) {
+                var result = true;
+                var text = textInput.value;
+                text = escape(text);
+                note._noteModel.setText(text);
+                return result;
+            };
+
+            formElem.addEvent('submit', function(e)
+            {
+                $(okButtonId).fireEvent('click', e);
+                e = new Event(e);
+                e.stop();
+            });
+
+
+            var dialog = mindplot.Note.buildDialog(designer, okFunction, okButtonId);
+            dialog.adopt(msg).show();
+
+        }.bindWithEvent(this));
+        buttonContainer.inject(container);
+    }
+
+
+    var note = this;
+    image.addEventListener('mouseover', function(event) {
+        var text = textModel.getText();
+        text = unescape(text);
+        text = text.replace(/\n/ig,"<br/>");
+        text = text.replace(/<script/ig, "&lt;script");
+        text = text.replace(/<\/script/ig, "&lt;\/script");
+        this._textElem.innerHTML = text;
+
+        bubbleTip.open(event, container, note);
+    }.bind(this));
+    image.addEventListener('mousemove', function(event) {
+        bubbleTip.updatePosition(event);
+    });
+    image.addEventListener('mouseout', function(event) {
+        bubbleTip.close(event);
+    });
+};
+
+objects.extend(mindplot.Note, mindplot.Icon);
+
+mindplot.Note.prototype.initialize = function() {
+
+};
+
+mindplot.Note.prototype.getText=function(){
+    return this._text;
+};
+
+mindplot.Note.prototype.getModel=function(){
+    return this._noteModel;
+};
+
+mindplot.Note.buildDialog = function(designer, okFunction, okButtonId) {
+    var windoo = new Windoo({
+        title: 'Write note',
+        theme: Windoo.Themes.wise,
+        modal:true,
+        buttons:{'menu':false, 'close':false, 'minimize':false, 'roll':false, 'maximize':false},
+        destroyOnClose:true,
+        height:130
+    });
+
+    var cancel = new Element('input', {'type': 'button', 'class':'btn-primary', 'value': 'Cancel','class':'btn-primary'}).setStyle('margin-right', "5px");
+    cancel.setStyle('margin-left', "5px");
+    cancel.addEvent('click', function(event) {
+        $(document).addEvent('keydown', designer.keyEventHandler.bindWithEvent(designer));
+        windoo.close();
+    }.bindWithEvent(this));
+
+    var ok = new Element('input', {'type': 'button', 'class':'btn-primary', 'value': 'Ok','class':'btn-primary','id':okButtonId}).setStyle('marginRight', 10);
+    ok.addEvent('click', function(event) {
+        var couldBeUpdated = okFunction.attempt();
+        if (couldBeUpdated)
+        {
+            $(document).addEvent('keydown', designer.keyEventHandler.bindWithEvent(designer));
+            windoo.close();
+        }
+    }.bindWithEvent(this));
+
+    var panel = new Element('div', {'styles': {'padding-top': 10, 'text-align': 'right'}}).adopt(ok, cancel);
+
+    windoo.addPanel(panel);
+    $(document).removeEvents('keydown');
+    return windoo;
+};
+
+mindplot.Note.IMAGE_URL = "../images/note.png";
+
diff --git a/trunk/mindplot/src/main/javascript/NoteModel.js b/trunk/mindplot/src/main/javascript/NoteModel.js
new file mode 100644
index 00000000..ab7b192a
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/NoteModel.js
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.NoteModel = function(text, topic)
+{
+    core.assert(text, 'note text can not be null');
+    core.assert(topic, 'mindmap can not be null');
+    this._text = text;
+    this._topic = topic;
+};
+
+mindplot.NoteModel.prototype.getText = function()
+{
+    return this._text;
+};
+
+mindplot.NoteModel.prototype.setText = function(text)
+{
+    this._text=text;
+};
+
+mindplot.NoteModel.prototype.getTopic = function()
+{
+    return this._topic;
+};
+
+mindplot.NoteModel.prototype.isNoteModel = function()
+{
+    return true;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/PersistanceManager.js b/trunk/mindplot/src/main/javascript/PersistanceManager.js
new file mode 100644
index 00000000..2b53bf9c
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/PersistanceManager.js
@@ -0,0 +1,107 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.PersistanceManager = function(editorService)
+{
+    this._editorService = editorService;
+    this._serializer = new mindplot.XMLMindmapSerializer();
+};
+
+mindplot.PersistanceManager.prototype.save = function(mindmap, chartType, xmlChart, editorProperties, onSavedHandler,saveHistory)
+{
+    core.assert(mindmap, "mindmap can not be null");
+    core.assert(chartType, "chartType can not be null");
+    core.assert(xmlChart, "xmlChart can not be null");
+    core.assert(editorProperties, "editorProperties can not be null");
+
+    var mapId = mindmap.getId();
+
+    var xmlMap = this._serializer.toXML(mindmap);
+    var xmlMapStr = core.Utils.innerXML(xmlMap);
+
+    var pref = Json.toString(editorProperties);
+    this._editorService.saveMap(mapId, xmlMapStr, chartType, xmlChart, pref,saveHistory,
+    {
+        callback:function(response) {
+
+            if (response.msgCode != "OK")
+            {
+                monitor.logError("Save could not be completed. Please,try again in a couple of minutes.");
+                core.Logger.logError(response.msgDetails);
+            } else
+            {
+                // Execute on success handler ...
+                if (onSavedHandler)
+                {
+                    onSavedHandler();
+                }
+            }
+        },
+        errorHandler:function(message) {
+            var monitor = core.Monitor.getInstance();
+            monitor.logError("Save could not be completed. Please,try again in a couple of minutes.");
+            core.Logger.logError(message);
+        },
+        verb:"POST",
+        async: false
+    });
+
+};
+
+mindplot.PersistanceManager.prototype.load = function(mapId)
+{
+    core.assert(mapId, "mapId can not be null");
+
+    var deserializer = this;
+    var result = {r:null};
+    var serializer = this._serializer;
+    this._editorService.loadMap(mapId, {
+        callback:function(response) {
+
+            if (response.msgCode == "OK")
+            {
+                // Explorer Hack with local files ...
+                var xmlContent = response.content;
+                var domDocument = core.Utils.createDocumentFromText(xmlContent);
+                var mindmap = serializer.loadFromDom(domDocument);
+                mindmap.setId(mapId);
+
+                result.r = mindmap;
+            } else
+            {
+                // Handle error message ...
+                var msg = response.msgDetails;
+                var monitor = core.Monitor.getInstance();
+                monitor.logFatal("We're sorry, an error has occurred and we can't load your map. Please try again in a few minutes.");
+                core.Logger.logError(msg);
+            }
+        },
+        verb:"GET",
+        async: false,
+        errorHandler:function(msg) {
+            var monitor = core.Monitor.getInstance();
+            monitor.logFatal("We're sorry, an error has occurred and we can't load your map. Please try again in a few minutes.");
+            core.Logger.logError(msg);
+        }
+    });
+
+    return result.r;
+};
+
+
diff --git a/trunk/mindplot/src/main/javascript/ScreenManager.js b/trunk/mindplot/src/main/javascript/ScreenManager.js
new file mode 100644
index 00000000..d7abf07b
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/ScreenManager.js
@@ -0,0 +1,133 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.ScreenManager = function(width, height, divElement)
+{
+    this._divContainer = divElement;
+    this._offset = {x:0,y:0};
+};
+
+mindplot.ScreenManager.prototype.setScale = function(scale)
+{
+    core.assert(core.Utils.isDefined(scale), 'Screen scale can not be null');
+    this._workspaceScale = scale;
+};
+
+mindplot.ScreenManager.prototype.getWorkspaceElementPosition = function(e)
+{
+    // Retrive current element position.
+    var elementPosition = e.getPosition();
+    var x = elementPosition.x;
+    var y = elementPosition.y;
+
+    // Add workspace offset.
+    x = x - this._offset.x;
+    y = y - this._offset.y;
+
+    // Scale coordinate in order to be relative to the workspace. That's coordSize/size;
+    x = x / this._workspaceScale;
+    y = y / this._workspaceScale;
+
+    // Subtract div position.
+    /*    var containerElem = this.getContainer();
+var containerPosition = core.Utils.workOutDivElementPosition(containerElem);
+x = x + containerPosition.x;
+y = y + containerPosition.y;*/
+
+    // Remove decimal part..
+    return {x:x,y:y};
+};
+
+mindplot.ScreenManager.prototype.getWorkspaceIconPosition = function(e)
+{
+    // Retrive current icon position.
+    var image = e.getImage();
+    var elementPosition = image.getPosition();
+    var imageSize = e.getSize();
+
+    //Add group offset
+    var iconGroup = e.getGroup();
+    var group = iconGroup.getNativeElement();
+    var coordOrigin=group.getCoordOrigin();
+    var groupSize = group.getSize();
+    var coordSize = group.getCoordSize();
+
+    var scale={x:coordSize.width/parseInt(groupSize.width), y:coordSize.height/parseInt(groupSize.height)};
+
+    var x = (elementPosition.x - coordOrigin.x-(parseInt(imageSize.width)/2))/scale.x;
+    var y = (elementPosition.y - coordOrigin.y-(parseInt(imageSize.height)/2))/scale.y;
+
+    //Retrieve iconGroup Position
+    var groupPosition = iconGroup.getPosition();
+    x = x + groupPosition.x;
+    y = y + groupPosition.y;
+
+    //Retrieve topic Position
+    var topic = iconGroup.getTopic();
+    var topicPosition = this.getWorkspaceElementPosition(topic);
+    topicPosition.x = topicPosition.x - (parseInt(topic.getSize().width)/2);
+
+
+    // Remove decimal part..
+    return {x:x+topicPosition.x,y:y+topicPosition.y};
+};
+
+mindplot.ScreenManager.prototype.getWorkspaceMousePosition = function(e)
+{
+    // Retrive current mouse position.
+    var mousePosition = this._getMousePosition(e);
+    var x = mousePosition.x;
+    var y = mousePosition.y;
+
+    // Subtract div position.
+    var containerElem = this.getContainer();
+    var containerPosition = core.Utils.workOutDivElementPosition(containerElem);
+    x = x - containerPosition.x;
+    y = y - containerPosition.y;
+
+    // Scale coordinate in order to be relative to the workspace. That's coordSize/size;
+    x = x * this._workspaceScale;
+    y = y * this._workspaceScale;
+
+    // Add workspace offset.
+    x = x + this._offset.x;
+    y = y + this._offset.y;
+
+    // Remove decimal part..
+    return new core.Point(x, y);
+};
+
+/**
+ * http://www.howtocreate.co.uk/tutorials/javascript/eventinfo
+ */
+mindplot.ScreenManager.prototype._getMousePosition = function(event)
+{
+    return core.Utils.getMousePosition(event);
+};
+
+mindplot.ScreenManager.prototype.getContainer = function()
+{
+    return this._divContainer;
+};
+
+mindplot.ScreenManager.prototype.setOffset = function(x, y)
+{
+    this._offset.x = x;
+    this._offset.y = y;
+};
diff --git a/trunk/mindplot/src/main/javascript/ShrinkConnector.js b/trunk/mindplot/src/main/javascript/ShrinkConnector.js
new file mode 100644
index 00000000..d2de0dfa
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/ShrinkConnector.js
@@ -0,0 +1,118 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.ShirinkConnector = function(topic)
+{
+    var elipse = new web2d.Elipse(mindplot.Topic.prototype.INNER_RECT_ATTRIBUTES);
+    this._elipse = elipse;
+    elipse.setFill('#f7f7f7');
+
+    elipse.setSize(mindplot.Topic.CONNECTOR_WIDTH, mindplot.Topic.CONNECTOR_WIDTH);
+    var shrinkConnector = this;
+    elipse.addEventListener('click', function(event)
+    {
+        var model = topic.getModel();
+        var isShrink = !model.areChildrenShrinked();
+
+        var actionRunner = mindplot.DesignerActionRunner.getInstance();
+        var topicId = topic.getId();
+
+        var commandFunc = function(topic, isShrink)
+        {
+            topic.setChildrenShrinked(isShrink);
+            return !isShrink;
+        }
+
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc, isShrink, [topicId]);
+        actionRunner.execute(command)
+
+        new Event(event).stop();
+
+    });
+
+    elipse.addEventListener('click', function(event)
+    {
+        // Avoid node creation ...
+        new Event(event).stop();
+    });
+
+    elipse.addEventListener('dblclick', function(event)
+    {
+        // Avoid node creation ...
+        new Event(event).stop();
+
+    });
+
+    elipse.addEventListener('mouseover', function(event)
+    {
+        this.setFill('#009900');
+    });
+
+    elipse.addEventListener('mouseout', function(event)
+    {
+        var color = topic.getBackgroundColor();
+        this.setFill(color);
+    });
+
+    elipse.setCursor('default');
+    this._fillColor = '#f7f7f7';
+    var model = topic.getModel();
+    this.changeRender(model.areChildrenShrinked());
+
+};
+
+mindplot.ShirinkConnector.prototype.changeRender = function(isShrink)
+{
+    var elipse = this._elipse;
+    if (isShrink)
+    {
+        elipse.setStroke('2', 'solid');
+    } else
+    {
+        elipse.setStroke('1', 'solid');
+    }
+}
+
+
+mindplot.ShirinkConnector.prototype.setVisibility = function(value)
+{
+    this._elipse.setVisibility(value);
+}
+
+mindplot.ShirinkConnector.prototype.setFill = function(color)
+{
+    this._fillColor = color;
+    this._elipse.setFill(color);
+}
+
+mindplot.ShirinkConnector.prototype.setAttribute = function(name, value)
+{
+    this._elipse.setAttribute(name, value);
+}
+
+mindplot.ShirinkConnector.prototype.addToWorkspace = function(group)
+{
+    group.appendChild(this._elipse);
+}
+
+
+mindplot.ShirinkConnector.prototype.setPosition = function(x, y)
+{
+    this._elipse.setPosition(x, y);
+}
diff --git a/trunk/mindplot/src/main/javascript/TextEditor.js b/trunk/mindplot/src/main/javascript/TextEditor.js
new file mode 100644
index 00000000..80259cbb
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/TextEditor.js
@@ -0,0 +1,396 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.TextEditor = function(screenManager,actionRunner)
+{
+    this._screenManager = screenManager;
+    this._container = screenManager.getContainer();
+    this._actionRunner = actionRunner;
+
+    //Create editor ui
+    this._size = {width:500, height:100};
+    this._myOverlay = new Element('div').setStyles({position:"absolute", display: "none", zIndex: "8", top: 0, left:0, width:"500px", height:"100px"});
+    var inputContainer = new Element('div').setStyles({border:"none", overflow:"auto"}).injectInside(this._myOverlay);
+    this.inputText = new Element('input').setProperties({type:"text", tabindex:'-1', id:"inputText", value:""}).setStyles({border:"none", background:"transparent"}).injectInside(inputContainer);
+    var spanContainer = new Element('div').setStyle('visibility', "hidden").injectInside(this._myOverlay);
+    this._spanText = new Element('span').setProperties({id: "spanText", tabindex:"-1"}).setStyle('white-space', "nowrap").setStyle('nowrap', 'nowrap').injectInside(spanContainer);
+
+    this._myOverlay.injectInside(this._container);
+
+    var elem = this;
+    this.applyChanges=true;
+    this.inputText.onkeyup = function (evt) {
+        var event = new Event(evt);
+        var key = event.key;
+        switch(key)
+        {
+            case 'esc':
+                elem.applyChanges=false;
+            case 'enter':        
+                var executor = function(editor)
+                {
+                    return function()
+                    {
+                        elem.lostFocus(true);
+                        $(document.documentElement).fireEvent('focus');
+                    };
+                };
+                setTimeout(executor(this), 3);
+
+                break;
+            default:
+                var span =core.findElement('spanText');
+                var input = core.findElement('inputText');
+                span.innerHTML = input.value;
+                var size = input.value.length + 1;
+                input.size= size;
+                if (span.offsetWidth > (parseInt(elem._myOverlay.style.width) - 100))
+                {
+                    elem._myOverlay.style.width = (span.offsetWidth + 100) + "px";
+                }
+                break;
+        }
+    };
+    //Register onLostFocus/onBlur event
+    $(this.inputText).addEvent('blur', this.lostFocusEvent.bind(this));
+
+
+    var elem = this;
+    var onComplete = function() {
+        this._myOverlay.setStyle('display', "none");
+        this.inputText.setStyle('opacity', 1);
+
+        this.setPosition(0, 0);
+        if (elem._currentNode != null)
+        {
+            this._currentNode.getTextShape().setVisibility(true);
+            if(this.applyChanges)
+            {
+                this._updateNode();
+            }
+            this.applyChanges=true;
+            this._currentNode = null;
+        }
+
+       if (core.UserAgent.isSVGSupported())
+        {
+            setTimeout("core.findElement('ffoxWorkarroundInput').focus();", 0);
+        }
+    };
+    this.fx = new Fx.Style(this.inputText, 'opacity', { duration: 10});
+    this.fx.addEvent('onComplete', onComplete.bind(this));
+
+};
+
+mindplot.TextEditor.prototype.lostFocusEvent = function ()
+{
+    this.fx.options.duration = 10;
+    this.fx.start(1, 0);
+    //myAnim.animate();
+};
+
+mindplot.TextEditor.prototype._isVisible = function ()
+{
+    //console.log('focus event');
+    //if(this._myOverlay.cfg.getProperty("visible") == true)
+    if ($(this._myOverlay).getStyle('display') == "block")
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+};
+mindplot.TextEditor.prototype.getFocusEvent = function (node)
+{
+    //console.log('focus event');
+    if (this._isVisible())
+    {
+        //        var elem = this;
+        //        var executor = function(editor)
+        //        {
+        //            return function()
+        //            {
+        //                elem.getFocusEvent.attempt(node, elem);
+        //            };
+        //        };
+        //
+        //        setTimeout(executor(this), 10);
+        this.getFocusEvent.delay(10, this);
+    }
+    else
+    {
+        //console.log('calling init');
+        this.init(node);
+    }
+    //console.log('focus event done');
+};
+
+mindplot.TextEditor.prototype.setInitialText = function (text)
+{
+    this.initialText=text;
+};
+
+mindplot.TextEditor.prototype._updateNode = function ()
+{
+
+    if (core.Utils.isDefined(this._currentNode) && this._currentNode.getText() != this.getText())
+    {
+        var text = this.getText();
+        var topicId = this._currentNode.getId();
+
+        var commandFunc = function(topic,value)
+        {
+            var result = topic.getText();
+            topic.setText(value);
+            return result;
+        };
+        var command = new mindplot.commands.GenericFunctionCommand(commandFunc,text,[topicId]);
+        this._actionRunner.execute(command);
+    }
+};
+
+mindplot.TextEditor.prototype.listenEventOnNode = function(topic, eventName, stopPropagation)
+{
+    var elem = this;
+    topic.addEventListener(eventName, function (event) {
+        elem.lostFocus();
+        elem.getFocusEvent.attempt(topic, elem);
+
+        if (stopPropagation)
+        {
+            if (event.stopPropagation)
+            {
+                event.stopPropagation(true);
+            } else
+            {
+                event.cancelBubble = true;
+            }
+        }
+    });
+};
+
+mindplot.TextEditor.prototype.init = function (nodeGraph)
+{
+    //console.log('init method');
+    nodeGraph.getTextShape().setVisibility(false);
+    this._currentNode = nodeGraph;
+
+    //set Editor Style
+    var nodeText = nodeGraph.getTextShape();
+    var text;
+    var selectText=true;
+    if(this.initialText && this.initialText!="")
+    {
+        text = this.initialText;
+        this.initialText=null;
+        selectText=false;
+    }
+    else
+        text = nodeText.getText();
+    
+    var font = nodeText.getFont();
+    font.size = nodeText.getHtmlFontSize();
+    font.color = nodeText.getColor();
+
+    this.setStyle(font);
+
+    //set editor's initial text
+    this.setText(text);
+
+    //set editor's initial size
+    var editor = this;
+    var executor = function(editor)
+    {
+        return function()
+        {
+            //console.log('setting editor in init thread');
+            var scale = web2d.peer.utils.TransformUtil.workoutScale(editor._currentNode.getTextShape()._peer);
+            var elemSize = editor._currentNode.getSize();
+            //var textSize = editor.getSize();
+            var pos = editor._screenManager.getWorkspaceElementPosition(editor._currentNode);
+
+            var textWidth = editor._currentNode.getTextShape().getWidth();
+            var textHeight = editor._currentNode.getTextShape().getHeight();
+            var iconGroup = editor._currentNode.getIconGroup();
+            var iconGroupSize;
+            if($chk(iconGroup))
+            {
+                iconGroupSize = editor._currentNode.getIconGroup().getSize();
+            }
+            else
+            {
+                iconGroupSize = {width:0, height:0};
+            }
+            var position = {x:0,y:0};
+            position.x = pos.x - ((textWidth * scale.width) / 2) + ((iconGroupSize.width * scale.width)/2);
+            var fixError = 0;
+            if (core.UserAgent.isSVGSupported())
+            {
+                fixError = 4;
+            }
+            position.y = pos.y - ((textHeight * scale.height) / 2) - fixError;
+
+            editor.setEditorSize(elemSize.width, elemSize.height, scale);
+            //console.log('setting position:'+pos.x+';'+pos.y);
+            editor.setPosition(position.x, position.y, scale);
+            editor.showTextEditor(selectText);
+            //console.log('setting editor done');
+        };
+    };
+
+    setTimeout(executor(this), 10);
+    //console.log('init done');
+};
+
+mindplot.TextEditor.prototype.setStyle = function (fontStyle)
+{
+    var inputField = core.findElement("inputText");
+    var spanField = core.findElement("spanText");
+    if (!core.Utils.isDefined(fontStyle.font))
+    {
+        fontStyle.font = "Arial";
+    }
+    if (!core.Utils.isDefined(fontStyle.style))
+    {
+        fontStyle.style = "normal";
+    }
+    if (!core.Utils.isDefined(fontStyle.weight))
+    {
+        fontStyle.weight = "normal";
+    }
+    if (!core.Utils.isDefined(fontStyle.size))
+    {
+        fontStyle.size = 12;
+    }
+    inputField.style.fontSize = fontStyle.size + "px";
+    inputField.style.fontFamily = fontStyle.font;
+    inputField.style.fontStyle = fontStyle.style;
+    inputField.style.fontWeight = fontStyle.weight;
+    inputField.style.color = fontStyle.color;
+    spanField.style.fontFamily = fontStyle.font;
+    spanField.style.fontStyle = fontStyle.style;
+    spanField.style.fontWeight = fontStyle.weight;
+    spanField.style.fontSize = fontStyle.size + "px";
+};
+
+mindplot.TextEditor.prototype.setText = function(text)
+{
+    var inputField = core.findElement("inputText");
+    inputField.size = text.length + 1;
+    //this._myOverlay.cfg.setProperty("width", (inputField.size * parseInt(inputField.style.fontSize) + 100) + "px");
+    this._myOverlay.style.width = (inputField.size * parseInt(inputField.style.fontSize) + 100) + "px";
+    var spanField = core.findElement("spanText");
+    spanField.innerHTML = text;
+    inputField.value = text;
+};
+
+mindplot.TextEditor.prototype.getText = function()
+{
+    return core.findElement('inputText').value;
+};
+
+
+mindplot.TextEditor.prototype.setEditorSize = function (width, height, scale)
+{
+    //var scale = web2d.peer.utils.TransformUtil.workoutScale(this._currentNode.getTextShape()._peer);
+    this._size = {width:width * scale.width, height:height * scale.height};
+    //this._myOverlay.cfg.setProperty("width",this._size.width*2+"px");
+    this._myOverlay.style.width = this._size.width * 2 + "px";
+    //this._myOverlay.cfg.setProperty("height",this._size.height+"px");
+    this._myOverlay.style.height = this._size.height + "px";
+};
+
+mindplot.TextEditor.prototype.getSize = function ()
+{
+    return {width:core.findElement("spanText").offsetWidth,height:core.findElement("spanText").offsetHeight};
+};
+
+
+mindplot.TextEditor.prototype.setPosition = function (x, y, scale)
+{
+    $(this._myOverlay).setStyles({top : y + "px", left: x + "px"});
+    //this._myOverlay.style.left = x + "px";
+};
+
+mindplot.TextEditor.prototype.showTextEditor = function(selectText)
+{
+    //this._myOverlay.show();
+    //var myAnim = new YAHOO.util.Anim('inputText',{opacity: {to:1}}, 0.10, YAHOO.util.Easing.easeOut);
+    //$('inputText').style.opacity='1';
+    var elem = this;
+    //myAnim.onComplete.subscribe(function(){
+    //elem._myOverlay.show();
+    elem._myOverlay.setStyle('display', "block");
+    //elem.cfg.setProperty("visible", false);
+    //elem._myOverlay.cfg.setProperty("xy", [0, 0]);
+    //elem._myOverlay.cfg.setProperty("visible", true);
+    //select the text in the input
+    core.findElement('inputText').disabled = false;
+
+    if (core.findElement('inputText').createTextRange) //ie
+    {
+        var range = core.findElement('inputText').createTextRange();
+        var pos = core.findElement('inputText').value.length;
+        if(selectText)
+        {
+            range.select();
+            range.move("character", pos);
+        }
+        else
+        {
+            range.move("character", pos);
+            range.select();
+        }
+    }
+    else if(selectText)
+    {
+        core.findElement('inputText').setSelectionRange(0, core.findElement('inputText').value.length);
+    }
+
+    var executor = function(editor)
+    {
+        return function()
+        {
+            try {
+                core.findElement('inputText').focus();
+            }
+            catch (e)
+            {
+
+            }
+        };
+    };
+    setTimeout(executor(this), 0);
+    //});
+    //myAnim.animate();
+
+};
+
+mindplot.TextEditor.prototype.lostFocus = function(bothBrowsers)
+{
+    if (this._isVisible())
+    {
+        //the editor is opened in another node. lets Finish it.
+        var fireOnThis = core.findElement('inputText');
+        fireOnThis.fireEvent('blur');
+    }
+};
+
diff --git a/trunk/mindplot/src/main/javascript/Tip.js b/trunk/mindplot/src/main/javascript/Tip.js
new file mode 100644
index 00000000..76db9148
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Tip.js
@@ -0,0 +1,135 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Tip = function(divContainer){
+    this.initialize(divContainer);
+    };
+mindplot.Tip.prototype.initialize=function(divContainer){
+    this.options={
+        panel:null,
+        container:null,
+        divContainer:divContainer,
+        content:null,
+        onShowComplete:Class.empty,
+        onHideComplete:Class.empty,
+        width:null,
+        height:null,
+        form:null
+    };
+        this.buildTip();
+        this._isMouseOver=false;
+        this._open=false;
+    };
+mindplot.Tip.prototype.buildTip=function(){
+        var opts = this.options;
+        var panel = new Element('div').addClass('bubbleContainer');
+        if($chk(opts.height))
+            panel.setStyle('height', opts.height);
+        if($chk(opts.width))
+            panel.setStyle('width', opts.width);
+        if(!$chk(opts.divContainer))
+        {
+            opts.divContainer=document.body;
+        }
+        panel.injectTop(opts.divContainer);
+        opts.panel = $(panel);
+        opts.panel.setStyle('opacity',0);
+        opts.panel.addEvent('mouseover',function(){this._isMouseOver=true;}.bind(this));
+        opts.panel.addEvent('mouseleave',function(event){this.close(event);}.bindWithEvent(this));//this.close.bindWithEvent(this)
+
+    };
+mindplot.Tip.prototype.click= function(event, el) {
+        return this.open(event, el);
+    };
+mindplot.Tip.prototype.open= function(event, content, source){
+        this._isMouseOver=true;
+        this._evt = new Event(event);
+        this.doOpen.delay(500, this,[content,source]);
+    };
+mindplot.Tip.prototype.doOpen= function(content, source){
+    if($chk(this._isMouseOver) &&!$chk(this._open) && !$chk(this._opening))
+        {
+            this._opening=true;
+            var container = new Element('div');
+            $(content).inject(container);
+            this.options.content=content;
+            this.options.container=container;
+            $(this.options.container).inject(this.options.panel);
+            this.init(this._evt,source);
+            $(this.options.panel).effect('opacity',{duration:500, onComplete:function(){this._open=true; this._opening = false;}.bind(this)}).start(0,100);
+        }
+    };
+mindplot.Tip.prototype.updatePosition=function(event){
+        this._evt = new Event(event);
+    };
+mindplot.Tip.prototype.close=function(event){
+        this._isMouseOver=false;
+        this.doClose.delay(50,this,new Event(event));
+    };
+mindplot.Tip.prototype.doClose=function(event){
+
+        if(!$chk(this._isMouseOver) && $chk(this._opening))
+            this.doClose.delay(500,this,this._evt);
+
+        if(!$chk(this._isMouseOver) && $chk(this._open))
+        {
+            this.forceClose();
+        }
+    };
+mindplot.Tip.prototype.forceClose=function(){
+        this.options.panel.effect('opacity',{duration:100, onComplete:function(){
+            this._open=false;
+            $(this.options.panel).setStyles({left:0,top:0});
+            $(this.options.container).remove();
+        }.bind(this)}).start(100,0);
+    };
+mindplot.Tip.prototype.init=function(event,source){
+        var opts = this.options;
+        var coordinates = $(opts.panel).getCoordinates();
+        var width = coordinates.width;   //not total width, but close enough
+        var height = coordinates.height; //not total height, but close enough
+
+        var offset = designer.getWorkSpace().getScreenManager().getWorkspaceIconPosition(source);
+
+        var containerCoords = $(opts.divContainer).getCoordinates();
+        var screenWidth = containerCoords.width;
+        var screenHeight = containerCoords.height;
+
+        $(this.options.panel).remove();
+        this.buildTip();
+        $(this.options.container).inject(this.options.panel);
+        this.moveTopic(offset, $(opts.panel).getCoordinates().height);
+    };
+
+mindplot.Tip.prototype.moveTopic=function(offset, panelHeight){
+        var opts = this.options;
+        var width = $(opts.panel).getCoordinates().width;
+        $(opts.panel).setStyles({left:offset.x - (width/2), top:offset.y - (panelHeight*2)});
+    };
+
+mindplot.Tip.getInstance = function(divContainer)
+{
+    var result = mindplot.Tip.instance;
+    if(!result)
+    {
+        mindplot.Tip.instance = new mindplot.Tip(divContainer);
+        result = mindplot.Tip.instance;
+    }
+    return result;
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/Topic.js b/trunk/mindplot/src/main/javascript/Topic.js
new file mode 100644
index 00000000..2b433bfa
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Topic.js
@@ -0,0 +1,1265 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Topic = function()
+{
+    mindplot.Topic.superClass.initialize.call(this);
+};
+
+objects.extend(mindplot.Topic, mindplot.NodeGraph);
+
+mindplot.Topic.prototype.initialize = function(topicBoard)
+{
+    core.assert(core.Utils.isDefined(topicBoard), 'topic board can not be null.');
+
+    this._children = [];
+    this._parent = null;
+    this._lastIconId = -1;
+
+    this._topicBoard = topicBoard;
+    this._buildShape();
+    this.setMouseEventsEnabled(true);
+
+    // Positionate topic ....
+    var model = this.getModel();
+    var pos = model.getPosition();
+    if (pos != null)
+    {
+        this.setPosition(pos);
+    }
+};
+
+mindplot.Topic.prototype.setShapeType = function(type)
+{
+    this._setShapeType(type, true);
+
+};
+
+mindplot.Topic.prototype.getParent = function()
+{
+    return this._parent;
+};
+
+mindplot.Topic.prototype._setShapeType = function(type, updateModel)
+{
+    // Remove inner shape figure ...
+    var model = this.getModel();
+    if (updateModel)
+    {
+        model.setShapeType(type);
+    }
+
+    var innerShape = this.getInnerShape();
+    if (innerShape != null)
+    {
+        var dispatcherByEventType = innerShape._dispatcherByEventType;
+        // Remove old shape ...
+        this._removeInnerShape();
+
+        // Create a new one ...
+        innerShape = this.getInnerShape();
+
+        //Let's register all the events. The first one is the default one. The others will be copied.
+        this._registerDefaultListenersToElement(innerShape, this);
+
+        var dispatcher = dispatcherByEventType['mousedown'];
+        if(dispatcher)
+        {
+            for(var i = 1; i<dispatcher._listeners.length; i++)
+            {
+                innerShape.addEventListener('mousedown', dispatcher._listeners[i]);
+            }
+        }
+        if (!this.isConnectedToCentralTopic() && type == mindplot.NodeModel.SHAPE_TYPE_LINE)
+        {
+            // In this case, The normal connection line is not used.
+            innerShape.setVisibility(false);
+        }
+
+        // Update figure size ...
+        var size = model.getSize();
+        this.setSize(size, true);
+
+        var group = this.get2DElement();
+        group.appendChild(innerShape);
+
+        // Move text to the front ...
+        var text = this.getTextShape();
+        text.moveToFront();
+
+        //Move iconGroup to front ...
+        var iconGroup = this.getIconGroup();
+        if($chk(iconGroup)){
+            iconGroup.moveToFront();
+        }
+    }
+
+};
+
+mindplot.Topic.prototype.getShapeType = function()
+{
+    var model = this.getModel();
+    var result = model.getShapeType();
+    if (!result)
+    {
+        result = this._defaultShapeType();
+    }
+    return result;
+};
+
+mindplot.Topic.prototype._removeInnerShape = function()
+{
+    var group = this.get2DElement();
+    var innerShape = this.getInnerShape();
+    group.removeChild(innerShape);
+    this._innerShape = null;
+};
+
+mindplot.Topic.prototype.INNER_RECT_ATTRIBUTES = {stroke:'0.5 solid'};
+mindplot.Topic.prototype.getInnerShape = function()
+{
+    if (!this._innerShape)
+    {
+        // Create inner box.
+        this._innerShape = this.buildShape(this.INNER_RECT_ATTRIBUTES);
+
+        // Update bgcolor ...
+        var bgColor = this.getBackgroundColor();
+        this._setBackgroundColor(bgColor, false);
+
+        // Update border color ...
+        var brColor = this.getBorderColor();
+        this._setBorderColor(brColor, false);
+
+        // Define the pointer ...
+        if (this.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            this._innerShape.setCursor('move');
+        } else
+        {
+            this._innerShape.setCursor('default');
+        }
+
+    }
+    return this._innerShape;
+};
+
+
+mindplot.Topic.prototype.buildShape = function(attributes, type)
+{
+    var result;
+    if (!core.Utils.isDefined(type))
+    {
+        type = this.getShapeType();
+    }
+
+    if (type == mindplot.NodeModel.SHAPE_TYPE_RECT)
+    {
+        result = new web2d.Rect(0, attributes);
+    }
+    else if (type == mindplot.NodeModel.SHAPE_TYPE_ELIPSE)
+    {
+        result = new web2d.Elipse(attributes);
+    }
+    else if (type == mindplot.NodeModel.SHAPE_TYPE_ROUNDED_RECT)
+    {
+        result = new web2d.Rect(0.3, attributes);
+    }
+    else if (type == mindplot.NodeModel.SHAPE_TYPE_LINE)
+    {
+        result = new web2d.Line();
+        result.setSize = function(width, height)
+        {
+            this.size = {width:width, height:height};
+            result.setFrom(-1, height);
+            result.setTo(width + 1, height);
+
+            // Lines will have the same color of the default connection lines...
+            var stokeColor = mindplot.ConnectionLine.getStrokeColor();
+            result.setStroke(1, 'solid', stokeColor);
+        };
+
+        result.getSize = function()
+        {
+            return this.size;
+        };
+
+        result.setPosition = function()
+        {
+        };
+
+        var setStrokeFunction = result.setStroke;
+        result.setFill = function(color)
+        {
+
+        };
+
+        result.setStroke = function(color)
+        {
+
+        };
+    }
+    else
+    {
+        core.assert(false, "Unsupported figure type:" + type);
+    }
+
+    result.setPosition(0, 0);
+    return result;
+};
+
+
+mindplot.Topic.prototype.setCursor = function(type)
+{
+    var innerShape = this.getInnerShape();
+    innerShape.setCursor(type);
+
+    var outerShape = this.getOuterShape();
+    outerShape.setCursor(type);
+
+    var textShape = this.getTextShape();
+    textShape.setCursor(type);
+};
+
+mindplot.Topic.OUTER_SHAPE_ATTRIBUTES = {fillColor:'#dbe2e6',stroke:'1 solid #77555a',x:0,y:0};
+
+mindplot.Topic.prototype.getOuterShape = function()
+{
+    if (!this._outerShape)
+    {
+        var rect = this.buildShape(mindplot.Topic.OUTER_SHAPE_ATTRIBUTES, mindplot.NodeModel.SHAPE_TYPE_ROUNDED_RECT);
+        rect.setPosition(-2, -3);
+        rect.setOpacity(0);
+        this._outerShape = rect;
+    }
+
+    return this._outerShape;
+};
+
+mindplot.Topic.prototype.getTextShape = function()
+{
+    if (!this._text)
+    {
+        var model = this.getModel();
+        this._text = this._buildTextShape();
+
+        // Set Text ...
+        var text = this.getText();
+        this._setText(text, false);
+    }
+    return this._text;
+};
+
+mindplot.Topic.prototype.getOrBuildIconGroup = function()
+{
+    if (!this._icon)
+    {
+        this._icon = this._buildIconGroup();
+        var group = this.get2DElement();
+        group.appendChild(this._icon.getNativeElement());
+        this._icon.moveToFront();
+    }
+    return this._icon;
+};
+
+mindplot.Topic.prototype.getIconGroup = function()
+{
+    return this._icon;
+};
+
+mindplot.Topic.prototype._buildIconGroup = function(disableEventsListeners)
+{
+    var result = new mindplot.IconGroup(this);
+    var model = this.getModel();
+
+    //Icons
+    var icons = model.getIcons();
+    for(var i=0;i<icons.length;i++)
+    {
+        // Update model identifier ...
+        var iconModel = icons[i];
+        var icon = new mindplot.ImageIcon(iconModel, this, designer);
+        result.addIcon(icon);
+    }
+
+    //Links
+    var links = model.getLinks();
+    for(var i=0;i<links.length;i++)
+    {
+        this._hasLink=true;
+        this._link = new mindplot.LinkIcon(links[i], this, designer);
+        result.addIcon(this._link);
+    }
+
+    //Notes
+    var notes = model.getNotes();
+    for(var i=0;i<notes.length;i++)
+    {
+        this._hasNote=true;
+        this._note = new mindplot.Note(notes[i], this, designer);
+        result.addIcon(this._note);
+    }
+
+    return result;
+};
+
+mindplot.Topic.prototype.addLink = function(url, designer){
+    var iconGroup = this.getOrBuildIconGroup();
+    var model = this.getModel();
+    var linkModel = model.createLink(url);
+    model.addLink(linkModel);
+    this._link = new mindplot.LinkIcon(linkModel, this, designer);
+    iconGroup.addIcon(this._link);
+    this._hasLink=true;
+};
+
+mindplot.Topic.prototype.addNote = function(text, designer){
+    var iconGroup = this.getOrBuildIconGroup();
+    var model = this.getModel();
+    text = escape(text);
+    var noteModel = model.createNote(text)
+    model.addNote(noteModel);
+    this._note = new mindplot.Note(noteModel, this, designer);
+    iconGroup.addIcon(this._note);
+    this._hasNote=true;
+};
+
+mindplot.Topic.prototype.addIcon = function(iconType, designer){
+    var iconGroup = this.getOrBuildIconGroup();
+    var model = this.getModel();
+
+    // Update model ...
+    var iconModel = model.createIcon(iconType);
+    model.addIcon(iconModel);
+
+    var imageIcon = new mindplot.ImageIcon(iconModel, this, designer);
+    iconGroup.addIcon(imageIcon);
+
+    return imageIcon;
+};
+
+mindplot.Topic.prototype.removeIcon = function(iconModel){
+
+    //Removing the icon from MODEL
+    var model = this.getModel();
+    model._removeIcon(iconModel);
+
+    //Removing the icon from UI
+    var iconGroup = this.getIconGroup();
+    if($chk(iconGroup))
+    {
+        var imgIcon = iconGroup.findIconFromModel(iconModel);
+        iconGroup.removeImageIcon(imgIcon);
+        if(iconGroup.getIcons().length==0){
+            this.get2DElement().removeChild(iconGroup.getNativeElement());
+            this._icon=null;
+        }
+        this.updateNode();
+    }
+};
+
+mindplot.Topic.prototype.removeLink = function(){
+    var model = this.getModel();
+    var links = model.getLinks();
+    model._removeLink(links[0]);
+    var iconGroup = this.getIconGroup();
+    if($chk(iconGroup))
+    {
+        iconGroup.removeIcon(mindplot.LinkIcon.IMAGE_URL);
+        if(iconGroup.getIcons().length==0){
+            this.get2DElement().removeChild(iconGroup.getNativeElement());
+            this._icon=null;
+        }
+        this.updateNode.delay(0,this);
+    }
+    this._link=null;
+    this._hasLink=false;
+}
+
+mindplot.Topic.prototype.removeNote = function(){
+    var model = this.getModel();
+    var notes = model.getNotes();
+    model._removeNote(notes[0]);
+    var iconGroup = this.getIconGroup();
+    if($chk(iconGroup))
+    {
+        iconGroup.removeIcon(mindplot.Note.IMAGE_URL);
+        if(iconGroup.getIcons().length==0){
+            this.get2DElement().removeChild(iconGroup.getNativeElement());
+            this._icon=null;
+        }
+    }
+    var elem = this;
+    var executor = function(editor)
+    {
+        return function()
+        {
+            elem.updateNode();
+        };
+    };
+
+    setTimeout(executor(this), 0);
+    this._note=null;
+    this._hasNote=false;
+}
+
+mindplot.Topic.prototype._buildTextShape = function(disableEventsListeners)
+{
+    var result = new web2d.Text();
+    var font = {};
+
+    var family = this.getFontFamily();
+    var size = this.getFontSize();
+    var weight = this.getFontWeight();
+    var style = this.getFontStyle();
+    result.setFont(family, size, style, weight);
+
+    var color = this.getFontColor();
+    result.setColor(color);
+
+    if (!disableEventsListeners)
+    {
+        // Propagate mouse events ...
+        var topic = this;
+        result.addEventListener('mousedown', function(event)
+        {
+            var eventDispatcher = topic.getInnerShape()._dispatcherByEventType['mousedown'];
+            if (eventDispatcher)
+            {
+                eventDispatcher.eventListener(event);
+            }
+        });
+
+        if (this.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            result.setCursor('move');
+        } else
+        {
+            result.setCursor('default');
+        }
+    }
+
+    // Positionate node ...
+    this._offset = this.getOffset();
+    var iconOffset = this.getIconOffset();
+    result.setPosition(iconOffset + this._offset, this._offset / 2);
+    return result;
+};
+
+mindplot.Topic.prototype.getIconOffset = function(){
+    var iconGroup = this.getIconGroup();
+    var size = 0;
+    if($chk(iconGroup))
+    {
+        size = iconGroup.getSize().width;
+    }
+    return size;
+};
+
+mindplot.Topic.prototype.getOffset = function(value, updateModel)
+{
+    var offset = 18;
+
+    if (mindplot.NodeModel.MAIN_TOPIC_TYPE == this.getType())
+    {
+        var parent = this.getModel().getParent();
+        if (parent && mindplot.NodeModel.MAIN_TOPIC_TYPE == parent.getType())
+        {
+            offset = 6;
+        }
+        else
+        {
+            offset = 8;
+        }
+    }
+    return offset;
+};
+
+mindplot.Topic.prototype.setFontFamily = function(value, updateModel)
+{
+    var textShape = this.getTextShape();
+    textShape.setFontFamily(value);
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setFontFamily(value);
+    }
+    var elem = this;
+    var executor = function(editor)
+    {
+        return function()
+        {
+            elem.updateNode();
+        };
+    };
+
+    setTimeout(executor(this), 0);
+};
+
+mindplot.Topic.prototype.setFontSize = function(value, updateModel)
+{
+    var textShape = this.getTextShape();
+    textShape.setSize(value);
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setFontSize(value);
+    }
+    var elem = this;
+    var executor = function(editor)
+    {
+        return function()
+        {
+            elem.updateNode();
+        };
+    };
+
+    setTimeout(executor(this), 0);
+
+};
+
+mindplot.Topic.prototype.setFontStyle = function(value, updateModel)
+{
+    var textShape = this.getTextShape();
+    textShape.setStyle(value);
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setFontStyle(value);
+    }
+    var elem = this;
+    var executor = function(editor)
+    {
+        return function()
+        {
+            elem.updateNode();
+        };
+    };
+
+    setTimeout(executor(this), 0);
+};
+
+mindplot.Topic.prototype.setFontWeight = function(value, updateModel)
+{
+    var textShape = this.getTextShape();
+    textShape.setWeight(value);
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setFontWeight(value);
+    }
+};
+
+mindplot.Topic.prototype.getFontWeight = function()
+{
+    var model = this.getModel();
+    var result = model.getFontWeight();
+    if (!result)
+    {
+        var font = this._defaultFontStyle();
+        result = font.weight;
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.getFontFamily = function()
+{
+    var model = this.getModel();
+    var result = model.getFontFamily();
+    if (!result)
+    {
+        var font = this._defaultFontStyle();
+        result = font.font;
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.getFontColor = function()
+{
+    var model = this.getModel();
+    var result = model.getFontColor();
+    if (!result)
+    {
+        var font = this._defaultFontStyle();
+        result = font.color;
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.getFontStyle = function()
+{
+    var model = this.getModel();
+    var result = model.getFontStyle();
+    if (!result)
+    {
+        var font = this._defaultFontStyle();
+        result = font.style;
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.getFontSize = function()
+{
+    var model = this.getModel();
+    var result = model.getFontSize();
+    if (!result)
+    {
+        var font = this._defaultFontStyle();
+        result = font.size;
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.setFontColor = function(value, updateModel)
+{
+    var textShape = this.getTextShape();
+    textShape.setColor(value);
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setFontColor(value);
+    }
+};
+
+mindplot.Topic.prototype._setText = function(text, updateModel)
+{
+    var textShape = this.getTextShape();
+    textShape.setText(text);
+    var elem = this;
+    var executor = function(editor)
+    {
+        return function()
+        {
+            elem.updateNode();
+        };
+    };
+
+    setTimeout(executor(this), 0);
+
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setText(text);
+    }
+};
+
+mindplot.Topic.prototype.setText = function(text)
+{
+    this._setText(text, true);
+};
+
+mindplot.Topic.prototype.getText = function()
+{
+    var model = this.getModel();
+    var result = model.getText();
+    if (!result)
+    {
+        result = this._defaultText();
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.setBackgroundColor = function(color)
+{
+    this._setBackgroundColor(color, true);
+};
+
+mindplot.Topic.prototype._setBackgroundColor = function(color, updateModel)
+{
+    var innerShape = this.getInnerShape();
+    innerShape.setFill(color);
+
+    var connector = this.getShrinkConnector();
+    connector.setFill(color);
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setBackgroundColor(color);
+    }
+};
+
+mindplot.Topic.prototype.getBackgroundColor = function()
+{
+    var model = this.getModel();
+    var result = model.getBackgroundColor();
+    if (!result)
+    {
+        result = this._defaultBackgroundColor();
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.setBorderColor = function(color)
+{
+    this._setBorderColor(color, true);
+};
+
+mindplot.Topic.prototype._setBorderColor = function(color, updateModel)
+{
+    var innerShape = this.getInnerShape();
+    innerShape.setAttribute('strokeColor', color);
+
+    var connector = this.getShrinkConnector();
+    connector.setAttribute('strokeColor', color);
+
+
+    if (updateModel)
+    {
+        var model = this.getModel();
+        model.setBorderColor(color);
+    }
+};
+
+mindplot.Topic.prototype.getBorderColor = function()
+{
+    var model = this.getModel();
+    var result = model.getBorderColor();
+    if (!result)
+    {
+        result = this._defaultBorderColor();
+    }
+    return result;
+};
+
+mindplot.Topic.prototype._buildShape = function()
+{
+    var groupAttributes = {width: 100, height:100,coordSizeWidth:100,coordSizeHeight:100};
+    var group = new web2d.Group(groupAttributes);
+    this._set2DElement(group);
+
+    // Shape must be build based on the model width ...
+    var outerShape = this.getOuterShape();
+    var innerShape = this.getInnerShape();
+    var textShape = this.getTextShape();
+    var shrinkConnector = this.getShrinkConnector();
+
+    // Update figure size ...
+    var model = this.getModel();
+    var size = model.getSize();
+    this._setSize(size);
+
+    // Add to the group ...
+    group.appendChild(outerShape);
+    group.appendChild(innerShape);
+    group.appendChild(textShape);
+
+    if(model.getLinks().length!=0 || model.getNotes().length!=0 || model.getIcons().length!=0)
+    {
+        iconGroup = this.getOrBuildIconGroup();
+    }
+
+    if (this.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        shrinkConnector.addToWorkspace(group);
+    }
+
+    // Register listeners ...
+    this._registerDefaultListenersToElement(outerShape, this);
+    this._registerDefaultListenersToElement(innerShape, this);
+    this._registerDefaultListenersToElement(textShape, this);
+
+};
+
+mindplot.Topic.prototype._registerDefaultListenersToElement=function(elem, topic)
+{
+    var mouseOver = function(event)
+    {
+        if (topic.isMouseEventsEnabled())
+        {
+            topic.handleMouseOver(event);
+        }
+    };
+    elem.addEventListener('mouseover', mouseOver);
+
+    var outout = function(event)
+    {
+        if (topic.isMouseEventsEnabled())
+        {
+            topic.handleMouseOut(event);
+        }
+    };
+    elem.addEventListener('mouseout', outout);
+
+    // Focus events ...
+    var mouseDown = function(event)
+    {
+        topic.setOnFocus(true);
+    };
+    elem.addEventListener('mousedown', mouseDown);
+};
+
+mindplot.Topic.prototype.areChildrenShrinked = function()
+{
+    var model = this.getModel();
+    return model.areChildrenShrinked();
+};
+
+mindplot.Topic.prototype.isCollapsed = function()
+{
+    var model = this.getModel();
+    var result = false;
+
+    var current = this.getParent();
+    while(current && !result)
+    {
+        result = current.areChildrenShrinked();
+        current = current.getParent();
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.setChildrenShrinked = function(value)
+{
+    // Update Model ...
+    var model = this.getModel();
+    model.setChildrenShrinked(value);
+
+    // Change render base on the state.
+    var shrinkConnector = this.getShrinkConnector();
+    shrinkConnector.changeRender(value);
+
+    //  Hide branch in order to avoid flickering...
+    this._setChildrenVisibility(false);
+
+    // Update topic position based on the state ...
+    var targetTopicBoard = this.getTopicBoard();
+    targetTopicBoard.repositionate();
+
+    // Hide children ...
+    this._setChildrenVisibility(!value);
+};
+
+mindplot.Topic.prototype.getShrinkConnector = function()
+{
+    var result = this._connector;
+    if (this._connector == null)
+    {
+        this._connector = new mindplot.ShirinkConnector(this);
+        this._connector.setVisibility(false);
+        result = this._connector;
+
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.handleMouseOver = function(event)
+{
+    var outerShape = this.getOuterShape();
+    outerShape.setOpacity(1);
+};
+
+mindplot.Topic.prototype.handleMouseOut = function(event)
+{
+    var outerShape = this.getOuterShape();
+    if (!this.isOnFocus())
+    {
+        outerShape.setOpacity(0);
+    }
+};
+
+/**
+ * Point: references the center of the rect shape.!!!
+ */
+mindplot.Topic.prototype.setPosition = function(point)
+{
+    // Elements are positioned in the center.
+    // All topic element must be positioned based on the innerShape.
+    var size = this.getSize();
+
+    var cx = Math.round(point.x - (size.width / 2));
+    var cy = Math.round(point.y - (size.height / 2));
+
+    // Update visual position.
+    this._elem2d.setPosition(cx, cy);
+
+    // Update model's position ...
+    var model = this.getModel();
+    model.setPosition(point.x, point.y);
+
+    // Update connection lines ...
+    this._updateConnectionLines();
+
+    // Check object state.
+    this.invariant();
+};
+
+mindplot.Topic.CONNECTOR_WIDTH = 6;
+
+mindplot.Topic.prototype.getOutgoingLine = function()
+{
+    return this._outgoingLine;
+};
+
+mindplot.Topic.prototype.getIncomingLines = function()
+{
+    var result = [];
+    var children = this._getChildren();
+    for (var i = 0; i < children.length; i++)
+    {
+        var node = children[i];
+        var line = node.getOutgoingLine();
+        if (line)
+        {
+            result.push(line);
+        }
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.getOutgoingConnectedTopic = function()
+{
+    var result = null;
+    var line = this.getOutgoingLine();
+    if (line)
+    {
+        result = line.getTargetTopic();
+    }
+    return result;
+};
+
+
+mindplot.Topic.prototype._updateConnectionLines = function()
+{
+    // Update this to parent line ...
+    var outgoingLine = this.getOutgoingLine();
+    if (outgoingLine)
+    {
+        outgoingLine.redraw();
+    }
+
+    // Update all the incoming lines ...
+    var incomingLines = this.getIncomingLines();
+    for (var i = 0; i < incomingLines.length; i++)
+    {
+        incomingLines[i].redraw();
+    }
+};
+
+mindplot.Topic.prototype.setBranchVisibility = function(value)
+{
+    var current = this;
+    var parent = this;
+    while (parent != null && parent.getType() != mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        current = parent;
+        parent = current.getParent();
+    }
+    current.setVisibility(value);
+};
+
+
+mindplot.Topic.prototype.setVisibility = function(value)
+{
+    this._setTopicVisibility(value);
+
+    // Hide all children...
+    this._setChildrenVisibility(value);
+};
+
+mindplot.Topic.prototype._setTopicVisibility = function(value)
+{
+    var elem = this.get2DElement();
+    elem.setVisibility(value);
+
+    if (this.getIncomingLines().length > 0)
+    {
+        var connector = this.getShrinkConnector();
+        connector.setVisibility(value);
+    }
+
+    var textShape = this.getTextShape();
+    textShape.setVisibility(value);
+
+};
+
+mindplot.Topic.prototype._setChildrenVisibility = function(isVisible)
+{
+
+    // Hide all children.
+    var children = this._getChildren();
+    var model = this.getModel();
+
+    isVisible = isVisible ? !model.areChildrenShrinked() : isVisible;
+    for (var i = 0; i < children.length; i++)
+    {
+        var child = children[i];
+        child._setChildrenVisibility(isVisible);
+
+        child._setTopicVisibility(isVisible);
+
+        var outgoingLine = child.getOutgoingLine();
+        outgoingLine.setVisibility(isVisible);
+    }
+
+}
+
+mindplot.Topic.prototype.invariant = function()
+{
+    var line = this._outgoingLine;
+    var model = this.getModel();
+    var isConnected = model.isConnected();
+
+    // Check consitency...
+    if ((isConnected && !line) || (!isConnected && line))
+    {
+        // core.assert(false,'Illegal state exception.');
+    }
+};
+
+/**
+ * type:
+ *    onfocus
+ */
+mindplot.Topic.prototype.addEventListener = function(type, listener)
+{
+    // Translate to web 2d events ...
+    if (type == 'onfocus')
+    {
+        type = 'mousedown';
+    }
+
+    var textShape = this.getTextShape();
+    textShape.addEventListener(type, listener);
+
+    var outerShape = this.getOuterShape();
+    outerShape.addEventListener(type, listener);
+
+    var innerShape = this.getInnerShape();
+    innerShape.addEventListener(type, listener);
+};
+
+
+mindplot.Topic.prototype._setSize = function(size)
+{
+    core.assert(size, "size can not be null");
+    core.assert(core.Utils.isDefined(size.width), "size seem not to be a valid element");
+
+    mindplot.Topic.superClass.setSize.call(this, size);
+
+    var outerShape = this.getOuterShape();
+    var innerShape = this.getInnerShape();
+    var connector = this.getShrinkConnector();
+
+    outerShape.setSize(size.width + 4, size.height + 6);
+    innerShape.setSize(size.width, size.height);
+};
+
+mindplot.Topic.prototype.setSize = function(size, force)
+{
+    var oldSize = this.getSize();
+    if (oldSize.width != size.width || oldSize.height != size.height || force)
+    {
+        this._setSize(size);
+
+        // Update the figure position(ej: central topic must be centered) and children position.
+        this._updatePositionOnChangeSize(oldSize, size);
+    }
+};
+
+mindplot.Topic.prototype._updatePositionOnChangeSize = function(oldSize, newSize) {
+    core.assert(false, "this method must be overided");
+};
+
+mindplot.Topic.prototype.disconnect = function(workspace)
+{
+    var outgoingLine = this.getOutgoingLine();
+    if (outgoingLine)
+    {
+        core.assert(workspace, 'workspace can not be null');
+
+        this._outgoingLine = null;
+
+        // Disconnect nodes ...
+        var targetTopic = outgoingLine.getTargetTopic();
+        targetTopic._removeChild(this);
+
+        // Update model ...
+        var childModel = this.getModel();
+        childModel.disconnect();
+
+        // Remove graphical element from the workspace...
+        outgoingLine.removeFromWorkspace(workspace);
+
+        // Remove from workspace.
+        var topicBoard = targetTopic.getTopicBoard();
+        topicBoard.removeTopicFromBoard(this);
+
+        // Change text based on the current connection ...
+        var model = this.getModel();
+        if (!model.getText())
+        {
+            var text = this.getText();
+            this._setText(text, false);
+        }
+        if (!model.getFontSize())
+        {
+            var size = this.getFontSize();
+            this.setFontSize(size, false);
+        }
+
+        // Hide connection line?.
+        if (targetTopic._getChildren().length == 0)
+        {
+            var connector = targetTopic.getShrinkConnector();
+            connector.setVisibility(false);
+        }
+
+    }
+};
+
+mindplot.Topic.prototype.getOrder = function()
+{
+    var model = this.getModel();
+    return model.getOrder();
+};
+
+mindplot.Topic.prototype.moveToFront = function()
+{
+    var elem2d = this.get2DElement();
+    elem2d.moveToFront();
+};
+mindplot.Topic.prototype.setOrder = function(value)
+{
+    var model = this.getModel();
+    model.setOrder(value);
+};
+
+mindplot.Topic.prototype.connectTo = function(targetTopic, workspace)
+{
+    core.assert(!this._outgoingLine, 'Could not connect an already connected node');
+    core.assert(targetTopic != this, 'Cilcular connection are not allowed');
+    core.assert(targetTopic, 'Parent Graph can not be null');
+    core.assert(workspace, 'Workspace can not be null');
+
+    // Create a connection line ...
+    var outgoingLine = new mindplot.ConnectionLine(this, targetTopic);
+    this._outgoingLine = outgoingLine;
+    workspace.appendChild(outgoingLine);
+
+    // Connect Graphical Nodes ...
+    targetTopic._appendChild(this);
+    this._parent = targetTopic;
+
+    // Update model ...
+    var targetModel = targetTopic.getModel();
+    var childModel = this.getModel();
+    childModel.connectTo(targetModel);
+
+    // Update figure is necessary.
+    this.updateTopicShape(targetTopic);
+
+    // Change text based on the current connection ...
+    var model = this.getModel();
+    if (!model.getText())
+    {
+        var text = this.getText();
+        this._setText(text, false);
+    }
+    if (!model.getFontSize())
+    {
+        var size = this.getFontSize();
+        this.setFontSize(size, false);
+    }
+    var textShape = this.getTextShape();
+
+    // Update topic position based on the state ...
+    var targetTopicBoard = targetTopic.getTopicBoard();
+    targetTopicBoard.addBranch(this);
+
+    // Display connection node...
+    var connector = targetTopic.getShrinkConnector();
+    connector.setVisibility(true);
+
+    // Redraw line ...
+    outgoingLine.redraw();
+};
+
+mindplot.Topic.prototype._appendChild = function(child)
+{
+    var children = this._getChildren();
+    children.push(child);
+};
+
+mindplot.Topic.prototype._removeChild = function(child)
+{
+    var children = this._getChildren();
+    children.remove(child);
+};
+
+mindplot.Topic.prototype._getChildren = function()
+{
+    var result = this._children;
+    if (!result)
+    {
+        this._children = [];
+        result = this._children;
+    }
+    return result;
+};
+
+mindplot.Topic.prototype.removeFromWorkspace = function(workspace)
+{
+    var elem2d = this.get2DElement();
+    workspace.removeChild(elem2d);
+    var line = this.getOutgoingLine();
+    if (line)
+    {
+        workspace.removeChild(line);
+    }
+};
+
+mindplot.Topic.prototype.addToWorkspace = function(workspace)
+{
+    var elem = this.get2DElement();
+    workspace.appendChild(elem);
+};
+
+mindplot.Topic.prototype.getTopicBoard = function()
+{
+    return this._topicBoard;
+};
+
+mindplot.Topic.prototype.createDragNode = function()
+{
+    var dragNode = mindplot.Topic.superClass.createDragNode.call(this);
+
+    // Is the node already connected ?
+    var targetTopic = this.getOutgoingConnectedTopic();
+    if (targetTopic)
+    {
+        dragNode.connectTo(targetTopic);
+    }
+    return dragNode;
+};
+
+mindplot.Topic.prototype.updateNode = function()
+{
+    var textShape = this.getTextShape();
+    var sizeWidth = textShape.getWidth();
+    var sizeHeight = textShape.getHeight();
+    var font = textShape.getFont();
+    var iconOffset = this.getIconOffset();
+
+    var newSize = {width:sizeWidth + this._offset*2 + iconOffset,height:sizeHeight + this._offset};
+    this.setSize(newSize);
+
+    // Positionate node ...
+    textShape.setPosition(iconOffset+this._offset, this._offset / 2);
+    textShape.setTextSize(sizeWidth, sizeHeight);
+};
diff --git a/trunk/mindplot/src/main/javascript/TopicBoard.js b/trunk/mindplot/src/main/javascript/TopicBoard.js
new file mode 100644
index 00000000..50202ea9
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/TopicBoard.js
@@ -0,0 +1,53 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.TopicBoard = function()
+{
+    this._height = null;
+};
+
+mindplot.TopicBoard.prototype._removeEntryByOrder = function(order, position)
+{
+    var board = this._getBoard(position);
+    var entry = board.lookupEntryByOrder(order);
+
+    core.assert(!entry.isAvailable(), 'Entry must not be available in order to be removed.Entry Order:' + order);
+    entry.removeTopic();
+    board.update(entry);
+};
+
+mindplot.TopicBoard.prototype.removeTopicFromBoard = function(topic)
+{
+    var position = topic.getPosition();
+    var order = topic.getOrder();
+
+    this._removeEntryByOrder(order, position);
+    topic.setOrder(null);
+};
+
+mindplot.TopicBoard.prototype.positionateDragTopic = function(dragTopic)
+{
+    throw "this method must be overrided";
+};
+
+mindplot.TopicBoard.prototype.getHeight = function()
+{
+    var board = this._getBoard();
+    return board.getHeight();
+};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/VariableDistanceBoard.js b/trunk/mindplot/src/main/javascript/VariableDistanceBoard.js
new file mode 100644
index 00000000..c051c526
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/VariableDistanceBoard.js
@@ -0,0 +1,296 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.VariableDistanceBoard = function(defaultHeight, referencePoint)
+{
+    mindplot.VariableDistanceBoard.superClass.initialize.call(this, defaultHeight, referencePoint);
+
+    var zeroEntryCoordinate = referencePoint.y;
+    var entry = this.createBoardEntry(zeroEntryCoordinate - (defaultHeight / 2), zeroEntryCoordinate + (defaultHeight / 2), 0);
+    this._entries.set(0, entry);
+};
+
+
+objects.extend(mindplot.VariableDistanceBoard, mindplot.Board);
+
+mindplot.VariableDistanceBoard.prototype.lookupEntryByOrder = function(order)
+{
+    var entries = this._entries;
+    var index = this._orderToIndex(order);
+
+    var result = entries.get(index);
+    if (!result)
+    {
+        // I've not found a entry. I have to create a new one.
+        var i = 1;
+        var zeroEntry = entries.get(0);
+        var distance = zeroEntry.getWidth() / 2;
+        var indexSign = Math.sign(index);
+        var absIndex = Math.abs(index);
+        while (i < absIndex)
+        {
+            // Move to the next entry ...
+            var width;
+            var entry = entries.get(i, indexSign);
+            if (entry != null)
+            {
+                distance += entry.getWidth();
+            } else
+            {
+                distance += this._defaultWidth;
+            }
+
+            i++;
+        }
+
+        // Caculate limits ...
+        var upperLimit = -1;
+        var lowerLimit = -1;
+        var offset = zeroEntry.workoutEntryYCenter();
+        if (index >= 0)
+        {
+            lowerLimit = offset + distance;
+            upperLimit = lowerLimit + this._defaultWidth;
+        } else
+        {
+            upperLimit = offset - distance;
+            lowerLimit = upperLimit - this._defaultWidth;
+        }
+
+        result = this.createBoardEntry(lowerLimit, upperLimit, order);
+    }
+    return result;
+};
+
+mindplot.VariableDistanceBoard.prototype.createBoardEntry = function(lowerLimit, upperLimit, order)
+{
+    return  new mindplot.BoardEntry(lowerLimit, upperLimit, order);
+};
+
+mindplot.VariableDistanceBoard.prototype.updateReferencePoint = function(position)
+{
+    var entries = this._entries;
+    var referencePoint = this._referencePoint;
+
+    // Update zero entry current position.
+    this._referencePoint = position.clone();
+    var yOffset = position.y - referencePoint.y;
+
+    var i = -entries.lowerLength();
+    for (; i <= entries.length(1); i++)
+    {
+        var entry = entries.get(i);
+        if (entry != null)
+        {
+            var upperLimit = entry.getUpperLimit() + yOffset;
+            var lowerLimit = entry.getLowerLimit() + yOffset;
+            entry.setUpperLimit(upperLimit);
+            entry.setLowerLimit(lowerLimit);
+
+            // Update topic position ...
+            if (!entry.isAvailable())
+            {
+                var topic = entry.getTopic();
+                var topicPosition = topic.getPosition();
+                topicPosition.y = topicPosition.y + yOffset;
+
+                // MainTopicToCentral must be positioned based on the referencePoint.
+                var xOffset = position.x - referencePoint.x;
+                topicPosition.x = topicPosition.x + xOffset;
+
+                topic.setPosition(topicPosition);
+            }
+        }
+    }
+};
+
+
+mindplot.VariableDistanceBoard.prototype.lookupEntryByPosition = function(pos)
+{
+    core.assert(core.Utils.isDefined(pos), 'position can not be null');
+    var entries = this._entries;
+    var zeroEntry = entries.get(0);
+    if (zeroEntry.isCoordinateIn(pos.y))
+    {
+        return zeroEntry;
+    }
+
+    // Is Upper or lower ?
+    var sign = -1;
+    if (pos.y >= zeroEntry.getUpperLimit())
+    {
+        sign = 1;
+    }
+
+    var i = 1;
+    var tempEntry = this.createBoardEntry();
+    var currentEntry = zeroEntry;
+    while (true)
+    {
+        // Move to the next entry ...
+        var index = i * sign;
+        var entry = entries.get(index);
+        if (entry)
+        {
+            currentEntry = entry;
+        } else
+        {
+            // Calculate boundaries...
+            var lowerLimit, upperLimit;
+            if (sign > 0)
+            {
+                lowerLimit = currentEntry.getUpperLimit();
+                upperLimit = lowerLimit + this._defaultWidth;
+            }
+            else
+            {
+                upperLimit = currentEntry.getLowerLimit();
+                lowerLimit = upperLimit - this._defaultWidth;
+            }
+
+            // Update current entry.
+            currentEntry = tempEntry;
+            currentEntry.setLowerLimit(lowerLimit);
+            currentEntry.setUpperLimit(upperLimit);
+
+            var order = this._indexToOrder(index);
+            currentEntry.setOrder(order);
+        }
+
+        // Have I found the item?
+        if (currentEntry.isCoordinateIn(pos.y))
+        {
+            break;
+        }
+        i++;
+    }
+    return currentEntry;
+};
+
+
+mindplot.VariableDistanceBoard.prototype.update = function(entry)
+{
+    core.assert(entry, 'Entry can not be null');
+    var order = entry.getOrder();
+    var index = this._orderToIndex(order);
+
+    this._entries.set(index, entry);
+
+};
+
+
+mindplot.VariableDistanceBoard.prototype.getLastNoAvailalbleEntry = function()
+{
+    var entries = this._entries;
+    var lowerLength = entries.lowerLength();
+    var upperLength = entries.upperLength();
+
+    var result = null;
+    var i = -lowerLength;
+    while (i <= upperLength)
+    {
+        var entry = entries.get(i);
+        if (entry && !entry.isAvailable())
+        {
+            result = entry;
+            break;
+        }
+        i++;
+    }
+    return result;
+
+};
+
+mindplot.VariableDistanceBoard.prototype.getFirstNoAvailableEntry = function()
+{
+    var entries = this._entries;
+    var lowerLength = -entries.lowerLength();
+    var upperLength = entries.upperLength();
+
+    var result = null;
+    var i = upperLength;
+    while (i >= lowerLength)
+    {
+        var entry = entries.get(i);
+        if (entry && !entry.isAvailable())
+        {
+            result = entry;
+            break;
+        }
+        i--;
+    }
+    return result;
+};
+
+
+mindplot.VariableDistanceBoard.prototype.freeEntry = function(entry)
+{
+    var order = entry.getOrder();
+    var entries = this._entries;
+
+    var index = this._orderToIndex(order);
+    var indexSign = Math.sign(index);
+    var lenght = entries.length(index);
+
+    var currentTopic = entry.getTopic();
+    var i = Math.abs(index) + 1;
+    while (currentTopic)
+    {
+        var e = entries.get(i, indexSign);
+        if (currentTopic && !e)
+        {
+            var entryOrder = this._indexToOrder(i * indexSign);
+            e = this.lookupEntryByOrder(entryOrder);
+        }
+
+        // Move the topic to the next entry ...
+        var topic = null;
+        if (e)
+        {
+            topic = e.getTopic();
+            if (currentTopic)
+            {
+                e.setTopic(currentTopic);
+            }
+            this.update(e);
+        }
+        currentTopic = topic;
+        i++;
+    }
+
+    // Clear the entry topic ...
+    entry.setTopic(null);
+};
+
+mindplot.VariableDistanceBoard.prototype._orderToIndex = function(order)
+{
+    var index = Math.round(order / 2);
+    return ((order % 2) == 0) ? index : -index;
+};
+mindplot.VariableDistanceBoard.prototype._indexToOrder = function(index)
+{
+    var order = Math.abs(index) * 2;
+    return (index >= 0)? order: order - 1;
+};
+
+mindplot.VariableDistanceBoard.prototype.inspect = function()
+{
+    return this._entries.inspect();
+};
+
diff --git a/trunk/mindplot/src/main/javascript/Workspace.js b/trunk/mindplot/src/main/javascript/Workspace.js
new file mode 100644
index 00000000..76207fa1
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/Workspace.js
@@ -0,0 +1,249 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.Workspace = function(profile, screenManager, zoom)
+{
+    // Create a suitable container ...
+    core.assert(screenManager, 'Div container can not be null');
+    this._zoom = zoom;
+    this._screenManager = screenManager;
+    this._screenWidth = profile.width;
+    this._screenHeight = profile.height;
+
+    // Initalize web2d workspace.
+    var workspace = this._createWorkspace(profile);
+    this._workspace = workspace;
+
+    var screenContainer = screenManager.getContainer();
+    // Fix the height of the container ....
+    screenContainer.style.height = this._screenHeight + "px";
+
+    // Append to the workspace...
+    workspace.addItAsChildTo(screenContainer);
+    this.setZoom(zoom, true);
+
+    // Register drag events ...
+    this._registerDragEvents();
+
+    this._eventsEnabled = true;
+
+};
+
+mindplot.Workspace.prototype._updateScreenManager = function()
+{
+    var zoom = this._zoom;
+    this._screenManager.setScale(zoom);
+
+    var coordOriginX = -((this._screenWidth * this._zoom) / 2);
+    var coordOriginY = -((this._screenHeight * this._zoom) / 2);
+    this._screenManager.setOffset(coordOriginX, coordOriginY);
+};
+
+mindplot.Workspace.prototype._createWorkspace = function(profile)
+{
+    // Initialize workspace ...
+    var coordOriginX = -(this._screenWidth / 2);
+    var coordOriginY = -(this._screenHeight / 2);
+
+    var workspaceProfile = {
+        width: this._screenWidth + "px",
+        height: this._screenHeight + "px",
+        coordSizeWidth:this._screenWidth,
+        coordSizeHeight:this._screenHeight,
+        coordOriginX:coordOriginX,
+        coordOriginY:coordOriginY,
+        fillColor:'transparent',
+        strokeWidth:0};
+
+    web2d.peer.Toolkit.init();
+    return  new web2d.Workspace(workspaceProfile);
+};
+
+mindplot.Workspace.prototype.appendChild = function(shape)
+{
+    if (shape.addToWorkspace)
+    {
+        shape.addToWorkspace(this);
+    } else
+    {
+        this._workspace.appendChild(shape);
+    }
+};
+
+mindplot.Workspace.prototype.removeChild = function(shape)
+{
+    // Element is a node, not a web2d element?
+    if (shape.removeFromWorkspace)
+    {
+        shape.removeFromWorkspace(this);
+    } else
+    {
+        this._workspace.removeChild(shape);
+    }
+};
+
+mindplot.Workspace.prototype.addEventListener = function(type, listener)
+{
+    this._workspace.addEventListener(type, listener);
+};
+
+mindplot.Workspace.prototype.removeEventListener = function(type, listener)
+{
+    this._workspace.removeEventListener(type, listener);
+};
+
+mindplot.Workspace.prototype.getSize = function()
+{
+    return this._workspace.getCoordSize();
+};
+
+mindplot.Workspace.prototype.setZoom = function(zoom, center)
+{
+    this._zoom = zoom;
+    var workspace = this._workspace;
+
+    // Update coord scale...
+    var coordWidth = zoom * this._screenWidth;
+    var coordHeight = zoom * this._screenHeight;
+    workspace.setCoordSize(coordWidth, coordHeight);
+
+    // Center topic....
+    var coordOriginX;
+    var coordOriginY;
+    if (center)
+    {
+        coordOriginX = -(coordWidth / 2);
+        coordOriginY = -(coordHeight / 2);
+    } else
+    {
+        var coordOrigin = workspace.getCoordOrigin();
+        coordOriginX = coordOrigin.x;
+        coordOriginY = coordOrigin.y;
+    }
+
+    workspace.setCoordOrigin(coordOriginX, coordOriginY);
+
+    // Update screen.
+    this._screenManager.setOffset(coordOriginX, coordOriginY);
+    this._screenManager.setScale(zoom);
+};
+
+mindplot.Workspace.prototype.getScreenManager = function()
+{
+    return this._screenManager;
+};
+
+
+mindplot.Workspace.prototype.enableWorkspaceEvents = function(value)
+{
+    this._eventsEnabled = value;
+};
+
+mindplot.Workspace.prototype.isWorkspaceEventsEnabled = function()
+{
+    return this._eventsEnabled;
+};
+
+mindplot.Workspace.prototype.dumpNativeChart = function()
+{
+    var workspace = this._workspace;
+    return workspace.dumpNativeChart();
+};
+
+mindplot.Workspace.prototype._registerDragEvents = function()
+{
+    var workspace = this._workspace;
+    var screenManager = this._screenManager;
+    this._dragging = true;
+    var mWorkspace = this;
+    var mouseDownListener = function(event)
+    {
+        if (!workspace.mouseMoveListener)
+        {
+            if (mWorkspace.isWorkspaceEventsEnabled())
+            {
+                mWorkspace.enableWorkspaceEvents(false);
+
+                var mouseDownPosition = screenManager.getWorkspaceMousePosition(event);
+                var originalCoordOrigin = workspace.getCoordOrigin();
+                var periodicalFunction = function() {
+                    mWorkspace._processMouseMoveEvent = true;
+                };
+                // Start precision timer updater ...
+                mWorkspace._precitionUpdater = periodicalFunction.periodical(mindplot.Workspace.DRAG_PRECISION_IN_SEG);
+
+                workspace.mouseMoveListener = function(event)
+                {
+                    if (mWorkspace._processMouseMoveEvent)
+                    {
+                        // Disable mouse move rendering ...
+                        mWorkspace._processMouseMoveEvent = false;
+
+                        var currentMousePosition = screenManager.getWorkspaceMousePosition(event);
+
+                        var offsetX = currentMousePosition.x - mouseDownPosition.x;
+                        var coordOriginX = -offsetX + originalCoordOrigin.x;
+
+                        var offsetY = currentMousePosition.y - mouseDownPosition.y;
+                        var coordOriginY = -offsetY + originalCoordOrigin.y;
+
+                        workspace.setCoordOrigin(coordOriginX, coordOriginY);
+
+                        // Change cursor.
+                        if (core.UserAgent.isMozillaFamily())
+                        {
+                            window.document.body.style.cursor = "-moz-grabbing";
+                        } else
+                        {
+                            window.document.body.style.cursor = "move";
+                        }
+                    }
+                };
+                workspace.addEventListener('mousemove', workspace.mouseMoveListener);
+
+                // Register mouse up listeners ...
+                workspace.mouseUpListener = function(event)
+                {
+                    // Stop presition updater listener ...
+                    $clear(mWorkspace._precitionUpdater);
+                    mWorkspace._precitionUpdater = null;
+
+                    workspace.removeEventListener('mousemove', workspace.mouseMoveListener);
+                    workspace.removeEventListener('mouseup', workspace.mouseUpListener);
+                    workspace.mouseUpListener = null;
+                    workspace.mouseMoveListener = null;
+                    window.document.body.style.cursor = 'default';
+
+                    // Update screen manager offset.
+                    var coordOrigin = workspace.getCoordOrigin();
+                    screenManager.setOffset(coordOrigin.x, coordOrigin.y);
+                    mWorkspace.enableWorkspaceEvents(true);
+                };
+                workspace.addEventListener('mouseup', workspace.mouseUpListener);
+            }
+        } else
+        {
+            workspace.mouseUpListener();
+        }
+    };
+
+    workspace.addEventListener('mousedown', mouseDownListener);
+};
+
+mindplot.Workspace.DRAG_PRECISION_IN_SEG = 50;
diff --git a/trunk/mindplot/src/main/javascript/XMLMindmapSerializer.js b/trunk/mindplot/src/main/javascript/XMLMindmapSerializer.js
new file mode 100644
index 00000000..98dd216a
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/XMLMindmapSerializer.js
@@ -0,0 +1,321 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.XMLMindmapSerializer = function()
+{
+
+};
+
+mindplot.XMLMindmapSerializer.prototype.toXML = function(mindmap)
+{
+    core.assert(mindmap, "Can not save a null mindmap");
+
+    var document = core.Utils.createDocument();
+
+    // Store map attributes ...
+    var mapElem = document.createElement("map");
+    var name = mindmap.getId();
+    if (name)
+    {
+        mapElem.setAttribute('name', name);
+    }
+    document.appendChild(mapElem);
+
+    // Create branches ...
+    var topics = mindmap.getBranches();
+    for (var i = 0; i < topics.length; i++)
+    {
+        var topic = topics[i];
+        var topicDom = this._topicToXML(document, topic);
+        mapElem.appendChild(topicDom);
+    }
+
+    return document;
+};
+
+mindplot.XMLMindmapSerializer.prototype._topicToXML = function(document, topic)
+{
+    var parentTopic = document.createElement("topic");
+
+    // Set topic attributes...
+    if (topic.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+    {
+        parentTopic.setAttribute("central", true);
+    } else
+    {
+        var parent = topic.getParent();
+        if (parent == null || parent.getType() == mindplot.NodeModel.CENTRAL_TOPIC_TYPE)
+        {
+            var pos = topic.getPosition();
+            parentTopic.setAttribute("position", pos.x + ',' + pos.y);
+        } else
+        {
+            var order = topic.getOrder();
+            parentTopic.setAttribute("order", order);
+        }
+    }
+
+    var text = topic.getText();
+    if (text) {
+        parentTopic.setAttribute('text', text);
+    }
+
+    var shape = topic.getShapeType();
+    if (shape) {
+        parentTopic.setAttribute('shape', shape);
+    }
+
+    if(topic.areChildrenShrinked())
+    {
+        parentTopic.setAttribute('shrink',true);
+    }
+
+    // Font properties ...
+    var font = "";
+
+    var fontFamily = topic.getFontFamily();
+    font += (fontFamily ? fontFamily : '') + ';';
+
+    var fontSize = topic.getFontSize();
+    font += (fontSize ? fontSize : '') + ';';
+
+    var fontColor = topic.getFontColor();
+    font += (fontColor ? fontColor : '') + ';';
+
+    var fontWeight = topic.getFontWeight();
+    font += (fontWeight ? fontWeight : '') + ';';
+
+    var fontStyle = topic.getFontStyle();
+    font += (fontStyle ? fontStyle : '') + ';';
+
+    if (fontFamily || fontSize || fontColor || fontWeight || fontStyle)
+    {
+        parentTopic.setAttribute('fontStyle', font);
+    }
+
+    var bgColor = topic.getBackgroundColor();
+    if (bgColor) {
+        parentTopic.setAttribute('bgColor', bgColor);
+    }
+
+    var brColor = topic.getBorderColor();
+    if (brColor) {
+        parentTopic.setAttribute('brColor', brColor);
+    }
+
+    //ICONS
+    var icons = topic.getIcons();
+    for (var i = 0; i < icons.length; i++)
+    {
+        var icon = icons[i];
+        var iconDom = this._iconToXML(document, icon);
+        parentTopic.appendChild(iconDom);
+    }
+
+    //LINKS
+    var links = topic.getLinks();
+    for (var i = 0; i < links.length; i++)
+    {
+        var link = links[i];
+        var linkDom = this._linkToXML(document, link);
+        parentTopic.appendChild(linkDom);
+    }
+
+    var notes = topic.getNotes();
+    for (var i = 0; i < notes.length; i++)
+    {
+        var note = notes[i];
+        var noteDom = this._noteToXML(document, note);
+        parentTopic.appendChild(noteDom);
+    }
+
+    //CHILDREN TOPICS
+    var childTopics = topic.getChildren();
+    for (var i = 0; i < childTopics.length; i++)
+    {
+        var childTopic = childTopics[i];
+        var childDom = this._topicToXML(document, childTopic);
+        parentTopic.appendChild(childDom);
+
+    }
+
+    return parentTopic;
+};
+
+mindplot.XMLMindmapSerializer.prototype._iconToXML = function(document, icon)
+{
+    var iconDom = document.createElement("icon");
+    iconDom.setAttribute('id', icon.getIconType());
+    return iconDom;
+};
+
+mindplot.XMLMindmapSerializer.prototype._linkToXML = function(document, link)
+{
+    var linkDom = document.createElement("link");
+    linkDom.setAttribute('url', link.getUrl());
+    return linkDom;
+};
+
+mindplot.XMLMindmapSerializer.prototype._noteToXML = function(document, note)
+{
+    var noteDom = document.createElement("note");
+    noteDom.setAttribute('text', note.getText());
+    return noteDom;
+};
+
+mindplot.XMLMindmapSerializer.prototype.loadFromDom = function(dom)
+{
+    core.assert(dom, "Dom can not be null");
+    var rootElem = dom.documentElement;
+
+    // Is a wisemap?.
+    core.assert(rootElem.tagName == mindplot.XMLMindmapSerializer.MAP_ROOT_NODE, "This seem not to be a map document.");
+
+    // Start the loading process ...
+    var mindmap = new mindplot.Mindmap();
+
+    var children = rootElem.childNodes;
+    for (var i = 0; i < children.length; i++)
+    {
+        var child = children[i];
+        if (child.nodeType == 1)
+        {
+            var topic = this._deserializeNode(child, mindmap);
+            mindmap.addBranch(topic);
+        }
+    }
+    return mindmap;
+};
+
+mindplot.XMLMindmapSerializer.prototype._deserializeNode = function(domElem, mindmap)
+{
+    var type = (domElem.getAttribute('central') != null) ? mindplot.NodeModel.CENTRAL_TOPIC_TYPE : mindplot.NodeModel.MAIN_TOPIC_TYPE;
+    var topic = mindmap.createNode(type);
+
+    // Load attributes...
+    var text = domElem.getAttribute('text');
+    if (text) {
+        topic.setText(text);
+    }
+
+    var order = domElem.getAttribute('order');
+    if (order) {
+        topic.setOrder(order);
+    }
+
+    var shape = domElem.getAttribute('shape');
+    if (shape) {
+        topic.setShapeType(shape);
+    }
+
+    var isShrink = domElem.getAttribute('shrink');
+    if(isShrink)
+    {
+        topic.setChildrenShrinked(isShrink);
+    }
+
+    var fontStyle = domElem.getAttribute('fontStyle');
+    if (fontStyle) {
+        var font = fontStyle.split(';');
+
+        if (font[0])
+        {
+            topic.setFontFamily(font[0]);
+        }
+
+        if (font[1])
+        {
+            topic.setFontSize(font[1]);
+        }
+
+        if (font[2])
+        {
+            topic.setFontColor(font[2]);
+        }
+
+        if (font[3])
+        {
+            topic.setFontWeight(font[3]);
+        }
+
+        if (font[4])
+        {
+            topic.setFontStyle(font[4]);
+        }
+    }
+
+    var bgColor = domElem.getAttribute('bgColor');
+    if (bgColor) {
+        topic.setBackgroundColor(bgColor);
+    }
+
+    var borderColor = domElem.getAttribute('brColor');
+    if (borderColor) {
+        topic.setBorderColor(borderColor);
+    }
+
+    var position = domElem.getAttribute('position');
+    if (position) {
+        var pos = position.split(',');
+        topic.setPosition(pos[0], pos[1]);
+    }
+
+    //Creating icons and children nodes
+    var children = domElem.childNodes;
+    for (var i = 0; i < children.length; i++)
+    {
+        var child = children[i];
+        if (child.nodeType == 1)
+        {
+            core.assert(child.tagName == "topic" || child.tagName == "icon" || child.tagName == "link" || child.tagName == "note", 'Illegal node type:' + child.tagName);
+            if (child.tagName == "topic") {
+                var childTopic = this._deserializeNode(child, mindmap);
+                childTopic.connectTo(topic);
+            } else if(child.tagName == "icon") {
+                var icon = this._deserializeIcon(child, topic);
+                topic.addIcon(icon);
+            } else if(child.tagName == "link") {
+                var link = this._deserializeLink(child, topic);
+                topic.addLink(link);
+            } else if(child.tagName == "note") {
+                var note = this._deserializeNote(child, topic);
+                topic.addNote(note);
+            }
+        }
+    }
+    ;
+    return topic;
+};
+
+mindplot.XMLMindmapSerializer.prototype._deserializeIcon = function(domElem, topic)
+{
+    return topic.createIcon(domElem.getAttribute("id"));
+};
+
+mindplot.XMLMindmapSerializer.prototype._deserializeLink = function(domElem, topic)
+{
+    return topic.createLink(domElem.getAttribute("url"));
+};
+
+mindplot.XMLMindmapSerializer.prototype._deserializeNote = function(domElem, topic)
+{
+    return topic.createNote(domElem.getAttribute("text"));
+};
+
+mindplot.XMLMindmapSerializer.MAP_ROOT_NODE = 'map';
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/AddIconToTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/AddIconToTopicCommand.js
new file mode 100644
index 00000000..1bae198f
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/AddIconToTopicCommand.js
@@ -0,0 +1,48 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.AddIconToTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId, iconType)
+    {
+        core.assert(topicId, 'topicId can not be null');
+        core.assert(iconType, 'iconType can not be null');
+        this._topicId = topicId;
+        this._iconType = iconType;
+    },
+    execute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            var iconImg = topic.addIcon(this._iconType, commandContext._designer);
+            this._iconModel = iconImg.getModel();
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    },
+    undoExecute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.removeIcon(this._iconModel);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/AddLinkToTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/AddLinkToTopicCommand.js
new file mode 100644
index 00000000..20cc7168
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/AddLinkToTopicCommand.js
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.AddLinkToTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId,url)
+    {
+        core.assert(topicId, 'topicId can not be null');
+        this._topicId = topicId;
+        this._url = url;
+        this._id = mindplot.Command._nextUUID();
+    },
+    execute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.addLink(this._url,commandContext._designer);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    },
+    undoExecute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.removeLink();
+        }.bind(this);
+        updated.delay(0);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/AddNoteToTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/AddNoteToTopicCommand.js
new file mode 100644
index 00000000..7a11c207
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/AddNoteToTopicCommand.js
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.AddNoteToTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId,text)
+    {
+        core.assert(topicId, 'topicId can not be null');
+        this._topicId = topicId;
+        this._text = text;
+        this._id = mindplot.Command._nextUUID();
+    },
+    execute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.addNote(this._text,commandContext._designer);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    },
+    undoExecute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.removeNote();
+        }.bind(this);
+        updated.delay(0);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/AddTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/AddTopicCommand.js
new file mode 100644
index 00000000..8904a2cc
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/AddTopicCommand.js
@@ -0,0 +1,51 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.AddTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(model, parentTopicId)
+    {
+        core.assert(model, 'Model can not be null');
+        this._model = model;
+        this._parentId = parentTopicId;
+        this._id = mindplot.Command._nextUUID();
+    },
+    execute: function(commandContext)
+    {
+        // Add a new topic ...
+        var topic = commandContext.createTopic(this._model);
+
+        // Connect to topic ...
+        if (this._parentId)
+        {
+            var parentTopic = commandContext.findTopics(this._parentId)[0];
+            commandContext.connect(topic, parentTopic);
+        }
+
+        // Finally, focus ...
+        topic.setOnFocus(true);
+    },
+    undoExecute: function(commandContext)
+    {
+        // Finally, delete the topic from the workspace ...
+        var topicId = this._model.getId();
+        var topic = commandContext.findTopics(topicId)[0];
+        commandContext.deleteTopic(topic);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/ChangeIconFromTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/ChangeIconFromTopicCommand.js
new file mode 100644
index 00000000..6e824593
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/ChangeIconFromTopicCommand.js
@@ -0,0 +1,49 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.ChangeIconFromTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId, iconId, iconType)
+    {
+        core.assert(topicId, 'topicId can not be null');
+        core.assert(iconId, 'iconId can not be null');
+        core.assert(iconType, 'iconType can not be null');
+        this._topicId = topicId;
+        this._iconModel = iconId;
+        this._iconType = iconType;
+    },
+    execute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.removeIcon(this._iconModel);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    },
+    undoExecute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.addIcon(this._iconModel, commandContext._designer);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/DeleteTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/DeleteTopicCommand.js
new file mode 100644
index 00000000..8da3401c
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/DeleteTopicCommand.js
@@ -0,0 +1,78 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.DeleteTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicsIds)
+    {
+        core.assert(topicsIds, "topicsIds must be defined");
+        this._topicId = topicsIds;
+        this._deletedTopicModels = [];
+        this._parentTopicIds = [];
+        this._id = mindplot.Command._nextUUID();
+    },
+    execute: function(commandContext)
+    {
+        var topics = commandContext.findTopics(this._topicId);
+        topics.forEach(
+                function(topic, index)
+                {
+                    var model = topic.getModel().clone();
+                    this._deletedTopicModels.push(model);
+
+                    // Is connected?.
+                    var outTopic = topic.getOutgoingConnectedTopic();
+                    var outTopicId = null;
+                    if (outTopic != null)
+                    {
+                        outTopicId = outTopic.getId();
+                    }
+                    this._parentTopicIds.push(outTopicId);
+
+                    // Finally, delete the topic from the workspace...
+                    commandContext.deleteTopic(topic);
+
+                }.bind(this)
+                )
+    },
+    undoExecute: function(commandContext)
+    {
+
+        var topics = commandContext.findTopics(this._topicId);
+        var parent = commandContext.findTopics(this._parentTopicIds);
+
+        this._deletedTopicModels.forEach(
+                function(model, index)
+                {
+                    var topic = commandContext.createTopic(model);
+
+                    // Was the topic connected?
+                    var parentTopic = parent[index];
+                    if (parentTopic != null)
+                    {
+                        commandContext.connect(topic, parentTopic);
+                    }
+
+                }.bind(this)
+                )
+
+        this._deletedTopicModels = [];
+        this._parentTopicIds = [];
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/DragTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/DragTopicCommand.js
new file mode 100644
index 00000000..679fcfaf
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/DragTopicCommand.js
@@ -0,0 +1,104 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.DragTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId)
+    {
+        core.assert(topicId, "topicId must be defined");
+        this._topicId = topicId;
+        this._parentTopic = null;
+        this._position = null;
+        this._order = null;
+        this._id = mindplot.Command._nextUUID();
+    },
+    execute: function(commandContext)
+    {
+
+        var topic = commandContext.findTopics([this._topicId])[0];
+
+        // Save old position ...
+        var origParentTopic = topic.getOutgoingConnectedTopic();
+        var origOrder = null;
+        var origPosition = null;
+        if (topic.getType() == mindplot.NodeModel.MAIN_TOPIC_TYPE && origParentTopic != null && origParentTopic.getType() == mindplot.NodeModel.MAIN_TOPIC_TYPE)
+        {
+            // In this case, topics are positioned using order ...
+            origOrder = topic.getOrder();
+        } else
+        {
+            origPosition = topic.getPosition().clone();
+        }
+
+        // Disconnect topic ..
+        if (origParentTopic)
+        {
+            commandContext.disconnect(topic);
+        }
+
+
+        // Set topic position ...
+        if (this._position != null)
+        {
+            // Set position ...
+            topic.setPosition(this._position);
+
+        } else if (this._order != null)
+        {
+            topic.setOrder(this._order);
+        } else
+        {
+            core.assert("Illegal commnad state exception.");
+        }
+        this._order = origOrder;
+        this._position = origPosition;
+
+        // Finally, connect topic ...
+        if (this._parentId)
+        {
+            var parentTopic = commandContext.findTopics([this._parentId])[0];
+            commandContext.connect(topic, parentTopic);
+        }
+
+        // Backup old parent id ...
+        this._parentId = null;
+        if (origParentTopic)
+        {
+            this._parentId = origParentTopic.getId();
+        }
+
+    },
+    undoExecute: function(commandContext)
+    {
+        this.execute(commandContext);
+
+    },
+    setPosition: function(point)
+    {
+        this._position = point;
+    },
+    setParetTopic: function(topic) {
+        this._parentId = topic.getId();
+
+    },
+    setOrder: function(order)
+    {
+        this._order = order
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/GenericFunctionCommand.js b/trunk/mindplot/src/main/javascript/commands/GenericFunctionCommand.js
new file mode 100644
index 00000000..eb1250b1
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/GenericFunctionCommand.js
@@ -0,0 +1,67 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.GenericFunctionCommand = mindplot.Command.extend(
+{
+   initialize: function(commandFunc,value,topicsIds)
+    {
+        core.assert(commandFunc, "commandFunc must be defined");
+        core.assert(topicsIds, "topicsIds must be defined");
+        this._value = value;
+        this._topicId = topicsIds;
+        this._commandFunc = commandFunc;
+        this._oldValues = [];
+        this._id = mindplot.Command._nextUUID();
+    },
+    execute: function(commandContext)
+    {
+        if (!this.applied)
+        {
+            var topics = commandContext.findTopics(this._topicId);
+            topics.forEach(function(topic)
+            {
+                var oldValue = this._commandFunc(topic, this._value);
+                this._oldValues.push(oldValue);
+            }.bind(this));
+            this.applied = true;
+        } else
+        {
+            throw "Command can not be applied two times in a row.";
+        }
+
+    },
+    undoExecute: function(commandContext)
+    {
+       if (this.applied)
+        {
+            var topics = commandContext.findTopics(this._topicId);
+            topics.forEach(function(topic,index)
+            {
+                this._commandFunc(topic, this._oldValues[index]);
+
+            }.bind(this));
+
+            this.applied = false;
+            this._oldValues = [];
+        } else
+        {
+            throw "undo can not be applied.";
+        }
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/RemoveIconFromTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/RemoveIconFromTopicCommand.js
new file mode 100644
index 00000000..0a6d5eea
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/RemoveIconFromTopicCommand.js
@@ -0,0 +1,49 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.RemoveIconFromTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId, iconModel)
+    {
+        core.assert(topicId, 'topicId can not be null');
+        core.assert(iconModel, 'iconId can not be null');
+        this._topicId = topicId;
+        this._iconModel = iconModel;
+    },
+    execute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.removeIcon(this._iconModel);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    },
+    undoExecute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            var iconType = this._iconModel.getIconType();
+            var iconImg = topic.addIcon(iconType, commandContext._designer);
+            this._iconModel = iconImg.getModel();
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/RemoveLinkFromTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/RemoveLinkFromTopicCommand.js
new file mode 100644
index 00000000..70cf48f7
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/RemoveLinkFromTopicCommand.js
@@ -0,0 +1,45 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.RemoveLinkFromTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId)
+    {
+        core.assert(topicId, 'topicId can not be null');
+        this._topicId = topicId;
+    },
+    execute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        this._url = topic._link.getUrl();
+        var updated = function() {
+            topic.removeLink();
+        }.bind(this);
+        updated.delay(0);
+    },
+    undoExecute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.addLink(this._url,commandContext._designer);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/commands/RemoveNoteFromTopicCommand.js b/trunk/mindplot/src/main/javascript/commands/RemoveNoteFromTopicCommand.js
new file mode 100644
index 00000000..62fbe532
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/commands/RemoveNoteFromTopicCommand.js
@@ -0,0 +1,45 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.commands.RemoveNoteFromTopicCommand = mindplot.Command.extend(
+{
+    initialize: function(topicId)
+    {
+        core.assert(topicId, 'topicId can not be null');
+        this._topicId = topicId;
+    },
+    execute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        this._text = topic._note.getText();
+        var updated = function() {
+            topic.removeNote();
+        }.bind(this);
+        updated.delay(0);
+    },
+    undoExecute: function(commandContext)
+    {
+        var topic = commandContext.findTopics(this._topicId)[0];
+        var updated = function() {
+            topic.addNote(this._text,commandContext._designer);
+            topic.updateNode();
+        }.bind(this);
+        updated.delay(0);
+    }
+});
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/footer.js b/trunk/mindplot/src/main/javascript/footer.js
new file mode 100644
index 00000000..955e2715
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/footer.js
@@ -0,0 +1,23 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+if(afterWisemapLoading)
+{
+afterWisemapLoading();
+}
diff --git a/trunk/mindplot/src/main/javascript/header.js b/trunk/mindplot/src/main/javascript/header.js
new file mode 100644
index 00000000..c825926e
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/header.js
@@ -0,0 +1,28 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// (C) Copyright 2007 WiseMapping.com. All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF WiseMapping.com
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+// ....................................................................
+
+var mindplot = {};
+mindplot.util = {};
+mindplot.commands = {};
\ No newline at end of file
diff --git a/trunk/mindplot/src/main/javascript/util/Shape.js b/trunk/mindplot/src/main/javascript/util/Shape.js
new file mode 100644
index 00000000..3e2061e2
--- /dev/null
+++ b/trunk/mindplot/src/main/javascript/util/Shape.js
@@ -0,0 +1,145 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+mindplot.util.Shape =
+{
+    isAtRight: function(sourcePoint, targetPoint)
+    {
+        core.assert(sourcePoint, "Source can not be null");
+        core.assert(targetPoint, "Target can not be null");
+        return (targetPoint.x - sourcePoint.x) > 0;
+    },
+    workoutDistance: function(sourceNode, targetNode)
+    {
+        var sPos = sourceNode.getPosition();
+        var tPos = targetNode.getPosition();
+
+        var x = tPos.x - sPos.x;
+        var y = tPos.y - sPos.y;
+
+        var hip = y * y + x * x;
+        return hip;
+    },
+    calculateRectConnectionPoint: function(rectCenterPoint, rectSize, isAtRight)
+    {
+        core.assert(rectCenterPoint, 'rectCenterPoint can  not be null');
+        core.assert(rectSize, 'rectSize can  not be null');
+        core.assert(core.Utils.isDefined(isAtRight), 'isRight can  not be null');
+
+        // Node is placed at the right ?
+        var result = new core.Point();
+
+        // This is used fix a minor difference ...z
+        var correctionHardcode = 2;
+        if (isAtRight)
+        {
+            result.setValue(rectCenterPoint.x - (rectSize.width / 2) + correctionHardcode, rectCenterPoint.y);
+        } else
+        {
+            result.setValue(parseFloat(rectCenterPoint.x) + (rectSize.width / 2) - correctionHardcode, rectCenterPoint.y);
+        }
+
+        return result;
+    },
+    _getRectShapeOffset : function(sourceTopic, targetTopic)
+    {
+
+        var tPos = targetTopic.getPosition();
+        var sPos = sourceTopic.getPosition();
+
+        var tSize = targetTopic.getSize();
+
+        var x = sPos.x - tPos.x;
+        var y = sPos.y - tPos.y;
+
+        var gradient = 0;
+        if (x)
+        {
+            gradient = y / x;
+        }
+
+        var area = this._getSector(gradient, x, y);
+        var xOff = -1;
+        var yOff = -1;
+        if (area == 1 || area == 3)
+        {
+            xOff = tSize.width / 2;
+            yOff = xOff * gradient;
+
+            xOff = xOff * ((x < 0) ? -1 : 1);
+            yOff = yOff * ((x < 0) ? -1 : 1);
+
+
+        } else
+        {
+            yOff = tSize.height / 2;
+            xOff = yOff / gradient;
+
+            yOff = yOff * ((y < 0) ? -1 : 1);
+            xOff = xOff * ((y < 0) ? -1 : 1);
+        }
+
+
+        // Controll boundaries.
+        if (Math.abs(xOff) > tSize.width / 2)
+        {
+            xOff = ((tSize.width / 2) * Math.sign(xOff));
+        }
+
+        if (Math.abs(yOff) > tSize.height / 2)
+        {
+            yOff = ((tSize.height / 2) * Math.sign(yOff));
+        }
+
+        return {x:xOff,y:yOff};
+    },
+
+/**
+ *  Sector are numered following the clockwise direction.
+ */
+    _getSector : function(gradient, x, y)
+    {
+        var result;
+        if (gradient < 0.5 && gradient > -0.5)
+        {
+            // Sector 1 and 3
+            if (x >= 0)
+            {
+                result = 1;
+            } else
+            {
+                result = 3;
+            }
+
+        } else
+        {
+            // Sector 2 and 4
+            if (y <= 0)
+            {
+                result = 4;
+            } else
+            {
+                result = 2;
+            }
+        }
+
+        return result;
+    }
+};
+
diff --git a/trunk/pom.xml b/trunk/pom.xml
new file mode 100644
index 00000000..656538d0
--- /dev/null
+++ b/trunk/pom.xml
@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.wisemapping</groupId>
+    <artifactId>wisemapping</artifactId>
+    <name>WiseMapping Project</name>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Maven 2 Repository</name>
+            <url>http://download.java.net/maven/2</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+
+    <organization>
+        <name>WiseMapping</name>
+        <url>http://www.wisemapping.com</url>
+    </organization>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <inherited>true</inherited>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <inherited>true</inherited>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <inherited>true</inherited>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>config/maven_checks.xml</configLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- Module Dependecies -->
+    <modules>
+        <module>web2d</module>
+        <module>core-js</module>
+        <module>mindplot</module>
+        <module>wise-webapp</module>
+    </modules>
+</project>
+
diff --git a/trunk/web2d/pom.xml b/trunk/web2d/pom.xml
new file mode 100644
index 00000000..11ea03e4
--- /dev/null
+++ b/trunk/web2d/pom.xml
@@ -0,0 +1,127 @@
+<project>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>web2d</artifactId>
+    <packaging>jar</packaging>
+    <name>Web 2D SVG/VML Abstraction</name>
+
+    <parent>
+        <groupId>org.wisemapping</groupId>
+        <artifactId>wisemapping</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <plugins>
+              <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>merge-js-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir  dir="${basedir}/target/classes"/>                  
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>net.sf.alchim</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>compress</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>src/main/javascript/</sourceDirectory>
+                            <outputDirectory>target/tmp/</outputDirectory>
+                            <aggregations>
+                                <aggregation>
+                                    <output>${basedir}/target/classes/web2d.vml-min.js</output>
+                                    <includes>
+                                        <include>${basedir}/target/tmp/header-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/utils/EventUtils-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/utils/TransformUtils-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/ElementPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/Font-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/ArialFont-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/PolyLinePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/TextBoxPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/VerdanaFont-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/GroupPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/RectPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/ImagePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/TextPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/WorkspacePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/ElipsePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/LinePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/TahomaFont-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/vml/TimesFont-min.js</include>
+
+                                        <include>${basedir}/target/tmp/Element-min.js</include>
+                                        <include>${basedir}/target/tmp/Elipse-min.js</include>
+                                        <include>${basedir}/target/tmp/EventDispatcher-min.js</include>
+                                        <include>${basedir}/target/tmp/Font-min.js</include>
+                                        <include>${basedir}/target/tmp/Group-min.js</include>
+                                        <include>${basedir}/target/tmp/Image-min.js</include>
+                                        <include>${basedir}/target/tmp/Line-min.js</include>
+                                        <include>${basedir}/target/tmp/PolyLine-min.js</include>
+                                        <include>${basedir}/target/tmp/Rect-min.js</include>
+                                        <include>${basedir}/target/tmp/Text-min.js</include>
+                                        <include>${basedir}/target/tmp/Toolkit-min.js</include>
+                                        <include>${basedir}/target/tmp/Workspace-min.js</include>
+                                    </includes>
+                                </aggregation>
+                                <aggregation>
+                                    <output>${basedir}/target/classes/web2d.svg-min.js</output>
+                                    <includes>
+                                        <include>${basedir}/target/tmp/header-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/utils/EventUtils-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/utils/TransformUtils-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/ElementPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/ElipsePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/Font-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/ArialFont-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/PolyLinePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/TextPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/WorkspacePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/GroupPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/RectPeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/ImagePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/TimesFont-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/LinePeer-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/TahomaFont-min.js</include>
+                                        <include>${basedir}/target/tmp/peer/svg/VerdanaFont-min.js</include>
+
+                                        <include>${basedir}/target/tmp/Element-min.js</include>
+                                        <include>${basedir}/target/tmp/Elipse-min.js</include>
+                                        <include>${basedir}/target/tmp/EventDispatcher-min.js</include>
+                                        <include>${basedir}/target/tmp/Font-min.js</include>
+                                        <include>${basedir}/target/tmp/Group-min.js</include>
+                                        <include>${basedir}/target/tmp/Image-min.js</include>
+                                        <include>${basedir}/target/tmp/Line-min.js</include>
+                                        <include>${basedir}/target/tmp/PolyLine-min.js</include>
+                                        <include>${basedir}/target/tmp/Rect-min.js</include>
+                                        <include>${basedir}/target/tmp/Text-min.js</include>
+                                        <include>${basedir}/target/tmp/Toolkit-min.js</include>
+                                        <include>${basedir}/target/tmp/Workspace-min.js</include>
+                                    </includes>
+                                </aggregation>
+                            </aggregations>
+                            <nomunge>true</nomunge>
+                            <jswarn>false</jswarn>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/trunk/web2d/src/main/javascript/Element.js b/trunk/web2d/src/main/javascript/Element.js
new file mode 100644
index 00000000..0f09909a
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Element.js
@@ -0,0 +1,362 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.Element = function(peer, attributes)
+{
+    this._peer = peer;
+    if (peer == null)
+    {
+        throw "Element peer can not be null";
+    }
+
+    this._dispatcherByEventType = new Hash({});
+    if (core.Utils.isDefined(attributes))
+    {
+        this._initialize(attributes);
+    }
+};
+
+web2d.Element.prototype._SIGNATURE_MULTIPLE_ARGUMENTS = -1;
+
+web2d.Element.prototype._initialize = function(attributes)
+{
+    var batchExecute = {};
+
+    // Collect arguments ...
+    for (var key in attributes)
+    {
+        var funcName = this._attributeNameToFuncName(key, 'set');
+        var funcArgs = batchExecute[funcName];
+        if (!funcArgs)
+        {
+            funcArgs = [];
+        }
+
+        var signature = this._propertyNameToSignature[key];
+        var argPositions = signature[1];
+        if (argPositions != this._SIGNATURE_MULTIPLE_ARGUMENTS)
+        {
+            funcArgs[argPositions] = attributes[key];
+        } else
+        {
+            funcArgs = attributes[key].split(' ');
+        }
+        batchExecute[funcName] = funcArgs;
+    }
+
+    // Call functions ...
+    for (var key in batchExecute)
+    {
+        var func = this[key];
+        if (!func)
+        {
+            throw "Could not find function: " + key;
+        }
+        func.apply(this, batchExecute[key]);
+    }
+};
+
+web2d.Element.prototype.setSize = function(width, height)
+{
+    this._peer.setSize(width, height);
+};
+
+web2d.Element.prototype.setPosition = function(cx, cy)
+{
+    this._peer.setPosition(cx, cy);
+};
+
+web2d.Element.prototype._supportedEvents = ["click","dblclick","mousemove","mouseout","mouseover","mousedown","mouseup"];
+
+/**
+ * Allows the registration of event listeners on the event target.
+ * type
+ *     A string representing the event type to listen for.
+ * listener
+ *     The object that receives a notification when an event of the specified type occurs. This must be an object implementing the EventListener interface, or simply a function in JavaScript.
+ *
+ * The following events types are supported:
+ *
+ */
+web2d.Element.prototype.addEventListener = function(type, listener)
+{
+    if (!this._supportedEvents.include(type))
+    {
+        throw "Unsupported event type: " + type;
+    }
+
+    // Concat previous event listeners for a given type.
+    if (!this._dispatcherByEventType[type])
+    {
+        this._dispatcherByEventType[type] = new web2d.EventDispatcher(this);
+
+        var eventListener = this._dispatcherByEventType[type].eventListener;
+        this._peer.addEventListener(type, eventListener);
+    }
+
+    this._dispatcherByEventType[type].addListener(type, listener);
+};
+/**
+ *
+ * Allows the removal of event listeners from the event target.
+ *
+ * Parameters:
+ * type
+ *    A string representing the event type being registered.
+ * listener
+ *     The listener parameter takes an interface implemented by the user which contains the methods to be called when the event occurs.
+ *     This interace will be invoked passing an event as argument and the 'this' referece in the function will be the element.
+ */
+web2d.Element.prototype.removeEventListener = function(type, listener)
+{
+    var dispatcher = this._dispatcherByEventType[type];
+    if (dispatcher == null)
+    {
+        throw "There is no listener previously registered";
+    }
+    var result = dispatcher.removeListener(type, listener);
+
+    // If there is not listeners, EventDispatcher must be removed.
+    if (dispatcher.getListenersCount() <= 0)
+    {
+        this._peer.removeEventListener(type, dispatcher.eventListener);
+        this._dispatcherByEventType[type] = null;
+    }
+};
+
+/**
+ * /*
+ * Returns element type name.
+ */
+web2d.Element.prototype.getType = function()
+{
+    throw "Not implemeneted yet. This method must be implemented by all the inherited objects.";
+};
+
+/**
+ * Todo: Doc
+ */
+web2d.Element.prototype.getFill = function()
+{
+    return this._peer.getFill();
+};
+
+/**
+ * Used to define the fill element color and element opacity.
+ * color: Fill color
+ * opacity: Opacity of the fill. It must be less than 1.
+ */
+web2d.Element.prototype.setFill = function(color, opacity)
+{
+    this._peer.setFill(color, opacity);
+};
+
+web2d.Element.prototype.getPosition = function()
+{
+    return this._peer.getPosition();
+};
+
+/*
+*  Defines the element stroke properties.
+*  width: stroke width
+*  style: "solid|dot|dash|dashdot|longdash".
+*  color: stroke color
+*  opacity: stroke visibility
+*/
+web2d.Element.prototype.setStroke = function(width, style, color, opacity)
+{
+    if (style != null && style != undefined && style != 'dash' && style != 'dot' && style != 'solid' && style != 'longdash' && style != "dashdot")
+    {
+        throw "Unsupported stroke style: '" + style + "'";
+    }
+    this._peer.setStroke(width, style, color, opacity);
+};
+
+web2d.Element.prototype._propertyNameToSignature =
+{
+// Format: [attribute name, argument position on setter, attribute name on getter]
+    size: ['size',-1],
+    width: ['size',0,'width'],
+    height: ['size',1,'height'],
+
+    position: ['position',-1],
+    x: ['position',0,'x'],
+    y: ['position',1,'y'],
+
+    stroke:['stroke',-1],
+    strokeWidth:['stroke',0,'width'],
+    strokeStyle:['stroke',1,'style'],
+    strokeColor:['stroke',2,'color'],
+    strokeOpacity:['stroke',3,'opacity'],
+
+    fill:['fill',-1],
+    fillColor:['fill',0,'color'],
+    fillOpacity:['fill',1,'opacity'],
+
+    coordSize:['coordSize',-1],
+    coordSizeWidth:['coordSize',0,'width'],
+    coordSizeHeight:['coordSize',1,'height'],
+
+    coordOrigin:['coordOrigin',-1],
+    coordOriginX:['coordOrigin',0,'x'],
+    coordOriginY:['coordOrigin',1,'y'],
+
+    visibility:['visibility',0],
+    opacity:['opacity',0]
+};
+
+web2d.Element.prototype._attributeNameToFuncName = function(attributeKey, prefix)
+{
+    var signature = this._propertyNameToSignature[attributeKey];
+    if (!signature)
+    {
+        throw "Unsupported attribute: " + attributeKey;
+    }
+
+    var firstLetter = signature[0].charAt(0);
+    return  prefix + firstLetter.toUpperCase() + signature[0].substring(1);
+
+};
+
+/**
+ * All element properties can be setted using either a method invocation or attribute invocation.
+ *  key: size, width, height, position, x, y, stroke, strokeWidth, strokeStyle, strokeColor, strokeOpacity,
+ *       fill, fillColor, fillOpacity, coordSize, coordSizeWidth, coordSizeHeight, coordOrigin, coordOriginX, coordOrigiY
+ */
+web2d.Element.prototype.setAttribute = function(key, value)
+{
+    var funcName = this._attributeNameToFuncName(key, 'set');
+
+    var signature = this._propertyNameToSignature[key];
+    if (signature == null)
+    {
+        throw "Could not find the signature for:" + key;
+    }
+
+    // Parse arguments ..
+    var argPositions = signature[1];
+    var args = [];
+    if (argPositions !== this._SIGNATURE_MULTIPLE_ARGUMENTS)
+    {
+        args[argPositions] = value;
+    }
+    else if (typeof value == "array")
+    {
+        args = value;
+    } else
+    {
+        var strValue = String(value);
+        args = strValue.split(' ');
+    }
+
+    // Look up method ...
+    var setter = this[funcName];
+    if (setter == null)
+    {
+        throw "Could not find the function name:" + funcName;
+    }
+    setter.apply(this, args);
+
+};
+
+web2d.Element.prototype.getAttribute = function(key)
+{
+    var funcName = this._attributeNameToFuncName(key, 'get');
+
+    var signature = this._propertyNameToSignature[key];
+    if (signature == null)
+    {
+        throw "Could not find the signature for:" + key;
+    }
+
+    var getter = this[funcName];
+    if (getter == null)
+    {
+        throw "Could not find the function name:" + funcName;
+    }
+
+    var getterResult = getter.apply(this, []);
+    var attibuteName = signature[2];
+    if (!attibuteName)
+    {
+        throw "Could not find attribute mapping for:" + key;
+    }
+
+    var result = getterResult[attibuteName];
+    if (!result)
+    {
+        throw "Could not find attribute with name:" + attibuteName;
+    }
+
+    return result;
+};
+
+
+/**
+ * Defines the element opacity.
+ * Parameters:
+ *   opacity: A value between 0 and 1.
+ */
+web2d.Element.prototype.setOpacity = function(opacity)
+{
+    this._peer.setStroke(null, null, null, opacity);
+    this._peer.setFill(null, opacity);
+};
+
+web2d.Element.prototype.setVisibility = function(isVisible)
+{
+    this._peer.setVisibility(isVisible);
+};
+
+
+web2d.Element.prototype.isVisible = function()
+{
+    return this._peer.isVisible();
+};
+
+/**
+ * Move the element to the front
+ */
+web2d.Element.prototype.moveToFront = function()
+{
+    this._peer.moveToFront();
+};
+
+/**
+ * Move the element to the back
+ */
+web2d.Element.prototype.moveToBack = function()
+{
+    this._peer.moveToBack();
+};
+
+web2d.Element.prototype.getStroke = function()
+{
+    return this._peer.getStroke();
+};
+
+
+web2d.Element.prototype.setCursor = function(type)
+{
+    this._peer.setCursor(type);
+};
+
+web2d.Element.prototype.getParent = function(){
+    return this._peer.getParent();
+}
diff --git a/trunk/web2d/src/main/javascript/Elipse.js b/trunk/web2d/src/main/javascript/Elipse.js
new file mode 100644
index 00000000..73f0f278
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Elipse.js
@@ -0,0 +1,43 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.Elipse = function(attributes)
+{
+    var peer = web2d.peer.Toolkit.createElipse();
+    var defaultAttributes = {width:40, height:40, x:5, y:5,stroke:'1 solid black',fillColor:'blue'};
+    for (var key in attributes)
+    {
+        defaultAttributes[key] = attributes[key];
+    }
+    web2d.Element.call(this, peer, defaultAttributes);
+};
+objects.extend(web2d.Elipse, web2d.Element);
+
+web2d.Elipse.prototype.getType = function()
+{
+    return "Elipse";
+};
+
+/**
+ * @Todo: Complete Doc
+ */
+web2d.Elipse.prototype.getSize = function()
+{
+    return this._peer.getSize();
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/EventDispatcher.js b/trunk/web2d/src/main/javascript/EventDispatcher.js
new file mode 100644
index 00000000..7fd3fa4d
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/EventDispatcher.js
@@ -0,0 +1,84 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.EventDispatcher = function(element)
+{
+    this._listeners = [];
+    var dispatcher = this;
+
+    this.eventListener = function(event)
+    {
+        for (var i = 0; i < dispatcher._listeners.length; i++)
+        {
+            if (dispatcher._listeners[i] != null)
+            {
+                dispatcher._listeners[i].call(element, event || window.event);
+            }
+        }
+    };
+};
+
+web2d.EventDispatcher.prototype.addListener = function(type, listener)
+{
+    if (!listener)
+    {
+        throw "Listener can not be null.";
+    }
+    this._listeners.include(listener);
+};
+
+web2d.EventDispatcher.prototype.removeListener = function(type, listener)
+{
+    if (!listener)
+    {
+        throw "Listener can not be null.";
+    }
+
+    //    var found = false;
+    var length = this._listeners.length;
+
+    this._listeners.remove(listener);
+
+    var newLength = this._listeners.length;
+
+    if (newLength >= length)
+    {
+        throw "There is not listener to remove";
+    }
+    /*this._listeners = this._listeners.reject(function(iter)
+    {
+        if (iter == listener)
+        {
+            found = true;
+        }
+        return iter == listener;
+    });
+
+    // Could I remove any listener ?
+    if (!found)
+    {
+        throw "There is not listener to remove";
+    }*/
+
+};
+
+web2d.EventDispatcher.prototype.getListenersCount = function()
+{
+    return this._listeners.length;
+};
diff --git a/trunk/web2d/src/main/javascript/Font.js b/trunk/web2d/src/main/javascript/Font.js
new file mode 100644
index 00000000..08f1fe0d
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Font.js
@@ -0,0 +1,94 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.Font = function(fontFamily, textPeer)
+{
+    var font = "web2d.peer.Toolkit.create" + fontFamily + "Font();";
+    this._peer = eval(font);
+    this._textPeer = textPeer;
+};
+
+web2d.Font.prototype.getHtmlSize = function ()
+{
+    var scale = web2d.peer.utils.TransformUtil.workoutScale(this._textPeer);
+    return this._peer.getHtmlSize(scale);
+};
+
+web2d.Font.prototype.getGraphSize = function ()
+{
+    var scale = web2d.peer.utils.TransformUtil.workoutScale(this._textPeer);
+    return this._peer.getGraphSize(scale);
+};
+
+web2d.Font.prototype.getFontScale = function ()
+{
+    return web2d.peer.utils.TransformUtil.workoutScale(this._textPeer).height;
+};
+
+web2d.Font.prototype.getSize = function ()
+{
+    return this._peer.getSize();
+};
+
+web2d.Font.prototype.getStyle = function ()
+{
+    return this._peer.getStyle();
+};
+
+web2d.Font.prototype.getWeight = function ()
+{
+    return this._peer.getWeight();
+};
+
+web2d.Font.prototype.getFontFamily = function ()
+{
+    return this._peer.getFontFamily();
+};
+
+web2d.Font.prototype.setSize = function (size)
+{
+    return this._peer.setSize(size);
+};
+
+web2d.Font.prototype.setStyle = function (style)
+{
+    return this._peer.setStyle(style);
+};
+
+web2d.Font.prototype.setWeight = function (weight)
+{
+    return this._peer.setWeight(weight);
+};
+
+web2d.Font.prototype.getFont = function ()
+{
+    return this._peer.getFont();
+};
+
+web2d.Font.prototype.getWidthMargin = function ()
+{
+    return this._peer.getWidthMargin();
+};
+
+
+web2d.Font.ARIAL = "Arial";
+web2d.Font.TIMES = "Times";
+web2d.Font.TAHOMA = "Tahoma";
+web2d.Font.VERDANA = "Verdana";
+
diff --git a/trunk/web2d/src/main/javascript/Group.js b/trunk/web2d/src/main/javascript/Group.js
new file mode 100644
index 00000000..cdfdfc09
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Group.js
@@ -0,0 +1,159 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/**
+ * A group object can be used to collect shapes.
+ */
+web2d.Group = function(attributes)
+{
+    var peer = web2d.peer.Toolkit.createGroup();
+    var defaultAttributes = {width:50, height:50, x:50, y:50,coordOrigin:'0 0',coordSize:'50 50'};
+    for (var key in attributes)
+    {
+        defaultAttributes[key] = attributes[key];
+    }
+    web2d.Element.call(this, peer, defaultAttributes);
+};
+
+objects.extend(web2d.Group, web2d.Element);
+
+/**
+ * Remove an element as a child to the object.
+ */
+web2d.Group.prototype.removeChild = function(element)
+{
+    if (!element)
+    {
+        throw "Child element can not be null";
+    }
+
+    if (element == this)
+    {
+        throw "It's not posible to add the group as a child of itself";
+    }
+
+    var elementType = element.getType();
+    if (elementType == null)
+    {
+        throw "It seems not to be an element ->" + element;
+    }
+
+    this._peer.removeChild(element._peer);
+};
+
+/**
+ * Appends an element as a child to the object.
+ */
+web2d.Group.prototype.appendChild = function(element)
+{
+    if (!element)
+    {
+        throw "Child element can not be null";
+    }
+
+    if (element == this)
+    {
+        throw "It's not posible to add the group as a child of itself";
+    }
+
+    var elementType = element.getType();
+    if (elementType == null)
+    {
+        throw "It seems not to be an element ->" + element;
+    }
+
+    if (elementType == "Workspace")
+    {
+        throw "A group can not have a workspace as a child";
+    }
+
+    this._peer.appendChild(element._peer);
+};
+
+
+web2d.Group.prototype.getType = function()
+{
+    return "Group";
+};
+
+/**
+ * The group element is a containing blocks for this content - they define a CSS2 "block level box".
+ * Inside the containing block a local coordinate system is defined for any sub-elements using the coordsize and coordorigin attributes.
+ * All CSS2 positioning information is expressed in terms of this local coordinate space.
+ * Consequently CSS2 position attributes (left, top, width, height and so on) have no unit specifier -
+ * they are simple numbers, not CSS length quantities.
+ */
+web2d.Group.prototype.setCoordSize = function(width, height)
+{
+    this._peer.setCoordSize(width, height);
+};
+
+web2d.Group.prototype.getCoordSize = function(){
+    return this.peer.getCoordSize();
+};
+
+/**
+ * @Todo: Complete Doc
+ */
+web2d.Group.prototype.setCoordOrigin = function(x, y)
+{
+    this._peer.setCoordOrigin(x, y);
+};
+
+web2d.Group.prototype.getCoordOrigin = function(){
+    return this._peer.getCoordOrigin();
+};
+
+/**
+ * @Todo: Complete Doc
+ */
+web2d.Group.prototype.getSize = function()
+{
+    return this._peer.getSize();
+};
+
+web2d.Group.prototype.setFill = function(color, opacity)
+{
+    throw "Unsupported operation. Fill can not be set to a group";
+};
+
+web2d.Group.prototype.setStroke = function(width, style, color, opacity)
+{
+    throw "Unsupported operation. Stroke can not be set to a group";
+};
+
+web2d.Group.prototype.getCoordSize = function()
+{
+  return this._peer.getCoordSize();
+};
+
+web2d.Group.prototype.appendDomChild = function(DomElement)
+{
+        if (!DomElement)
+    {
+        throw "Child element can not be null";
+    }
+
+    if (DomElement == this)
+    {
+        throw "It's not posible to add the group as a child of itself";
+    }
+
+    this._peer._native.appendChild(DomElement);
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/Image.js b/trunk/web2d/src/main/javascript/Image.js
new file mode 100644
index 00000000..81c5b742
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Image.js
@@ -0,0 +1,44 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.Image = function(attributes)
+{
+    var peer = web2d.peer.Toolkit.createImage();
+    web2d.Element.call(this, peer, attributes);
+};
+objects.extend(web2d.Image, web2d.Element);
+
+web2d.Image.prototype.getType = function()
+{
+    return "Image";
+};
+
+web2d.Image.prototype.setHref = function(href)
+{
+    this._peer.setHref(href);
+};
+
+web2d.Image.prototype.getHref = function()
+{
+    return this._peer.getHref();
+};
+web2d.Image.prototype.getSize = function()
+{
+    return this._peer.getSize();
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/Issues.txt b/trunk/web2d/src/main/javascript/Issues.txt
new file mode 100644
index 00000000..eca6fc76
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Issues.txt
@@ -0,0 +1,17 @@
+- El Logger se come el procesador en Firefox. En el ejemplo del group.html si pones un logger que haga print de
+algo periodico se cuelga el Firefox.
+- Seria bueno que el tookit se inicialice bajo demanda, sin la necesidad de hacerlo por el usuario.
+- Workspace setStroke fixiar los styles.
+- Implementar setArrowStyle de svg en caso de ser necesario. 
+
+* Las funciones deben soportar el pasar objetos.?
+
+- Delete isolated Node, throws an exception.
+
+Test:
+
+* Remove children.
+* opacity,visibility
+
+
+
diff --git a/trunk/web2d/src/main/javascript/Line.js b/trunk/web2d/src/main/javascript/Line.js
new file mode 100644
index 00000000..8ee996e4
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Line.js
@@ -0,0 +1,69 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.Line = function(attributes)
+{
+    var peer = web2d.peer.Toolkit.createLine();
+    var defaultAttributes = {strokeColor:'#495879',strokeWidth:1};
+    for (var key in attributes)
+    {
+        defaultAttributes[key] = attributes[key];
+    }
+    web2d.Element.call(this, peer, defaultAttributes);
+};
+objects.extend(web2d.Line, web2d.Element);
+
+web2d.Line.prototype.getType = function()
+{
+    return "Line";
+};
+
+web2d.Line.prototype.setFrom = function(x, y)
+{
+    this._peer.setFrom(x, y);
+};
+
+web2d.Line.prototype.setTo = function(x, y)
+{
+    this._peer.setTo(x, y);
+};
+
+/**
+ * Defines the start and the end line arrow style.
+ * Can have values "none | block | classic | diamond | oval | open | chevron | doublechevron"
+ **/
+web2d.Line.prototype.setArrowStyle = function(startStyle, endStyle)
+{
+    this._peer.setArrowStyle(startStyle, endStyle);
+};
+
+web2d.Line.prototype.setPosition = function(cx, cy)
+{
+    throw "Unsupported operation";
+};
+
+web2d.Line.prototype.setSize = function(width, height)
+{
+    throw "Unsupported operation";
+};
+
+web2d.Line.prototype.setFill = function(color, opacity)
+{
+    throw "Unsupported operation";
+};
diff --git a/trunk/web2d/src/main/javascript/PolyLine.js b/trunk/web2d/src/main/javascript/PolyLine.js
new file mode 100644
index 00000000..455f2c2c
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/PolyLine.js
@@ -0,0 +1,89 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.PolyLine = function(attributes)
+{
+    var peer = web2d.peer.Toolkit.createPolyLine();
+    var defaultAttributes = {strokeColor:'blue',strokeWidth:1,strokeStyle:'solid',strokeOpacity:1};
+    for (var key in attributes)
+    {
+        defaultAttributes[key] = attributes[key];
+    }
+    web2d.Element.call(this, peer, defaultAttributes);
+};
+objects.extend(web2d.PolyLine, web2d.Element);
+
+web2d.PolyLine.prototype.getType = function()
+{
+    return "PolyLine";
+};
+
+web2d.PolyLine.prototype.setFrom = function(x, y)
+{
+    this._peer.setFrom(x, y);
+};
+
+web2d.PolyLine.prototype.setTo = function(x, y)
+{
+    this._peer.setTo(x, y);
+};
+
+web2d.PolyLine.prototype.setStyle = function(style)
+{
+    this._peer.setStyle(style);
+};
+
+web2d.PolyLine.prototype.getStyle = function()
+{
+    return this._peer.getStyle();
+};
+
+web2d.PolyLine.buildCurvedPath = function(dist, x1, y1, x2, y2)
+{
+    var signx = 1;
+    var signy = 1;
+    if (x2 < x1)
+    {
+        signx = -1;
+    }
+    if (y2 < y1)
+    {
+        signy = -1;
+    }
+
+    var path;
+    if (Math.abs(y1 - y2) > 2)
+    {
+        var middlex = x1 + ((x2 - x1 > 0) ? dist : -dist);
+        path = x1.toFixed(1) + ", " + y1.toFixed(1) + " " + middlex.toFixed(1) + ", " + y1.toFixed(1) + " " + middlex.toFixed(1) + ", " + (y2 - 5 * signy).toFixed(1) + " " + (middlex + 5 * signx).toFixed(1) + ", " + y2.toFixed(1) + " " + x2.toFixed(1) + ", " + y2.toFixed(1);
+    } else
+    {
+        path = x1.toFixed(1) + ", " + y1.toFixed(1) + " " + x2.toFixed(1) + ", " + y2.toFixed(1);
+    }
+
+    return path;
+};
+
+web2d.PolyLine.buildStraightPath = function(dist, x1, y1, x2, y2)
+{
+    var middlex = x1 + ((x2 - x1 > 0) ? dist : -dist);
+    return  x1 + ", " + y1 + " " + middlex + ", " + y1 + " " + middlex + ", " + y2 + " " + x2 + ", " + y2;
+};
+
+
diff --git a/trunk/web2d/src/main/javascript/Rect.js b/trunk/web2d/src/main/javascript/Rect.js
new file mode 100644
index 00000000..e1df99f9
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Rect.js
@@ -0,0 +1,59 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/**
+ * Create a rectangle and variations of a rectangle shape.
+ * arc must be specified to create rounded rectangles.
+ * arc = "<length>"
+ *     For rounded rectangles, radius of the ellipse used to round off the corners of the rectangle.
+ */
+web2d.Rect = function(arc, attributes)
+{
+    if (arc && arc > 1)
+    {
+        throw "Arc must be 0<=arc<=1";
+    }
+    if (arguments.length <= 0)
+    {
+        var rx = 0;
+        var ry = 0;
+    }
+
+    var peer = web2d.peer.Toolkit.createRect(arc);
+    var defaultAttributes = {width:40, height:40, x:5, y:5,stroke:'1 solid black',fillColor:'green'};
+    for (var key in attributes)
+    {
+        defaultAttributes[key] = attributes[key];
+    }
+    web2d.Element.call(this, peer, defaultAttributes);
+};
+objects.extend(web2d.Rect, web2d.Element);
+
+web2d.Rect.prototype.getType = function()
+{
+    return "Rect";
+};
+
+/**
+ * @Todo: Complete Doc
+ */
+web2d.Rect.prototype.getSize = function()
+{
+    return this._peer.getSize();
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/Text.js b/trunk/web2d/src/main/javascript/Text.js
new file mode 100644
index 00000000..63ea5654
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Text.js
@@ -0,0 +1,100 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.Text = function(attributes)
+{
+    var peer = web2d.peer.Toolkit.createText();
+    web2d.Element.call(this, peer, attributes);
+};
+objects.extend(web2d.Text, web2d.Element);
+
+web2d.Text.prototype.getType = function()
+{
+    return "Text";
+};
+
+web2d.Text.prototype.setText = function(text)
+{
+    this._peer.setText(text);
+};
+
+web2d.Text.prototype.setTextSize = function(width, height)
+{
+    this._peer.setContentSize(width, height);
+};
+
+web2d.Text.prototype.getText = function()
+{
+    return this._peer.getText();
+};
+
+web2d.Text.prototype.setFont = function(font, size, style, weight)
+{
+    this._peer.setFont(font, size, style, weight);
+};
+
+web2d.Text.prototype.setColor = function(color)
+{
+    this._peer.setColor(color);
+};
+
+web2d.Text.prototype.getColor = function()
+{
+    return this._peer.getColor();
+};
+
+web2d.Text.prototype.setStyle = function(style)
+{
+    this._peer.setStyle(style);
+};
+
+web2d.Text.prototype.setWeight = function(weight)
+{
+    this._peer.setWeight(weight);
+};
+
+web2d.Text.prototype.setFontFamily = function(family)
+{
+    this._peer.setFontFamily(family);
+};
+
+web2d.Text.prototype.getFont = function()
+{
+    return this._peer.getFont();
+};
+
+web2d.Text.prototype.setSize = function(size)
+{
+    this._peer.setSize(size);
+};
+
+web2d.Text.prototype.getHtmlFontSize = function()
+{
+    return this._peer.getHtmlFontSize();
+};
+
+web2d.Text.prototype.getWidth = function()
+{
+    return this._peer.getWidth();
+};
+
+web2d.Text.prototype.getHeight = function()
+{
+    return parseInt(this._peer.getHeight());
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/Toolkit.js b/trunk/web2d/src/main/javascript/Toolkit.js
new file mode 100644
index 00000000..3e187cba
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Toolkit.js
@@ -0,0 +1,145 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.ToolkitVML =
+{
+    init: function()
+    {
+        var domDocument = window.document;
+        //ownerDocument;
+        // Add VML includes and namespace
+        domDocument.namespaces.add("v", "urn:schemas-microsoft-com:vml");
+
+        var style = domDocument.createStyleSheet();
+        style.addRule('v\\:*', "behavior: url(#default#VML);");
+    },
+    createWorkspace: function(element)
+    {
+        return new web2d.peer.vml.WorkspacePeer(element);
+    },
+    createGroup: function()
+    {
+        return new web2d.peer.vml.GroupPeer();
+    },
+    createElipse: function()
+    {
+        return new web2d.peer.vml.ElipsePeer();
+    },
+    createLine: function()
+    {
+        return new web2d.peer.vml.LinePeer();
+    },
+    createPolyLine: function()
+    {
+        return new web2d.peer.vml.PolyLinePeer();
+    },
+    createImage: function ()
+    {
+        return new web2d.peer.vml.ImagePeer();
+    },
+    createText: function ()
+    {
+        return new web2d.peer.vml.TextBoxPeer();
+    },
+    createRect: function(arc)
+
+    {
+        return new web2d.peer.vml.RectPeer(arc);
+    },
+    createArialFont: function()
+    {
+        return new web2d.peer.vml.ArialFont();
+    },
+    createTimesFont: function()
+    {
+        return new web2d.peer.vml.TimesFont();
+    },
+    createVerdanaFont: function()
+    {
+        return new web2d.peer.vml.VerdanaFont();
+    },
+    createTahomaFont: function()
+    {
+        return new web2d.peer.vml.TahomaFont();
+    }
+
+};
+
+web2d.peer.ToolkitSVG =
+{
+    init: function()
+    {
+    },
+    createWorkspace: function(element)
+    {
+        return new web2d.peer.svg.WorkspacePeer(element);
+    },
+    createGroup: function(element)
+    {
+        return new web2d.peer.svg.GroupPeer();
+    },
+    createElipse: function()
+    {
+        return new web2d.peer.svg.ElipsePeer();
+    },
+    createLine: function()
+    {
+        return new web2d.peer.svg.LinePeer();
+    },
+    createPolyLine: function()
+    {
+        return new web2d.peer.svg.PolyLinePeer();
+    },
+    createText: function ()
+    {
+        return new web2d.peer.svg.TextPeer();
+    },
+    createImage: function ()
+    {
+        return new web2d.peer.svg.ImagePeer();
+    },
+    createRect: function(arc)
+    {
+        return new web2d.peer.svg.RectPeer(arc);
+    },
+    createArialFont: function()
+    {
+        return new web2d.peer.svg.ArialFont();
+    },
+    createTimesFont: function()
+    {
+        return new web2d.peer.svg.TimesFont();
+    },
+    createVerdanaFont: function()
+    {
+        return new web2d.peer.svg.VerdanaFont();
+    },
+    createTahomaFont: function()
+    {
+        return new web2d.peer.svg.TahomaFont();
+    }
+};
+
+if (core.UserAgent.isSVGSupported())
+{
+    web2d.peer.Toolkit = web2d.peer.ToolkitSVG;
+} else
+{
+    web2d.peer.Toolkit = web2d.peer.ToolkitVML;
+}
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/Workspace.js b/trunk/web2d/src/main/javascript/Workspace.js
new file mode 100644
index 00000000..74d69f21
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/Workspace.js
@@ -0,0 +1,260 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.Workspace = function(attributes)
+{
+    this._htmlContainer = this._createDivContainer();
+
+    var peer = web2d.peer.Toolkit.createWorkspace(this._htmlContainer);
+    var defaultAttributes = {width:'200px',height:'200px',stroke:'1px solid #edf1be',
+        fillColor:"white",coordOrigin:'0 0',coordSize:'200 200' };
+    for (var key in attributes)
+    {
+        defaultAttributes[key] = attributes[key];
+    }
+    web2d.Element.call(this, peer, defaultAttributes);
+    this._htmlContainer.appendChild(this._peer._native);
+
+    this._disableTextSelection();
+};
+
+objects.extend(web2d.Workspace, web2d.Element);
+
+/**
+ * Avoid element selection. This remove some odd effect in IE when a element is draged.
+ */
+web2d.Workspace.prototype._disableTextSelection = function()
+{
+    var contaier = this._htmlContainer;
+
+    function disabletext(e) {
+        return false;
+    }
+    ;
+
+    function reEnable() {
+        return true;
+    }
+    ;
+
+    //if the browser is IE4+
+    contaier.onselectstart = new Function("return false");
+
+    //if the browser is NS6
+    if (window.sidebar)
+    {
+        contaier.onmousedown = disabletext;
+        contaier.onclick = reEnable;
+    }
+    ;
+};
+
+web2d.Workspace.prototype.getType = function()
+{
+    return "Workspace";
+};
+/**
+ * Appends an element as a child to the object.
+ */
+web2d.Workspace.prototype.appendChild = function(element)
+{
+    if (!element)
+    {
+        throw "Child element can not be null";
+    }
+    var elementType = element.getType();
+    if (elementType == null)
+    {
+        throw "It seems not to be an element ->" + element;
+    }
+
+    if (elementType == "Workspace")
+    {
+        throw "A workspace can not have a workspace as a child";
+    }
+
+    this._peer.appendChild(element._peer);
+};
+
+/**
+ * @todo: Write doc.
+ */
+web2d.Workspace.prototype.addItAsChildTo = function(element)
+{
+    if (!element)
+    {
+        throw "Workspace div container can not be null";
+    }
+    element.appendChild(this._htmlContainer);
+};
+
+/**
+ * Create a new div element that will be resposible for containing the workspace elements.
+ */
+web2d.Workspace.prototype._createDivContainer = function(domElement)
+{
+    var container = window.document.createElement("div");
+    container.id = "workspaceContainer";
+    container.style.overflow = "hidden";
+    container.style.position = "relative";
+    container.style.top = "0px";
+    container.style.left = "0px";
+    container.style.height = "688px";
+    container.style.border = '1px solid red';
+
+    return container;
+};
+
+/**
+ *  Set the workspace area size. It can be defined using different units:
+ * in (inches; 1in=2.54cm)
+ * cm (centimeters; 1cm=10mm)
+ * mm (millimeters)
+ * pt (points; 1pt=1/72in)
+ * pc (picas; 1pc=12pt)
+ */
+web2d.Workspace.prototype.setSize = function(width, height)
+{
+    // HTML container must have the size of the group element.
+    if (core.Utils.isDefined(width))
+    {
+        this._htmlContainer.style.width = width;
+
+    }
+
+    if (core.Utils.isDefined(height))
+    {
+        this._htmlContainer.style.height = height;
+    }
+    this._peer.setSize(width, height);
+};
+
+/**
+ * The workspace element is a containing blocks for this content - they define a CSS2 "block level box".
+ * Inside the containing block a local coordinate system is defined for any sub-elements using the coordsize and coordorigin attributes.
+ * All CSS2 positioning information is expressed in terms of this local coordinate space.
+ * Consequently CSS2 position attributes (left, top, width, height and so on) have no unit specifier -
+ * they are simple numbers, not CSS length quantities.
+ */
+web2d.Workspace.prototype.setCoordSize = function(width, height)
+{
+    this._peer.setCoordSize(width, height);
+};
+
+/**
+ * @Todo: Complete Doc
+ */
+web2d.Workspace.prototype.setCoordOrigin = function(x, y)
+{
+    this._peer.setCoordOrigin(x, y);
+};
+
+/**
+ * @Todo: Complete Doc
+ */
+web2d.Workspace.prototype.getCoordOrigin = function()
+{
+    return this._peer.getCoordOrigin();
+};
+
+
+// Private method declaration area
+/**
+ * All the VML or SVG elements will be children of this HTML element.
+ */
+web2d.Workspace.prototype._getHtmlContainer = function()
+{
+    return this._htmlContainer;
+};
+
+web2d.Workspace.prototype.setFill = function(color, opacity)
+{
+    this._htmlContainer.style.backgroundColor = color;
+    if (opacity || opacity === 0)
+    {
+        throw "Unsupported operation. Opacity not supported.";
+    }
+};
+
+web2d.Workspace.prototype.getFill = function()
+{
+    var color = this._htmlContainer.style.backgroundColor;
+    return {color:color};
+};
+
+/**
+ * @Todo: Complete Doc
+ */
+web2d.Workspace.prototype.getSize = function()
+{
+    var width = this._htmlContainer.style.width;
+    var height = this._htmlContainer.style.height;
+    return {width:width,height:height};
+};
+
+web2d.Workspace.prototype.setStroke = function(width, style, color, opacity)
+{
+    if (style != 'solid')
+    {
+        throw 'Not supported style stroke style:' + style;
+    }
+    this._htmlContainer.style.border = width + ' ' + style + ' ' + color;
+
+    if (opacity || opacity === 0)
+    {
+        throw "Unsupported operation. Opacity not supported.";
+    }
+};
+
+
+web2d.Workspace.prototype.getCoordSize = function()
+{
+    return this._peer.getCoordSize();
+};
+
+/**
+ * Remove an element as a child to the object.
+ */
+web2d.Workspace.prototype.removeChild = function(element)
+{
+    if (!element)
+    {
+        throw "Child element can not be null";
+    }
+
+    if (element == this)
+    {
+        throw "It's not posible to add the group as a child of itself";
+    }
+
+    var elementType = element.getType();
+    if (elementType == null)
+    {
+        throw "It seems not to be an element ->" + element;
+    }
+
+    this._peer.removeChild(element._peer);
+};
+
+
+web2d.Workspace.prototype.dumpNativeChart = function()
+{
+    var elem = this._htmlContainer
+    return elem.innerHTML;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/header.js b/trunk/web2d/src/main/javascript/header.js
new file mode 100644
index 00000000..1c2db9d3
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/header.js
@@ -0,0 +1,26 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+var web2d = {};
+web2d.peer =
+{
+svg: {},
+vml: {}
+};
+web2d.peer.utils = {};
diff --git a/trunk/web2d/src/main/javascript/peer/svg/ArialFont.js b/trunk/web2d/src/main/javascript/peer/svg/ArialFont.js
new file mode 100644
index 00000000..ce98e479
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/ArialFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.ArialFont = function()
+{
+    web2d.peer.svg.Font.call(this);
+    this._fontFamily="Arial";
+};
+
+objects.extend(web2d.peer.svg.ArialFont, web2d.peer.svg.Font);
+
+web2d.peer.svg.ArialFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.svg.ArialFont.prototype.getFont=function ()
+{
+    return web2d.Font.ARIAL;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/ElementPeer.js b/trunk/web2d/src/main/javascript/peer/svg/ElementPeer.js
new file mode 100644
index 00000000..d8e3615d
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/ElementPeer.js
@@ -0,0 +1,311 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.ElementPeer = function(svgElement)
+{
+    this._native = svgElement;
+    this._dblClickListeners = new Hash();
+    this._size = {width:1,height:1};
+    this._changeListeners = {};
+    // http://support.adobe.com/devsup/devsup.nsf/docs/50493.htm
+};
+
+web2d.peer.svg.ElementPeer.prototype.svgNamespace = 'http://www.w3.org/2000/svg';
+web2d.peer.svg.ElementPeer.prototype.linkNamespace = 'http://www.w3.org/1999/xlink';
+
+web2d.peer.svg.ElementPeer.prototype.setChildren = function(children)
+{
+    this._children = children;
+};
+
+web2d.peer.svg.ElementPeer.prototype.getChildren = function()
+{
+    var result = this._children;
+    if (!result)
+    {
+        result = [];
+        this._children = result;
+    }
+    return result;
+};
+
+web2d.peer.svg.ElementPeer.prototype.getParent = function()
+{
+    return this._parent;
+};
+
+web2d.peer.svg.ElementPeer.prototype.setParent = function(parent)
+{
+    this._parent = parent;
+};
+
+web2d.peer.svg.ElementPeer.prototype.appendChild = function(elementPeer)
+{
+    // Store parent and child relationship.
+    elementPeer.setParent(this);
+    var children = this.getChildren();
+    children.include(elementPeer);
+
+    // Append element as a child.
+    this._native.appendChild(elementPeer._native);
+
+    // Broadcast events ...
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "strokeStyle");
+};
+
+
+web2d.peer.svg.ElementPeer.prototype.removeChild = function(elementPeer)
+{
+    // Store parent and child relationship.
+    elementPeer.setParent(null);
+    var children = this.getChildren();
+
+    // Remove from children array ...
+    var length = children.length;
+
+    children.remove(elementPeer);
+
+    var newLength = children.length;
+    if (newLength >= length)
+    {
+        throw "Could not remove the element.";
+    }
+    /*var found = false;
+    children = children.reject(function(iter)
+    {
+        var equals = (iter._native == elementPeer._native);
+        if (equals)
+        {
+            found = true;
+        }
+        return equals;
+    });
+
+    // Could found the element ?
+    if (!found)
+    {
+        throw "Could not remove the element.";
+    }*/
+
+    // Append element as a child.
+    this._native.removeChild(elementPeer._native);
+};
+
+/**
+ * http://www.w3.org/TR/DOM-Level-3-Events/events.html
+ * http://developer.mozilla.org/en/docs/addEventListener
+ */
+web2d.peer.svg.ElementPeer.prototype.addEventListener = function(type, listener)
+{
+    if (type == 'dblclick')
+    {
+        // This is workaround to support double click...
+        var dblListener = function(e)
+        {
+            if (e.detail >= 2)
+            {
+                listener.call(this, e);
+            }
+        };
+
+        this._dblClickListeners[listener] = dblListener;
+        this._native.addEventListener(type, dblListener, false);
+    } else
+    {
+        this._native.addEventListener(type, listener, false);
+    }
+};
+
+web2d.peer.svg.ElementPeer.prototype.removeEventListener = function(type, listener)
+{
+    if (type == 'dblclick')
+    {
+        // This is workaround to support double click...
+        var dblClickListener = this._dblClickListeners[listener];
+        if (dblClickListener == null)
+        {
+            throw "Could not find listener to remove";
+        }
+        type = 'click';
+        this._native.removeEventListener(type, dblClickListener, false);
+        delete this._dblClickListeners[listener];
+    } else
+    {
+        this._native.removeEventListener(type, listener, false);
+    }
+};
+
+web2d.peer.svg.ElementPeer.prototype.setSize = function(width, height)
+{
+    if (core.Utils.isDefined(width))
+    {
+        this._size.width = parseInt(width);
+        this._native.setAttribute('width', parseInt(width));
+    }
+
+    if (core.Utils.isDefined(height))
+    {
+        this._size.height = parseInt(height);
+        this._native.setAttribute('height', parseInt(height));
+    }
+
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "strokeStyle");
+};
+
+web2d.peer.svg.ElementPeer.prototype.getSize = function()
+{
+    return {width:this._size.width,height:this._size.height};
+};
+
+web2d.peer.svg.ElementPeer.prototype.setFill = function(color, opacity)
+{
+    if (core.Utils.isDefined(color))
+    {
+        this._native.setAttribute('fill', color);
+    }
+    if (core.Utils.isDefined(opacity))
+    {
+        this._native.setAttribute('fill-opacity', opacity);
+    }
+};
+
+web2d.peer.svg.ElementPeer.prototype.getFill = function()
+{
+    var color = this._native.getAttribute('fill');
+    var opacity = this._native.getAttribute('fill-opacity');
+    return {color:color, opacity:Number(opacity)};
+};
+
+web2d.peer.svg.ElementPeer.prototype.getStroke = function()
+{
+    var vmlStroke = this._native;
+    var color = vmlStroke.getAttribute('stroke');
+    var dashstyle = this._stokeStyle;
+    var opacity = vmlStroke.getAttribute('stroke-opacity');
+    var width = vmlStroke.getAttribute('stroke-width');
+    return {color: color, style: dashstyle, opacity: opacity, width: width};
+};
+
+web2d.peer.svg.ElementPeer.prototype.__stokeStyleToStrokDasharray = {solid:[],dot:[1,3],dash:[4,3],longdash:[10,2],dashdot:[5,3,1,3]};
+web2d.peer.svg.ElementPeer.prototype.setStroke = function(width, style, color, opacity)
+{
+    if (core.Utils.isDefined(width))
+    {
+        this._native.setAttribute('stroke-width', width + "px");
+    }
+    if (core.Utils.isDefined(color))
+    {
+        this._native.setAttribute('stroke', color);
+    }
+    if (core.Utils.isDefined(style))
+    {
+        // Scale the dash array in order to be equal to VML. In VML, stroke style doesn't scale.
+        var dashArrayPoints = this.__stokeStyleToStrokDasharray[style];
+        var scale = 1 / web2d.peer.utils.TransformUtil.workoutScale(this).width;
+
+        var strokeWidth = this._native.getAttribute('stroke-width');
+        strokeWidth = parseFloat(strokeWidth);
+
+        var scaledPoints = [];
+        for (var i = 0; i < dashArrayPoints.length; i++)
+        {
+            // VML scale the stroke based on the stroke width.
+            scaledPoints[i] = dashArrayPoints[i] * strokeWidth;
+
+            // Scale the points based on the scale.
+            scaledPoints[i] = (scaledPoints[i] * scale) + "px";
+        }
+
+        //        this._native.setAttribute('stroke-dasharray', scaledPoints);
+        this._stokeStyle = style;
+    }
+
+    if (core.Utils.isDefined(opacity))
+    {
+        this._native.setAttribute('stroke-opacity', opacity);
+    }
+};
+
+/*
+* style='visibility: visible'
+*/
+web2d.peer.svg.ElementPeer.prototype.setVisibility = function(isVisible)
+{
+    this._native.setAttribute('visibility', (isVisible) ? 'visible' : 'hidden');
+};
+
+web2d.peer.svg.ElementPeer.prototype.isVisible = function()
+{
+    var visibility = this._native.getAttribute('visibility');
+    return !(visibility == 'hidden');
+};
+
+web2d.peer.svg.ElementPeer.prototype.updateStrokeStyle = function()
+{
+    var strokeStyle = this._stokeStyle;
+    if (this.getParent())
+    {
+        if (strokeStyle && strokeStyle != 'solid')
+        {
+            this.setStroke(null, strokeStyle);
+        }
+    }
+};
+
+web2d.peer.svg.ElementPeer.prototype.attachChangeEventListener = function(type, listener)
+{
+    var listeners = this.getChangeEventListeners(type);
+    if (!listener)
+    {
+        throw "Listener can not be null";
+    }
+    listeners.push(listener);
+};
+
+web2d.peer.svg.ElementPeer.prototype.getChangeEventListeners = function(type)
+{
+    var listeners = this._changeListeners[type];
+    if (!listeners)
+    {
+        listeners = [];
+        this._changeListeners[type] = listeners;
+    }
+    return listeners;
+};
+
+/**
+ * Move element to the front
+ */
+web2d.peer.svg.ElementPeer.prototype.moveToFront = function()
+{
+    this._native.parentNode.appendChild(this._native);
+};
+
+/**
+ * Move element to the back
+ */
+web2d.peer.svg.ElementPeer.prototype.moveToBack = function()
+{
+    this._native.parentNode.insertBefore(this._native, this._native.parentNode.firstChild);
+};
+
+web2d.peer.svg.ElementPeer.prototype.setCursor = function(type)
+{
+    this._native.style.cursor = type;
+};
diff --git a/trunk/web2d/src/main/javascript/peer/svg/ElipsePeer.js b/trunk/web2d/src/main/javascript/peer/svg/ElipsePeer.js
new file mode 100644
index 00000000..2cfe666f
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/ElipsePeer.js
@@ -0,0 +1,70 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.ElipsePeer = function()
+{
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'ellipse');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this.attachChangeEventListener("strokeStyle", web2d.peer.svg.ElementPeer.prototype.updateStrokeStyle);
+    this._position={x:0, y:0};
+};
+
+objects.extend(web2d.peer.svg.ElipsePeer, web2d.peer.svg.ElementPeer);
+
+web2d.peer.svg.ElipsePeer.prototype.setSize = function(width, height)
+{
+    web2d.peer.svg.ElipsePeer.superClass.setSize.call(this, width, height);
+    if (core.Utils.isDefined(width))
+    {
+        this._native.setAttribute('rx', width / 2);
+    }
+
+    if (core.Utils.isDefined(height))
+    {
+        this._native.setAttribute('ry', height / 2);
+    }
+
+    var pos = this.getPosition();
+    this.setPosition(pos.x, pos.y);
+};
+
+web2d.peer.svg.ElipsePeer.prototype.setPosition = function(cx, cy)
+{
+    var size =this.getSize();
+    cx =cx + size.width/2;
+    cy =cy + size.height/2;
+    if (core.Utils.isDefined(cx))
+    {
+        this._native.setAttribute('cx', cx);
+    }
+
+    if (core.Utils.isDefined(cy))
+    {
+        this._native.setAttribute('cy', cy);
+    }
+};
+
+web2d.peer.svg.ElipsePeer.prototype.getPosition = function()
+{
+//    var x = this._native.getAttribute('cx');
+//    var y = this._native.getAttribute('cy');
+//    return {x:parseInt(x),y:parseInt(y)};
+    return this._position;
+};
+
diff --git a/trunk/web2d/src/main/javascript/peer/svg/Font.js b/trunk/web2d/src/main/javascript/peer/svg/Font.js
new file mode 100644
index 00000000..d441df6e
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/Font.js
@@ -0,0 +1,109 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.Font = function()
+{
+    this._size = 10;
+    this._style = "normal";
+    this._weight = "normal";
+};
+
+web2d.peer.svg.Font.prototype.init = function(args)
+{
+    if (core.Utils.isDefined(args.size))
+    {
+        this._size = parseInt(args.size);
+    }
+    if (core.Utils.isDefined(args.style))
+    {
+        this._style = args.style;
+    }
+    if (core.Utils.isDefined(args.weight))
+    {
+        this._weight = args.weight;
+    }
+};
+
+web2d.peer.svg.Font.prototype.getHtmlSize = function (scale)
+{
+    var result = 0;
+    if (this._size == 6)
+    {
+        result = this._size * scale.height * 43 / 32;
+    }
+    if (this._size == 8)
+    {
+        result = this._size * scale.height * 42 / 32;
+    }
+    else if (this._size == 10)
+    {
+        result = this._size * scale.height * 42 / 32;
+    }
+    else if (this._size == 15)
+    {
+        result = this._size * scale.height * 42 / 32;
+    }
+
+    return result;
+};
+
+web2d.peer.svg.Font.prototype.getGraphSize = function (scale)
+{
+    return this._size * 43 / 32;
+};
+
+web2d.peer.svg.Font.prototype.getSize = function ()
+{
+    return parseInt(this._size);
+};
+
+web2d.peer.svg.Font.prototype.getStyle = function ()
+{
+    return this._style;
+};
+
+web2d.peer.svg.Font.prototype.getWeight = function ()
+{
+    return this._weight;
+};
+
+web2d.peer.svg.Font.prototype.setSize = function (size)
+{
+    this._size = size;
+};
+
+web2d.peer.svg.Font.prototype.setStyle = function (style)
+{
+    this._style = style;
+};
+
+web2d.peer.svg.Font.prototype.setWeight = function (weight)
+{
+    this._weight = weight;
+};
+
+web2d.peer.svg.Font.prototype.getWidthMargin = function ()
+{
+    var result = 0;
+    if (this._size == 10 || this._size == 6)
+    {
+        result = 4;
+    }
+    return result;
+};
diff --git a/trunk/web2d/src/main/javascript/peer/svg/GroupPeer.js b/trunk/web2d/src/main/javascript/peer/svg/GroupPeer.js
new file mode 100644
index 00000000..879584b7
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/GroupPeer.js
@@ -0,0 +1,132 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.GroupPeer = function()
+{
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'g');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this._native.setAttribute("preserveAspectRatio", "none");
+    this._coordSize = {width:1,height:1};
+    this._native.setAttribute("focusable","true");
+    this._position = {x:0,y:0};
+    this._coordOrigin = {x:0,y:0};
+};
+
+objects.extend(web2d.peer.svg.GroupPeer, web2d.peer.svg.ElementPeer);
+
+/*web2d.peer.svg.GroupPeer.prototype.setPosition = function(cx, cy)
+{
+    this._native.setAttribute("transform", "translate(" + parseInt(cx) + " " + parseInt(cy) + ")");
+};*/
+
+web2d.peer.svg.GroupPeer.prototype.setCoordSize = function(width, height)
+{
+    this._coordSize.width = width;
+    this._coordSize.height = height;
+    this.updateTransform();
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "strokeStyle");
+};
+
+web2d.peer.svg.GroupPeer.prototype.getCoordSize = function()
+{
+    return {width:this._coordSize.width,height:this._coordSize.height};
+};
+
+/**
+ * http://www.w3.org/TR/SVG/coords.html#TransformAttribute
+ * 7.6 The transform  attribute
+ *
+ * The value of the transform attribute is a <transform-list>, which is defined as a list of transform definitions, which are applied in the order provided. The individual transform definitions are separated by whitespace and/or a comma. The available types of transform definitions include:
+ *
+ *    * matrix(<a> <b> <c> <d> <e> <f>), which specifies a transformation in the form of a transformation matrix of six values. matrix(a,b,c,d,e,f) is equivalent to applying the transformation matrix [a b c d e f].
+ *
+ *    * translate(<tx> [<ty>]), which specifies a translation by tx and ty. If <ty> is not provided, it is assumed to be zero.
+ *
+ *    * scale(<sx> [<sy>]), which specifies a scale operation by sx and sy. If <sy> is not provided, it is assumed to be equal to <sx>.
+ *
+ *    * rotate(<rotate-angle> [<cx> <cy>]), which specifies a rotation by <rotate-angle> degrees about a given point.
+ *      If optional parameters <cx> and <cy> are not supplied, the rotate is about the origin of the current user coordinate system. The operation corresponds to the matrix [cos(a) sin(a) -sin(a) cos(a) 0 0].
+ *      If optional parameters <cx> and <cy> are supplied, the rotate is about the point (<cx>, <cy>). The operation represents the equivalent of the following specification: translate(<cx>, <cy>) rotate(<rotate-angle>) translate(-<cx>, -<cy>).
+ *
+ *    * skewX(<skew-angle>), which specifies a skew transformation along the x-axis.
+ *
+ *    * skewY(<skew-angle>), which specifies a skew transformation along the y-axis.
+ **/
+
+web2d.peer.svg.GroupPeer.prototype.updateTransform = function()
+{
+    var sx = this._size.width / this._coordSize.width;
+    var sy = this._size.height / this._coordSize.height;
+
+    var cx = this._position.x - this._coordOrigin.x * sx;
+    var cy = this._position.y - this._coordOrigin.y * sy;
+
+    //Logger.logMsg("Group.updateTrasform:"+"translate("+ cx + "," + cy+ ") scale("+ sx + "," + sy + ")");
+    this._native.setAttribute("transform", "translate(" + cx + "," + cy + ") scale(" + sx + "," + sy + ")");
+};
+
+web2d.peer.svg.GroupPeer.prototype.setCoordOrigin = function(x, y)
+{
+    if (core.Utils.isDefined(x))
+    {
+        this._coordOrigin.x = x;
+    }
+
+    if (core.Utils.isDefined(y))
+    {
+        this._coordOrigin.y = y;
+    }
+    this.updateTransform();
+};
+
+web2d.peer.svg.GroupPeer.prototype.setSize = function(width, height)
+{
+    web2d.peer.svg.GroupPeer.superClass.setSize.call(this, width, height);
+    this.updateTransform();
+};
+
+web2d.peer.svg.GroupPeer.prototype.setPosition = function(x, y)
+{
+    if (core.Utils.isDefined(x))
+    {
+        this._position.x = parseInt(x);
+    }
+
+    if (core.Utils.isDefined(y))
+    {
+        this._position.y = parseInt(y);
+    }
+    this.updateTransform();
+};
+
+web2d.peer.svg.GroupPeer.prototype.getPosition = function()
+{
+    return {x:this._position.x,y:this._position.y};
+};
+
+web2d.peer.svg.GroupPeer.prototype.appendChild = function(child)
+{
+    web2d.peer.svg.GroupPeer.superClass.appendChild.call(this, child);
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(child, "onChangeCoordSize");
+};
+
+web2d.peer.svg.GroupPeer.prototype.getCoordOrigin = function ()
+{
+    return {x:this._coordOrigin.x, y:this._coordOrigin.y};
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/ImagePeer.js b/trunk/web2d/src/main/javascript/peer/svg/ImagePeer.js
new file mode 100644
index 00000000..94dae897
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/ImagePeer.js
@@ -0,0 +1,52 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.ImagePeer = function()
+{
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'image');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this._position = {x:0,y:0};
+    this._href="";
+};
+
+objects.extend(web2d.peer.svg.ImagePeer, web2d.peer.svg.ElementPeer);
+
+web2d.peer.svg.ImagePeer.prototype.setPosition = function(x, y)
+{
+    this._position = {x:x, y:y};
+    this._native.setAttribute('y', y);
+    this._native.setAttribute('x', x);
+};
+
+
+web2d.peer.svg.ImagePeer.prototype.getPosition = function()
+{
+    return this._position;
+};
+
+web2d.peer.svg.ImagePeer.prototype.setHref = function(url)
+{
+    this._native.setAttributeNS(this.linkNamespace, "href", url);
+    this._href = url;
+};
+
+web2d.peer.svg.ImagePeer.prototype.getHref = function()
+{
+    return this._href;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/LinePeer.js b/trunk/web2d/src/main/javascript/peer/svg/LinePeer.js
new file mode 100644
index 00000000..5e8cef31
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/LinePeer.js
@@ -0,0 +1,55 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.LinePeer = function()
+{
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'line');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this.attachChangeEventListener("strokeStyle", web2d.peer.svg.ElementPeer.prototype.updateStrokeStyle);
+};
+
+objects.extend(web2d.peer.svg.LinePeer, web2d.peer.svg.ElementPeer);
+
+web2d.peer.svg.LinePeer.prototype.setFrom = function(x1, y1)
+{
+    this._native.setAttribute('x1', x1);
+    this._native.setAttribute('y1', y1);
+};
+
+web2d.peer.svg.LinePeer.prototype.setTo = function(x2, y2)
+{
+    this._native.setAttribute('x2', x2);
+    this._native.setAttribute('y2', y2);
+};
+
+/*
+* http://www.zvon.org/HowTo/Output/howto_jj_svg_27.html?at=marker-end
+*/
+web2d.peer.svg.LinePeer.prototype.setArrowStyle = function(startStyle, endStyle)
+{
+    if (core.Utils.isDefined(startStyle))
+    {
+        // Todo: This must be implemented ...
+    }
+
+    if (core.Utils.isDefined(endStyle))
+    {
+        // Todo: This must be implemented ...
+    }
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/PolyLinePeer.js b/trunk/web2d/src/main/javascript/peer/svg/PolyLinePeer.js
new file mode 100644
index 00000000..ce619659
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/PolyLinePeer.js
@@ -0,0 +1,122 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.PolyLinePeer = function()
+{
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'polyline');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this.setFill("none");
+    this.breakDistance = 10;
+};
+
+objects.extend(web2d.peer.svg.PolyLinePeer, web2d.peer.svg.ElementPeer);
+
+web2d.peer.svg.PolyLinePeer.prototype.setFrom = function(x1, y1)
+{
+    this._x1 = x1;
+    this._y1 = y1;
+    this._updatePath();
+};
+
+web2d.peer.svg.PolyLinePeer.prototype.setTo = function(x2, y2)
+{
+    this._x2 = x2;
+    this._y2 = y2;
+    this._updatePath();
+};
+
+web2d.peer.svg.PolyLinePeer.prototype.setStrokeWidth = function(width)
+{
+    this._native.setAttribute('stroke-width', width);
+};
+
+web2d.peer.svg.PolyLinePeer.prototype.setColor = function(color)
+{
+    this._native.setAttribute('stroke', color);
+};
+
+web2d.peer.svg.PolyLinePeer.prototype.setStyle = function(style)
+{
+    this._style = style;
+    this._updatePath();
+};
+
+web2d.peer.svg.PolyLinePeer.prototype.getStyle = function()
+{
+    return this._style;
+};
+
+web2d.peer.svg.PolyLinePeer.prototype._updatePath = function()
+{
+    if (this._style == "Curved")
+    {
+        this._updateMiddleCurvePath();
+    }
+    else if (this._style == "Straight")
+    {
+        this._updateStraightPath();
+    }
+    else
+    {
+        this._updateCurvePath();
+    }
+};
+
+web2d.peer.svg.PolyLinePeer.prototype._updateStraightPath = function()
+{
+    if (core.Utils.isDefined(this._x1) && core.Utils.isDefined(this._x2) && core.Utils.isDefined(this._y1) && core.Utils.isDefined(this._y2))
+    {
+        this.buildStraightPath(this.breakDistance, this._x1, this._y1, this._x2, this._y2);
+        this._native.setAttribute('points', path);
+    }
+};
+
+web2d.peer.svg.PolyLinePeer.prototype._updateMiddleCurvePath = function()
+{
+    var x1 = this._x1;
+    var y1 = this._y1;
+    var x2 = this._x2;
+    var y2 = this._y2;
+    if (core.Utils.isDefined(x1) && core.Utils.isDefined(x2) && core.Utils.isDefined(y1) && core.Utils.isDefined(y2))
+    {
+        var diff = x2 - x1;
+        var middlex = (diff / 2) + x1;
+        var signx = 1;
+        var signy = 1;
+        if (diff < 0)
+        {
+            signx = -1;
+        }
+        if (y2 < y1)
+        {
+            signy = -1;
+        }
+        var path = x1 + ", " + y1 + " " + (middlex - 10 * signx) + ", " + y1 + " " + middlex + ", " + (y1 + 10 * signy) + " " + middlex + ", " + (y2 - 10 * signy) + " " + (middlex + 10 * signx) + ", " + y2 + " " + x2 + ", " + y2;
+        this._native.setAttribute('points', path);
+    }
+};
+
+web2d.peer.svg.PolyLinePeer.prototype._updateCurvePath = function()
+{
+    if (core.Utils.isDefined(this._x1) && core.Utils.isDefined(this._x2) && core.Utils.isDefined(this._y1) && core.Utils.isDefined(this._y2))
+    {
+        var path = web2d.PolyLine.buildCurvedPath(this.breakDistance, this._x1, this._y1, this._x2, this._y2);
+        this._native.setAttribute('points', path);
+    }
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/RectPeer.js b/trunk/web2d/src/main/javascript/peer/svg/RectPeer.js
new file mode 100644
index 00000000..281a7152
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/RectPeer.js
@@ -0,0 +1,64 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/**
+ * http://www.w3.org/TR/SVG/shapes.html#RectElement
+ */
+web2d.peer.svg.RectPeer = function(arc)
+{
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'rect');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this._arc = arc;
+    this.attachChangeEventListener("strokeStyle", web2d.peer.svg.ElementPeer.prototype.updateStrokeStyle);
+};
+
+objects.extend(web2d.peer.svg.RectPeer, web2d.peer.svg.ElementPeer);
+
+web2d.peer.svg.RectPeer.prototype.setPosition = function(x, y)
+{
+    if (core.Utils.isDefined(x))
+    {
+        this._native.setAttribute('x', parseInt(x));
+    }
+    if (core.Utils.isDefined(y))
+    {
+        this._native.setAttribute('y', parseInt(y));
+    }
+};
+
+web2d.peer.svg.RectPeer.prototype.getPosition = function()
+{
+    var x = this._native.getAttribute('x');
+    var y = this._native.getAttribute('y');
+    return {x:parseInt(x),y:parseInt(y)};
+};
+
+web2d.peer.svg.RectPeer.prototype.setSize = function(width, height)
+{
+    web2d.peer.svg.RectPeer.superClass.setSize.call(this, width, height);
+
+    var min = width < height?width:height;
+    if (this._arc)
+    {
+        // Transform percentages to SVG format.
+        var arc = (min / 2) * this._arc;
+        this._native.setAttribute('rx', arc);
+        this._native.setAttribute('ry', arc);
+    }
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/TahomaFont.js b/trunk/web2d/src/main/javascript/peer/svg/TahomaFont.js
new file mode 100644
index 00000000..e88e45f4
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/TahomaFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.TahomaFont = function()
+{
+    web2d.peer.svg.Font.call(this);
+    this._fontFamily="tahoma";
+};
+
+objects.extend(web2d.peer.svg.TahomaFont, web2d.peer.svg.Font);
+
+web2d.peer.svg.TahomaFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.svg.TahomaFont.prototype.getFont=function ()
+{
+    return web2d.Font.TAHOMA;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/TextPeer.js b/trunk/web2d/src/main/javascript/peer/svg/TextPeer.js
new file mode 100644
index 00000000..20241b58
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/TextPeer.js
@@ -0,0 +1,184 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.TextPeer = function()
+{
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'text');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this._native.setAttribute("focusable", "true");
+    this._position = {x:0,y:0};
+    this._font = new web2d.Font("Arial", this);
+};
+
+objects.extend(web2d.peer.svg.TextPeer, web2d.peer.svg.ElementPeer);
+
+//todo: use ths method to specify the maximum size of the text box
+/*web2d.web2d.peer.svg.TextPeer.prototype.setSize = function(width, height)
+{
+    web2d.web2d.peer.svg.TextPeer.superClass.setSize.call(this,width,height);
+    this._native.setAttribute('rx', width / 2);
+    this._native.setAttribute('ry', height /ose 2);
+};
+*/
+
+web2d.peer.svg.TextPeer.prototype.appendChild = function(element)
+{
+    this._native.appendChild(element._native);
+};
+
+web2d.peer.svg.TextPeer.prototype.setText = function(text)
+{
+    text = core.Utils.escapeInvalidTags(text);
+    var child = this._native.firstChild;
+    if (child)
+    {
+        this._native.removeChild(child);
+    }
+    this._text = text;
+    var textNode = window.document.createTextNode(text);
+    this._native.appendChild(textNode);
+};
+
+web2d.peer.svg.TextPeer.prototype.getText = function()
+{
+    return this._text;
+};
+
+web2d.peer.svg.TextPeer.prototype.setPosition = function(x, y)
+{
+    this._position = {x:x, y:y};
+    var size = parseInt(this._font.getSize());
+    this._native.setAttribute('y', y + size);
+    //y+size/2
+    this._native.setAttribute('x', x);
+};
+
+web2d.peer.svg.TextPeer.prototype.getPosition = function()
+{
+    return this._position;
+};
+
+web2d.peer.svg.TextPeer.prototype.setFont = function(font, size, style, weight)
+{
+    if (core.Utils.isDefined(font))
+    {
+        this._font = new web2d.Font(font, this);
+    }
+    if (core.Utils.isDefined(style))
+    {
+        this._font.setStyle(style);
+    }
+    if (core.Utils.isDefined(weight))
+    {
+        this._font.setWeight(weight);
+    }
+    if (core.Utils.isDefined(size))
+    {
+        this._font.setSize(size);
+    }
+    this._updateFontStyle();
+};
+
+web2d.peer.svg.TextPeer.prototype._updateFontStyle = function()
+{
+    this._native.setAttribute('font-family', this._font.getFontFamily());
+    this._native.setAttribute('font-size', this._font.getGraphSize());
+    this._native.setAttribute('font-style', this._font.getStyle());
+    this._native.setAttribute('font-weight', this._font.getWeight());
+
+    var scale = this._font.getFontScale();
+    this._native.xFontScale = scale.toFixed(1);
+
+};
+web2d.peer.svg.TextPeer.prototype.setColor = function(color)
+{
+    this._native.setAttribute('fill', color);
+};
+
+web2d.peer.svg.TextPeer.prototype.getColor = function()
+{
+    return this._native.getAttribute('fill');
+};
+
+web2d.peer.svg.TextPeer.prototype.setTextSize = function (size)
+{
+    this._font.setSize(size);
+    this._updateFontStyle();
+};
+
+web2d.peer.svg.TextPeer.prototype.setContentSize = function(width, height)
+{
+    this._native.xTextSize = width.toFixed(1) + "," + height.toFixed(1);
+};
+
+web2d.peer.svg.TextPeer.prototype.setStyle = function (style)
+{
+    this._font.setStyle(style);
+    this._updateFontStyle();
+};
+
+web2d.peer.svg.TextPeer.prototype.setWeight = function (weight)
+{
+    this._font.setWeight(weight);
+    this._updateFontStyle();
+};
+
+web2d.peer.svg.TextPeer.prototype.setFontFamily = function (family)
+{
+    var oldFont = this._font;
+    this._font = new web2d.Font(family, this);
+    this._font.setSize(oldFont.getSize());
+    this._font.setStyle(oldFont.getStyle());
+    this._font.setWeight(oldFont.getWeight());
+    this._updateFontStyle();
+};
+
+web2d.peer.svg.TextPeer.prototype.getFont = function ()
+{
+    return {
+        font:this._font.getFont(),
+        size:parseInt(this._font.getSize()),
+        style:this._font.getStyle(),
+        weight:this._font.getWeight()
+    };
+};
+
+web2d.peer.svg.TextPeer.prototype.setSize = function (size)
+{
+    this._font.setSize(size);
+    this._updateFontStyle();
+};
+
+web2d.peer.svg.TextPeer.prototype.getWidth = function ()
+{
+    var width = parseInt(this._native.getComputedTextLength());
+    width = width + this._font.getWidthMargin();
+    return width;
+};
+
+web2d.peer.svg.TextPeer.prototype.getHeight = function ()
+{
+    return this._font.getGraphSize();
+};
+
+web2d.peer.svg.TextPeer.prototype.getHtmlFontSize = function ()
+{
+    return this._font.getHtmlSize();
+};
+
diff --git a/trunk/web2d/src/main/javascript/peer/svg/TimesFont.js b/trunk/web2d/src/main/javascript/peer/svg/TimesFont.js
new file mode 100644
index 00000000..746de059
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/TimesFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.TimesFont = function()
+{
+    web2d.peer.svg.Font.call(this);
+    this._fontFamily="times";
+};
+
+objects.extend(web2d.peer.svg.TimesFont, web2d.peer.svg.Font);
+
+web2d.peer.svg.TimesFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.svg.TimesFont.prototype.getFont=function ()
+{
+    return web2d.Font.TIMES;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/VerdanaFont.js b/trunk/web2d/src/main/javascript/peer/svg/VerdanaFont.js
new file mode 100644
index 00000000..645cd57a
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/VerdanaFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.VerdanaFont = function()
+{
+    web2d.peer.svg.Font.call(this);
+    this._fontFamily="verdana";
+};
+
+objects.extend(web2d.peer.svg.VerdanaFont, web2d.peer.svg.Font);
+
+web2d.peer.svg.VerdanaFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.svg.VerdanaFont.prototype.getFont=function ()
+{
+    return web2d.Font.VERDANA;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/svg/WorkspacePeer.js b/trunk/web2d/src/main/javascript/peer/svg/WorkspacePeer.js
new file mode 100644
index 00000000..de15890c
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/svg/WorkspacePeer.js
@@ -0,0 +1,122 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.svg.WorkspacePeer = function(element)
+{
+    this._element = element;
+    var svgElement = window.document.createElementNS(this.svgNamespace, 'svg');
+    web2d.peer.svg.ElementPeer.call(this, svgElement);
+    this._native.setAttribute("focusable", "true");
+    this._native.setAttribute("id", "workspace");
+};
+
+objects.extend(web2d.peer.svg.WorkspacePeer, web2d.peer.svg.ElementPeer);
+
+
+/**
+ * http://www.w3.org/TR/SVG/coords.html 7.7 The viewBox  attribute
+ * It is often desirable to specify that a given set of graphics stretch to fit a particular container element. The viewBox attribute provides this capability.
+ *
+ * All elements that establish a new viewport (see elements that establish viewports), plus the 'marker', 'pattern' and 'view' elements have attribute viewBox. The value of the viewBox attribute is a list of four numbers <min-x>, <min-y>, <width> and <height>, separated by whitespace and/or a comma, which specify a rectangle in user space which should be mapped to the bounds of the viewport established by the given element, taking into account attribute preserveAspectRatio. If specified, an additional transformation is applied to all descendants of the given element to achieve the specified effect.
+ *
+ * A negative value for <width> or <height> is an error (see Error processing). A value of zero disables rendering of the element.
+ *
+ */
+
+web2d.peer.svg.WorkspacePeer.prototype.setCoordSize = function(width, height)
+{
+    var viewBox = this._native.getAttribute('viewBox');
+    var coords = [0,0,0,0];
+    if (viewBox != null)
+    {
+        coords = viewBox.split(/ /);
+    }
+    if (core.Utils.isDefined(width))
+    {
+        coords[2] = width;
+    }
+
+    if (core.Utils.isDefined(height))
+    {
+        coords[3] = height;
+    }
+
+    this._native.setAttribute('viewBox', coords.join(" "));
+    this._native.setAttribute("preserveAspectRatio", "none");
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "strokeStyle");
+};
+
+web2d.peer.svg.WorkspacePeer.prototype.getCoordSize = function()
+{
+    var viewBox = this._native.getAttribute('viewBox');
+    var coords = [1,1,1,1];
+    if (viewBox != null)
+    {
+        coords = viewBox.split(/ /);
+    }
+    return {width:coords[2],height:coords[3]};
+};
+
+web2d.peer.svg.WorkspacePeer.prototype.setCoordOrigin = function(x, y)
+{
+    var viewBox = this._native.getAttribute('viewBox');
+
+    // ViewBox min-x ,min-y by default initializated with 0 and 0.
+    var coords = [0,0,0,0];
+    if (viewBox != null)
+    {
+        coords = viewBox.split(/ /);
+    }
+
+    if (core.Utils.isDefined(x))
+    {
+        coords[0] = x;
+    }
+
+    if (core.Utils.isDefined(y))
+    {
+        coords[1] = y;
+    }
+
+    this._native.setAttribute('viewBox', coords.join(" "));
+};
+
+web2d.peer.svg.WorkspacePeer.prototype.appendChild = function(child)
+{
+    web2d.peer.svg.WorkspacePeer.superClass.appendChild.call(this, child);
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(child, "onChangeCoordSize");
+};
+
+web2d.peer.svg.WorkspacePeer.prototype.getCoordOrigin = function(child)
+{
+    var viewBox = this._native.getAttribute('viewBox');
+    var coords = [1,1,1,1];
+    if (viewBox != null)
+    {
+        coords = viewBox.split(/ /);
+    }
+    var x = parseFloat(coords[0]);
+    var y = parseFloat(coords[1]);
+    return {x:x,y:y};
+};
+
+web2d.peer.svg.WorkspacePeer.prototype.getPosition = function()
+{
+    return {x:0,y:0};
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/utils/EventUtils.js b/trunk/web2d/src/main/javascript/peer/utils/EventUtils.js
new file mode 100644
index 00000000..f7d67a33
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/utils/EventUtils.js
@@ -0,0 +1,41 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.utils.EventUtils =
+{
+    broadcastChangeEvent:function (elementPeer, type)
+    {
+        var listeners = elementPeer.getChangeEventListeners(type);
+        if (listeners)
+        {
+            for (var i = 0; i < listeners.length; i++)
+            {
+                var listener = listeners[i];
+                listener.call(elementPeer, null);
+            }
+        }
+
+        var children = elementPeer.getChildren();
+        for (var i = 0; i < children.length; i++)
+        {
+            var child = children[i];
+            web2d.peer.utils.EventUtils.broadcastChangeEvent(child, type);
+        }
+    }
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/utils/TransformUtils.js b/trunk/web2d/src/main/javascript/peer/utils/TransformUtils.js
new file mode 100644
index 00000000..c552f39e
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/utils/TransformUtils.js
@@ -0,0 +1,39 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.utils.TransformUtil =
+{
+
+    workoutScale: function(elementPeer)
+    {
+        var current = elementPeer.getParent();
+        var width = 1;
+        var height = 1;
+        while (current)
+        {
+            var coordSize = current.getCoordSize();
+            var size = current.getSize();
+
+            width = width * (parseInt(size.width) / coordSize.width);
+            height = height * (parseInt(size.height) / coordSize.height);
+            current = current.getParent();
+        }
+        return {width:width,height:height};
+    }
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/ArialFont.js b/trunk/web2d/src/main/javascript/peer/vml/ArialFont.js
new file mode 100644
index 00000000..ff9ced8a
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/ArialFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.ArialFont = function()
+{
+    web2d.peer.vml.Font.call(this);
+    this._fontFamily="Arial";
+};
+
+objects.extend(web2d.peer.vml.ArialFont, web2d.peer.vml.Font);
+
+web2d.peer.vml.ArialFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.vml.ArialFont.prototype.getFont=function ()
+{
+    return web2d.Font.ARIAL;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/ElementPeer.js b/trunk/web2d/src/main/javascript/peer/vml/ElementPeer.js
new file mode 100644
index 00000000..4d3a32a6
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/ElementPeer.js
@@ -0,0 +1,349 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.ElementPeer = function(vmlElement)
+{
+    this._native = vmlElement;
+    this._native.style.position = 'absolute';
+    this._position = {x:0,y:0};
+    this._strokeWidth = -1;
+    this._changeListeners = {};
+};
+
+/**
+ *  http://www.quirksmode.org/js/events_advanced.html
+ *
+ * Drawbacks
+ *
+ * When compared to the W3C model, the Microsoft model has two important drawbacks:
+
+ *    1. Events always bubble, no capturing possibility.
+ *    2. The event handling function is referenced, not copied, so the this keyword always refers to the window and is completely useless.
+ *
+ * The result of these two weaknesses is that when an event bubbles up it is impossible to know which HTML element currently handles the event. I explain this problem more fully on the Event order page.
+ * Since the Microsoft event adding model is only supported by Explorer 5 and higher on Windows, it cannot be used for cross�browser scripts. But even for Explorer�on�Windows only applications it�s best not to use it, since the bubbling problem can be quite nasty in complex applications.
+ */
+web2d.peer.vml.ElementPeer.prototype.addEventListener = function(type, listener)
+{
+    var element = this.getElementToAttachEvent();
+    element.attachEvent("on" + type, listener);
+};
+
+web2d.peer.vml.ElementPeer.prototype.getElementToAttachEvent = function()
+{
+    return this._native;
+};
+
+web2d.peer.vml.ElementPeer.prototype.removeEventListener = function(type, listener, useCapture)
+{
+    var element = this.getElementToAttachEvent();
+    element.detachEvent("on" + type, listener);
+};
+
+web2d.peer.vml.ElementPeer.prototype.getChangeEventListeners = function(type)
+{
+    var listeners = this._changeListeners[type];
+    if (!listeners)
+    {
+        listeners = [];
+        this._changeListeners[type] = listeners;
+    }
+    return listeners;
+};
+
+web2d.peer.vml.ElementPeer.prototype.attachChangeEventListener = function(type, listener)
+{
+    var listeners = this.getChangeEventListeners(type);
+    if (!listener)
+    {
+        throw "Listener can not be null";
+    }
+    listeners.push(listener);
+};
+
+web2d.peer.vml.ElementPeer.prototype.setSize = function(width, height)
+{
+    // First set the size of the group element.
+    if (core.Utils.isDefined(width))
+    {
+        this._native.style.width = parseInt(width);
+    }
+
+    if (core.Utils.isDefined(height))
+    {
+        this._native.style.height = parseInt(height);
+    }
+};
+
+web2d.peer.vml.ElementPeer.prototype.getChildren = function()
+{
+    var result = this._children;
+    if (!result)
+    {
+        result = [];
+        this._children = result;
+    }
+    return result;
+};
+
+web2d.peer.vml.ElementPeer.prototype.setChildren = function(children)
+{
+    this._children = children;
+};
+
+web2d.peer.vml.ElementPeer.prototype.removeChild = function(elementPeer)
+{
+    // Store parent and child relationship.
+    elementPeer.setParent(null);
+    var children = this.getChildren();
+
+    // Remove from children array ...
+    var length = children.length;
+
+    children.remove(elementPeer);
+
+    var newLength = children.length;
+
+    if (newLength >= length)
+    {
+        throw "Could not remove the element.";
+    }
+    /*var found = false;
+    children = children.reject(function(iter)
+    {
+        var equals = (iter._native === elementPeer._native);
+        if (equals)
+        {
+            found = true;
+        }
+        return equals;
+    });
+
+    // Could found the element ?
+    if (!found)
+    {
+        throw "Could not remove the element.";
+    }*/
+
+    // Append element as a child.
+    this._native.removeChild(elementPeer._native);
+};
+
+web2d.peer.vml.ElementPeer.prototype.appendChild = function(elementPeer)
+{
+    // Warning: Posible memory leak.
+    // Store parent and child relationship.
+    elementPeer.setParent(this);
+
+    var children = this.getChildren();
+    children.push(elementPeer);
+
+    // Add native element ..
+    this._native.appendChild(elementPeer._native);
+
+    // Broadcast events ...
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "onChangeCoordSize");
+};
+
+web2d.peer.vml.ElementPeer.prototype.getSize = function()
+{
+    return {
+        width:parseFloat(this._native.style.width),
+        height:parseFloat(this._native.style.height)
+    };
+};
+
+web2d.peer.vml.ElementPeer.prototype.setPosition = function(x, y)
+{
+    if (core.Utils.isDefined(x))
+    {
+        this._position.x = parseInt(x);
+        this._native.style.left = x;
+    }
+
+    if (core.Utils.isDefined(y))
+    {
+        this._position.y = parseInt(y);
+        this._native.style.top = y;
+    }
+};
+
+web2d.peer.vml.ElementPeer.prototype.getPosition = function()
+{
+    return {x:this._position.x, y:this._position.y};
+};
+
+web2d.peer.vml.ElementPeer.prototype.getVMLFill = function()
+{
+    if (!this._vmlFill)
+    {
+        this._vmlFill = window.document.createElement('v:fill');
+        this._native.appendChild(this._vmlFill);
+    }
+    return this._vmlFill;
+};
+
+web2d.peer.vml.ElementPeer.prototype.setFill = function(color, opacity)
+{
+    var vmlFill = this.getVMLFill();
+    if (core.Utils.isDefined(color))
+    {
+        vmlFill.setAttribute('color', color);
+    }
+
+    if (core.Utils.isDefined(opacity))
+    {
+        vmlFill.setAttribute('opacity', opacity);
+    }
+
+};
+
+web2d.peer.vml.ElementPeer.prototype.getFill = function()
+{
+    var vmlFill = this.getVMLFill();
+    var color = vmlFill.getAttribute('color');
+
+    var opacity = vmlFill.getAttribute('opacity');
+    opacity = opacity.toFixed(1);
+
+    return {color:String(color), opacity:Number(opacity)};
+};
+
+web2d.peer.vml.ElementPeer.prototype.getVMLStroke = function()
+{
+    if (!this._vmlStroke)
+    {
+        this._vmlStroke = window.document.createElement('v:stroke');
+        this._native.appendChild(this._vmlStroke);
+    }
+    return this._vmlStroke;
+};
+
+web2d.peer.vml.ElementPeer.prototype.getStroke = function()
+{
+    var vmlStroke = this.getVMLStroke();
+    var color = vmlStroke.getAttribute('color');
+    var dashstyle = vmlStroke.getAttribute('dashstyle');
+    var opacity = vmlStroke.getAttribute('opacity');
+    var width = this._strokeWidth;
+    if (width == -1)
+    {
+        width = 0;
+    }
+    return {color: color, style: dashstyle, opacity: opacity, width: width};
+};
+
+/*
+* http://msdn.microsoft.com/workshop/author/VML/ref/adv2.asp
+* 	"solid|dot|dash|dashdot|longdash|longdashdot|longdashdotdot".
+* /**
+* 	The opacity of the entire shape. A fraction between 0 (completely transparent) and 1 (completely opaque.)
+*/
+web2d.peer.vml.ElementPeer.prototype.setStroke = function(width, style, color, opacity)
+{
+    var vmlStroke = this.getVMLStroke();
+    if (core.Utils.isDefined(color))
+    {
+        vmlStroke.setAttribute('color', color);
+    }
+
+    if (core.Utils.isDefined(style))
+    {
+        vmlStroke.setAttribute('dashstyle', style);
+    }
+
+    if (core.Utils.isDefined(opacity))
+    {
+        vmlStroke.setAttribute('opacity', opacity);
+    }
+
+    if (core.Utils.isDefined(width))
+    {
+        var scaleStrokeWidth = 0;
+        if (width !== 0)
+        {
+            this._strokeWidth = width;
+            var scale = web2d.peer.utils.TransformUtil.workoutScale(this);
+
+            scaleStrokeWidth = scale.width * this._strokeWidth;
+            scaleStrokeWidth = scaleStrokeWidth.toFixed(2);
+            vmlStroke.setAttribute('weight', scaleStrokeWidth + "px");
+            vmlStroke.setAttribute('on', 'true');
+        }
+        else
+        {
+            vmlStroke.setAttribute('strokeweight', 0);
+            vmlStroke.setAttribute('on', 'false');
+        }
+    }
+};
+
+/**
+ * 	If hidden the shape is not rendered and does not generate mouse events.
+ */
+web2d.peer.vml.ElementPeer.prototype.setVisibility = function(isVisible)
+{
+    this._native.style.visibility = (isVisible) ? 'visible' : 'hidden';
+};
+
+web2d.peer.vml.ElementPeer.prototype.isVisible = function(isVisible)
+{
+    var visibility = this._native.style.visibility;
+    return !(visibility == 'hidden');
+};
+;
+
+web2d.peer.vml.ElementPeer.prototype._updateStrokeWidth = function()
+{
+    if (this.getParent())
+    {
+        this.setStroke(this._strokeWidth);
+    }
+};
+
+web2d.peer.vml.ElementPeer.prototype.getParent = function()
+{
+    return this._parent;
+};
+
+web2d.peer.vml.ElementPeer.prototype.setParent = function(parent)
+{
+    this._parent = parent;
+};
+
+/**
+ * Move element to the front
+ */
+web2d.peer.vml.ElementPeer.prototype.moveToFront = function()
+{
+    this._native.parentNode.appendChild(this._native);
+};
+
+/**
+ * Move element to the back
+ */
+web2d.peer.vml.ElementPeer.prototype.moveToBack = function()
+{
+    this._native.parentNode.insertBefore(this._native, this._native.parentNode.firstChild);
+};
+
+web2d.peer.vml.ElementPeer.prototype.setCursor = function(type)
+{
+    this._native.style.cursor = type;
+};
diff --git a/trunk/web2d/src/main/javascript/peer/vml/ElipsePeer.js b/trunk/web2d/src/main/javascript/peer/vml/ElipsePeer.js
new file mode 100644
index 00000000..0902bc8b
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/ElipsePeer.js
@@ -0,0 +1,58 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.ElipsePeer = function()
+{
+    var vmlElement = window.document.createElement('v:oval');
+    web2d.peer.vml.ElementPeer.call(this, vmlElement);
+    this.attachChangeEventListener("onChangeCoordSize", web2d.peer.vml.ElementPeer.prototype._updateStrokeWidth);
+};
+
+objects.extend(web2d.peer.vml.ElipsePeer, web2d.peer.vml.ElementPeer);
+
+web2d.peer.vml.ElipsePeer.prototype.setPosition = function(cx, cy)
+{
+    // VML position is positioned the coorner of the oval.
+    // That's why, I have to move the circle to the center by hand.
+    if (core.Utils.isDefined(cx))
+    {
+        this._position.x = parseInt(cx);
+        this._native.style.left = cx;// + parseInt(this.getSize().width / 2);
+    }
+
+    if (core.Utils.isDefined(cy))
+    {
+        this._position.y = parseInt(cy);
+        this._native.style.top = cy;// + parseInt(this.getSize().height / 2);
+    }
+};
+
+
+web2d.peer.vml.ElementPeer.prototype.getPosition = function()
+{
+    return {x:this._position.x, y:this._position.y};
+};
+
+web2d.peer.vml.ElipsePeer.prototype.setSize = function(width, height)
+{
+    web2d.peer.vml.ElipsePeer.superClass.setSize.call(this, width, height);
+
+    var coord = this.getPosition();
+    this.setPosition(coord.x, coord.y);
+};
diff --git a/trunk/web2d/src/main/javascript/peer/vml/Font.js b/trunk/web2d/src/main/javascript/peer/vml/Font.js
new file mode 100644
index 00000000..5aa2fa00
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/Font.js
@@ -0,0 +1,89 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.Font = function()
+{
+    this._size = 10;
+    this._style = "normal";
+    this._weight = "normal";
+};
+
+web2d.peer.vml.Font.prototype.init = function(args)
+{
+    if (core.Utils.isDefined(args.size))
+    {
+        this._size = parseInt(args.size);
+    }
+    if (core.Utils.isDefined(args.style))
+    {
+        this._style = args.style;
+    }
+    if (core.Utils.isDefined(args.weight))
+    {
+        this._weight = args.weight;
+    }
+};
+
+web2d.peer.vml.Font.prototype.getHtmlSize = function (scale)
+{
+    var result = this._size * scale.height * 43 / 32;
+    return result;
+};
+
+web2d.peer.vml.Font.prototype.getGraphSize = function (scale)
+{
+    var result = parseInt(this._size) * scale.height * 43 / 32;
+    return result;
+};
+
+web2d.peer.vml.Font.prototype.getSize = function ()
+{
+    return parseInt(this._size);
+};
+
+web2d.peer.vml.Font.prototype.getStyle = function ()
+{
+    return this._style;
+};
+
+web2d.peer.vml.Font.prototype.getWeight = function ()
+{
+    return this._weight;
+};
+
+web2d.peer.vml.Font.prototype.setSize = function (size)
+{
+    this._size = size;
+};
+
+web2d.peer.vml.Font.prototype.setStyle = function (style)
+{
+    this._style = style;
+};
+
+web2d.peer.vml.Font.prototype.setWeight = function (weight)
+{
+    this._weight = weight;
+};
+
+web2d.peer.vml.Font.prototype.getWidthMargin = function ()
+{
+    var result = 0;
+    return result;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/GroupPeer.js b/trunk/web2d/src/main/javascript/peer/vml/GroupPeer.js
new file mode 100644
index 00000000..426651be
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/GroupPeer.js
@@ -0,0 +1,77 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.GroupPeer = function()
+{
+    var vmlElement = window.document.createElement('v:group');
+    web2d.peer.vml.ElementPeer.call(this, vmlElement);
+    this._native.style.cursor = 'move';
+};
+
+objects.extend(web2d.peer.vml.GroupPeer, web2d.peer.vml.ElementPeer);
+
+web2d.peer.vml.ElementPeer.prototype.setCoordOrigin = function(x, y)
+{
+    this._native.coordorigin = x + "," + y;
+};
+
+web2d.peer.vml.GroupPeer.prototype.setCoordSize = function(width, height)
+{
+    this._native.coordsize = width + "," + height;
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "onChangeCoordSize");
+};
+
+web2d.peer.vml.GroupPeer.prototype.getCoordSize = function()
+{
+    var coordSize = this._native.coordsize + "";
+    var coord;
+    if (coordSize)
+    {
+        coord = coordSize.split(",");
+    } else
+    {
+        coord = [1,1];
+    }
+    return { width:coord[0], height:coord[1] };
+};
+
+web2d.peer.vml.GroupPeer.prototype.setSize = function(width, height)
+{
+    web2d.peer.vml.ElipsePeer.superClass.setSize.call(this, width, height);
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "onChangeCoordSize");
+};
+web2d.peer.vml.GroupPeer.prototype.appendChild = function(child)
+{
+    web2d.peer.vml.GroupPeer.superClass.appendChild.call(this, child);
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(child, "onChangeCoordSize");
+};
+
+web2d.peer.vml.GroupPeer.prototype.getCoordOrigin = function()
+{
+    var coordOrigin = this._native.coordorigin + "";
+    var coord;
+    if (coordOrigin)
+    {
+        coord = coordOrigin.split(",");
+    } else
+    {
+        coord = [1,1];
+    }
+    return { x:coord[0], y:coord[1] };
+};
diff --git a/trunk/web2d/src/main/javascript/peer/vml/ImagePeer.js b/trunk/web2d/src/main/javascript/peer/vml/ImagePeer.js
new file mode 100644
index 00000000..1c917f1e
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/ImagePeer.js
@@ -0,0 +1,38 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.ImagePeer = function()
+{
+    var vmlElement = window.document.createElement('v:image');
+    web2d.peer.vml.ElementPeer.call(this, vmlElement);
+};
+
+objects.extend(web2d.peer.vml.ImagePeer, web2d.peer.vml.ElementPeer);
+
+web2d.peer.vml.ImagePeer.prototype.setHref = function(url)
+{
+    this._native.setAttribute("src", url);
+    this._href = url;
+};
+
+web2d.peer.vml.ImagePeer.prototype.getHref = function()
+{
+    return this._href;
+};
+
diff --git a/trunk/web2d/src/main/javascript/peer/vml/LinePeer.js b/trunk/web2d/src/main/javascript/peer/vml/LinePeer.js
new file mode 100644
index 00000000..ffe35ec7
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/LinePeer.js
@@ -0,0 +1,69 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.LinePeer = function()
+{
+    var vmlElement = window.document.createElement('v:line');
+    web2d.peer.vml.ElementPeer.call(this, vmlElement);
+    this._native.setAttribute('fillcolor', 'none');
+};
+
+objects.extend(web2d.peer.vml.LinePeer, web2d.peer.vml.ElementPeer);
+
+web2d.peer.vml.LinePeer.prototype.setFrom = function(x1, y1)
+{
+    this._native.setAttribute('from', x1 + "," + y1);
+};
+
+web2d.peer.vml.LinePeer.prototype.setTo = function(x2, y2)
+{
+    this._native.setAttribute('to', x2 + "," + y2);
+};
+
+
+web2d.peer.vml.LinePeer.prototype.setStroke = function(width, style, color, opacity)
+{
+    web2d.peer.vml.LinePeer.superClass.setStroke.call(this, width, style, color, opacity);
+
+    if (core.Utils.isDefined(width))
+    {
+        this._vmlStroke.setAttribute('weight', width + "px");
+    }
+};
+
+web2d.peer.vml.LinePeer.prototype.setArrowStyle = function(startStyle, endStyle)
+{
+    var vmlStroke = this.getVMLStroke();
+    if (core.Utils.isDefined(startStyle))
+    {
+        vmlStroke.setAttribute('startarrow', startStyle);
+        vmlStroke.setAttribute('startarrowwidth', 'narrow');
+        vmlStroke.setAttribute('startarrowlength', 'short');
+    }
+
+    if (core.Utils.isDefined(endStyle))
+    {
+        vmlStroke.setAttribute('endarrow', endStyle);
+        vmlStroke.setAttribute('endarrowwidth', 'narrow');
+        vmlStroke.setAttribute('endarrowlength', 'short');
+
+    }
+};
+
+
diff --git a/trunk/web2d/src/main/javascript/peer/vml/PolyLinePeer.js b/trunk/web2d/src/main/javascript/peer/vml/PolyLinePeer.js
new file mode 100644
index 00000000..21b07c98
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/PolyLinePeer.js
@@ -0,0 +1,151 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.PolyLinePeer = function()
+{
+    var vmlElement = window.document.createElement('v:polyline');
+    web2d.peer.vml.ElementPeer.call(this, vmlElement);
+    this._native.setAttribute('filled', 'false');
+    this.breakDistance = 10;
+};
+
+objects.extend(web2d.peer.vml.PolyLinePeer, web2d.peer.vml.ElementPeer);
+
+web2d.peer.vml.PolyLinePeer.prototype.setFrom = function(x1, y1)
+{
+    this._x1 = x1;
+    this._y1 = y1;
+    this._updatePath();
+};
+
+web2d.peer.vml.PolyLinePeer.prototype.setTo = function(x2, y2)
+{
+    this._x2 = x2;
+    this._y2 = y2;
+    this._updatePath();
+
+};
+
+
+web2d.peer.vml.PolyLinePeer.prototype.setStyle = function(style)
+{
+    this._style = style;
+    this._updatePath();
+};
+
+web2d.peer.vml.PolyLinePeer.prototype.getStyle = function()
+{
+    return this._style;
+};
+
+web2d.peer.vml.PolyLinePeer.prototype._updatePath = function()
+{
+    if (this._style == "Curved")
+    {
+        this._updateMiddleCurvePath();
+    }
+    else if (this._style == "Straight")
+    {
+        this._updateStraightPath();
+    }
+    else
+    {
+        this._updateCurvePath();
+    }
+};
+
+web2d.peer.vml.PolyLinePeer.prototype._updateStraightPath = function()
+{
+    if (core.Utils.isDefined(this._x1) && core.Utils.isDefined(this._x2) && core.Utils.isDefined(this._y1) && core.Utils.isDefined(this._y2))
+    {
+        this.buildStraightPath(this.breakDistance, this._x1, this._y1, this._x2, this._y2);
+
+        // Hack: I could not solve why this is happening...
+        if (!this._native.points)
+        {
+            this._native.setAttribute('points', path);
+        } else
+        {
+            this._native.points.value = path;
+        }
+    }
+};
+
+web2d.peer.vml.PolyLinePeer.prototype._updateMiddleCurvePath = function()
+{
+    var x1 = this._x1;
+    var y1 = this._y1;
+    var x2 = this._x2;
+    var y2 = this._y2;
+    if (core.Utils.isDefined(x1) && core.Utils.isDefined(x2) && core.Utils.isDefined(y1) && core.Utils.isDefined(y2))
+    {
+        var diff = x2 - x1;
+        var middlex = (diff / 2) + x1;
+        var signx = 1;
+        var signy = 1;
+        if (diff < 0)
+        {
+            signx = -1;
+        }
+        if (y2 < y1)
+        {
+            signy = -1;
+        }
+
+
+        var path = x1 + ", " + y1 + " " + (middlex - 10 * signx) + ", " + y1 + " " + middlex + ", " + (y1 + 10 * signy) + " " + middlex + ", " + (y2 - 10 * signy) + " " + (middlex + 10 * signx) + ", " + y2 + " " + x2 + ", " + y2;
+
+        // Hack: I could not solve why this is happening...
+        if (!this._native.points)
+        {
+            this._native.setAttribute('points', path);
+        } else
+        {
+            this._native.points.value = path;
+        }
+    }
+};
+
+web2d.peer.vml.PolyLinePeer.prototype._updateCurvePath = function()
+{
+    if (core.Utils.isDefined(this._x1) && core.Utils.isDefined(this._x2) && core.Utils.isDefined(this._y1) && core.Utils.isDefined(this._y2))
+    {
+        var path = web2d.PolyLine.buildCurvedPath(this.breakDistance, this._x1, this._y1, this._x2, this._y2);
+
+        // Hack: I could not solve why this is happening...
+        if (!this._native.points)
+        {
+            this._native.setAttribute('points', path);
+        } else
+        {
+            this._native.points.value = path;
+            this._native.xPoints = path;
+        }
+    }
+};
+
+web2d.peer.vml.PolyLinePeer.prototype.setStroke = function(width, style, color, opacity)
+{
+    web2d.peer.vml.LinePeer.superClass.setStroke.call(this, null, style, color, opacity);
+
+    if (core.Utils.isDefined(width))
+    {
+        this._vmlStroke.setAttribute('weight', width + "px");
+    }
+};
diff --git a/trunk/web2d/src/main/javascript/peer/vml/RectPeer.js b/trunk/web2d/src/main/javascript/peer/vml/RectPeer.js
new file mode 100644
index 00000000..d04fa650
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/RectPeer.js
@@ -0,0 +1,47 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/**
+ * http://www.w3.org/TR/NOTE-VML#_Toc416858381
+ * VML  	arcsize  	number  	"0.2"
+ * Defines rounded corners as a percentage of half the smaller dimension of the rectangle. 0.0 (0%)
+ * square corners, 1.0 (100%) - smaller dimension forms a semi-circle.
+ */
+web2d.peer.vml.RectPeer = function(arc)
+{
+    this.__act = arc;
+    var vmlElement;
+    if (!arc)
+    {
+        vmlElement = window.document.createElement('v:rect');
+    } else
+    {
+        vmlElement = window.document.createElement('v:roundrect');
+
+        // In all examples, arc size 1 looks similiar to 0.5 arc size. This helps to solve look and feel incompatibilities with Fire
+        arc = arc / 2;
+        vmlElement.setAttribute('arcsize', arc);
+    }
+
+    web2d.peer.vml.ElementPeer.call(this, vmlElement);
+    this.attachChangeEventListener("onChangeCoordSize", web2d.peer.vml.ElementPeer.prototype._updateStrokeWidth);
+};
+
+
+objects.extend(web2d.peer.vml.RectPeer, web2d.peer.vml.ElementPeer);
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/TahomaFont.js b/trunk/web2d/src/main/javascript/peer/vml/TahomaFont.js
new file mode 100644
index 00000000..164a3d71
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/TahomaFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.TahomaFont = function()
+{
+    web2d.peer.vml.Font.call(this);
+    this._fontFamily="tahoma";
+};
+
+objects.extend(web2d.peer.vml.TahomaFont, web2d.peer.vml.Font);
+
+web2d.peer.vml.TahomaFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.vml.TahomaFont.prototype.getFont=function ()
+{
+    return web2d.Font.TAHOMA;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/TextBoxPeer.js b/trunk/web2d/src/main/javascript/peer/vml/TextBoxPeer.js
new file mode 100644
index 00000000..3d4bbe65
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/TextBoxPeer.js
@@ -0,0 +1,236 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.TextBoxPeer = function()
+{
+    var container = window.document.createElement('v:shape');
+    this._textElement = window.document.createElement('v:textbox');
+    web2d.peer.vml.ElementPeer.call(this, container);
+    this._native.appendChild(this._textElement);
+    this._container = window.document.createElement('span');
+    this._container.style.width = "100%";
+    this._container.style.height = "100%";
+    this._textContainer = window.document.createElement('span');
+    this._container.appendChild(this._textContainer);
+    this._textElement.appendChild(this._container);
+    container.style.position = "absolute";
+    container.style.top = "0";
+    container.style.left = "0";
+    container.style.width = "1";
+    container.style.height = "1";
+    container.style.antialias = "true";
+    container.style.zIndex = 10;
+    this._textElement.style.position = "absolute";
+    this._textElement.style.overflow = "visible";
+    this._textElement.inset = "0 0 0 0";
+    this.attachChangeEventListener("onChangeCoordSize", web2d.peer.vml.TextBoxPeer.prototype._updateTextSize);
+    this._font = new web2d.Font("Arial", this);
+};
+
+objects.extend(web2d.peer.vml.TextBoxPeer, web2d.peer.vml.ElementPeer);
+
+web2d.peer.vml.TextBoxPeer.prototype._updateTextSize = function()
+{
+    if (core.Utils.isDefined(this._font.getSize()))
+    {
+        this._updateFontStyle();
+    }
+};
+
+//todo: use ths method to specify the maximum size of the text box
+/*web2d.web2d.peer.vml.TextBoxPeer.prototype.setSize = function(width, height)
+{
+    web2d.web2d.peer.vml.TextBoxPeer.superClass.setSize.call(this,width,height);
+    this._native.setAttribute('rx', width / 2);
+    this._native.setAttribute('ry', height /ose 2);
+};
+*/
+
+web2d.peer.vml.TextBoxPeer.prototype.appendChild = function(element)
+{
+    this._native.appendChild(element._native);
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setText = function(text)
+{
+    text = core.Utils.escapeInvalidTags(text);
+    //remove previous text
+    //var child = this._textContainer.firstChild;
+    var child = this._textContainer.firstChild;
+    if (child)
+    {
+        this._textContainer.removeChild(child);
+    }
+
+    this._text = text;
+    var textNode = window.document.createTextNode(text);
+    this._textContainer.appendChild(textNode);
+    this._updateSize();
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.getText = function()
+{
+    //todo(discutir): deberiamos buscar recursivamente por todos los hijos (textspan)?
+    return this._text;
+};
+
+web2d.peer.vml.TextBoxPeer.prototype._updateSize = function()
+{
+    var size = 0;
+    if (this._font.getSize())
+    {
+        size = this._font.getSize();
+    }
+    var length = 0;
+    if (this._text)
+    {
+        length = this._text.length;
+    }
+    this._native.style.width = length * size;
+    //this._textElement.style.marginleft="0px";
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setPosition = function(x, y)
+{
+    if (core.Utils.isDefined(x))
+    {
+        this._position.x = parseInt(x);
+        var leftmargin = 0;
+        //0.375;
+        this._native.style.left = x - leftmargin;
+    }
+
+    if (core.Utils.isDefined(y))
+    {
+        this._position.y = parseInt(y);
+        var topmargin = 0;
+        //2.375;
+        this._native.style.top = y - topmargin;
+    }
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setFont = function(font, size, style, weight)
+{
+    if (core.Utils.isDefined(font))
+    {
+        this._font = new web2d.Font(font, this);
+    }
+    if (core.Utils.isDefined(style))
+    {
+        this._font.setStyle(style);
+    }
+    if (core.Utils.isDefined(weight))
+    {
+        this._font.setWeight(weight);
+    }
+    if (core.Utils.isDefined(size))
+    {
+        this._font.setSize(size);
+    }
+    this._updateFontStyle();
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setColor = function(color)
+{
+    this._textElement.style.color = color;
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.getColor = function()
+{
+    return this._textElement.style.color;
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setTextSize = function (size)
+{
+    this._font.setSize(size);
+    this._updateFontStyle();
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setStyle = function (style)
+{
+    this._font.setStyle(style);
+    this._updateFontStyle();
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setWeight = function (weight)
+{
+    this._font.setWeight(weight);
+    this._updateFontStyle();
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setSize = function (size)
+{
+    this._font.setSize(size);
+    this._updateFontStyle();
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.setFontFamily = function (family)
+{
+    var oldFont = this._font;
+    this._font = new web2d.Font(family, this);
+    this._font.setSize(oldFont.getSize());
+    this._font.setStyle(oldFont.getStyle());
+    this._font.setWeight(oldFont.getWeight());
+    this._updateFontStyle();
+};
+
+web2d.peer.vml.TextBoxPeer.prototype._updateFontStyle = function ()
+{
+    this._textElement.style.font = this._font.getStyle() + " " + this._font.getWeight() + " " + this._font.getGraphSize() + " " + this._font.getFontFamily();
+    this._updateSize();
+
+    var scale = this._font.getFontScale();
+    this._textElement.xFontScale = scale.toFixed(1);
+};
+
+
+web2d.peer.vml.TextBoxPeer.prototype.setContentSize = function(width, height)
+{
+    this._textElement.xTextSize = width.toFixed(1) + "," + height.toFixed(1);
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.getFont = function()
+{
+    return {
+        font:this._font.getFont(),
+        size:parseInt(this._font.getSize()),
+        style:this._font.getStyle(),
+        weight:this._font.getWeight()
+    };
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.getWidth = function ()
+{
+    var scale = web2d.peer.utils.TransformUtil.workoutScale(this);
+    var size = (this._textContainer.offsetWidth / scale.width);
+    return size;
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.getHeight = function ()
+{
+    //return this._font.getGraphSize();
+    var scale = web2d.peer.utils.TransformUtil.workoutScale(this);
+    var size = (this._textContainer.offsetHeight / scale.height);
+    return size;
+};
+
+web2d.peer.vml.TextBoxPeer.prototype.getHtmlFontSize = function ()
+{
+    return this._font.getHtmlSize();
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/TextPeer.js b/trunk/web2d/src/main/javascript/peer/vml/TextPeer.js
new file mode 100644
index 00000000..fea038c1
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/TextPeer.js
@@ -0,0 +1,119 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.TextPeer = function()
+{
+    var container = window.document.createElement('v:shape');
+    this._textElement = window.document.createElement('v:textpath');
+    web2d.peer.vml.ElementPeer.call(this, container);
+    this._native.appendChild(this._textElement);
+    container.style.position = "absolute";
+    container.style.top = "1";
+    container.style.left = "1";
+    container.style.width = "2";
+    container.style.height = "2";
+    container.style.antialias = "true";
+    container.style.zIndex = 10;
+    // Create the path object
+    var myPath = document.createElement("v:path");
+    myPath.textpathok = "True";
+    myPath.v = "m 0,0 l 10,0 m 0,20 l 10,20";
+
+    // Add it to the DOM hierarchy
+    container.appendChild(myPath);
+
+     // Create the fill object
+    this._fontColor = document.createElement("v:fill");
+    this._fontColor.on = "true";
+    this._fontColor.color = "red";
+
+    // Add it to the DOM hierarchy
+    container.appendChild(this._fontColor);
+
+    // The border is not going to be shown. To show it change .on to true
+    this._fontBorderColor = document.createElement("v:stroke");
+    this._fontBorderColor.on = "false";
+    this._fontBorderColor.color="red";
+
+    // Add it to the DOM hierarchy
+    container.appendChild(this._fontBorderColor);
+
+    this._textElement.on = "true";
+    this._textElement.fitpath = "false";
+    this._textElement.style.setAttribute("V-Text-Align","left");
+    this._size=12;
+};
+
+objects.extend(web2d.peer.vml.TextPeer, web2d.peer.vml.ElementPeer);
+
+web2d.peer.vml.TextPeer.prototype.setPosition = function(x, y)
+{
+    // VML position is positioned the coorner of the oval.
+    // That's why, I have to move the circle to the center by hand.
+    if (core.Utils.isDefined(x))
+    {
+        this._position.x = parseInt(x);
+        this._native.style.left = x;
+    }
+
+    if (core.Utils.isDefined(y))
+    {
+        this._position.y = parseInt(y);
+        this._native.style.top = y - parseInt(parseInt(this._size)/8);
+    }
+};
+
+web2d.peer.vml.TextPeer.prototype.getPosition = function()
+{
+    return this._position;
+};
+
+web2d.peer.vml.TextPeer.prototype.appendChild = function(element)
+{
+    this._textElement.appendChild(element._native);
+};
+
+web2d.peer.vml.TextPeer.prototype.setText = function(text)
+{
+    this._text = text;
+    this._textElement.string=text;
+};
+
+web2d.peer.vml.TextPeer.prototype.getText = function()
+{
+    return this._text;
+};
+
+web2d.peer.vml.TextPeer.prototype.setFont = function(font, size, style, weight)
+{
+    var scale=web2d.peer.utils.TransformUtil.workoutScale(this);
+    this._size=parseInt(size)*scale.height*43/32;
+    this._textElement.style.font = style + " " + weight + " " + this._size + " " + font;
+};
+
+web2d.peer.vml.TextPeer.prototype.setColor = function(color)
+{
+    this._fontColor.color=color;
+    this._fontBorderColor.color=color;
+};
+
+web2d.peer.vml.TextPeer.prototype.getHtmlFontSize = function ()
+{
+    return this._font.getHtmlSize();
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/TimesFont.js b/trunk/web2d/src/main/javascript/peer/vml/TimesFont.js
new file mode 100644
index 00000000..a21a7fdb
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/TimesFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.TimesFont = function()
+{
+    web2d.peer.vml.Font.call(this);
+    this._fontFamily="times";
+};
+
+objects.extend(web2d.peer.vml.TimesFont, web2d.peer.vml.Font);
+
+web2d.peer.vml.TimesFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.vml.TimesFont.prototype.getFont=function ()
+{
+    return web2d.Font.TIMES;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/VerdanaFont.js b/trunk/web2d/src/main/javascript/peer/vml/VerdanaFont.js
new file mode 100644
index 00000000..0a8a91e8
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/VerdanaFont.js
@@ -0,0 +1,36 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.VerdanaFont = function()
+{
+    web2d.peer.vml.Font.call(this);
+    this._fontFamily="verdana";
+};
+
+objects.extend(web2d.peer.vml.VerdanaFont, web2d.peer.vml.Font);
+
+web2d.peer.vml.VerdanaFont.prototype.getFontFamily=function ()
+{
+    return this._fontFamily;
+};
+
+web2d.peer.vml.VerdanaFont.prototype.getFont=function ()
+{
+    return web2d.Font.VERDANA;
+};
\ No newline at end of file
diff --git a/trunk/web2d/src/main/javascript/peer/vml/WorkspacePeer.js b/trunk/web2d/src/main/javascript/peer/vml/WorkspacePeer.js
new file mode 100644
index 00000000..a4d12293
--- /dev/null
+++ b/trunk/web2d/src/main/javascript/peer/vml/WorkspacePeer.js
@@ -0,0 +1,94 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+web2d.peer.vml.WorkspacePeer = function(element)
+{
+    var vmlElement = window.document.createElement('v:group');
+    this._element = element;
+    web2d.peer.vml.ElementPeer.call(this, vmlElement);
+};
+
+objects.extend(web2d.peer.vml.WorkspacePeer, web2d.peer.vml.ElementPeer);
+
+// Note: For some reason, VML groups are not able to receive events such as "onclick".
+// As a workaround, all the workspace events will be registered in the container div element.
+web2d.peer.vml.WorkspacePeer.prototype.getElementToAttachEvent = function()
+{
+    return this._element;
+};
+
+web2d.peer.vml.WorkspacePeer.prototype.setCoordOrigin = function(x, y)
+{
+    this._native.coordorigin = x + "," + y;
+};
+
+web2d.peer.vml.WorkspacePeer.prototype.setCoordSize = function(width, height)
+{
+    this._native.coordsize = width + "," + height;
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "onChangeCoordSize");
+    //web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "textSize");
+};
+
+web2d.peer.vml.WorkspacePeer.prototype.getCoordSize = function()
+{
+    var coordSize = this._native.coordsize + "";
+    var coord;
+    if (coordSize)
+    {
+        coord = coordSize.split(",");
+    } else
+    {
+        coord = [1,1];
+    }
+
+    return { width:coord[0], height:coord[1] };
+};
+
+web2d.peer.vml.WorkspacePeer.prototype.setSize = function(width, height)
+{
+    web2d.peer.vml.ElipsePeer.superClass.setSize.call(this, width, height);
+};
+
+web2d.peer.vml.WorkspacePeer.prototype.appendChild = function(child)
+{
+    web2d.peer.vml.WorkspacePeer.superClass.appendChild.call(this, child);
+    web2d.peer.utils.EventUtils.broadcastChangeEvent(child, "onChangeCoordSize");
+};
+
+web2d.peer.vml.WorkspacePeer.prototype.getCoordOrigin = function()
+{
+    var coordOrigin = this._native.coordorigin + "";
+    var coord;
+    if (coordOrigin)
+    {
+        coord = coordOrigin.split(",");
+    } else
+    {
+        coord = [1,1];
+    }
+
+    var y = parseFloat(coord[1]);
+    var x = parseFloat(coord[0]);
+    return { x:x, y:y };
+};
+
+web2d.peer.vml.WorkspacePeer.prototype.getPosition = function()
+{
+    return {x:0,y:0};
+};
diff --git a/trunk/web2d/src/test/javascript/jsUnit/ElementsTestSuite.html b/trunk/web2d/src/test/javascript/jsUnit/ElementsTestSuite.html
new file mode 100755
index 00000000..e2067789
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/jsUnit/ElementsTestSuite.html
@@ -0,0 +1,286 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>JsUnit Test Suite</title>
+    <link rel="stylesheet" type="text/css" href="../../../../../libraries/jsUnit/css/jsUnitStyle.css">
+    <script language="JavaScript" type="text/javascript" src="../../../../../libraries/jsUnit/app/jsUnitCore.js"></script>    <!--<script language="JavaScript" type="text/javascript" src="../../../src/core.js"></script>-->
+    <script language="JavaScript" type="text/javascript" src="../../../src/web2d.js"></script>
+    <script type="text/javascript">
+
+        web2d.peer.Toolkit.init();
+
+    </script>
+</head>
+
+<body>
+<h1>JsUnit Test Suite</h1>
+
+<p>This page contains a suite of tests for testing JsUnit. Click <a href="../../lib/jsunit/testRunner.html">here</a> to
+    start running the test</p>
+
+<div id="divWorkspace" style="border:1px solid red;position:absolute;left:0;top:0;width:400px;height:410px;">
+</div>
+
+
+<script language="JavaScript" type="text/javascript">
+
+function setUp()
+{
+    debug("Setting up workspace");
+    workspace = new web2d.Workspace();
+    workspace.addItAsChildTo($("divWorkspace"));
+
+    group = new web2d.Group();
+    line = new web2d.Line();
+    elipse = new web2d.Elipse();
+    rect = new web2d.Rect();
+    rectArc = new web2d.Rect(0.3);
+
+}
+
+function testAppendAndRemoveElements()
+{
+    workspace.appendChild(group);
+    workspace.appendChild(line);
+    workspace.appendChild(elipse);
+    workspace.appendChild(rect);
+    workspace.appendChild(rectArc);
+
+    workspace.removeChild(group);
+    workspace.removeChild(line);
+    workspace.removeChild(elipse);
+    workspace.removeChild(rect);
+    workspace.removeChild(rectArc);
+
+    workspace.appendChild(group);
+    group.appendChild(line);
+    group.appendChild(elipse);
+    group.appendChild(rect);
+    group.appendChild(rectArc);
+
+    group.removeChild(line);
+    group.removeChild(elipse);
+    group.removeChild(rect);
+    group.removeChild(rectArc);
+    workspace.removeChild(group);
+
+}
+
+function testElementFill()
+{
+    var testFill = function(elem, parent, color, opacity, isSupported)
+    {
+        if (parent)
+        {
+            parent.appendChild(elem);
+        }
+
+        if (isSupported)
+        {
+            elem.setFill(color, opacity);
+
+            var fill = elem.getFill();
+            assertEquals(color, fill.color);
+            if (opacity)
+            {
+                assertEquals(opacity, fill.opacity);
+            }
+
+            // Set attributes
+            elem.setAttribute('fillColor', color);
+            elem.setAttribute('fillOpacity', opacity);
+
+            fill = elem.getFill();
+            assertEquals(color, fill.color);
+            if (opacity)
+            {
+                assertEquals(opacity, fill.opacity);
+            }
+
+        } else
+        {
+            var wasCatched = false;
+            try
+            {
+                line.setFill(color);
+            } catch (e)
+            {
+                wasCatched = true;
+            }
+            assertEquals(true, wasCatched);
+        }
+    };
+
+    testFill(workspace, null, 'blue', null, true);
+    testFill(elipse, workspace, 'green', 0.3, true);
+    testFill(rect, workspace, 'blue', 0.3, true);
+    testFill(rectArc, workspace, 'yellow', 0.3, true);
+    testFill(line, workspace, 'yellow', 0.3, false);
+    testFill(group, workspace, 'yellow', null, false);
+}
+
+function testElementPosition()
+{
+    var testPosition = function(elem, parent, x, y, isSupported)
+    {
+        if (isSupported)
+        {
+            // Method setting ...
+            parent.appendChild(elem);
+            elem.setPosition(x, y);
+
+            assertEquals(x, elem.getPosition().x);
+            assertEquals(y, elem.getPosition().y);
+
+            // Attribute setting
+            x = x + 10;
+            elem.setAttribute('x', x);
+            assertEquals(x, elem.getPosition().x);
+
+            y = y + 20;
+            elem.setAttribute('y', y);
+            assertEquals(y, elem.getPosition().y);
+
+            // Attribute getters
+            assertEquals(y, elem.getAttribute('y'));
+            assertEquals(x, elem.getAttribute('x'));
+
+            // Attribute setter.
+            y = y + 20;
+            x = x + 20;
+            elem.setAttribute('position', x + ' ' + y);
+
+            assertEquals(x, elem.getPosition().x);
+            assertEquals(y, elem.getPosition().y);
+
+        } else
+        {
+            var wasCatched = false;
+            try
+            {
+                line.setPosition(44, 34);
+            } catch (e)
+            {
+                wasCatched = true;
+            }
+            assertEquals(true, wasCatched);
+        }
+    };
+
+    testPosition(group, workspace, 41, 31, true);
+    testPosition(elipse, workspace, 42, 32, true);
+    testPosition(rect, workspace, 43, 33, true);
+    testPosition(rectArc, workspace, 44, 34, true);
+}
+
+function testElementSize()
+{
+
+    var testSize = function(elem, parent, width, height, isSupported)
+    {
+        if (parent)
+        {
+            parent.appendChild(elem);
+        }
+        if (isSupported)
+        {
+            // Function setter ..
+            elem.setSize(width, height);
+
+            assertEquals(width, elem.getSize().width);
+            assertEquals(height, elem.getSize().height);
+
+            // Attribute setter.
+            elem.setAttribute('width', width);
+            assertEquals(height, elem.getSize().height);
+            assertEquals(width, elem.getSize().width);
+
+            elem.setAttribute('height', height);
+            assertEquals(height, elem.getSize().height);
+            assertEquals(width, elem.getSize().width);
+
+            // Multiple setter.
+            elem.setAttribute('size', width + ' ' + height);
+
+        }
+        else {
+
+            var wasCatched = false;
+            try
+            {
+                elem.setSize(44, 34);
+            } catch (e)
+            {
+                wasCatched = true;
+            }
+            assertEquals(true, wasCatched);
+        }
+    };
+
+    testSize(workspace, null, '43mm', '43mm', true);
+    testSize(group, workspace, 10, 20, true);
+    testSize(elipse, group, 11, 21, true);
+    testSize(rect, workspace, 12, 22, true);
+    testSize(rectArc, workspace, 23, 13, true);
+    testSize(line, workspace, 13, 23, false);
+}
+
+function testElementEventHandling()
+{
+    var testEventHandling = function(elem, parent, eventType)
+    {
+        if (parent)
+        {
+            parent.appendChild(elem);
+        }
+
+        var listener = function() { /* Dummy event listener */
+        };
+        elem.addEventListener(eventType, listener);
+        elem.removeEventListener(eventType, listener);
+    };
+
+    testEventHandling(workspace, null, 'mouseover');
+    testEventHandling(group, workspace, 'mouseover');
+    testEventHandling(elipse, workspace, 'mouseover');
+    testEventHandling(rect, workspace, 'mouseover');
+    testEventHandling(rectArc, workspace, 'mouseover');
+    testEventHandling(line, workspace, 'mouseover');
+}
+;
+
+function testStroke()
+{
+    var testStroke = function(elem, parent, isSupported)
+    {
+        if (parent)
+        {
+            parent.appendChild(elem);
+        }
+        var strokeStyles = ['solid','dot','dash','dashdot','longdash'];
+        for (var i = 0; i < strokeStyles.length; i++)
+        {
+            for (var j = 0; j < 10; j++)
+            {
+                elem.setStroke(j, strokeStyles[i], 'red');
+            }
+        }
+    };
+
+    //    testStroke(workspace,null);
+    testStroke(elipse, workspace);
+    testStroke(rect, workspace);
+    testStroke(rectArc, workspace);
+    testStroke(line, workspace);
+}
+;
+
+</script>
+
+
+</body>
+</html>
+
diff --git a/trunk/web2d/src/test/javascript/jsUnit/WorkspaceTestSuite.html b/trunk/web2d/src/test/javascript/jsUnit/WorkspaceTestSuite.html
new file mode 100755
index 00000000..677d9857
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/jsUnit/WorkspaceTestSuite.html
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>JsUnit Test Suite</title>
+    <link rel="stylesheet" type="text/css" href="../../lib/jsunit/css/jsUnitStyle.css">
+
+    <script language="JavaScript" type="text/javascript" src="../../lib/jsunit/app/jsUnitCore.js"></script>
+    <script language="JavaScript" type="text/javascript" src="../../../src/web2d.js"></script>
+    <script type="text/javascript">
+
+        web2d.peer.Toolkit.init();
+
+    </script>
+</head>
+
+<body>
+<h1>JsUnit Test Suite</h1>
+
+<p>This page contains a suite of tests for testing JsUnit. Click <a href="../../lib/jsunit/testRunner.html">here</a> to
+    start running the test</p>
+
+<div id="divWorkspace" style="border:1px solid red;position:absolute;left:0px;top:0px;width:400;height:410px;">
+</div>
+
+
+<script language="JavaScript" type="text/javascript">
+
+function setUp()
+{
+    debug("Setting up workspace");
+    workspace = new web2d.Workspace();
+    workspace.addItAsChildTo($("divWorkspace"));
+}
+
+function testGettersTest()
+{
+    // I you initialize a workspace, all default values must have valid values.
+    var fill = workspace.getFill();
+    assertEquals("white", fill.color);
+}
+
+function testSettersTest()
+{
+    // I you initialize a workspace, all default values must have valid values.
+    workspace.setFill("red");
+    var fill = workspace.getFill();
+    assertEquals("red", fill.color);
+}
+
+function testEventTest()
+{
+    var firstListener = function() {
+        alert("My Listener 1");
+    };
+    var secondListener = function() {
+        alert("My Listener 2");
+    };
+
+    workspace.addEventListener("click", firstListener);
+
+    // Handle gracefully invalid event types...
+    var catchException = false
+    try
+    {
+        workspace.addEventListener("click2", firstListener);
+    } catch(e)
+    {
+        catchException = true;
+    }
+    assert("Invalid type handling check seems to be broken", catchException);
+
+    // Test remove event functionality.
+    //// Fail if a listener is tryed to be removed and it was not previouly added.
+    catchException = false
+    try
+    {
+        workspace.removeEventListener("click", secondListener);
+    } catch(e)
+    {
+        catchException = true;
+    }
+    assert("Invalid remove operation seems to be broken", catchException);
+
+    //// Remove a valid listener.
+    workspace.removeEventListener("click", firstListener);
+
+    //// It has been removed?
+    catchException = false;
+    try
+    {
+        workspace.removeEventListener("click", firstListener);
+    } catch(e)
+    {
+        catchException = true;
+    }
+    assert("Could not remove the element", catchException);
+
+
+    // Check multiple registation of a type ...
+    //// Add two listeners ...
+    workspace.addEventListener("dblclick", firstListener);
+    workspace.addEventListener("dblclick", secondListener);
+
+    //// Remove it ...
+    workspace.removeEventListener("dblclick", firstListener);
+    workspace.removeEventListener("dblclick", secondListener);
+
+    /// Check multiple registration on different types ...
+    workspace.addEventListener("click", firstListener);
+    workspace.addEventListener("mouseover", secondListener);
+
+}
+
+function testAppendAndRemoveTest()
+{
+    // Append elements ..
+    var elipse = new web2d.Elipse();
+    var group = new web2d.Group();
+    group.appendChild(elipse);
+    workspace.appendChild(group);
+
+    // Remove elements ..
+    workspace.removeChild(group);
+    group.removeChild(elipse);
+
+}
+</script>
+
+
+</body>
+</html>
+
diff --git a/trunk/web2d/src/test/javascript/render/events.html b/trunk/web2d/src/test/javascript/render/events.html
new file mode 100755
index 00000000..f5e62fa3
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/events.html
@@ -0,0 +1,270 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript" src="web2dLibraryLoader.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
+    <style type="text/css">
+        .eventForm {
+            float: left;
+            margin: 10px;
+        }
+
+    </style>
+
+    <script type="text/javascript">
+
+        function EventLogger(type, element)
+        {
+            this._enable = false;
+            this._element = element;
+            this._type = type;
+            this._listener = function logger(event)
+            {
+                var oldColor = this.getAttribute('fillColor');
+                this.setFill("yellow");
+                alert("Event on:" + this.getType() + ", Type:" + type);
+                this.setFill(oldColor);
+            };
+        }
+
+        EventLogger.prototype.changeState = function()
+        {
+            this._enable = !this._enable;
+            if (this._enable)
+            {
+                this._element.addEventListener(this._type, this._listener);
+            } else
+            {
+                this._element.removeEventListener(this._type, this._listener);
+            }
+            return this._enable;
+        };
+
+    </script>
+</head>
+
+<body>
+
+<script type="text/javascript">
+    //    Logger.setEnabled(true);
+</script>
+
+<h1>Elements Event Handling</h1>
+
+<table border="1">
+<colgroup style="width:80%;">
+    <col style="width:30%"/>
+    <col style="width:60%"/>
+</colgroup>
+<tbody>
+<tr>
+<td>
+    This examples shows the ability to attach listeners to handle several events.
+    In this example, you can attach different events to three elements: workspace, small elipse and the big elipse.
+    Events will follow the event bubbling behaviour.
+</td>
+<td>
+    <div id="workspaceContainer" style="float:left;"></div>
+
+    <div class="eventForm">
+        <form action="">
+            <fieldset>
+                <legend>Workspace Events</legend>
+                <label>Click Event:
+                    <input type="button" value="Register"
+                           onclick="(!wClickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Double Click Event:
+                    <input type="button" value="Register"
+                           onclick="(!wDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Over Event:
+                    <input type="button" value="Register"
+                           onclick="(!wMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Out Event:
+                    <input type="button" value="Register"
+                           onclick="(!wMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Move Event:
+                    <input type="button" value="Register"
+                           onclick="(!wMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label>
+            </fieldset>
+        </form>
+
+        <form action="">
+            <fieldset>
+                <legend>Small Elipse Events</legend>
+                <label>Click Event:
+                    <input type="button" value="Register"
+                           onclick="(!esClickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Double Click Event:
+                    <input type="button" value="Register"
+                           onclick="(!esDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Over Event:
+                    <input type="button" value="Register"
+                           onclick="(!esMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Out Event:
+                    <input type="button" value="Register"
+                           onclick="(!esMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Move Event:
+                    <input type="button" value="Register"
+                           onclick="(!esMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label>
+            </fieldset>
+        </form>
+
+        <form action="">
+            <fieldset>
+                <legend>Big Elipse Events</legend>
+                <label>Click Event:
+                    <input type="button" value="Register"
+                           onclick="(!ebClickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Double Click Event:
+                    <input type="button" value="Register"
+                           onclick="(!ebDblCickEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Over Event:
+                    <input type="button" value="Register"
+                           onclick="(!ebMouseoverEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Out Event:
+                    <input type="button" value="Register"
+                           onclick="(!ebMouseoutEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label><br/>
+                <label>Mouse Move Event:
+                    <input type="button" value="Register"
+                           onclick="(!ebMousemoveEventLogger.changeState())?this.value='Register':this.value='Unregister'"/>
+                </label>
+            </fieldset>
+        </form>
+
+    </div>
+</td>
+
+
+<script type="text/javascript">
+    web2d.peer.Toolkit.init();
+
+    // Workspace with CoordOrigin(100,100);
+    var workspace = new web2d.Workspace();
+    workspace.setSize("150px", "150px");
+    workspace.setCoordSize(150, 150);
+
+    var bigElipse = new web2d.Elipse();
+    bigElipse.setSize(100, 100);
+    bigElipse.setPosition(75, 75);
+    workspace.appendChild(bigElipse);
+
+    var smallElipse = new web2d.Elipse();
+    smallElipse.setSize(50, 50);
+    smallElipse.setPosition(75, 75);
+    smallElipse.setFill('red')
+    workspace.appendChild(smallElipse);
+
+    wClickEventLogger = new EventLogger('click', workspace);
+    wMouseoverEventLogger = new EventLogger('mouseover', workspace);
+    wMouseoutEventLogger = new EventLogger('mouseout', workspace);
+    wMousemoveEventLogger = new EventLogger('mousemove', workspace);
+    wDblCickEventLogger = new EventLogger('dblclick', workspace);
+
+    esClickEventLogger = new EventLogger('click', smallElipse);
+    esMouseoverEventLogger = new EventLogger('mouseover', smallElipse);
+    esMouseoutEventLogger = new EventLogger('mouseout', smallElipse);
+    esMousemoveEventLogger = new EventLogger('mousemove', smallElipse);
+    esDblCickEventLogger = new EventLogger('dblclick', smallElipse);
+
+    ebClickEventLogger = new EventLogger('click', bigElipse);
+    ebMouseoverEventLogger = new EventLogger('mouseover', bigElipse);
+    ebMouseoutEventLogger = new EventLogger('mouseout', bigElipse);
+    ebousemoveEventLogger = new EventLogger('mousemove', bigElipse);
+    ebblCickEventLogger = new EventLogger('dblclick', bigElipse);
+
+    workspace.addItAsChildTo($("workspaceContainer"));
+
+</script>
+</tr>
+<tr>
+    <td>Multiple listeners can be attached to an element to handle an event type.
+        In this example, multiple listeners can be registered to the elipse element to handle the click event type.
+    </td>
+    <td>
+        <div id="workspaceMultipleEvents" style="float:left;"></div>
+
+        <div class="eventForm">
+            <form action="">
+                <fieldset>
+                    <legend>Elipse Click Events Listeners</legend>
+                    <label>Registered Listeners #:
+                        <input type="text" disabled="disabled" value="0" id="listenerCounter" maxlength="2" size="2"/>
+                    </label>
+                    <br/>
+                    <input type="button" value="Register Listener"
+                           onclick="multipleHandler.registerOneListener();$('listenerCounter').value=multipleHandler.listenerCount();"/>
+                    <input type="button" value="UnRegister Listener"
+                           onclick="multipleHandler.unRegisterOneListener();$('listenerCounter').value=multipleHandler.listenerCount();"/>
+                </fieldset>
+
+            </form>
+
+        </div>
+        <script type="text/javascript">
+            function MultipleEventHandler(type, element)
+            {
+                this._listeners = [];
+                this._type = type;
+                this._element = element;
+            }
+
+            MultipleEventHandler.prototype.registerOneListener = function()
+            {
+                var count = this._listeners.length;
+                var listener = function(event) {
+                    alert("Listener #:" + count);
+                };
+                this._listeners.push(listener);
+                this._element.addEventListener(this._type, listener);
+
+            }
+
+            MultipleEventHandler.prototype.listenerCount = function()
+            {
+                return  this._listeners.length;
+            }
+
+            MultipleEventHandler.prototype.unRegisterOneListener = function()
+            {
+                if (this._listeners.length > 0)
+                {
+                    var listener = this._listeners.pop();
+                    this._element.removeEventListener(this._type, listener);
+                }
+            }
+
+            var mEventWorkspace = new web2d.Workspace();
+            mEventWorkspace.setSize("150px", "150px");
+            mEventWorkspace.setCoordSize(150, 150);
+
+            var elipse = new web2d.Elipse();
+            elipse.setSize(100, 100);
+            elipse.setPosition(75, 75);
+            elipse.setFill('blue')
+            mEventWorkspace.appendChild(elipse);
+
+            mEventWorkspace.addItAsChildTo($("workspaceMultipleEvents"));
+            multipleHandler = new MultipleEventHandler('click', elipse);
+
+        </script>
+    </td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/group.html b/trunk/web2d/src/test/javascript/render/group.html
new file mode 100755
index 00000000..5a8791bc
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/group.html
@@ -0,0 +1,480 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript" src="web2dLibraryLoader.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
+</head>
+
+<body>
+
+<h1>Group Render Tests.</h1>
+<table border="1">
+<colgroup style="width:80%;">
+    <col style="width:50%"/>
+    <col style="width:50%"/>
+</colgroup>
+<tr>
+    <td>
+        A group object can be used to collect shapes. In this example,
+        There is a group that contains an elipse and two lines as children.
+        Changing the group position also change the position of all contained
+        elements.
+    </td>
+    <td>
+        <div id="groupBasicContainer"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    web2d.peer.Toolkit.init();
+
+    var basicTest = function()
+    {
+        var workspace = new web2d.Workspace();
+        workspace.setSize("150px", "150px");
+        workspace.setCoordSize(100, 100);
+
+        var group = new web2d.Group();
+        group.setSize(50, 50);
+        group.setPosition(25, 50);
+        group.setCoordSize(200, 200);
+        group.setCoordOrigin(0, 0);
+        workspace.appendChild(group);
+
+        var elipse = new web2d.Elipse();
+        elipse.setSize(200, 200);
+        elipse.setPosition(100, 100);
+        group.appendChild(elipse);
+
+        var line = new web2d.Line();
+        line.setFrom(0, 0);
+        line.setTo(200, 200);
+        line.setStroke("blue");
+        group.appendChild(line);
+
+        line = new web2d.Line();
+        line.setFrom(200, 0);
+        line.setTo(0, 200);
+        line.setStroke("blue");
+        group.appendChild(line);
+
+        workspace.addItAsChildTo($("groupBasicContainer"));
+
+
+        var xDir = 1;
+        var yDir = 1;
+        var executer = function()
+        {
+            var y = group.getPosition().y + yDir;
+            var x = group.getPosition().x + xDir;
+
+            if (x < 0)
+            {
+                xDir = 1;
+            } else if (x > 50)
+            {
+                xDir = -1;
+            }
+
+            if (y < 0)
+            {
+                yDir = 1;
+            } else if (y > 50)
+            {
+                yDir = -1;
+            }
+
+            //  Logger.logMsg("Moving group x,y:"+ x + "," + y);
+            group.setPosition(x, y);
+        };
+        executer.periodical(100);
+    };
+    basicTest();
+</script>
+<!-- ************************************************************************** -->
+<tr>
+    <td>
+        Following the bubbling event pattern, all the events over a shape are propageted to its
+        parent. In this example, both elipse objects are child of a group element and click event listeners
+        have been added to the elipse and the group.
+    </td>
+    <td>
+        <div id="groupEventsContainer"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+
+    var eventTest = function()
+    {
+        var workspace = new web2d.Workspace();
+        workspace.setSize("150px", "150px");
+        workspace.setCoordSize(100, 100);
+
+        var groupAttributes = {width:50,height:50,x:25,y:50,coordSize:'200 200',coordOrigin:'0 0'};
+        var group = new web2d.Group(groupAttributes);
+        workspace.appendChild(group);
+
+        var elipseLeft = new web2d.Elipse();
+        elipseLeft.setSize(200, 200)
+        elipseLeft.setPosition(200, 0)
+        group.appendChild(elipseLeft);
+
+        var elipseRight = new web2d.Elipse();
+        elipseRight.setSize(200, 200)
+        elipseRight.setPosition(0, 0)
+        group.appendChild(elipseRight);
+
+        var listener = function(e) {
+            alert("Click event on:" + this.getType())
+        };
+        group.addEventListener("click", listener);
+        elipseLeft.addEventListener("click", listener);
+        elipseRight.addEventListener("click", listener);
+
+        workspace.addItAsChildTo($("groupEventsContainer"));
+    }
+    eventTest();
+</script>
+<!-- ************************************************************************** -->
+<tr>
+    <td>
+        Groups can be nested as a regular shape. An important property of the groups is the ability
+        to define their own coordSize, coorOrigin and size. In this example, both shapes have been
+        created with the same properties. The red one has been added as a child element of a group with the
+        following properties:<br/>
+        <br/>
+        Size(50,50);<br/>
+        Position(25,25);<br/>
+        CoordSize(100,100);<br/>
+        CoordOrigin(0,0)<br/>
+
+        The blue one has been added as a child of another group with the following properties::<br/>
+        <br/>
+        Size(50,50);<br/>
+        Position(25,25);<br/>
+        CoordSize(100,100);<br/>
+        CoordOrigin(0,0);<br/>
+        <br/>
+        Finally, the second group has been added as a child of the first declared group.
+    </td>
+    <td>
+        <div id="groupNestedContainer"/>
+    </td>
+
+</tr>
+
+<script type="text/javascript">
+    var eventTest = function()
+    {
+        var workspace = new web2d.Workspace();
+        workspace.setSize("150px", "150px");
+        workspace.setCoordSize(200, 200);
+
+        var groupOuter = new web2d.Group();
+        groupOuter.setSize(50, 50)
+        groupOuter.setPosition(25, 25);
+        groupOuter.setCoordSize(100, 100);
+        groupOuter.setCoordOrigin(0, 0)
+        workspace.appendChild(groupOuter);
+
+        var elipseOuter = new web2d.Elipse();
+        elipseOuter.setSize(200, 200);
+        elipseOuter.setPosition(100, 100);
+        elipseOuter.setFill("red");
+        groupOuter.appendChild(elipseOuter);
+
+        var line = new web2d.Line();
+        line.setFrom(0, 0);
+        line.setTo(200, 200);
+        line.setStroke("red");
+        groupOuter.appendChild(line);
+
+        var line = new web2d.Line();
+        line.setFrom(200, 0);
+        line.setTo(0, 200);
+        line.setStroke("red");
+        groupOuter.appendChild(line);
+
+        var groupInner = new web2d.Group();
+        groupInner.setSize(50, 50);
+        groupInner.setPosition(25, 25);
+        groupInner.setCoordSize(100, 100);
+        groupInner.setCoordOrigin(0, 0);
+        groupOuter.appendChild(groupInner);
+
+        var elipse = new web2d.Elipse();
+        elipse.setSize(200, 200);
+        elipse.setPosition(100, 100);
+        groupInner.appendChild(elipse);
+
+        var line = new web2d.Line();
+        line.setFrom(0, 0);
+        line.setTo(200, 200);
+        line.setStroke("blue");
+        groupInner.appendChild(line);
+
+        var line = new web2d.Line();
+        line.setFrom(200, 0);
+        line.setTo(0, 200);
+        line.setStroke("blue");
+        groupInner.appendChild(line);
+
+        workspace.addItAsChildTo($("groupNestedContainer"));
+    };
+    eventTest();
+</script>
+
+<!-- ************************************************************************** -->
+<tr>
+    <td>
+        Group coordsize defines how many units there are along the width of the containing block.
+        In all the examples, the coordsize of the workspaces have been set to (100,100) and the circles have been
+        positioned
+        at (0,0),(0,100),(100,0),(100,100)(50,50).<br/>
+        <br/>
+        1) Group with CoordSize(100,100)<br/>
+        2) Group with CoordSize(100,200)<br/>
+        3) Group with CoordSize(200,100)<br/>
+    </td>
+    <td>
+        <div style="position:relative;width:100%;">
+            <div id="coordsizeExample100x100" style="float:left;margin:20px;">
+                (1)
+            </div>
+
+            <div id="coordsizeExample100x200" style="float:left;margin:20px;">
+                (2)
+            </div>
+
+            <div id="coordsizeExample200x100" style="float:left;margin:20px;">
+                (3)
+            </div>
+        </div>
+    </td>
+</tr>
+
+<script type="text/javascript">
+    var workspaceCoordSizeSample = function()
+    {
+
+        function groupSampleBuilder(width, height)
+        {
+            // Group with CoordSize(50,50);
+            var workspace = new web2d.Workspace();
+            workspace.setSize("100px", "100px");
+            workspace.setCoordSize(100, 100);
+
+            elipseOuter = new web2d.Elipse();
+            elipseOuter.setPosition(50, 50);
+            elipseOuter.setSize(50, 50);
+            workspace.appendChild(elipseOuter);
+
+            var group = new web2d.Group();
+            group.setSize(50, 50);
+            group.setCoordSize(width, height);
+            group.setPosition(25, 25);
+            workspace.appendChild(group);
+
+            elipseInner = new web2d.Elipse();
+            elipseInner.setPosition(50, 50);
+            elipseInner.setSize(50, 50);
+            elipseInner.setFill("red");
+            group.appendChild(elipseInner);
+
+            return workspace;
+        }
+
+        var sample100x100 = groupSampleBuilder(100, 100);
+        sample100x100.addItAsChildTo($("coordsizeExample100x100"));
+
+        var sample100x200 = groupSampleBuilder(100, 200);
+        sample100x200.addItAsChildTo($("coordsizeExample100x200"));
+
+        var sample200x100 = groupSampleBuilder(200, 100);
+        sample200x100.addItAsChildTo($("coordsizeExample200x100"));
+    };
+    workspaceCoordSizeSample();
+</script>
+
+<!-- ************************************************************************** -->
+<tr>
+    <td>
+        Group coordorigin defines the coordinate at the top left corner of the containing block.
+        In all the examples,the coordsize of the groups have been set to (100,100) and the circles have been positioned
+        at (0,0),(0,100),(100,0),(100,100)(50,50). <br/>
+        <br/>
+        1) Group with CoordOrigin(0,0)<br/>
+        2) Group with CoordOrigin(0,50)<br/>
+        3) Group with CoordOrigin(50,0)<br/>
+    </td>
+    <td>
+        <div style="position:relative;width:100%;">
+            <div id="coordOriginExample0x0" style="float:left;margin:20px;">
+                (1)
+            </div>
+
+            <div id="coordOriginExample0x50" style="float:left;margin:20px;">
+                (2)
+            </div>
+
+            <div id="coordOriginExample50x0" style="float:left;margin:20px;">
+                (3)
+            </div>
+        </div>
+    </td>
+</tr>
+
+<script type="text/javascript">
+    var workspaceCoordOriginSample = function()
+    {
+
+        function groupSampleBuilder(x, y)
+        {
+            var workspace = new web2d.Workspace();
+            workspace.setSize("100px", "100px");
+            workspace.setCoordSize(100, 100);
+
+            elipseOuter = new web2d.Elipse();
+            elipseOuter.setPosition(50, 50);
+            elipseOuter.setSize(50, 50);
+            workspace.appendChild(elipseOuter);
+
+            var group = new web2d.Group();
+            group.setSize(50, 50);
+            group.setCoordSize(100, 100);
+            group.setCoordOrigin(x, y);
+            group.setPosition(25, 25);
+            workspace.appendChild(group);
+
+            elipseInner = new web2d.Elipse();
+            elipseInner.setPosition(50, 50);
+            elipseInner.setSize(50, 50);
+            elipseInner.setFill("red");
+            group.appendChild(elipseInner);
+
+            return workspace;
+        }
+        ;
+
+        var sample0x0 = groupSampleBuilder(0, 0);
+        sample0x0.addItAsChildTo($("coordOriginExample0x0"));
+
+        var sample100x200 = groupSampleBuilder(0, 50);
+        sample100x200.addItAsChildTo($("coordOriginExample0x50"));
+
+        var sample200x100 = groupSampleBuilder(50, 0);
+        sample200x100.addItAsChildTo($("coordOriginExample50x0"));
+    }
+    workspaceCoordOriginSample();
+</script>
+
+<!-- ************************************************************************** -->
+<tr>
+    <td>
+        Visibility can be used to hide an element and disable all the element events.
+        In the case of a group, this property is applied to all the children elements.
+    </td>
+    <td>
+        <div id="visibilityExample" style="float:left;margin:20px;"></div>
+    </td>
+</tr>
+
+<script type="text/javascript">
+    var groupVisibilitySample = function()
+    {
+
+        var workspace = new web2d.Workspace();
+        workspace.setSize("100px", "100px");
+        workspace.setCoordSize(100, 100);
+
+        var group = new web2d.Group();
+        group.setSize(100, 100);
+        group.setPosition(0, 0);
+        group.setCoordSize(100, 100);
+        group.addEventListener("mouseover", function() {
+            alert("Mouse Over Group");
+        });
+        workspace.appendChild(group);
+
+        elipseOuter = new web2d.Elipse();
+        elipseOuter.setPosition(50, 50);
+        elipseOuter.setSize(50, 50);
+        group.addEventListener("mouseover", function() {
+            alert("Mouse Over elipseOuter");
+        });
+        group.appendChild(elipseOuter);
+
+        elipseInner = new web2d.Elipse();
+        elipseInner.setPosition(50, 50);
+        elipseInner.setSize(25, 25);
+        elipseInner.setFill("red");
+        group.appendChild(elipseInner);
+
+        var isVisible = true;
+        var executer = function()
+        {
+            isVisible = !isVisible;
+            group.setVisibility(isVisible);
+        };
+        executer.periodical(100);
+        workspace.addItAsChildTo($("visibilityExample"));
+
+    }
+    groupVisibilitySample();
+</script>
+
+<!-- ************************************************************************** -->
+<tr>
+    <td>
+        Scale.
+    </td>
+    <td>
+        <div id="scaleStrokeExample" style="float:left;margin:20px;"></div>
+    </td>
+</tr>
+
+<script type="text/javascript">
+    var groupVisibilitySample = function()
+    {
+
+        var workspace = new web2d.Workspace();
+        workspace.setSize("100px", "100px");
+        workspace.setCoordSize(100, 100);
+
+        var group = new web2d.Group();
+        group.setSize(100, 100);
+        group.setPosition(0, 0);
+        group.setCoordSize(100, 100);
+        workspace.appendChild(group);
+
+        elipseOuter = new web2d.Elipse();
+        elipseOuter.setPosition(50, 50);
+        elipseOuter.setSize(50, 50);
+        group.appendChild(elipseOuter);
+
+        elipseInner = new web2d.Elipse();
+        elipseInner.setPosition(50, 50);
+        elipseInner.setSize(25, 25);
+        elipseInner.setFill("red");
+        group.appendChild(elipseInner);
+
+        var width = 10;
+        var height = 10;
+        var executer = function()
+        {
+            width = (width + 10) % 100;
+            height = (height + 10) % 100;
+            group.setCoordSize(width, height);
+        };
+        executer.periodical(100);
+        workspace.addItAsChildTo($("scaleStrokeExample"));
+
+    }
+    groupVisibilitySample();
+</script>
+
+</table>
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/line.html b/trunk/web2d/src/test/javascript/render/line.html
new file mode 100755
index 00000000..2095bbdd
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/line.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript" src="web2dLibraryLoader.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
+</head>
+
+<body>
+
+<h1>Lines Render Tests </h1>
+
+<table border="1">
+<colgroup style="width:80%;">
+    <col style="width:30%"/>
+    <col style="width:60%"/>
+</colgroup>
+<tr>
+    <td>
+        Lines.
+    </td>
+    <td>
+        <div id="strokeWidthSample"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    web2d.peer.Toolkit.init();
+    var workspaceAttributes = { width:'700px',height:'100px',coordSize:'350 50',fillColor:'#ffffcc'};
+    var strokeWidthWorkspace = new web2d.Workspace(workspaceAttributes);
+
+    var rect = new web2d.Rect();
+    rect.setSize(10, 10);
+    rect.setStroke(0);
+    rect.setPosition(250, 5);
+    strokeWidthWorkspace.appendChild(rect);
+
+    for (var i = 0; i <= 10; i++)
+    {
+        var line = new web2d.Line();
+        line.setFrom(5 + (i * 25), 5);
+        line.setTo(5 + (i * 25), 45);
+        line.setAttribute('strokeWidth', i + 1);
+        strokeWidthWorkspace.appendChild(line);
+    }
+    strokeWidthWorkspace.appendChild(rect);
+
+    strokeWidthWorkspace.addItAsChildTo($("strokeWidthSample"));
+</script>
+
+<tr>
+    <td>
+        Lines Opacity.
+    </td>
+    <td>
+        <div id="strokeOpacitySample"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    var strokeOpacityWorkspace = new web2d.Workspace(workspaceAttributes);
+    for (var i = 0; i < 10; i++)
+    {
+        var line = new web2d.Line();
+        line.setFrom(15 + (i * 25), 5);
+        line.setTo(3 + (i * 25), 45);
+        line.setAttribute('strokeWidth', 2);
+        line.setAttribute('strokeOpacity', 1 / (i + 1));
+        line.setAttribute('strokeColor', 'red');
+        strokeOpacityWorkspace.appendChild(line);
+    }
+    strokeOpacityWorkspace.addItAsChildTo($("strokeOpacitySample"));
+</script>
+
+<tr>
+    <td>
+        Line Styles.
+    </td>
+    <td>
+        <div id="strokeStyleSample"/>
+    </td>
+
+</tr>
+
+<script type="text/javascript">
+    var strokeStyleWorkspace = new web2d.Workspace(workspaceAttributes);
+    var styles = ['solid','dot','dash','dashdot','longdash'];
+    for (var i = 0; i < styles.length; i++)
+    {
+        var line = new web2d.Line();
+        line.setFrom(25 + (i * 30), 5);
+        line.setTo(13 + (i * 30), 45);
+        line.setAttribute('strokeWidth', 2);
+        line.setAttribute('strokeColor', 'red');
+        line.setAttribute('strokeStyle', styles[i]);
+        strokeStyleWorkspace.appendChild(line);
+    }
+    strokeStyleWorkspace.addItAsChildTo($("strokeStyleSample"));
+</script>
+
+<tr>
+    <td>
+        Line Arrows.
+    </td>
+    <td>
+        <div id="strokeArrowSample"/>
+    </td>
+
+</tr>
+
+<script type="text/javascript">
+    var strokeArrowWorkspace = new web2d.Workspace(workspaceAttributes);
+    var styles = ['none ','block ','classic','diamond ','oval','open','chevron','doublechevron'];
+    for (var i = 0; i < styles.length; i++)
+    {
+        var line = new web2d.Line();
+        line.setFrom(25 + (i * 30), 5);
+        line.setTo(13 + (i * 30), 45);
+        line.setAttribute('strokeWidth', 2);
+        line.setAttribute('strokeColor', 'red');
+        line.setArrowStyle(styles[i]);
+        strokeArrowWorkspace.appendChild(line);
+    }
+    strokeArrowWorkspace.addItAsChildTo($("strokeArrowSample"));
+</script>
+
+</table>
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/mootools.js b/trunk/web2d/src/test/javascript/render/mootools.js
new file mode 100644
index 00000000..38369cea
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/mootools.js
@@ -0,0 +1,2171 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//MooTools, My Object Oriented Javascript Tools. Copyright (c) 2006 Valerio Proietti, <http://mad4milk.net>, MIT Style License.
+
+var MooTools = {version:'1.11'};
+function $defined(obj) {
+    return(obj != undefined);
+}
+;
+function $type(obj) {
+    if (!$defined(obj))return false;
+    if (obj.htmlElement)return'element';
+    var type = typeof obj;
+    if (type == 'object' && obj.nodeName) {
+        switch (obj.nodeType) {case 1:return'element';case 3:return(/\S/).test(obj.nodeValue) ? 'textnode' : 'whitespace';}
+    }
+    if (type == 'object' || type == 'function') {
+        switch (obj.constructor) {case Array:return'array';case RegExp:return'regexp';case Class:return'class';}
+        if (typeof obj.length == 'number') {
+            if (obj.item)return'collection';
+            if (obj.callee)return'arguments';
+        }
+    }
+    return type;
+}
+;
+function $merge() {
+    var mix = {};
+    for (var i = 0; i < arguments.length; i++) {
+        for (var property in arguments[i]) {
+            var ap = arguments[i][property];
+            var mp = mix[property];
+            if (mp && $type(ap) == 'object' && $type(mp) == 'object')mix[property] = $merge(mp, ap); else mix[property] = ap;
+        }
+    }
+    return mix;
+}
+;
+var $extend = function() {
+    var args = arguments;
+    if (!args[1])args = [this,args[0]];
+    for (var property in args[1])args[0][property] = args[1][property];
+    return args[0];
+};
+var $native = function() {
+    for (var i = 0,l = arguments.length; i < l; i++) {
+        arguments[i].extend = function(props) {
+            for (var prop in props) {
+                if (!this.prototype[prop])this.prototype[prop] = props[prop];
+                if (!this[prop])this[prop] = $native.generic(prop);
+            }
+        };
+    }
+};
+$native.generic = function(prop) {
+    return function(bind) {
+        return this.prototype[prop].apply(bind, Array.prototype.slice.call(arguments, 1));
+    };
+};
+$native(Function, Array, String, Number);
+function $chk(obj) {
+    return!!(obj || obj === 0);
+}
+;
+function $pick(obj, picked) {
+    return $defined(obj) ? obj : picked;
+}
+;
+function $random(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+;
+function $time() {
+    return new Date().getTime();
+}
+;
+function $clear(timer) {
+    clearTimeout(timer);
+    clearInterval(timer);
+    return null;
+}
+;
+var Abstract = function(obj) {
+    obj = obj || {};
+    obj.extend = $extend;
+    return obj;
+};
+var Window = new Abstract(window);
+var Document = new Abstract(document);
+document.head = document.getElementsByTagName('head')[0];
+window.xpath = !!(document.evaluate);
+if (window.ActiveXObject)window.ie = window[window.XMLHttpRequest ? 'ie7' : 'ie6'] = true; else if (document.childNodes && !document.all && !navigator.taintEnabled)window.webkit = window[window.xpath ? 'webkit420' : 'webkit419'] = true; else if (document.getBoxObjectFor != null)window.gecko = true;
+window.khtml = window.webkit;
+Object.extend = $extend;
+if (typeof HTMLElement == 'undefined') {
+    var HTMLElement = function() {
+    };
+    if (window.webkit)document.createElement("iframe");
+    HTMLElement.prototype = (window.webkit) ? window["[[DOMElement.prototype]]"] : {};
+}
+HTMLElement.prototype.htmlElement = function() {
+};
+if (window.ie6)try {
+    document.execCommand("BackgroundImageCache", false, true);
+} catch(e) {
+}
+;
+var Class = function(properties) {
+    var klass = function() {
+        return(arguments[0] !== null && this.initialize && $type(this.initialize) == 'function') ? this.initialize.apply(this, arguments) : this;
+    };
+    $extend(klass, this);
+    klass.prototype = properties;
+    klass.constructor = Class;
+    return klass;
+};
+Class.empty = function() {
+};
+Class.prototype = {extend:function(properties) {
+    var proto = new this(null);
+    for (var property in properties) {
+        var pp = proto[property];
+        proto[property] = Class.Merge(pp, properties[property]);
+    }
+    return new Class(proto);
+},implement:function() {
+    for (var i = 0,l = arguments.length; i < l; i++)$extend(this.prototype, arguments[i]);
+}};
+Class.Merge = function(previous, current) {
+    if (previous && previous != current) {
+        var type = $type(current);
+        if (type != $type(previous))return current;
+        switch (type) {case'function':var merged = function() {
+            this.parent = arguments.callee.parent;
+            return current.apply(this, arguments);
+        };merged.parent = previous;return merged;case'object':return $merge(previous, current);}
+    }
+    return current;
+};
+var Chain = new Class({chain:function(fn) {
+    this.chains = this.chains || [];
+    this.chains.push(fn);
+    return this;
+},callChain:function() {
+    if (this.chains && this.chains.length)this.chains.shift().delay(10, this);
+},clearChain:function() {
+    this.chains = [];
+}});
+var Events = new Class({addEvent:function(type, fn) {
+    if (fn != Class.empty) {
+        this.$events = this.$events || {};
+        this.$events[type] = this.$events[type] || [];
+        this.$events[type].include(fn);
+    }
+    return this;
+},fireEvent:function(type, args, delay) {
+    if (this.$events && this.$events[type]) {
+        this.$events[type].each(function(fn) {
+            fn.create({'bind':this,'delay':delay,'arguments':args})();
+        }, this);
+    }
+    return this;
+},removeEvent:function(type, fn) {
+    if (this.$events && this.$events[type])this.$events[type].remove(fn);
+    return this;
+}});
+var Options = new Class({setOptions:function() {
+    this.options = $merge.apply(null, [this.options].extend(arguments));
+    if (this.addEvent) {
+        for (var option in this.options) {
+            if ($type(this.options[option] == 'function') && (/^on[A-Z]/).test(option))this.addEvent(option, this.options[option]);
+        }
+    }
+    return this;
+}});
+Array.extend({forEach:function(fn, bind) {
+    for (var i = 0,j = this.length; i < j; i++)fn.call(bind, this[i], i, this);
+},filter:function(fn, bind) {
+    var results = [];
+    for (var i = 0,j = this.length; i < j; i++) {
+        if (fn.call(bind, this[i], i, this))results.push(this[i]);
+    }
+    return results;
+},map:function(fn, bind) {
+    var results = [];
+    for (var i = 0,j = this.length; i < j; i++)results[i] = fn.call(bind, this[i], i, this);
+    return results;
+},every:function(fn, bind) {
+    for (var i = 0,j = this.length; i < j; i++) {
+        if (!fn.call(bind, this[i], i, this))return false;
+    }
+    return true;
+},some:function(fn, bind) {
+    for (var i = 0,j = this.length; i < j; i++) {
+        if (fn.call(bind, this[i], i, this))return true;
+    }
+    return false;
+},indexOf:function(item, from) {
+    var len = this.length;
+    for (var i = (from < 0) ? Math.max(0, len + from) : from || 0; i < len; i++) {
+        if (this[i] === item)return i;
+    }
+    return-1;
+},copy:function(start, length) {
+    start = start || 0;
+    if (start < 0)start = this.length + start;
+    length = length || (this.length - start);
+    var newArray = [];
+    for (var i = 0; i < length; i++)newArray[i] = this[start++];
+    return newArray;
+},remove:function(item) {
+    var i = 0;
+    var len = this.length;
+    while (i < len) {
+        if (this[i] === item) {
+            this.splice(i, 1);
+            len--;
+        } else {
+            i++;
+        }
+    }
+    return this;
+},contains:function(item, from) {
+    return this.indexOf(item, from) != -1;
+},associate:function(keys) {
+    var obj = {},length = Math.min(this.length, keys.length);
+    for (var i = 0; i < length; i++)obj[keys[i]] = this[i];
+    return obj;
+},extend:function(array) {
+    for (var i = 0,j = array.length; i < j; i++)this.push(array[i]);
+    return this;
+},merge:function(array) {
+    for (var i = 0,l = array.length; i < l; i++)this.include(array[i]);
+    return this;
+},include:function(item) {
+    if (!this.contains(item))this.push(item);
+    return this;
+},getRandom:function() {
+    return this[$random(0, this.length - 1)] || null;
+},getLast:function() {
+    return this[this.length - 1] || null;
+}});
+Array.prototype.each = Array.prototype.forEach;
+Array.each = Array.forEach;
+function $A(array) {
+    return Array.copy(array);
+}
+;
+function $each(iterable, fn, bind) {
+    if (iterable && typeof iterable.length == 'number' && $type(iterable) != 'object') {
+        Array.forEach(iterable, fn, bind);
+    } else {
+        for (var name in iterable)fn.call(bind || iterable, iterable[name], name);
+    }
+}
+;
+Array.prototype.test = Array.prototype.contains;
+String.extend({test:function(regex, params) {
+    return(($type(regex) == 'string') ? new RegExp(regex, params) : regex).test(this);
+},toInt:function() {
+    return parseInt(this, 10);
+},toFloat:function() {
+    return parseFloat(this);
+},camelCase:function() {
+    return this.replace(/-\D/g, function(match) {
+        return match.charAt(1).toUpperCase();
+    });
+},hyphenate:function() {
+    return this.replace(/\w[A-Z]/g, function(match) {
+        return(match.charAt(0) + '-' + match.charAt(1).toLowerCase());
+    });
+},capitalize:function() {
+    return this.replace(/\b[a-z]/g, function(match) {
+        return match.toUpperCase();
+    });
+},trim:function() {
+    return this.replace(/^\s+|\s+$/g, '');
+},clean:function() {
+    return this.replace(/\s{2,}/g, ' ').trim();
+},rgbToHex:function(array) {
+    var rgb = this.match(/\d{1,3}/g);
+    return(rgb) ? rgb.rgbToHex(array) : false;
+},hexToRgb:function(array) {
+    var hex = this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
+    return(hex) ? hex.slice(1).hexToRgb(array) : false;
+},contains:function(string, s) {
+    return(s) ? (s + this + s).indexOf(s + string + s) > -1 : this.indexOf(string) > -1;
+},escapeRegExp:function() {
+    return this.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+}});
+Array.extend({rgbToHex:function(array) {
+    if (this.length < 3)return false;
+    if (this.length == 4 && this[3] == 0 && !array)return'transparent';
+    var hex = [];
+    for (var i = 0; i < 3; i++) {
+        var bit = (this[i] - 0).toString(16);
+        hex.push((bit.length == 1) ? '0' + bit : bit);
+    }
+    return array ? hex : '#' + hex.join('');
+},hexToRgb:function(array) {
+    if (this.length != 3)return false;
+    var rgb = [];
+    for (var i = 0; i < 3; i++) {
+        rgb.push(parseInt((this[i].length == 1) ? this[i] + this[i] : this[i], 16));
+    }
+    return array ? rgb : 'rgb(' + rgb.join(',') + ')';
+}});
+Function.extend({create:function(options) {
+    var fn = this;
+    options = $merge({'bind':fn,'event':false,'arguments':null,'delay':false,'periodical':false,'attempt':false}, options);
+    if ($chk(options.arguments) && $type(options.arguments) != 'array')options.arguments = [options.arguments];
+    return function(event) {
+        var args;
+        if (options.event) {
+            event = event || window.event;
+            args = [(options.event === true) ? event : new options.event(event)];
+            if (options.arguments)args.extend(options.arguments);
+        }
+        else args = options.arguments || arguments;
+        var returns = function() {
+            return fn.apply($pick(options.bind, fn), args);
+        };
+        if (options.delay)return setTimeout(returns, options.delay);
+        if (options.periodical)return setInterval(returns, options.periodical);
+        if (options.attempt)try {
+            return returns();
+        } catch(err) {
+            return false;
+        }
+        ;
+        return returns();
+    };
+},pass:function(args, bind) {
+    return this.create({'arguments':args,'bind':bind});
+},attempt:function(args, bind) {
+    return this.create({'arguments':args,'bind':bind,'attempt':true})();
+},bind:function(bind, args) {
+    return this.create({'bind':bind,'arguments':args});
+},bindAsEventListener:function(bind, args) {
+    return this.create({'bind':bind,'event':true,'arguments':args});
+},delay:function(delay, bind, args) {
+    return this.create({'delay':delay,'bind':bind,'arguments':args})();
+},periodical:function(interval, bind, args) {
+    return this.create({'periodical':interval,'bind':bind,'arguments':args})();
+}});
+Number.extend({toInt:function() {
+    return parseInt(this);
+},toFloat:function() {
+    return parseFloat(this);
+},limit:function(min, max) {
+    return Math.min(max, Math.max(min, this));
+},round:function(precision) {
+    precision = Math.pow(10, precision || 0);
+    return Math.round(this * precision) / precision;
+},times:function(fn) {
+    for (var i = 0; i < this; i++)fn(i);
+}});
+var Element = new Class({initialize:function(el, props) {
+    if ($type(el) == 'string') {
+        if (window.ie && props && (props.name || props.type)) {
+            var name = (props.name) ? ' name="' + props.name + '"' : '';
+            var type = (props.type) ? ' type="' + props.type + '"' : '';
+            delete props.name;
+            delete props.type;
+            el = '<' + el + name + type + '>';
+        }
+        el = document.createElement(el);
+    }
+    el = $(el);
+    return(!props || !el) ? el : el.set(props);
+}});
+var Elements = new Class({initialize:function(elements) {
+    return(elements) ? $extend(elements, this) : this;
+}});
+Elements.extend = function(props) {
+    for (var prop in props) {
+        this.prototype[prop] = props[prop];
+        this[prop] = $native.generic(prop);
+    }
+};
+function $(el) {
+    if (!el)return null;
+    if (el.htmlElement)return Garbage.collect(el);
+    if ([window,document].contains(el))return el;
+    var type = $type(el);
+    if (type == 'string') {
+        el = document.getElementById(el);
+        type = (el) ? 'element' : false;
+    }
+    if (type != 'element')return null;
+    if (el.htmlElement)return Garbage.collect(el);
+    if (['object','embed'].contains(el.tagName.toLowerCase()))return el;
+    $extend(el, Element.prototype);
+    el.htmlElement = function() {
+    };
+    return Garbage.collect(el);
+}
+;
+document.getElementsBySelector = document.getElementsByTagName;
+function $$() {
+    var elements = [];
+    for (var i = 0,j = arguments.length; i < j; i++) {
+        var selector = arguments[i];
+        switch ($type(selector)) {case'element':elements.push(selector);case'boolean':break;case false:break;case'string':selector = document.getElementsBySelector(selector, true);default:elements.extend(selector);}
+    }
+    return $$.unique(elements);
+}
+;
+$$.unique = function(array) {
+    var elements = [];
+    for (var i = 0,l = array.length; i < l; i++) {
+        if (array[i].$included)continue;
+        var element = $(array[i]);
+        if (element && !element.$included) {
+            element.$included = true;
+            elements.push(element);
+        }
+    }
+    for (var n = 0,d = elements.length; n < d; n++)elements[n].$included = null;
+    return new Elements(elements);
+};
+Elements.Multi = function(property) {
+    return function() {
+        var args = arguments;
+        var items = [];
+        var elements = true;
+        for (var i = 0,j = this.length,returns; i < j; i++) {
+            returns = this[i][property].apply(this[i], args);
+            if ($type(returns) != 'element')elements = false;
+            items.push(returns);
+        }
+        ;
+        return(elements) ? $$.unique(items) : items;
+    };
+};
+Element.extend = function(properties) {
+    for (var property in properties) {
+        HTMLElement.prototype[property] = properties[property];
+        Element.prototype[property] = properties[property];
+        Element[property] = $native.generic(property);
+        var elementsProperty = (Array.prototype[property]) ? property + 'Elements' : property;
+        Elements.prototype[elementsProperty] = Elements.Multi(property);
+    }
+};
+Element.extend({set:function(props) {
+    for (var prop in props) {
+        var val = props[prop];
+        switch (prop) {case'styles':this.setStyles(val);break;case'events':if (this.addEvents)this.addEvents(val);break;case'properties':this.setProperties(val);break;default:this.setProperty(prop, val);}
+    }
+    return this;
+},inject:function(el, where) {
+    el = $(el);
+    switch (where) {case'before':el.parentNode.insertBefore(this, el);break;case'after':var next = el.getNext();if (!next)el.parentNode.appendChild(this); else el.parentNode.insertBefore(this, next);break;case'top':var first = el.firstChild;if (first) {
+        el.insertBefore(this, first);
+        break;
+    }
+        default:el.appendChild(this);}
+    return this;
+},injectBefore:function(el) {
+    return this.inject(el, 'before');
+},injectAfter:function(el) {
+    return this.inject(el, 'after');
+},injectInside:function(el) {
+    return this.inject(el, 'bottom');
+},injectTop:function(el) {
+    return this.inject(el, 'top');
+},adopt:function() {
+    var elements = [];
+    $each(arguments, function(argument) {
+        elements = elements.concat(argument);
+    });
+    $$(elements).inject(this);
+    return this;
+},remove:function() {
+    return this.parentNode.removeChild(this);
+},clone:function(contents) {
+    var el = $(this.cloneNode(contents !== false));
+    if (!el.$events)return el;
+    el.$events = {};
+    for (var type in this.$events)el.$events[type] = {'keys':$A(this.$events[type].keys),'values':$A(this.$events[type].values)};
+    return el.removeEvents();
+},replaceWith:function(el) {
+    el = $(el);
+    this.parentNode.replaceChild(el, this);
+    return el;
+},appendText:function(text) {
+    this.appendChild(document.createTextNode(text));
+    return this;
+},hasClass:function(className) {
+    return this.className.contains(className, ' ');
+},addClass:function(className) {
+    if (!this.hasClass(className))this.className = (this.className + ' ' + className).clean();
+    return this;
+},removeClass:function(className) {
+    this.className = this.className.replace(new RegExp('(^|\\s)' + className + '(?:\\s|$)'), '$1').clean();
+    return this;
+},toggleClass:function(className) {
+    return this.hasClass(className) ? this.removeClass(className) : this.addClass(className);
+},setStyle:function(property, value) {
+    switch (property) {case'opacity':return this.setOpacity(parseFloat(value));case'float':property = (window.ie) ? 'styleFloat' : 'cssFloat';}
+    property = property.camelCase();
+    switch ($type(value)) {case'number':if (!['zIndex','zoom'].contains(property))value += 'px';break;case'array':value = 'rgb(' + value.join(',') + ')';}
+    this.style[property] = value;
+    return this;
+},setStyles:function(source) {
+    switch ($type(source)) {case'object':Element.setMany(this, 'setStyle', source);break;case'string':this.style.cssText = source;}
+    return this;
+},setOpacity:function(opacity) {
+    if (opacity == 0) {
+        if (this.style.visibility != "hidden")this.style.visibility = "hidden";
+    } else {
+        if (this.style.visibility != "visible")this.style.visibility = "visible";
+    }
+    if (!this.currentStyle || !this.currentStyle.hasLayout)this.style.zoom = 1;
+    if (window.ie)this.style.filter = (opacity == 1) ? '' : "alpha(opacity=" + opacity * 100 + ")";
+    this.style.opacity = this.$tmp.opacity = opacity;
+    return this;
+},getStyle:function(property) {
+    property = property.camelCase();
+    var result = this.style[property];
+    if (!$chk(result)) {
+        if (property == 'opacity')return this.$tmp.opacity;
+        result = [];
+        for (var style in Element.Styles) {
+            if (property == style) {
+                Element.Styles[style].each(function(s) {
+                    var style = this.getStyle(s);
+                    result.push(parseInt(style) ? style : '0px');
+                }, this);
+                if (property == 'border') {
+                    var every = result.every(function(bit) {
+                        return(bit == result[0]);
+                    });
+                    return(every) ? result[0] : false;
+                }
+                return result.join(' ');
+            }
+        }
+        if (property.contains('border')) {
+            if (Element.Styles.border.contains(property)) {
+                return['Width','Style','Color'].map(function(p) {
+                    return this.getStyle(property + p);
+                }, this).join(' ');
+            } else if (Element.borderShort.contains(property)) {
+                return['Top','Right','Bottom','Left'].map(function(p) {
+                    return this.getStyle('border' + p + property.replace('border', ''));
+                }, this).join(' ');
+            }
+        }
+        if (document.defaultView)result = document.defaultView.getComputedStyle(this, null).getPropertyValue(property.hyphenate()); else if (this.currentStyle)result = this.currentStyle[property];
+    }
+    if (window.ie)result = Element.fixStyle(property, result, this);
+    if (result && property.test(/color/i) && result.contains('rgb')) {
+        return result.split('rgb').splice(1, 4).map(function(color) {
+            return color.rgbToHex();
+        }).join(' ');
+    }
+    return result;
+},getStyles:function() {
+    return Element.getMany(this, 'getStyle', arguments);
+},walk:function(brother, start) {
+    brother += 'Sibling';
+    var el = (start) ? this[start] : this[brother];
+    while (el && $type(el) != 'element')el = el[brother];
+    return $(el);
+},getPrevious:function() {
+    return this.walk('previous');
+},getNext:function() {
+    return this.walk('next');
+},getFirst:function() {
+    return this.walk('next', 'firstChild');
+},getLast:function() {
+    return this.walk('previous', 'lastChild');
+},getParent:function() {
+    return $(this.parentNode);
+},getChildren:function() {
+    return $$(this.childNodes);
+},hasChild:function(el) {
+    return!!$A(this.getElementsByTagName('*')).contains(el);
+},getProperty:function(property) {
+    var index = Element.Properties[property];
+    if (index)return this[index];
+    var flag = Element.PropertiesIFlag[property] || 0;
+    if (!window.ie || flag)return this.getAttribute(property, flag);
+    var node = this.attributes[property];
+    return(node) ? node.nodeValue : null;
+},removeProperty:function(property) {
+    var index = Element.Properties[property];
+    if (index)this[index] = ''; else this.removeAttribute(property);
+    return this;
+},getProperties:function() {
+    return Element.getMany(this, 'getProperty', arguments);
+},setProperty:function(property, value) {
+    var index = Element.Properties[property];
+    if (index)this[index] = value; else this.setAttribute(property, value);
+    return this;
+},setProperties:function(source) {
+    return Element.setMany(this, 'setProperty', source);
+},setHTML:function() {
+    this.innerHTML = $A(arguments).join('');
+    return this;
+},setText:function(text) {
+    var tag = this.getTag();
+    if (['style','script'].contains(tag)) {
+        if (window.ie) {
+            if (tag == 'style')this.styleSheet.cssText = text; else if (tag == 'script')this.setProperty('text', text);
+            return this;
+        } else {
+            this.removeChild(this.firstChild);
+            return this.appendText(text);
+        }
+    }
+    this[$defined(this.innerText) ? 'innerText' : 'textContent'] = text;
+    return this;
+},getText:function() {
+    var tag = this.getTag();
+    if (['style','script'].contains(tag)) {
+        if (window.ie) {
+            if (tag == 'style')return this.styleSheet.cssText; else if (tag == 'script')return this.getProperty('text');
+        } else {
+            return this.innerHTML;
+        }
+    }
+    return($pick(this.innerText, this.textContent));
+},getTag:function() {
+    return this.tagName.toLowerCase();
+},empty:function() {
+    Garbage.trash(this.getElementsByTagName('*'));
+    return this.setHTML('');
+}});
+Element.fixStyle = function(property, result, element) {
+    if ($chk(parseInt(result)))return result;
+    if (['height','width'].contains(property)) {
+        var values = (property == 'width') ? ['left','right'] : ['top','bottom'];
+        var size = 0;
+        values.each(function(value) {
+            size += element.getStyle('border-' + value + '-width').toInt() + element.getStyle('padding-' + value).toInt();
+        });
+        return element['offset' + property.capitalize()] - size + 'px';
+    } else if (property.test(/border(.+)Width|margin|padding/)) {
+        return'0px';
+    }
+    return result;
+};
+Element.Styles = {'border':[],'padding':[],'margin':[]};
+['Top','Right','Bottom','Left'].each(function(direction) {
+    for (var style in Element.Styles)Element.Styles[style].push(style + direction);
+});
+Element.borderShort = ['borderWidth','borderStyle','borderColor'];
+Element.getMany = function(el, method, keys) {
+    var result = {};
+    $each(keys, function(key) {
+        result[key] = el[method](key);
+    });
+    return result;
+};
+Element.setMany = function(el, method, pairs) {
+    for (var key in pairs)el[method](key, pairs[key]);
+    return el;
+};
+Element.Properties = new Abstract({'class':'className','for':'htmlFor','colspan':'colSpan','rowspan':'rowSpan','accesskey':'accessKey','tabindex':'tabIndex','maxlength':'maxLength','readonly':'readOnly','frameborder':'frameBorder','value':'value','disabled':'disabled','checked':'checked','multiple':'multiple','selected':'selected'});
+Element.PropertiesIFlag = {'href':2,'src':2};
+Element.Methods = {Listeners:{addListener:function(type, fn) {
+    if (this.addEventListener)this.addEventListener(type, fn, false); else this.attachEvent('on' + type, fn);
+    return this;
+},removeListener:function(type, fn) {
+    if (this.removeEventListener)this.removeEventListener(type, fn, false); else this.detachEvent('on' + type, fn);
+    return this;
+}}};
+window.extend(Element.Methods.Listeners);
+document.extend(Element.Methods.Listeners);
+Element.extend(Element.Methods.Listeners);
+var Garbage = {elements:[],collect:function(el) {
+    if (!el.$tmp) {
+        Garbage.elements.push(el);
+        el.$tmp = {'opacity':1};
+    }
+    return el;
+},trash:function(elements) {
+    for (var i = 0,j = elements.length,el; i < j; i++) {
+        if (!(el = elements[i]) || !el.$tmp)continue;
+        if (el.$events)el.fireEvent('trash').removeEvents();
+        for (var p in el.$tmp)el.$tmp[p] = null;
+        for (var d in Element.prototype)el[d] = null;
+        Garbage.elements[Garbage.elements.indexOf(el)] = null;
+        el.htmlElement = el.$tmp = el = null;
+    }
+    Garbage.elements.remove(null);
+},empty:function() {
+    Garbage.collect(window);
+    Garbage.collect(document);
+    Garbage.trash(Garbage.elements);
+}};
+window.addListener('beforeunload', function() {
+    window.addListener('unload', Garbage.empty);
+    if (window.ie)window.addListener('unload', CollectGarbage);
+});
+var Event = new Class({initialize:function(event) {
+    if (event && event.$extended)return event;
+    this.$extended = true;
+    event = event || window.event;
+    this.event = event;
+    this.type = event.type;
+    this.target = event.target || event.srcElement;
+    if (this.target.nodeType == 3)this.target = this.target.parentNode;
+    this.shift = event.shiftKey;
+    this.control = event.ctrlKey;
+    this.alt = event.altKey;
+    this.meta = event.metaKey;
+    if (['DOMMouseScroll','mousewheel'].contains(this.type)) {
+        this.wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
+    } else if (this.type.contains('key')) {
+        this.code = event.which || event.keyCode;
+        for (var name in Event.keys) {
+            if (Event.keys[name] == this.code) {
+                this.key = name;
+                break;
+            }
+        }
+        if (this.type == 'keydown') {
+            var fKey = this.code - 111;
+            if (fKey > 0 && fKey < 13)this.key = 'f' + fKey;
+        }
+        this.key = this.key || String.fromCharCode(this.code).toLowerCase();
+    } else if (this.type.test(/(click|mouse|menu)/)) {
+        this.page = {'x':event.pageX || event.clientX + document.documentElement.scrollLeft,'y':event.pageY || event.clientY + document.documentElement.scrollTop};
+        this.client = {'x':event.pageX ? event.pageX - window.pageXOffset : event.clientX,'y':event.pageY ? event.pageY - window.pageYOffset : event.clientY};
+        this.rightClick = (event.which == 3) || (event.button == 2);
+        switch (this.type) {case'mouseover':this.relatedTarget = event.relatedTarget || event.fromElement;break;case'mouseout':this.relatedTarget = event.relatedTarget || event.toElement;}
+        this.fixRelatedTarget();
+    }
+    return this;
+},stop:function() {
+    return this.stopPropagation().preventDefault();
+},stopPropagation:function() {
+    if (this.event.stopPropagation)this.event.stopPropagation(); else this.event.cancelBubble = true;
+    return this;
+},preventDefault:function() {
+    if (this.event.preventDefault)this.event.preventDefault(); else this.event.returnValue = false;
+    return this;
+}});
+Event.fix = {relatedTarget:function() {
+    if (this.relatedTarget && this.relatedTarget.nodeType == 3)this.relatedTarget = this.relatedTarget.parentNode;
+},relatedTargetGecko:function() {
+    try {
+        Event.fix.relatedTarget.call(this);
+    } catch(e) {
+        this.relatedTarget = this.target;
+    }
+}};
+Event.prototype.fixRelatedTarget = (window.gecko) ? Event.fix.relatedTargetGecko : Event.fix.relatedTarget;
+Event.keys = new Abstract({'enter':13,'up':38,'down':40,'left':37,'right':39,'esc':27,'space':32,'backspace':8,'tab':9,'delete':46});
+Element.Methods.Events = {addEvent:function(type, fn) {
+    this.$events = this.$events || {};
+    this.$events[type] = this.$events[type] || {'keys':[],'values':[]};
+    if (this.$events[type].keys.contains(fn))return this;
+    this.$events[type].keys.push(fn);
+    var realType = type;
+    var custom = Element.Events[type];
+    if (custom) {
+        if (custom.add)custom.add.call(this, fn);
+        if (custom.map)fn = custom.map;
+        if (custom.type)realType = custom.type;
+    }
+    if (!this.addEventListener)fn = fn.create({'bind':this,'event':true});
+    this.$events[type].values.push(fn);
+    return(Element.NativeEvents.contains(realType)) ? this.addListener(realType, fn) : this;
+},removeEvent:function(type, fn) {
+    if (!this.$events || !this.$events[type])return this;
+    var pos = this.$events[type].keys.indexOf(fn);
+    if (pos == -1)return this;
+    var key = this.$events[type].keys.splice(pos, 1)[0];
+    var value = this.$events[type].values.splice(pos, 1)[0];
+    var custom = Element.Events[type];
+    if (custom) {
+        if (custom.remove)custom.remove.call(this, fn);
+        if (custom.type)type = custom.type;
+    }
+    return(Element.NativeEvents.contains(type)) ? this.removeListener(type, value) : this;
+},addEvents:function(source) {
+    return Element.setMany(this, 'addEvent', source);
+},removeEvents:function(type) {
+    if (!this.$events)return this;
+    if (!type) {
+        for (var evType in this.$events)this.removeEvents(evType);
+        this.$events = null;
+    } else if (this.$events[type]) {
+        this.$events[type].keys.each(function(fn) {
+            this.removeEvent(type, fn);
+        }, this);
+        this.$events[type] = null;
+    }
+    return this;
+},fireEvent:function(type, args, delay) {
+    if (this.$events && this.$events[type]) {
+        this.$events[type].keys.each(function(fn) {
+            fn.create({'bind':this,'delay':delay,'arguments':args})();
+        }, this);
+    }
+    return this;
+},cloneEvents:function(from, type) {
+    if (!from.$events)return this;
+    if (!type) {
+        for (var evType in from.$events)this.cloneEvents(from, evType);
+    } else if (from.$events[type]) {
+        from.$events[type].keys.each(function(fn) {
+            this.addEvent(type, fn);
+        }, this);
+    }
+    return this;
+}};
+window.extend(Element.Methods.Events);
+document.extend(Element.Methods.Events);
+Element.extend(Element.Methods.Events);
+Element.Events = new Abstract({'mouseenter':{type:'mouseover',map:function(event) {
+    event = new Event(event);
+    if (event.relatedTarget != this && !this.hasChild(event.relatedTarget))this.fireEvent('mouseenter', event);
+}},'mouseleave':{type:'mouseout',map:function(event) {
+    event = new Event(event);
+    if (event.relatedTarget != this && !this.hasChild(event.relatedTarget))this.fireEvent('mouseleave', event);
+}},'mousewheel':{type:(window.gecko) ? 'DOMMouseScroll' : 'mousewheel'}});
+Element.NativeEvents = ['click','dblclick','mouseup','mousedown','mousewheel','DOMMouseScroll','mouseover','mouseout','mousemove','keydown','keypress','keyup','load','unload','beforeunload','resize','move','focus','blur','change','submit','reset','select','error','abort','contextmenu','scroll'];
+Function.extend({bindWithEvent:function(bind, args) {
+    return this.create({'bind':bind,'arguments':args,'event':Event});
+}});
+Elements.extend({filterByTag:function(tag) {
+    return new Elements(this.filter(function(el) {
+        return(Element.getTag(el) == tag);
+    }));
+},filterByClass:function(className, nocash) {
+    var elements = this.filter(function(el) {
+        return(el.className && el.className.contains(className, ' '));
+    });
+    return(nocash) ? elements : new Elements(elements);
+},filterById:function(id, nocash) {
+    var elements = this.filter(function(el) {
+        return(el.id == id);
+    });
+    return(nocash) ? elements : new Elements(elements);
+},filterByAttribute:function(name, operator, value, nocash) {
+    var elements = this.filter(function(el) {
+        var current = Element.getProperty(el, name);
+        if (!current)return false;
+        if (!operator)return true;
+        switch (operator) {case'=':return(current == value);case'*=':return(current.contains(value));case'^=':return(current.substr(0, value.length) == value);case'$=':return(current.substr(current.length - value.length) == value);case'!=':return(current != value);case'~=':return current.contains(value, ' ');}
+        return false;
+    });
+    return(nocash) ? elements : new Elements(elements);
+}});
+function $E(selector, filter) {
+    return($(filter) || document).getElement(selector);
+}
+;
+function $ES(selector, filter) {
+    return($(filter) || document).getElementsBySelector(selector);
+}
+;
+$$.shared = {'regexp':/^(\w*|\*)(?:#([\w-]+)|\.([\w-]+))?(?:\[(\w+)(?:([!*^$]?=)["']?([^"'\]]*)["']?)?])?$/,'xpath':{getParam:function(items, context, param, i) {
+    var temp = [context.namespaceURI ? 'xhtml:' : '',param[1]];
+    if (param[2])temp.push('[@id="', param[2], '"]');
+    if (param[3])temp.push('[contains(concat(" ", @class, " "), " ', param[3], ' ")]');
+    if (param[4]) {
+        if (param[5] && param[6]) {
+            switch (param[5]) {case'*=':temp.push('[contains(@', param[4], ', "', param[6], '")]');break;case'^=':temp.push('[starts-with(@', param[4], ', "', param[6], '")]');break;case'$=':temp.push('[substring(@', param[4], ', string-length(@', param[4], ') - ', param[6].length, ' + 1) = "', param[6], '"]');break;case'=':temp.push('[@', param[4], '="', param[6], '"]');break;case'!=':temp.push('[@', param[4], '!="', param[6], '"]');}
+        } else {
+            temp.push('[@', param[4], ']');
+        }
+    }
+    items.push(temp.join(''));
+    return items;
+},getItems:function(items, context, nocash) {
+    var elements = [];
+    var xpath = document.evaluate('.//' + items.join('//'), context, $$.shared.resolver, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0,j = xpath.snapshotLength; i < j; i++)elements.push(xpath.snapshotItem(i));
+    return(nocash) ? elements : new Elements(elements.map($));
+}},'normal':{getParam:function(items, context, param, i) {
+    if (i == 0) {
+        if (param[2]) {
+            var el = context.getElementById(param[2]);
+            if (!el || ((param[1] != '*') && (Element.getTag(el) != param[1])))return false;
+            items = [el];
+        } else {
+            items = $A(context.getElementsByTagName(param[1]));
+        }
+    } else {
+        items = $$.shared.getElementsByTagName(items, param[1]);
+        if (param[2])items = Elements.filterById(items, param[2], true);
+    }
+    if (param[3])items = Elements.filterByClass(items, param[3], true);
+    if (param[4])items = Elements.filterByAttribute(items, param[4], param[5], param[6], true);
+    return items;
+},getItems:function(items, context, nocash) {
+    return(nocash) ? items : $$.unique(items);
+}},resolver:function(prefix) {
+    return(prefix == 'xhtml') ? 'http://www.w3.org/1999/xhtml' : false;
+},getElementsByTagName:function(context, tagName) {
+    var found = [];
+    for (var i = 0,j = context.length; i < j; i++)found.extend(context[i].getElementsByTagName(tagName));
+    return found;
+}};
+$$.shared.method = (window.xpath) ? 'xpath' : 'normal';
+Element.Methods.Dom = {getElements:function(selector, nocash) {
+    var items = [];
+    selector = selector.trim().split(' ');
+    for (var i = 0,j = selector.length; i < j; i++) {
+        var sel = selector[i];
+        var param = sel.match($$.shared.regexp);
+        if (!param)break;
+        param[1] = param[1] || '*';
+        var temp = $$.shared[$$.shared.method].getParam(items, this, param, i);
+        if (!temp)break;
+        items = temp;
+    }
+    return $$.shared[$$.shared.method].getItems(items, this, nocash);
+},getElement:function(selector) {
+    return $(this.getElements(selector, true)[0] || false);
+},getElementsBySelector:function(selector, nocash) {
+    var elements = [];
+    selector = selector.split(',');
+    for (var i = 0,j = selector.length; i < j; i++)elements = elements.concat(this.getElements(selector[i], true));
+    return(nocash) ? elements : $$.unique(elements);
+}};
+Element.extend({getElementById:function(id) {
+    var el = document.getElementById(id);
+    if (!el)return false;
+    for (var parent = el.parentNode; parent != this; parent = parent.parentNode) {
+        if (!parent)return false;
+    }
+    return el;
+},getElementsByClassName:function(className) {
+    return this.getElements('.' + className);
+}});
+document.extend(Element.Methods.Dom);
+Element.extend(Element.Methods.Dom);
+Element.extend({getValue:function() {
+    switch (this.getTag()) {case'select':var values = [];$each(this.options, function(option) {
+        if (option.selected)values.push($pick(option.value, option.text));
+    });return(this.multiple) ? values : values[0];case'input':if (!(this.checked && ['checkbox','radio'].contains(this.type)) && !['hidden','text','password'].contains(this.type))break;case'textarea':return this.value;}
+    return false;
+},getFormElements:function() {
+    return $$(this.getElementsByTagName('input'), this.getElementsByTagName('select'), this.getElementsByTagName('textarea'));
+},toQueryString:function() {
+    var queryString = [];
+    this.getFormElements().each(function(el) {
+        var name = el.name;
+        var value = el.getValue();
+        if (value === false || !name || el.disabled)return;
+        var qs = function(val) {
+            queryString.push(name + '=' + encodeURIComponent(val));
+        };
+        if ($type(value) == 'array')value.each(qs); else qs(value);
+    });
+    return queryString.join('&');
+}});
+Element.extend({scrollTo:function(x, y) {
+    this.scrollLeft = x;
+    this.scrollTop = y;
+},getSize:function() {
+    return{'scroll':{'x':this.scrollLeft,'y':this.scrollTop},'size':{'x':this.offsetWidth,'y':this.offsetHeight},'scrollSize':{'x':this.scrollWidth,'y':this.scrollHeight}};
+},getPosition:function(overflown) {
+    overflown = overflown || [];
+    var el = this,left = 0,top = 0;
+    do{
+        left += el.offsetLeft || 0;
+        top += el.offsetTop || 0;
+        el = el.offsetParent;
+    } while (el);
+    overflown.each(function(element) {
+        left -= element.scrollLeft || 0;
+        top -= element.scrollTop || 0;
+    });
+    return{'x':left,'y':top};
+},getTop:function(overflown) {
+    return this.getPosition(overflown).y;
+},getLeft:function(overflown) {
+    return this.getPosition(overflown).x;
+},getCoordinates:function(overflown) {
+    var position = this.getPosition(overflown);
+    var obj = {'width':this.offsetWidth,'height':this.offsetHeight,'left':position.x,'top':position.y};
+    obj.right = obj.left + obj.width;
+    obj.bottom = obj.top + obj.height;
+    return obj;
+}});
+Element.Events.domready = {add:function(fn) {
+    if (window.loaded) {
+        fn.call(this);
+        return;
+    }
+    var domReady = function() {
+        if (window.loaded)return;
+        window.loaded = true;
+        window.timer = $clear(window.timer);
+        this.fireEvent('domready');
+    }.bind(this);
+    if (document.readyState && window.webkit) {
+        window.timer = function() {
+            if (['loaded','complete'].contains(document.readyState))domReady();
+        }.periodical(50);
+    } else if (document.readyState && window.ie) {
+        if (!$('ie_ready')) {
+            var src = (window.location.protocol == 'https:') ? '://0' : 'javascript:void(0)';
+            document.write('<script id="ie_ready" defer src="' + src + '"><\/script>');
+            $('ie_ready').onreadystatechange = function() {
+                if (this.readyState == 'complete')domReady();
+            };
+        }
+    } else {
+        window.addListener("load", domReady);
+        document.addListener("DOMContentLoaded", domReady);
+    }
+}};
+window.onDomReady = function(fn) {
+    return this.addEvent('domready', fn);
+};
+window.extend({getWidth:function() {
+    if (this.webkit419)return this.innerWidth;
+    if (this.opera)return document.body.clientWidth;
+    return document.documentElement.clientWidth;
+},getHeight:function() {
+    if (this.webkit419)return this.innerHeight;
+    if (this.opera)return document.body.clientHeight;
+    return document.documentElement.clientHeight;
+},getScrollWidth:function() {
+    if (this.ie)return Math.max(document.documentElement.offsetWidth, document.documentElement.scrollWidth);
+    if (this.webkit)return document.body.scrollWidth;
+    return document.documentElement.scrollWidth;
+},getScrollHeight:function() {
+    if (this.ie)return Math.max(document.documentElement.offsetHeight, document.documentElement.scrollHeight);
+    if (this.webkit)return document.body.scrollHeight;
+    return document.documentElement.scrollHeight;
+},getScrollLeft:function() {
+    return this.pageXOffset || document.documentElement.scrollLeft;
+},getScrollTop:function() {
+    return this.pageYOffset || document.documentElement.scrollTop;
+},getSize:function() {
+    return{'size':{'x':this.getWidth(),'y':this.getHeight()},'scrollSize':{'x':this.getScrollWidth(),'y':this.getScrollHeight()},'scroll':{'x':this.getScrollLeft(),'y':this.getScrollTop()}};
+},getPosition:function() {
+    return{'x':0,'y':0};
+}});
+var Fx = {};
+Fx.Base = new Class({options:{onStart:Class.empty,onComplete:Class.empty,onCancel:Class.empty,transition:function(p) {
+    return-(Math.cos(Math.PI * p) - 1) / 2;
+},duration:500,unit:'px',wait:true,fps:50},initialize:function(options) {
+    this.element = this.element || null;
+    this.setOptions(options);
+    if (this.options.initialize)this.options.initialize.call(this);
+},step:function() {
+    var time = $time();
+    if (time < this.time + this.options.duration) {
+        this.delta = this.options.transition((time - this.time) / this.options.duration);
+        this.setNow();
+        this.increase();
+    } else {
+        this.stop(true);
+        this.set(this.to);
+        this.fireEvent('onComplete', this.element, 10);
+        this.callChain();
+    }
+},set:function(to) {
+    this.now = to;
+    this.increase();
+    return this;
+},setNow:function() {
+    this.now = this.compute(this.from, this.to);
+},compute:function(from, to) {
+    return(to - from) * this.delta + from;
+},start:function(from, to) {
+    if (!this.options.wait)this.stop(); else if (this.timer)return this;
+    this.from = from;
+    this.to = to;
+    this.change = this.to - this.from;
+    this.time = $time();
+    this.timer = this.step.periodical(Math.round(1000 / this.options.fps), this);
+    this.fireEvent('onStart', this.element);
+    return this;
+},stop:function(end) {
+    if (!this.timer)return this;
+    this.timer = $clear(this.timer);
+    if (!end)this.fireEvent('onCancel', this.element);
+    return this;
+},custom:function(from, to) {
+    return this.start(from, to);
+},clearTimer:function(end) {
+    return this.stop(end);
+}});
+Fx.Base.implement(new Chain, new Events, new Options);
+Fx.CSS = {select:function(property, to) {
+    if (property.test(/color/i))return this.Color;
+    var type = $type(to);
+    if ((type == 'array') || (type == 'string' && to.contains(' ')))return this.Multi;
+    return this.Single;
+},parse:function(el, property, fromTo) {
+    if (!fromTo.push)fromTo = [fromTo];
+    var from = fromTo[0],to = fromTo[1];
+    if (!$chk(to)) {
+        to = from;
+        from = el.getStyle(property);
+    }
+    var css = this.select(property, to);
+    return{'from':css.parse(from),'to':css.parse(to),'css':css};
+}};
+Fx.CSS.Single = {parse:function(value) {
+    return parseFloat(value);
+},getNow:function(from, to, fx) {
+    return fx.compute(from, to);
+},getValue:function(value, unit, property) {
+    if (unit == 'px' && property != 'opacity')value = Math.round(value);
+    return value + unit;
+}};
+Fx.CSS.Multi = {parse:function(value) {
+    return value.push ? value : value.split(' ').map(function(v) {
+        return parseFloat(v);
+    });
+},getNow:function(from, to, fx) {
+    var now = [];
+    for (var i = 0; i < from.length; i++)now[i] = fx.compute(from[i], to[i]);
+    return now;
+},getValue:function(value, unit, property) {
+    if (unit == 'px' && property != 'opacity')value = value.map(Math.round);
+    return value.join(unit + ' ') + unit;
+}};
+Fx.CSS.Color = {parse:function(value) {
+    return value.push ? value : value.hexToRgb(true);
+},getNow:function(from, to, fx) {
+    var now = [];
+    for (var i = 0; i < from.length; i++)now[i] = Math.round(fx.compute(from[i], to[i]));
+    return now;
+},getValue:function(value) {
+    return'rgb(' + value.join(',') + ')';
+}};
+Fx.Style = Fx.Base.extend({initialize:function(el, property, options) {
+    this.element = $(el);
+    this.property = property;
+    this.parent(options);
+},hide:function() {
+    return this.set(0);
+},setNow:function() {
+    this.now = this.css.getNow(this.from, this.to, this);
+},set:function(to) {
+    this.css = Fx.CSS.select(this.property, to);
+    return this.parent(this.css.parse(to));
+},start:function(from, to) {
+    if (this.timer && this.options.wait)return this;
+    var parsed = Fx.CSS.parse(this.element, this.property, [from,to]);
+    this.css = parsed.css;
+    return this.parent(parsed.from, parsed.to);
+},increase:function() {
+    this.element.setStyle(this.property, this.css.getValue(this.now, this.options.unit, this.property));
+}});
+Element.extend({effect:function(property, options) {
+    return new Fx.Style(this, property, options);
+}});
+Fx.Styles = Fx.Base.extend({initialize:function(el, options) {
+    this.element = $(el);
+    this.parent(options);
+},setNow:function() {
+    for (var p in this.from)this.now[p] = this.css[p].getNow(this.from[p], this.to[p], this);
+},set:function(to) {
+    var parsed = {};
+    this.css = {};
+    for (var p in to) {
+        this.css[p] = Fx.CSS.select(p, to[p]);
+        parsed[p] = this.css[p].parse(to[p]);
+    }
+    return this.parent(parsed);
+},start:function(obj) {
+    if (this.timer && this.options.wait)return this;
+    this.now = {};
+    this.css = {};
+    var from = {},to = {};
+    for (var p in obj) {
+        var parsed = Fx.CSS.parse(this.element, p, obj[p]);
+        from[p] = parsed.from;
+        to[p] = parsed.to;
+        this.css[p] = parsed.css;
+    }
+    return this.parent(from, to);
+},increase:function() {
+    for (var p in this.now)this.element.setStyle(p, this.css[p].getValue(this.now[p], this.options.unit, p));
+}});
+Element.extend({effects:function(options) {
+    return new Fx.Styles(this, options);
+}});
+Fx.Elements = Fx.Base.extend({initialize:function(elements, options) {
+    this.elements = $$(elements);
+    this.parent(options);
+},setNow:function() {
+    for (var i in this.from) {
+        var iFrom = this.from[i],iTo = this.to[i],iCss = this.css[i],iNow = this.now[i] = {};
+        for (var p in iFrom)iNow[p] = iCss[p].getNow(iFrom[p], iTo[p], this);
+    }
+},set:function(to) {
+    var parsed = {};
+    this.css = {};
+    for (var i in to) {
+        var iTo = to[i],iCss = this.css[i] = {},iParsed = parsed[i] = {};
+        for (var p in iTo) {
+            iCss[p] = Fx.CSS.select(p, iTo[p]);
+            iParsed[p] = iCss[p].parse(iTo[p]);
+        }
+    }
+    return this.parent(parsed);
+},start:function(obj) {
+    if (this.timer && this.options.wait)return this;
+    this.now = {};
+    this.css = {};
+    var from = {},to = {};
+    for (var i in obj) {
+        var iProps = obj[i],iFrom = from[i] = {},iTo = to[i] = {},iCss = this.css[i] = {};
+        for (var p in iProps) {
+            var parsed = Fx.CSS.parse(this.elements[i], p, iProps[p]);
+            iFrom[p] = parsed.from;
+            iTo[p] = parsed.to;
+            iCss[p] = parsed.css;
+        }
+    }
+    return this.parent(from, to);
+},increase:function() {
+    for (var i in this.now) {
+        var iNow = this.now[i],iCss = this.css[i];
+        for (var p in iNow)this.elements[i].setStyle(p, iCss[p].getValue(iNow[p], this.options.unit, p));
+    }
+}});
+Fx.Scroll = Fx.Base.extend({options:{overflown:[],offset:{'x':0,'y':0},wheelStops:true},initialize:function(element, options) {
+    this.now = [];
+    this.element = $(element);
+    this.bound = {'stop':this.stop.bind(this, false)};
+    this.parent(options);
+    if (this.options.wheelStops) {
+        this.addEvent('onStart', function() {
+            document.addEvent('mousewheel', this.bound.stop);
+        }.bind(this));
+        this.addEvent('onComplete', function() {
+            document.removeEvent('mousewheel', this.bound.stop);
+        }.bind(this));
+    }
+},setNow:function() {
+    for (var i = 0; i < 2; i++)this.now[i] = this.compute(this.from[i], this.to[i]);
+},scrollTo:function(x, y) {
+    if (this.timer && this.options.wait)return this;
+    var el = this.element.getSize();
+    var values = {'x':x,'y':y};
+    for (var z in el.size) {
+        var max = el.scrollSize[z] - el.size[z];
+        if ($chk(values[z]))values[z] = ($type(values[z]) == 'number') ? values[z].limit(0, max) : max; else values[z] = el.scroll[z];
+        values[z] += this.options.offset[z];
+    }
+    return this.start([el.scroll.x,el.scroll.y], [values.x,values.y]);
+},toTop:function() {
+    return this.scrollTo(false, 0);
+},toBottom:function() {
+    return this.scrollTo(false, 'full');
+},toLeft:function() {
+    return this.scrollTo(0, false);
+},toRight:function() {
+    return this.scrollTo('full', false);
+},toElement:function(el) {
+    var parent = this.element.getPosition(this.options.overflown);
+    var target = $(el).getPosition(this.options.overflown);
+    return this.scrollTo(target.x - parent.x, target.y - parent.y);
+},increase:function() {
+    this.element.scrollTo(this.now[0], this.now[1]);
+}});
+Fx.Slide = Fx.Base.extend({options:{mode:'vertical'},initialize:function(el, options) {
+    this.element = $(el);
+    this.wrapper = new Element('div', {'styles':$extend(this.element.getStyles('margin'), {'overflow':'hidden'})}).injectAfter(this.element).adopt(this.element);
+    this.element.setStyle('margin', 0);
+    this.setOptions(options);
+    this.now = [];
+    this.parent(this.options);
+    this.open = true;
+    this.addEvent('onComplete', function() {
+        this.open = (this.now[0] === 0);
+    });
+    if (window.webkit419)this.addEvent('onComplete', function() {
+        if (this.open)this.element.remove().inject(this.wrapper);
+    });
+},setNow:function() {
+    for (var i = 0; i < 2; i++)this.now[i] = this.compute(this.from[i], this.to[i]);
+},vertical:function() {
+    this.margin = 'margin-top';
+    this.layout = 'height';
+    this.offset = this.element.offsetHeight;
+},horizontal:function() {
+    this.margin = 'margin-left';
+    this.layout = 'width';
+    this.offset = this.element.offsetWidth;
+},slideIn:function(mode) {
+    this[mode || this.options.mode]();
+    return this.start([this.element.getStyle(this.margin).toInt(),this.wrapper.getStyle(this.layout).toInt()], [0,this.offset]);
+},slideOut:function(mode) {
+    this[mode || this.options.mode]();
+    return this.start([this.element.getStyle(this.margin).toInt(),this.wrapper.getStyle(this.layout).toInt()], [-this.offset,0]);
+},hide:function(mode) {
+    this[mode || this.options.mode]();
+    this.open = false;
+    return this.set([-this.offset,0]);
+},show:function(mode) {
+    this[mode || this.options.mode]();
+    this.open = true;
+    return this.set([0,this.offset]);
+},toggle:function(mode) {
+    if (this.wrapper.offsetHeight == 0 || this.wrapper.offsetWidth == 0)return this.slideIn(mode);
+    return this.slideOut(mode);
+},increase:function() {
+    this.element.setStyle(this.margin, this.now[0] + this.options.unit);
+    this.wrapper.setStyle(this.layout, this.now[1] + this.options.unit);
+}});
+Fx.Transition = function(transition, params) {
+    params = params || [];
+    if ($type(params) != 'array')params = [params];
+    return $extend(transition, {easeIn:function(pos) {
+        return transition(pos, params);
+    },easeOut:function(pos) {
+        return 1 - transition(1 - pos, params);
+    },easeInOut:function(pos) {
+        return(pos <= 0.5) ? transition(2 * pos, params) / 2 : (2 - transition(2 * (1 - pos), params)) / 2;
+    }});
+};
+Fx.Transitions = new Abstract({linear:function(p) {
+    return p;
+}});
+Fx.Transitions.extend = function(transitions) {
+    for (var transition in transitions) {
+        Fx.Transitions[transition] = new Fx.Transition(transitions[transition]);
+        Fx.Transitions.compat(transition);
+    }
+};
+Fx.Transitions.compat = function(transition) {
+    ['In','Out','InOut'].each(function(easeType) {
+        Fx.Transitions[transition.toLowerCase() + easeType] = Fx.Transitions[transition]['ease' + easeType];
+    });
+};
+Fx.Transitions.extend({Pow:function(p, x) {
+    return Math.pow(p, x[0] || 6);
+},Expo:function(p) {
+    return Math.pow(2, 8 * (p - 1));
+},Circ:function(p) {
+    return 1 - Math.sin(Math.acos(p));
+},Sine:function(p) {
+    return 1 - Math.sin((1 - p) * Math.PI / 2);
+},Back:function(p, x) {
+    x = x[0] || 1.618;
+    return Math.pow(p, 2) * ((x + 1) * p - x);
+},Bounce:function(p) {
+    var value;
+    for (var a = 0,b = 1; 1; a += b,b /= 2) {
+        if (p >= (7 - 4 * a) / 11) {
+            value = -Math.pow((11 - 6 * a - 11 * p) / 4, 2) + b * b;
+            break;
+        }
+    }
+    return value;
+},Elastic:function(p, x) {
+    return Math.pow(2, 10 * --p) * Math.cos(20 * p * Math.PI * (x[0] || 1) / 3);
+}});
+['Quad','Cubic','Quart','Quint'].each(function(transition, i) {
+    Fx.Transitions[transition] = new Fx.Transition(function(p) {
+        return Math.pow(p, [i + 2]);
+    });
+    Fx.Transitions.compat(transition);
+});
+var Drag = {};
+Drag.Base = new Class({options:{handle:false,unit:'px',onStart:Class.empty,onBeforeStart:Class.empty,onComplete:Class.empty,onSnap:Class.empty,onDrag:Class.empty,limit:false,modifiers:{x:'left',y:'top'},grid:false,snap:6},initialize:function(el, options) {
+    this.setOptions(options);
+    this.element = $(el);
+    this.handle = $(this.options.handle) || this.element;
+    this.mouse = {'now':{},'pos':{}};
+    this.value = {'start':{},'now':{}};
+    this.bound = {'start':this.start.bindWithEvent(this),'check':this.check.bindWithEvent(this),'drag':this.drag.bindWithEvent(this),'stop':this.stop.bind(this)};
+    this.attach();
+    if (this.options.initialize)this.options.initialize.call(this);
+},attach:function() {
+    this.handle.addEvent('mousedown', this.bound.start);
+    return this;
+},detach:function() {
+    this.handle.removeEvent('mousedown', this.bound.start);
+    return this;
+},start:function(event) {
+    this.fireEvent('onBeforeStart', this.element);
+    this.mouse.start = event.page;
+    var limit = this.options.limit;
+    this.limit = {'x':[],'y':[]};
+    for (var z in this.options.modifiers) {
+        if (!this.options.modifiers[z])continue;
+        this.value.now[z] = this.element.getStyle(this.options.modifiers[z]).toInt();
+        this.mouse.pos[z] = event.page[z] - this.value.now[z];
+        if (limit && limit[z]) {
+            for (var i = 0; i < 2; i++) {
+                if ($chk(limit[z][i]))this.limit[z][i] = ($type(limit[z][i]) == 'function') ? limit[z][i]() : limit[z][i];
+            }
+        }
+    }
+    if ($type(this.options.grid) == 'number')this.options.grid = {'x':this.options.grid,'y':this.options.grid};
+    document.addListener('mousemove', this.bound.check);
+    document.addListener('mouseup', this.bound.stop);
+    this.fireEvent('onStart', this.element);
+    event.stop();
+},check:function(event) {
+    var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
+    if (distance > this.options.snap) {
+        document.removeListener('mousemove', this.bound.check);
+        document.addListener('mousemove', this.bound.drag);
+        this.drag(event);
+        this.fireEvent('onSnap', this.element);
+    }
+    event.stop();
+},drag:function(event) {
+    this.out = false;
+    this.mouse.now = event.page;
+    for (var z in this.options.modifiers) {
+        if (!this.options.modifiers[z])continue;
+        this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
+        if (this.limit[z]) {
+            if ($chk(this.limit[z][1]) && (this.value.now[z] > this.limit[z][1])) {
+                this.value.now[z] = this.limit[z][1];
+                this.out = true;
+            } else if ($chk(this.limit[z][0]) && (this.value.now[z] < this.limit[z][0])) {
+                this.value.now[z] = this.limit[z][0];
+                this.out = true;
+            }
+        }
+        if (this.options.grid[z])this.value.now[z] -= (this.value.now[z] % this.options.grid[z]);
+        this.element.setStyle(this.options.modifiers[z], this.value.now[z] + this.options.unit);
+    }
+    this.fireEvent('onDrag', this.element);
+    event.stop();
+},stop:function() {
+    document.removeListener('mousemove', this.bound.check);
+    document.removeListener('mousemove', this.bound.drag);
+    document.removeListener('mouseup', this.bound.stop);
+    this.fireEvent('onComplete', this.element);
+}});
+Drag.Base.implement(new Events, new Options);
+Element.extend({makeResizable:function(options) {
+    return new Drag.Base(this, $merge({modifiers:{x:'width',y:'height'}}, options));
+}});
+Drag.Move = Drag.Base.extend({options:{droppables:[],container:false,overflown:[]},initialize:function(el, options) {
+    this.setOptions(options);
+    this.element = $(el);
+    this.droppables = $$(this.options.droppables);
+    this.container = $(this.options.container);
+    this.position = {'element':this.element.getStyle('position'),'container':false};
+    if (this.container)this.position.container = this.container.getStyle('position');
+    if (!['relative','absolute','fixed'].contains(this.position.element))this.position.element = 'absolute';
+    var top = this.element.getStyle('top').toInt();
+    var left = this.element.getStyle('left').toInt();
+    if (this.position.element == 'absolute' && !['relative','absolute','fixed'].contains(this.position.container)) {
+        top = $chk(top) ? top : this.element.getTop(this.options.overflown);
+        left = $chk(left) ? left : this.element.getLeft(this.options.overflown);
+    } else {
+        top = $chk(top) ? top : 0;
+        left = $chk(left) ? left : 0;
+    }
+    this.element.setStyles({'top':top,'left':left,'position':this.position.element});
+    this.parent(this.element);
+},start:function(event) {
+    this.overed = null;
+    if (this.container) {
+        var cont = this.container.getCoordinates();
+        var el = this.element.getCoordinates();
+        if (this.position.element == 'absolute' && !['relative','absolute','fixed'].contains(this.position.container)) {
+            this.options.limit = {'x':[cont.left,cont.right - el.width],'y':[cont.top,cont.bottom - el.height]};
+        } else {
+            this.options.limit = {'y':[0,cont.height - el.height],'x':[0,cont.width - el.width]};
+        }
+    }
+    this.parent(event);
+},drag:function(event) {
+    this.parent(event);
+    var overed = this.out ? false : this.droppables.filter(this.checkAgainst, this).getLast();
+    if (this.overed != overed) {
+        if (this.overed)this.overed.fireEvent('leave', [this.element,this]);
+        this.overed = overed ? overed.fireEvent('over', [this.element,this]) : null;
+    }
+    return this;
+},checkAgainst:function(el) {
+    el = el.getCoordinates(this.options.overflown);
+    var now = this.mouse.now;
+    return(now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
+},stop:function() {
+    if (this.overed && !this.out)this.overed.fireEvent('drop', [this.element,this]); else this.element.fireEvent('emptydrop', this);
+    this.parent();
+    return this;
+}});
+Element.extend({makeDraggable:function(options) {
+    return new Drag.Move(this, options);
+}});
+var XHR = new Class({options:{method:'post',async:true,onRequest:Class.empty,onSuccess:Class.empty,onFailure:Class.empty,urlEncoded:true,encoding:'utf-8',autoCancel:false,headers:{}},setTransport:function() {
+    this.transport = (window.XMLHttpRequest) ? new XMLHttpRequest() : (window.ie ? new ActiveXObject('Microsoft.XMLHTTP') : false);
+    return this;
+},initialize:function(options) {
+    this.setTransport().setOptions(options);
+    this.options.isSuccess = this.options.isSuccess || this.isSuccess;
+    this.headers = {};
+    if (this.options.urlEncoded && this.options.method == 'post') {
+        var encoding = (this.options.encoding) ? '; charset=' + this.options.encoding : '';
+        this.setHeader('Content-type', 'application/x-www-form-urlencoded' + encoding);
+    }
+    if (this.options.initialize)this.options.initialize.call(this);
+},onStateChange:function() {
+    if (this.transport.readyState != 4 || !this.running)return;
+    this.running = false;
+    var status = 0;
+    try {
+        status = this.transport.status;
+    } catch(e) {
+    }
+    ;
+    if (this.options.isSuccess.call(this, status))this.onSuccess(); else this.onFailure();
+    this.transport.onreadystatechange = Class.empty;
+},isSuccess:function(status) {
+    return((status >= 200) && (status < 300));
+},onSuccess:function() {
+    this.response = {'text':this.transport.responseText,'xml':this.transport.responseXML};
+    this.fireEvent('onSuccess', [this.response.text,this.response.xml]);
+    this.callChain();
+},onFailure:function() {
+    this.fireEvent('onFailure', this.transport);
+},setHeader:function(name, value) {
+    this.headers[name] = value;
+    return this;
+},send:function(url, data) {
+    if (this.options.autoCancel)this.cancel(); else if (this.running)return this;
+    this.running = true;
+    if (data && this.options.method == 'get') {
+        url = url + (url.contains('?') ? '&' : '?') + data;
+        data = null;
+    }
+    this.transport.open(this.options.method.toUpperCase(), url, this.options.async);
+    this.transport.onreadystatechange = this.onStateChange.bind(this);
+    if ((this.options.method == 'post') && this.transport.overrideMimeType)this.setHeader('Connection', 'close');
+    $extend(this.headers, this.options.headers);
+    for (var type in this.headers)try {
+        this.transport.setRequestHeader(type, this.headers[type]);
+    } catch(e) {
+    }
+    ;
+    this.fireEvent('onRequest');
+    this.transport.send($pick(data, null));
+    return this;
+},cancel:function() {
+    if (!this.running)return this;
+    this.running = false;
+    this.transport.abort();
+    this.transport.onreadystatechange = Class.empty;
+    this.setTransport();
+    this.fireEvent('onCancel');
+    return this;
+}});
+XHR.implement(new Chain, new Events, new Options);
+var Ajax = XHR.extend({options:{data:null,update:null,onComplete:Class.empty,evalScripts:false,evalResponse:false},initialize:function(url, options) {
+    this.addEvent('onSuccess', this.onComplete);
+    this.setOptions(options);
+    this.options.data = this.options.data || this.options.postBody;
+    if (!['post','get'].contains(this.options.method)) {
+        this._method = '_method=' + this.options.method;
+        this.options.method = 'post';
+    }
+    this.parent();
+    this.setHeader('X-Requested-With', 'XMLHttpRequest');
+    this.setHeader('Accept', 'text/javascript, text/html, application/xml, text/xml, */*');
+    this.url = url;
+},onComplete:function() {
+    if (this.options.update)$(this.options.update).empty().setHTML(this.response.text);
+    if (this.options.evalScripts || this.options.evalResponse)this.evalScripts();
+    this.fireEvent('onComplete', [this.response.text,this.response.xml], 20);
+},request:function(data) {
+    data = data || this.options.data;
+    switch ($type(data)) {case'element':data = $(data).toQueryString();break;case'object':data = Object.toQueryString(data);}
+    if (this._method)data = (data) ? [this._method,data].join('&') : this._method;
+    return this.send(this.url, data);
+},evalScripts:function() {
+    var script,scripts;
+    if (this.options.evalResponse || (/(ecma|java)script/).test(this.getHeader('Content-type')))scripts = this.response.text; else {
+        scripts = [];
+        var regexp = /<script[^>]*>([\s\S]*?)<\/script>/gi;
+        while ((script = regexp.exec(this.response.text)))scripts.push(script[1]);
+        scripts = scripts.join('\n');
+    }
+    if (scripts)(window.execScript) ? window.execScript(scripts) : window.setTimeout(scripts, 0);
+},getHeader:function(name) {
+    try {
+        return this.transport.getResponseHeader(name);
+    } catch(e) {
+    }
+    ;
+    return null;
+}});
+Object.toQueryString = function(source) {
+    var queryString = [];
+    for (var property in source)queryString.push(encodeURIComponent(property) + '=' + encodeURIComponent(source[property]));
+    return queryString.join('&');
+};
+Element.extend({send:function(options) {
+    return new Ajax(this.getProperty('action'), $merge({data:this.toQueryString()}, options, {method:'post'})).request();
+}});
+var Cookie = new Abstract({options:{domain:false,path:false,duration:false,secure:false},set:function(key, value, options) {
+    options = $merge(this.options, options);
+    value = encodeURIComponent(value);
+    if (options.domain)value += '; domain=' + options.domain;
+    if (options.path)value += '; path=' + options.path;
+    if (options.duration) {
+        var date = new Date();
+        date.setTime(date.getTime() + options.duration * 24 * 60 * 60 * 1000);
+        value += '; expires=' + date.toGMTString();
+    }
+    if (options.secure)value += '; secure';
+    document.cookie = key + '=' + value;
+    return $extend(options, {'key':key,'value':value});
+},get:function(key) {
+    var value = document.cookie.match('(?:^|;)\\s*' + key.escapeRegExp() + '=([^;]*)');
+    return value ? decodeURIComponent(value[1]) : false;
+},remove:function(cookie, options) {
+    if ($type(cookie) == 'object')this.set(cookie.key, '', $merge(cookie, {duration:-1})); else this.set(cookie, '', $merge(options, {duration:-1}));
+}});
+var Json = {toString:function(obj) {
+    switch ($type(obj)) {case'string':return'"' + obj.replace(/(["\\])/g, '\\$1') + '"';case'array':return'[' + obj.map(Json.toString).join(',') + ']';case'object':var string = [];for (var property in obj)string.push(Json.toString(property) + ':' + Json.toString(obj[property]));return'{' + string.join(',') + '}';case'number':if (isFinite(obj))break;case false:return'null';}
+    return String(obj);
+},evaluate:function(str, secure) {
+    return(($type(str) != 'string') || (secure && !str.test(/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/))) ? null : eval('(' + str + ')');
+}};
+Json.Remote = XHR.extend({initialize:function(url, options) {
+    this.url = url;
+    this.addEvent('onSuccess', this.onComplete);
+    this.parent(options);
+    this.setHeader('X-Request', 'JSON');
+},send:function(obj) {
+    return this.parent(this.url, 'json=' + Json.toString(obj));
+},onComplete:function() {
+    this.fireEvent('onComplete', [Json.evaluate(this.response.text, this.options.secure)]);
+}});
+var Asset = new Abstract({javascript:function(source, properties) {
+    properties = $merge({'onload':Class.empty}, properties);
+    var script = new Element('script', {'src':source}).addEvents({'load':properties.onload,'readystatechange':function() {
+        if (this.readyState == 'complete')this.fireEvent('load');
+    }});
+    delete properties.onload;
+    return script.setProperties(properties).inject(document.head);
+},css:function(source, properties) {
+    return new Element('link', $merge({'rel':'stylesheet','media':'screen','type':'text/css','href':source}, properties)).inject(document.head);
+},image:function(source, properties) {
+    properties = $merge({'onload':Class.empty,'onabort':Class.empty,'onerror':Class.empty}, properties);
+    var image = new Image();
+    image.src = source;
+    var element = new Element('img', {'src':source});
+    ['load','abort','error'].each(function(type) {
+        var event = properties['on' + type];
+        delete properties['on' + type];
+        element.addEvent(type, function() {
+            this.removeEvent(type, arguments.callee);
+            event.call(this);
+        });
+    });
+    if (image.width && image.height)element.fireEvent('load', element, 1);
+    return element.setProperties(properties);
+},images:function(sources, options) {
+    options = $merge({onComplete:Class.empty,onProgress:Class.empty}, options);
+    if (!sources.push)sources = [sources];
+    var images = [];
+    var counter = 0;
+    sources.each(function(source) {
+        var img = new Asset.image(source, {'onload':function() {
+            options.onProgress.call(this, counter);
+            counter++;
+            if (counter == sources.length)options.onComplete();
+        }});
+        images.push(img);
+    });
+    return new Elements(images);
+}});
+var Hash = new Class({length:0,initialize:function(object) {
+    this.obj = object || {};
+    this.setLength();
+},get:function(key) {
+    return(this.hasKey(key)) ? this.obj[key] : null;
+},hasKey:function(key) {
+    return(key in this.obj);
+},set:function(key, value) {
+    if (!this.hasKey(key))this.length++;
+    this.obj[key] = value;
+    return this;
+},setLength:function() {
+    this.length = 0;
+    for (var p in this.obj)this.length++;
+    return this;
+},remove:function(key) {
+    if (this.hasKey(key)) {
+        delete this.obj[key];
+        this.length--;
+    }
+    return this;
+},each:function(fn, bind) {
+    $each(this.obj, fn, bind);
+},extend:function(obj) {
+    $extend(this.obj, obj);
+    return this.setLength();
+},merge:function() {
+    this.obj = $merge.apply(null, [this.obj].extend(arguments));
+    return this.setLength();
+},empty:function() {
+    this.obj = {};
+    this.length = 0;
+    return this;
+},keys:function() {
+    var keys = [];
+    for (var property in this.obj)keys.push(property);
+    return keys;
+},values:function() {
+    var values = [];
+    for (var property in this.obj)values.push(this.obj[property]);
+    return values;
+}});
+function $H(obj) {
+    return new Hash(obj);
+}
+;
+Hash.Cookie = Hash.extend({initialize:function(name, options) {
+    this.name = name;
+    this.options = $extend({'autoSave':true}, options || {});
+    this.load();
+},save:function() {
+    if (this.length == 0) {
+        Cookie.remove(this.name, this.options);
+        return true;
+    }
+    var str = Json.toString(this.obj);
+    if (str.length > 4096)return false;
+    Cookie.set(this.name, str, this.options);
+    return true;
+},load:function() {
+    this.obj = Json.evaluate(Cookie.get(this.name), true) || {};
+    this.setLength();
+}});
+Hash.Cookie.Methods = {};
+['extend','set','merge','empty','remove'].each(function(method) {
+    Hash.Cookie.Methods[method] = function() {
+        Hash.prototype[method].apply(this, arguments);
+        if (this.options.autoSave)this.save();
+        return this;
+    };
+});
+Hash.Cookie.implement(Hash.Cookie.Methods);
+var Color = new Class({initialize:function(color, type) {
+    type = type || (color.push ? 'rgb' : 'hex');
+    var rgb,hsb;
+    switch (type) {case'rgb':rgb = color;hsb = rgb.rgbToHsb();break;case'hsb':rgb = color.hsbToRgb();hsb = color;break;default:rgb = color.hexToRgb(true);hsb = rgb.rgbToHsb();}
+    rgb.hsb = hsb;
+    rgb.hex = rgb.rgbToHex();
+    return $extend(rgb, Color.prototype);
+},mix:function() {
+    var colors = $A(arguments);
+    var alpha = ($type(colors[colors.length - 1]) == 'number') ? colors.pop() : 50;
+    var rgb = this.copy();
+    colors.each(function(color) {
+        color = new Color(color);
+        for (var i = 0; i < 3; i++)rgb[i] = Math.round((rgb[i] / 100 * (100 - alpha)) + (color[i] / 100 * alpha));
+    });
+    return new Color(rgb, 'rgb');
+},invert:function() {
+    return new Color(this.map(function(value) {
+        return 255 - value;
+    }));
+},setHue:function(value) {
+    return new Color([value,this.hsb[1],this.hsb[2]], 'hsb');
+},setSaturation:function(percent) {
+    return new Color([this.hsb[0],percent,this.hsb[2]], 'hsb');
+},setBrightness:function(percent) {
+    return new Color([this.hsb[0],this.hsb[1],percent], 'hsb');
+}});
+function $RGB(r, g, b) {
+    return new Color([r,g,b], 'rgb');
+}
+;
+function $HSB(h, s, b) {
+    return new Color([h,s,b], 'hsb');
+}
+;
+Array.extend({rgbToHsb:function() {
+    var red = this[0],green = this[1],blue = this[2];
+    var hue,saturation,brightness;
+    var max = Math.max(red, green, blue),min = Math.min(red, green, blue);
+    var delta = max - min;
+    brightness = max / 255;
+    saturation = (max != 0) ? delta / max : 0;
+    if (saturation == 0) {
+        hue = 0;
+    } else {
+        var rr = (max - red) / delta;
+        var gr = (max - green) / delta;
+        var br = (max - blue) / delta;
+        if (red == max)hue = br - gr; else if (green == max)hue = 2 + rr - br; else hue = 4 + gr - rr;
+        hue /= 6;
+        if (hue < 0)hue++;
+    }
+    return[Math.round(hue * 360),Math.round(saturation * 100),Math.round(brightness * 100)];
+},hsbToRgb:function() {
+    var br = Math.round(this[2] / 100 * 255);
+    if (this[1] == 0) {
+        return[br,br,br];
+    } else {
+        var hue = this[0] % 360;
+        var f = hue % 60;
+        var p = Math.round((this[2] * (100 - this[1])) / 10000 * 255);
+        var q = Math.round((this[2] * (6000 - this[1] * f)) / 600000 * 255);
+        var t = Math.round((this[2] * (6000 - this[1] * (60 - f))) / 600000 * 255);
+        switch (Math.floor(hue / 60)) {case 0:return[br,t,p];case 1:return[q,br,p];case 2:return[p,br,t];case 3:return[p,q,br];case 4:return[t,p,br];case 5:return[br,p,q];}
+    }
+    return false;
+}});
+var Scroller = new Class({options:{area:20,velocity:1,onChange:function(x, y) {
+    this.element.scrollTo(x, y);
+}},initialize:function(element, options) {
+    this.setOptions(options);
+    this.element = $(element);
+    this.mousemover = ([window,document].contains(element)) ? $(document.body) : this.element;
+},start:function() {
+    this.coord = this.getCoords.bindWithEvent(this);
+    this.mousemover.addListener('mousemove', this.coord);
+},stop:function() {
+    this.mousemover.removeListener('mousemove', this.coord);
+    this.timer = $clear(this.timer);
+},getCoords:function(event) {
+    this.page = (this.element == window) ? event.client : event.page;
+    if (!this.timer)this.timer = this.scroll.periodical(50, this);
+},scroll:function() {
+    var el = this.element.getSize();
+    var pos = this.element.getPosition();
+    var change = {'x':0,'y':0};
+    for (var z in this.page) {
+        if (this.page[z] < (this.options.area + pos[z]) && el.scroll[z] != 0)
+            change[z] = (this.page[z] - this.options.area - pos[z]) * this.options.velocity; else if (this.page[z] + this.options.area > (el.size[z] + pos[z]) && el.scroll[z] + el.size[z] != el.scrollSize[z])
+            change[z] = (this.page[z] - el.size[z] + this.options.area - pos[z]) * this.options.velocity;
+    }
+    if (change.y || change.x)this.fireEvent('onChange', [el.scroll.x + change.x,el.scroll.y + change.y]);
+}});
+Scroller.implement(new Events, new Options);
+var Slider = new Class({options:{onChange:Class.empty,onComplete:Class.empty,onTick:function(pos) {
+    this.knob.setStyle(this.p, pos);
+},mode:'horizontal',steps:100,offset:0},initialize:function(el, knob, options) {
+    this.element = $(el);
+    this.knob = $(knob);
+    this.setOptions(options);
+    this.previousChange = -1;
+    this.previousEnd = -1;
+    this.step = -1;
+    this.element.addEvent('mousedown', this.clickedElement.bindWithEvent(this));
+    var mod,offset;
+    switch (this.options.mode) {case'horizontal':this.z = 'x';this.p = 'left';mod = {'x':'left','y':false};offset = 'offsetWidth';break;case'vertical':this.z = 'y';this.p = 'top';mod = {'x':false,'y':'top'};offset = 'offsetHeight';}
+    this.max = this.element[offset] - this.knob[offset] + (this.options.offset * 2);
+    this.half = this.knob[offset] / 2;
+    this.getPos = this.element['get' + this.p.capitalize()].bind(this.element);
+    this.knob.setStyle('position', 'relative').setStyle(this.p, -this.options.offset);
+    var lim = {};
+    lim[this.z] = [-this.options.offset,this.max - this.options.offset];
+    this.drag = new Drag.Base(this.knob, {limit:lim,modifiers:mod,snap:0,onStart:function() {
+        this.draggedKnob();
+    }.bind(this),onDrag:function() {
+        this.draggedKnob();
+    }.bind(this),onComplete:function() {
+        this.draggedKnob();
+        this.end();
+    }.bind(this)});
+    if (this.options.initialize)this.options.initialize.call(this);
+},set:function(step) {
+    this.step = step.limit(0, this.options.steps);
+    this.checkStep();
+    this.end();
+    this.fireEvent('onTick', this.toPosition(this.step));
+    return this;
+},clickedElement:function(event) {
+    var position = event.page[this.z] - this.getPos() - this.half;
+    position = position.limit(-this.options.offset, this.max - this.options.offset);
+    this.step = this.toStep(position);
+    this.checkStep();
+    this.end();
+    this.fireEvent('onTick', position);
+},draggedKnob:function() {
+    this.step = this.toStep(this.drag.value.now[this.z]);
+    this.checkStep();
+},checkStep:function() {
+    if (this.previousChange != this.step) {
+        this.previousChange = this.step;
+        this.fireEvent('onChange', this.step);
+    }
+},end:function() {
+    if (this.previousEnd !== this.step) {
+        this.previousEnd = this.step;
+        this.fireEvent('onComplete', this.step + '');
+    }
+},toStep:function(position) {
+    return Math.round((position + this.options.offset) / this.max * this.options.steps);
+},toPosition:function(step) {
+    return this.max * step / this.options.steps;
+}});
+Slider.implement(new Events);
+Slider.implement(new Options);
+var SmoothScroll = Fx.Scroll.extend({initialize:function(options) {
+    this.parent(window, options);
+    this.links = (this.options.links) ? $$(this.options.links) : $$(document.links);
+    var location = window.location.href.match(/^[^#]*/)[0] + '#';
+    this.links.each(function(link) {
+        if (link.href.indexOf(location) != 0)return;
+        var anchor = link.href.substr(location.length);
+        if (anchor && $(anchor))this.useLink(link, anchor);
+    }, this);
+    if (!window.webkit419)this.addEvent('onComplete', function() {
+        window.location.hash = this.anchor;
+    });
+},useLink:function(link, anchor) {
+    link.addEvent('click', function(event) {
+        this.anchor = anchor;
+        this.toElement(anchor);
+        event.stop();
+    }.bindWithEvent(this));
+}});
+var Sortables = new Class({options:{handles:false,onStart:Class.empty,onComplete:Class.empty,ghost:true,snap:3,onDragStart:function(element, ghost) {
+    ghost.setStyle('opacity', 0.7);
+    element.setStyle('opacity', 0.7);
+},onDragComplete:function(element, ghost) {
+    element.setStyle('opacity', 1);
+    ghost.remove();
+    this.trash.remove();
+}},initialize:function(list, options) {
+    this.setOptions(options);
+    this.list = $(list);
+    this.elements = this.list.getChildren();
+    this.handles = (this.options.handles) ? $$(this.options.handles) : this.elements;
+    this.bound = {'start':[],'moveGhost':this.moveGhost.bindWithEvent(this)};
+    for (var i = 0,l = this.handles.length; i < l; i++) {
+        this.bound.start[i] = this.start.bindWithEvent(this, this.elements[i]);
+    }
+    this.attach();
+    if (this.options.initialize)this.options.initialize.call(this);
+    this.bound.move = this.move.bindWithEvent(this);
+    this.bound.end = this.end.bind(this);
+},attach:function() {
+    this.handles.each(function(handle, i) {
+        handle.addEvent('mousedown', this.bound.start[i]);
+    }, this);
+},detach:function() {
+    this.handles.each(function(handle, i) {
+        handle.removeEvent('mousedown', this.bound.start[i]);
+    }, this);
+},start:function(event, el) {
+    this.active = el;
+    this.coordinates = this.list.getCoordinates();
+    if (this.options.ghost) {
+        var position = el.getPosition();
+        this.offset = event.page.y - position.y;
+        this.trash = new Element('div').inject(document.body);
+        this.ghost = el.clone().inject(this.trash).setStyles({'position':'absolute','left':position.x,'top':event.page.y - this.offset});
+        document.addListener('mousemove', this.bound.moveGhost);
+        this.fireEvent('onDragStart', [el,this.ghost]);
+    }
+    document.addListener('mousemove', this.bound.move);
+    document.addListener('mouseup', this.bound.end);
+    this.fireEvent('onStart', el);
+    event.stop();
+},moveGhost:function(event) {
+    var value = event.page.y - this.offset;
+    value = value.limit(this.coordinates.top, this.coordinates.bottom - this.ghost.offsetHeight);
+    this.ghost.setStyle('top', value);
+    event.stop();
+},move:function(event) {
+    var now = event.page.y;
+    this.previous = this.previous || now;
+    var up = ((this.previous - now) > 0);
+    var prev = this.active.getPrevious();
+    var next = this.active.getNext();
+    if (prev && up && now < prev.getCoordinates().bottom)this.active.injectBefore(prev);
+    if (next && !up && now > next.getCoordinates().top)this.active.injectAfter(next);
+    this.previous = now;
+},serialize:function(converter) {
+    return this.list.getChildren().map(converter || function(el) {
+        return this.elements.indexOf(el);
+    }, this);
+},end:function() {
+    this.previous = null;
+    document.removeListener('mousemove', this.bound.move);
+    document.removeListener('mouseup', this.bound.end);
+    if (this.options.ghost) {
+        document.removeListener('mousemove', this.bound.moveGhost);
+        this.fireEvent('onDragComplete', [this.active,this.ghost]);
+    }
+    this.fireEvent('onComplete', this.active);
+}});
+Sortables.implement(new Events, new Options);
+var Tips = new Class({options:{onShow:function(tip) {
+    tip.setStyle('visibility', 'visible');
+},onHide:function(tip) {
+    tip.setStyle('visibility', 'hidden');
+},maxTitleChars:30,showDelay:100,hideDelay:100,className:'tool',offsets:{'x':16,'y':16},fixed:false},initialize:function(elements, options) {
+    this.setOptions(options);
+    this.toolTip = new Element('div', {'class':this.options.className + '-tip','styles':{'position':'absolute','top':'0','left':'0','visibility':'hidden'}}).inject(document.body);
+    this.wrapper = new Element('div').inject(this.toolTip);
+    $$(elements).each(this.build, this);
+    if (this.options.initialize)this.options.initialize.call(this);
+},build:function(el) {
+    el.$tmp.myTitle = (el.href && el.getTag() == 'a') ? el.href.replace('http://', '') : (el.rel || false);
+    if (el.title) {
+        var dual = el.title.split('::');
+        if (dual.length > 1) {
+            el.$tmp.myTitle = dual[0].trim();
+            el.$tmp.myText = dual[1].trim();
+        } else {
+            el.$tmp.myText = el.title;
+        }
+        el.removeAttribute('title');
+    } else {
+        el.$tmp.myText = false;
+    }
+    if (el.$tmp.myTitle && el.$tmp.myTitle.length > this.options.maxTitleChars)el.$tmp.myTitle = el.$tmp.myTitle.substr(0, this.options.maxTitleChars - 1) + "&hellip;";
+    el.addEvent('mouseenter', function(event) {
+        this.start(el);
+        if (!this.options.fixed)this.locate(event); else this.position(el);
+    }.bind(this));
+    if (!this.options.fixed)el.addEvent('mousemove', this.locate.bindWithEvent(this));
+    var end = this.end.bind(this);
+    el.addEvent('mouseleave', end);
+    el.addEvent('trash', end);
+},start:function(el) {
+    this.wrapper.empty();
+    if (el.$tmp.myTitle) {
+        this.title = new Element('span').inject(new Element('div', {'class':this.options.className + '-title'}).inject(this.wrapper)).setHTML(el.$tmp.myTitle);
+    }
+    if (el.$tmp.myText) {
+        this.text = new Element('span').inject(new Element('div', {'class':this.options.className + '-text'}).inject(this.wrapper)).setHTML(el.$tmp.myText);
+    }
+    $clear(this.timer);
+    this.timer = this.show.delay(this.options.showDelay, this);
+},end:function(event) {
+    $clear(this.timer);
+    this.timer = this.hide.delay(this.options.hideDelay, this);
+},position:function(element) {
+    var pos = element.getPosition();
+    this.toolTip.setStyles({'left':pos.x + this.options.offsets.x,'top':pos.y + this.options.offsets.y});
+},locate:function(event) {
+    var win = {'x':window.getWidth(),'y':window.getHeight()};
+    var scroll = {'x':window.getScrollLeft(),'y':window.getScrollTop()};
+    var tip = {'x':this.toolTip.offsetWidth,'y':this.toolTip.offsetHeight};
+    var prop = {'x':'left','y':'top'};
+    for (var z in prop) {
+        var pos = event.page[z] + this.options.offsets[z];
+        if ((pos + tip[z] - scroll[z]) > win[z])pos = event.page[z] - this.options.offsets[z] - tip[z];
+        this.toolTip.setStyle(prop[z], pos);
+    }
+    ;
+},show:function() {
+    if (this.options.timeout)this.timer = this.hide.delay(this.options.timeout, this);
+    this.fireEvent('onShow', [this.toolTip]);
+},hide:function() {
+    this.fireEvent('onHide', [this.toolTip]);
+}});
+Tips.implement(new Events, new Options);
+var Group = new Class({initialize:function() {
+    this.instances = $A(arguments);
+    this.events = {};
+    this.checker = {};
+},addEvent:function(type, fn) {
+    this.checker[type] = this.checker[type] || {};
+    this.events[type] = this.events[type] || [];
+    if (this.events[type].contains(fn))return false; else this.events[type].push(fn);
+    this.instances.each(function(instance, i) {
+        instance.addEvent(type, this.check.bind(this, [type,instance,i]));
+    }, this);
+    return this;
+},check:function(type, instance, i) {
+    this.checker[type][i] = true;
+    var every = this.instances.every(function(current, j) {
+        return this.checker[type][j] || false;
+    }, this);
+    if (!every)return;
+    this.checker[type] = {};
+    this.events[type].each(function(event) {
+        event.call(this, this.instances, instance);
+    }, this);
+}});
+var Accordion = Fx.Elements.extend({options:{onActive:Class.empty,onBackground:Class.empty,display:0,show:false,height:true,width:false,opacity:true,fixedHeight:false,fixedWidth:false,wait:false,alwaysHide:false},initialize:function() {
+    var options,togglers,elements,container;
+    $each(arguments, function(argument, i) {
+        switch ($type(argument)) {case'object':options = argument;break;case'element':container = $(argument);break;default:var temp = $$(argument);if (!togglers)togglers = temp; else elements = temp;}
+    });
+    this.togglers = togglers || [];
+    this.elements = elements || [];
+    this.container = $(container);
+    this.setOptions(options);
+    this.previous = -1;
+    if (this.options.alwaysHide)this.options.wait = true;
+    if ($chk(this.options.show)) {
+        this.options.display = false;
+        this.previous = this.options.show;
+    }
+    if (this.options.start) {
+        this.options.display = false;
+        this.options.show = false;
+    }
+    this.effects = {};
+    if (this.options.opacity)this.effects.opacity = 'fullOpacity';
+    if (this.options.width)this.effects.width = this.options.fixedWidth ? 'fullWidth' : 'offsetWidth';
+    if (this.options.height)this.effects.height = this.options.fixedHeight ? 'fullHeight' : 'scrollHeight';
+    for (var i = 0,l = this.togglers.length; i < l; i++)this.addSection(this.togglers[i], this.elements[i]);
+    this.elements.each(function(el, i) {
+        if (this.options.show === i) {
+            this.fireEvent('onActive', [this.togglers[i],el]);
+        } else {
+            for (var fx in this.effects)el.setStyle(fx, 0);
+        }
+    }, this);
+    this.parent(this.elements);
+    if ($chk(this.options.display))this.display(this.options.display);
+},addSection:function(toggler, element, pos) {
+    toggler = $(toggler);
+    element = $(element);
+    var test = this.togglers.contains(toggler);
+    var len = this.togglers.length;
+    this.togglers.include(toggler);
+    this.elements.include(element);
+    if (len && (!test || pos)) {
+        pos = $pick(pos, len - 1);
+        toggler.injectBefore(this.togglers[pos]);
+        element.injectAfter(toggler);
+    } else if (this.container && !test) {
+        toggler.inject(this.container);
+        element.inject(this.container);
+    }
+    var idx = this.togglers.indexOf(toggler);
+    toggler.addEvent('click', this.display.bind(this, idx));
+    if (this.options.height)element.setStyles({'padding-top':0,'border-top':'none','padding-bottom':0,'border-bottom':'none'});
+    if (this.options.width)element.setStyles({'padding-left':0,'border-left':'none','padding-right':0,'border-right':'none'});
+    element.fullOpacity = 1;
+    if (this.options.fixedWidth)element.fullWidth = this.options.fixedWidth;
+    if (this.options.fixedHeight)element.fullHeight = this.options.fixedHeight;
+    element.setStyle('overflow', 'hidden');
+    if (!test) {
+        for (var fx in this.effects)element.setStyle(fx, 0);
+    }
+    return this;
+},display:function(index) {
+    index = ($type(index) == 'element') ? this.elements.indexOf(index) : index;
+    if ((this.timer && this.options.wait) || (index === this.previous && !this.options.alwaysHide))return this;
+    this.previous = index;
+    var obj = {};
+    this.elements.each(function(el, i) {
+        obj[i] = {};
+        var hide = (i != index) || (this.options.alwaysHide && (el.offsetHeight > 0));
+        this.fireEvent(hide ? 'onBackground' : 'onActive', [this.togglers[i],el]);
+        for (var fx in this.effects)obj[i][fx] = hide ? 0 : el[this.effects[fx]];
+    }, this);
+    return this.start(obj);
+},showThisHideOpen:function(index) {
+    return this.display(index);
+}});
+Fx.Accordion = Accordion;
\ No newline at end of file
diff --git a/trunk/web2d/src/test/javascript/render/polyLine.html b/trunk/web2d/src/test/javascript/render/polyLine.html
new file mode 100755
index 00000000..4dd1336a
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/polyLine.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript" src="web2dLibraryLoader.js"></script>
+</head>
+
+<body>
+
+<h1>PolyLines Render Tests </h1>
+
+<table border="1">
+<colgroup style="width:80%;">
+    <col style="width:30%"/>
+    <col style="width:60%"/>
+</colgroup>
+<tr>
+    <td>
+        Different types of PolyLines that can be used.
+    </td>
+    <td>
+        <div id="overflowExample"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    web2d.peer.Toolkit.init();
+
+    var overflowWorkspace = new web2d.Workspace({fillColor:'green'});
+    overflowWorkspace.setSize("100px", "100px");
+
+    var line = new web2d.PolyLine();
+    line.setTo(165, 165);
+    line.setFrom(95, 95);
+    line.setStyle("Straight");
+    line.setStroke('10');
+    overflowWorkspace.appendChild(line);
+
+
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, -1653.0000000000000000000001);
+    //    line.setFrom(95, 952);
+    //    line.setTo(165, 1651);
+    //
+    //
+    //    var line = new web2d.PolyLine();
+    //    line.setFrom(95, 90);
+    //    line.setTo(160, 20);
+    //    overflowWorkspace.appendChild(line);
+    //
+    //    var line = new web2d.PolyLine();
+    //    line.setStyle("Straight");
+    //    line.setFrom(90, -90);
+    //    line.setTo(20, 20);
+    //    overflowWorkspace.appendChild(line);
+    //
+    //    var line = new web2d.PolyLine();
+    //    line.setFrom(95, 95);
+    //    line.setTo(165, 165);
+    //    line.setStroke(1, 'solid', 'red');
+    //    overflowWorkspace.appendChild(line);
+    //
+    //    // Reference ...
+    //    var refLine = new web2d.Line();
+    //    refLine.setFrom(95, 0);
+    //    refLine.setTo(95, 200);
+    //    refLine.setStroke(1, 'solid', 'red');
+    //    overflowWorkspace.appendChild(refLine);
+    //
+    //    var refLine = new web2d.Line();
+    //    refLine.setFrom(165, 0);
+    //    refLine.setTo(165, 200);
+    //    refLine.setStroke(1, 'solid', 'red');
+    //    overflowWorkspace.appendChild(refLine);
+    //
+
+    overflowWorkspace.addItAsChildTo($("overflowExample"));
+
+</script>
+<tr>
+    <td>
+        This is how multiple childs will look in each style line
+    </td>
+    <td>
+        <div id="multipleLineExample"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+
+    var overflowWorkspace = new web2d.Workspace();
+    overflowWorkspace.setSize("100px", "100px");
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(95, 95);
+    line1.setTo(165, 165);
+    line1.setStyle("Curved");
+    overflowWorkspace.appendChild(line1);
+
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(95, 95);
+    line1.setTo(165, 135);
+    line1.setStyle("Curved");
+    overflowWorkspace.appendChild(line1);
+
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(95, 90);
+    line1.setTo(160, 20);
+    line1.setStyle("Straight");
+    overflowWorkspace.appendChild(line1);
+
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(95, 90);
+    line1.setTo(160, 50);
+    line1.setStyle("Straight");
+    overflowWorkspace.appendChild(line1);
+
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(90, 90);
+    line1.setTo(20, 20);
+    overflowWorkspace.appendChild(line1);
+
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(90, 90);
+    line1.setTo(20, 50);
+    overflowWorkspace.appendChild(line1);
+
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(90, 95);
+    line1.setTo(20, 165);
+    overflowWorkspace.appendChild(line1);
+
+    var line1 = new web2d.PolyLine();
+    line1.setFrom(90, 95);
+    line1.setTo(20, 135);
+    overflowWorkspace.appendChild(line1);
+
+    overflowWorkspace.addItAsChildTo($("multipleLineExample"));
+
+</script>
+
+</table>
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/prototype.html b/trunk/web2d/src/test/javascript/render/prototype.html
new file mode 100755
index 00000000..f7f735c0
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/prototype.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript" src="web2dLibraryLoader.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
+</head>
+
+<body>
+
+<h1>Chart prototype Tests </h1>
+
+<input type="button" value="Create Shape" name="Create Shape" onclick="createShape();"/>
+<input type="button" value="Zoom In" name="Create Shape" onclick="zoomIn();"/>
+<input type="button" value="Zoom Out" name="Create Shape" onclick="zoomOut();"/>
+
+
+<div id="divWorkspace" style="overflow:scroll;width:1020px;height:620px;position:relative;">
+</div>
+
+
+<script type="text/javascript">
+
+web2d.peer.Toolkit.init();
+
+var xScale = 1000;
+var yScale = 600;
+
+var workspace = new web2d.Workspace();
+workspace.setSize(xScale + "px", yScale + "px");
+workspace.setCoordSize(xScale, yScale);
+workspace.setCoordOrigin(0, 0);
+workspace.setFill("#f0f0f0");
+
+function zoomIn()
+{
+    xScale = xScale / 2;
+    yScale = yScale / 2;
+    workspace.setSize(xScale + "px", yScale + "px");
+}
+
+function zoomOut()
+{
+    xScale = xScale * 2;
+    yScale = yScale * 2;
+    workspace.setSize(xScale + "px", yScale + "px");
+}
+
+
+var shapeOrigX = 0;
+function createShape()
+{
+    // Secondary Idea...
+    var nodeGroup = new web2d.Group();
+    nodeGroup.setSize(200, 60);
+    nodeGroup.setCoordSize(200, 60);
+    nodeGroup.setPosition(700, shapeOrigX);
+    shapeOrigX = shapeOrigX + 50;
+
+    var outerRect = new web2d.Rect();
+    outerRect.setSize(200, 100);
+    outerRect.setVisibility(false);
+    outerRect.setPosition(0, 0);
+    outerRect.setFill("#3e9eff");
+    outerRect.setStroke(1, 'solid', "#878b8f");
+    nodeGroup.appendChild(outerRect);
+
+    var inerRect = new web2d.Rect(0.3);
+    inerRect.setSize(190, 85);
+    inerRect.setPosition(5, 10);
+    inerRect.setFill("white");
+    inerRect.setStroke(1, 'dash', '#878b8f');
+    nodeGroup.appendChild(inerRect);
+    nodeGroup._drag = false;
+
+    workspace.appendChild(nodeGroup);
+
+    // Add behaviour ...
+    inerRect.addEventListener("mouseover", function() {
+        outerRect.setVisibility(true);
+    });
+    inerRect.addEventListener("mouseout", function() {
+        if (!nodeGroup._drag)
+        {
+            outerRect.setVisibility(false);
+        }
+    });
+
+    nodeGroup.addEventListener("mousedown", function(e)
+    {
+        var shadowGroup = new web2d.Group();
+        shadowGroup.setSize(200, 60);
+        shadowGroup.setCoordSize(200, 60);
+
+        var position = nodeGroup.getPosition();
+        shadowGroup.setPosition(position.x, position.y);
+
+        var shadowRect = new web2d.Rect(0.3);
+        shadowRect.setSize(190, 85);
+        shadowRect.setPosition(5, 10);
+        shadowRect.setFill("white", 0.3);
+        shadowRect.setStroke(1, 'dash', '#878b8f');
+        shadowGroup.appendChild(shadowRect);
+
+        workspace.appendChild(shadowGroup);
+
+        this._shadowGroup = shadowGroup;
+        if (!this._moveFunction)
+        {
+            nodeGroup._drag = true;
+            workspace._moveFunction = function(event)
+            {
+                // Esto mas o menos funciona por que el size del workspace es 1 a uno con
+                // el del la pantalla.
+                var posx = 0;
+                var posy = 0;
+                if (event.pageX || event.pageY)
+                {
+                    posx = e.pageX;
+                    posy = e.pageY;
+                }
+                else if (event.clientX || event.clientY) {
+                    posx = event.clientX + document.body.scrollLeft
+                            + document.documentElement.scrollLeft;
+                    posy = event.clientY + document.body.scrollTop
+                            + document.documentElement.scrollTop;
+                }
+
+                shadowGroup.setPosition(posx - 50, posy - 150);
+            };
+        }
+        workspace.addEventListener("mousemove", workspace._moveFunction);
+        var mouseUp = function(e)
+        {
+
+            workspace.removeChild(shadowGroup);
+
+            var pos = shadowGroup.getPosition();
+            nodeGroup.setPosition(pos.x, pos.y);
+            nodeGroup._drag = false;
+            outerRect.setVisibility(true);
+            workspace.removeEventListener("mousemove", workspace._moveFunction);
+            workspace.removeEventListener("mouseup", mouseUp);
+
+        };
+        workspace.addEventListener("mouseup", mouseUp);
+
+    });
+
+}
+// Center Topic Rect ...
+centralRect = new web2d.Rect(0.3);
+centralRect.setSize(200, 60);
+centralRect.setPosition(300, 300);
+centralRect.setFill("#99ccff");
+centralRect.setStroke(1, 'solid', "#878b8f");
+workspace.appendChild(centralRect);
+
+workspace.addItAsChildTo($("divWorkspace"));
+</script>
+
+Notas:
+<li>El evento de mousemove se debe agregar al workspace.
+<li>Cuando se esta drageando un elemento se deberia deshabilitar los eventos del resto de los elementos.
+<li>Definir comportamiento del area.
+
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/rect.html b/trunk/web2d/src/test/javascript/render/rect.html
new file mode 100755
index 00000000..6b93acd8
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/rect.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+      <script type="text/javascript">
+        web2d = {
+            peer: {}
+        };
+
+        web2d.peer =
+        {
+            svg: {},
+            vml: {}
+        };
+
+        web2d.peer.utils = {};
+    </script>
+
+    <script type="text/javascript" src="mootools.js"></script>
+    <script type="text/javascript" src="../../../../../core-js/target/classes/core.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/EventDispatcher.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ElementPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ElementPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Element.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Workspace.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/WorkspacePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/WorkspacePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Toolkit.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Elipse.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ElipsePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ElipsePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Line.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/LinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/LinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/PolyLine.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/PolyLinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/PolyLinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Group.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/GroupPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/GroupPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Rect.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/RectPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/RectPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Text.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TextPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TextPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TextBoxPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/utils/TransformUtils.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/utils/EventUtils.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Font.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/Font.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/Font.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TahomaFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TimesFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ArialFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/VerdanaFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TahomaFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TimesFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ArialFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/VerdanaFont.js"></script>
+
+    <script type="text/javascript" src="utils.js"></script>
+</head>
+
+<body>
+
+
+<h1>Rect Render Tests </h1>
+
+<table border="1">
+    <colgroup style="width:80%;">
+        <col style="width:10%"/>
+        <col style="width:90%"/>
+    </colgroup>
+    <tr>
+        <td>
+            Straight Lines.
+        </td>
+        <td>
+            <div id="rectExample"/>
+        </td>
+
+    </tr>
+    <script type="text/javascript">
+        web2d.peer.Toolkit.init();
+
+        var rectExampleTest = function ()
+        {
+            var workspace = new web2d.Workspace();
+            workspace.setSize("100px", "100px");
+            workspace.setCoordSize(100, 100);
+            workspace.setCoordOrigin(0, 0);
+
+            var rect = new web2d.Rect();
+            rect.setPosition(20, 20);
+
+            workspace.appendChild(rect);
+            workspace.addItAsChildTo($("rectExample"));
+        }
+        rectExampleTest();
+    </script>
+
+    <!-- ********************************************************** -->
+    <tr>
+        <td>
+            Straight Lines.
+        </td>
+        <td>
+            <div id="roundRect" style="float:left;margin:10px"></div>
+        </td>
+
+    </tr>
+    <script type="text/javascript">
+
+        var roundrectExampleTest = function ()
+        {
+            function builder(container, x, width, height)
+            {
+                for (var i = 1; i <= 10; i++)
+                {
+                    var rect = new web2d.Rect(i / 10);
+                    rect.setPosition(x, ((i - 1) * (50 + 5)));
+                    rect.setSize(width, height);
+                    container.appendChild(rect);
+                }
+            }
+
+            // 50 x 50
+            var workspace = new web2d.Workspace();
+            workspace.setSize("500px", "550px");
+            workspace.setCoordOrigin(0, -4);
+            workspace.setCoordSize(500, 550);
+            workspace.addItAsChildTo($("roundRect"));
+
+            builder(workspace, 10, 50, 50);
+
+            // 100 x 50
+            builder(workspace, 70, 100, 50);
+
+            // 200 x 50
+            builder(workspace, 180, 200, 50);
+
+        }
+        roundrectExampleTest();
+    </script>
+
+
+</table>
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/shapes.html b/trunk/web2d/src/test/javascript/render/shapes.html
new file mode 100755
index 00000000..0f7bf7ae
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/shapes.html
@@ -0,0 +1,386 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript">
+          web2d = {
+              peer: {}
+          };
+
+          web2d.peer =
+          {
+              svg: {},
+              vml: {}
+          };
+
+          web2d.peer.utils = {};
+      </script>
+
+      <script type="text/javascript" src="mootools.js"></script>
+      <script type="text/javascript" src="../../../../../core-js/target/classes/core.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/EventDispatcher.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ElementPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ElementPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Element.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Workspace.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/WorkspacePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/WorkspacePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Toolkit.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Elipse.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ElipsePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ElipsePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Line.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/LinePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/LinePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/PolyLine.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/PolyLinePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/PolyLinePeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Group.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/GroupPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/GroupPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Rect.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/RectPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/RectPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Text.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TextPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TextPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TextBoxPeer.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/utils/TransformUtils.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/utils/EventUtils.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/Font.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/Font.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/Font.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TahomaFont.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TimesFont.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ArialFont.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/VerdanaFont.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TahomaFont.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TimesFont.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ArialFont.js"></script>
+      <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/VerdanaFont.js"></script>
+       <script type="text/javascript" src="utils.js"></script>
+</head>
+
+<body>
+<script type="text/javascript">
+    // Logger.setEnabled(true);
+</script>
+
+
+<h1>Element properties Tests </h1>
+
+<table border="1">
+<colgroup style="width:80%;">
+    <col style="width:10%"/>
+    <col style="width:90%"/>
+</colgroup>
+<tr>
+    <td>
+        Stroke Styles.
+    </td>
+    <td>
+        <div>
+            <div id="strokeStyle"></div>
+            <div id="strokeStyleGroup"></div>
+            <div id="strokeStyleWidth"></div>
+        </div>
+    </td>
+</tr>
+<script type="text/javascript">
+    web2d.peer.Toolkit.init();
+
+    var strokeStyleTest = function ()
+    {
+        function builder(parent, scale, strokeWidth)
+        {
+            var rectSize = scale * 80;
+            var yPosition = 10 * scale;
+
+            var xPosition = 10 * scale;
+            var rect = new web2d.Rect();
+            rect.setSize(rectSize, rectSize);
+            rect.setPosition(xPosition, yPosition);
+            rect.setFill('yellow');
+            rect.setStroke(1, 'solid', 'black');
+            parent.appendChild(rect);
+
+            xPosition = xPosition + 90 * scale;
+            rect = new web2d.Rect();
+            rect.setSize(rectSize, rectSize);
+            rect.setPosition(xPosition, yPosition);
+            rect.setFill('yellow');
+            rect.setStroke(strokeWidth, 'dot', 'black');
+            parent.appendChild(rect);
+
+            xPosition = xPosition + 90 * scale;
+            rect = new web2d.Rect();
+            rect.setSize(rectSize, rectSize);
+            rect.setPosition(xPosition, yPosition);
+            rect.setFill('yellow');
+            rect.setStroke(strokeWidth, 'dash', 'black');
+            parent.appendChild(rect);
+
+            xPosition = xPosition + 90 * scale;
+            rect = new web2d.Rect();
+            rect.setSize(rectSize, rectSize);
+            rect.setPosition(xPosition, yPosition);
+            rect.setFill('yellow');
+            rect.setStroke(strokeWidth, 'longdash', 'black');
+            parent.appendChild(rect);
+
+            xPosition = xPosition + 90 * scale;
+            rect = new web2d.Rect();
+            rect.setSize(rectSize, rectSize);
+            rect.setPosition(xPosition, yPosition);
+            rect.setFill('yellow');
+            rect.setStroke(strokeWidth, 'dashdot', 'black');
+            parent.appendChild(rect);
+        }
+        ;
+
+        // Workspace with default scale ...
+        var workspace = new web2d.Workspace();
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(500, 100);
+        workspace.setCoordOrigin(0, 0);
+        builder(workspace, 1, 1);
+        workspace.addItAsChildTo($("strokeStyle"));
+
+        // Workspace with modified scale ...
+        workspace = new web2d.Workspace();
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(5000, 1000);
+        workspace.setCoordOrigin(0, 0);
+        builder(workspace, 10, 1);
+        workspace.addItAsChildTo($("strokeStyleGroup"));
+
+        // Workspace with default scale ...
+        workspace = new web2d.Workspace();
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(500, 100);
+        workspace.setCoordOrigin(0, 0);
+        builder(workspace, 1, 5);
+        workspace.addItAsChildTo($("strokeStyleWidth"));
+
+
+    };
+    strokeStyleTest();
+</script>
+
+<tr>
+    <td>
+        Stroke Width.
+    </td>
+    <td>
+        <div id="strokeWidth"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    var rectExampleTest = function ()
+    {
+        var workspace = new web2d.Workspace();
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(500, 100);
+        workspace.setCoordOrigin(0, 0);
+
+        var elipse = new web2d.Elipse();
+        elipse.setSize(80, 80);
+        elipse.setPosition(50, 50);
+        elipse.setFill('yellow');
+        elipse.setStroke(10, 'solid', 'black');
+        workspace.appendChild(elipse);
+
+        var rect = new web2d.Rect();
+        rect.setSize(80, 80);
+        rect.setPosition(160, 10);
+        rect.setFill('yellow');
+        rect.setStroke(10, 'solid', 'black');
+        workspace.appendChild(rect);
+
+        workspace.addItAsChildTo($("strokeWidth"));
+    };
+    rectExampleTest();
+</script>
+<!-- ************************************************** -->
+<tr>
+    <td>
+        Stroke Opacity.
+    </td>
+    <td>
+        <div id="strokeOpacity"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    var strokeOpacityTest = function ()
+    {
+        var workspace = new web2d.Workspace();
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(500, 100);
+        workspace.setCoordOrigin(0, 0);
+
+        var rect = new web2d.Rect(0, {x:5,y:5,width:390,height:90,fillColor:'green',
+            strokeColor:'black',strokeStyle:'solid',strokeWidth:1});
+        workspace.appendChild(rect);
+
+        var rectAttributes = {width:60,height:60,fillColor:'yellow',strokeColor:'black',strokeStyle:'solid',strokeWidth:10};
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(20, 20);
+        rect.setAttribute("strokeOpacity", 1);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(120, 20);
+        rect.setAttribute("strokeOpacity", 0.5);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(220, 20);
+        rect.setAttribute("strokeOpacity", 0.3);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(320, 20);
+        rect.setAttribute("strokeOpacity", 0);
+        workspace.appendChild(rect);
+
+        workspace.addItAsChildTo($("strokeOpacity"));
+    };
+    strokeOpacityTest();
+</script>
+<!-- ************************************************** -->
+<tr>
+    <td>
+        Fill Opacity.
+    </td>
+    <td>
+        <div id="fillOpacity"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    var fillOpacityTest = function ()
+    {
+        var workspace = new web2d.Workspace();
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(500, 100);
+        workspace.setCoordOrigin(0, 0);
+
+        var rect = new web2d.Rect(0, {x:5,y:5,width:390,height:90,fillColor:'green',
+            strokeColor:'black',strokeStyle:'solid',strokeWidth:4});
+        workspace.appendChild(rect);
+
+        var rectAttributes = {width:60,height:60,fillColor:'yellow',strokeColor:'black',strokeStyle:'solid',strokeWidth:10};
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(20, 20);
+        rect.setAttribute("fillOpacity", 1);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(120, 20);
+        rect.setAttribute("fillOpacity", 0.5);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(220, 20);
+        rect.setAttribute("fillOpacity", 0.3);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(320, 20);
+        rect.setAttribute("fillOpacity", 0);
+        workspace.appendChild(rect);
+
+        workspace.addItAsChildTo($("fillOpacity"));
+    };
+    fillOpacityTest();
+</script>
+<!-- ************************************************** -->
+<tr>
+    <td>
+        Opacity.
+    </td>
+    <td>
+        <div id="opacity"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    var opacityTest = function ()
+    {
+        var workspace = new web2d.Workspace();
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(500, 100);
+        workspace.setCoordOrigin(0, 0);
+
+        var rect = new web2d.Rect(0, {x:5,y:5,width:390,height:90,fillColor:'green',
+            strokeColor:'black',strokeStyle:'solid',strokeWidth:4});
+        workspace.appendChild(rect);
+
+        var rectAttributes = {width:60,height:60,fillColor:'yellow',strokeColor:'black',strokeStyle:'solid',strokeWidth:10};
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(20, 20);
+        rect.setOpacity(0.8);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(120, 20);
+        rect.setOpacity(0.5);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(220, 20);
+        rect.setOpacity(0.3);
+        workspace.appendChild(rect);
+
+        rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(320, 20);
+        rect.setOpacity(0);
+        workspace.appendChild(rect);
+
+        workspace.addItAsChildTo($("opacity"));
+    };
+    opacityTest();
+</script>
+<tr>
+    <td>
+        Visibility.
+    </td>
+    <td>
+        <div id="visibility"/>
+    </td>
+
+</tr>
+<script type="text/javascript">
+    var visibilityTest = function ()
+    {
+        var workspace = new web2d.Workspace({fillColor:'yellow',strokeWidth:'2px'});
+        workspace.setSize("500px", "100px");
+        workspace.setCoordSize(500, 100);
+        workspace.setCoordOrigin(0, 0);
+
+        var rectAttributes = {width:60,height:60,fillColor:'green',strokeColor:'black',strokeStyle:'solid',strokeWidth:10};
+        var rect = new web2d.Rect(0, rectAttributes);
+        rect.setPosition(120, 20);
+        workspace.appendChild(rect);
+        rect.addEventListener("mouseover", function() {
+            alert("Mouse Over");
+        });
+
+        var isVisible = true;
+        var executer = function()
+        {
+            isVisible = !isVisible;
+            rect.setVisibility(isVisible);
+        };
+        executer.periodical(100);
+
+        workspace.addItAsChildTo($("visibility"));
+    };
+    visibilityTest();
+</script>
+
+</table>
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/text.html b/trunk/web2d/src/test/javascript/render/text.html
new file mode 100755
index 00000000..f2124eac
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/text.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript" src="web2dLibraryLoader.js"></script>
+</head>
+
+<body>
+
+<script type="text/javascript">
+    function zoomIn()
+    {
+        for(i=0; i<workspaces.length; i++)
+        {
+            var coordSize = workspaces[i].getCoordSize();
+            workspaces[i].setCoordSize(coordSize.width*2,coordSize.height*2);
+        }
+    };
+
+    workspaces = [];
+
+    var TextTest = function (size,coordSize,textval,font,fontSizeval, style, modifier, fontColor, owner, iesimo)
+    {
+        var overflowWorkspace = new web2d.Workspace();
+                overflowWorkspace.setSize(size, size);
+                overflowWorkspace.setCoordSize(coordSize,coordSize);
+                overflowWorkspace.setCoordOrigin(0,0);
+
+                /*var rect = new web2d.Rect(1 / 10);
+                rect.setPosition(40, 40);
+                rect.setSize(20, 20);
+                overflowWorkspace.appendChild(rect);
+                */
+                var text = new web2d.Text();
+                overflowWorkspace.appendChild(text);
+                var scale = web2d.peer.utils.TransformUtil.workoutScale(text._peer);
+                text.setText(textval+" "+scale.height);
+                text.setFont(font, fontSizeval, style, modifier);
+                text.setPosition(0, 0);
+                text.setColor(fontColor);
+
+
+                overflowWorkspace.addItAsChildTo($(owner));
+
+                var parent = $(owner);
+                var span= document.createElement("span");
+                span.setAttribute("id","textoHTML"+iesimo);
+                var textsize = text.offsetWidth;
+                var textHtml=document.createTextNode(textsize);
+                var fontSize=text.getHtmlFontSize();
+                span.appendChild(textHtml);
+                if(core.UserAgent.isSVGSupported())
+                {
+                    //var fontSize=20*scale.height*2;
+                    span.setAttribute("style", "font-weight:"+modifier+";font-style: "+style+"; font-size:"+ fontSize +"pt; font-family: "+font+";width:30;height:30;");
+                }
+                else
+                {
+                    span.style.font=modifier+" "+style+" "+ fontSize +"pt "+font;
+                    span.style.width="30";
+                    span.style.height="30";
+                }
+
+                parent.appendChild(span);
+                workspaces[iesimo]=overflowWorkspace;
+    };
+</script>
+
+<h1>Text Render Tests </h1>
+
+<table border="1">
+    <colgroup style="width:80%;">
+        <col style="width:30%"/>
+        <col style="width:60%"/>
+    </colgroup>
+    <tr>
+        <td>
+            Simple text
+        </td>
+        <td>
+            <div id="text0"/>
+            <div id="text1"/>
+            <div id="text2"/>
+            <div id="text3"/>
+            <div id="text4"/>
+        </td>
+
+    </tr>
+    <script type="text/javascript">
+        web2d.peer.Toolkit.init();
+        TextTest("100px",200,"Test Text","Arial",10, "normal", "normal", "red", "text0", 0);
+        TextTest("100px",100,"Test Text","Arial",10, "normal", "normal", "blue", "text1", 1);
+        TextTest("100px",50,"Test Text","Arial",10, "normal", "normal", "blue", "text2", 2);
+        TextTest("100px",100,"Test Text","Arial",10, "italic", "normal", "blue", "text3", 3);
+        TextTest("100px",100,"Test Text","Arial",10, "italic", "bold", "green", "text4", 4);
+    </script>
+    <!--**************************************************************************-->
+
+</table>
+<span>Text to Inspect: </span><input type="text" id="iesimo">
+<input type="button" value="Inspect" onclick="alert(document.getElementById('textoHTML'+$('iesimo').value).offsetWidth);">
+<input type="button" value="Zoom In" onclick="zoomIn()">
+</body>
+</html>
diff --git a/trunk/web2d/src/test/javascript/render/utils.js b/trunk/web2d/src/test/javascript/render/utils.js
new file mode 100755
index 00000000..6c0d008e
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/utils.js
@@ -0,0 +1,64 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+Grid = function(parent, colums, rows)
+{
+    var cellSize = "10px";
+    this._parent = parent;
+    this._container = this._createContainer();
+    var tbody = this._container.firstChild.firstChild;
+    for (var i = 0; i < rows; i++)
+    {
+        var trElement = document.createElement("tr");
+        for (var j = 0; j < colums; j++)
+        {
+            var tdElement = document.createElement("td");
+            tdElement.style.width = cellSize;
+            tdElement.style.height = cellSize;
+            tdElement.style.borderWidth = "1px";
+            tdElement.style.borderStyle = "dashed";
+            tdElement.style.borderColor = "lightsteelblue";
+            trElement.appendChild(tdElement);
+        }
+        tbody.appendChild(trElement);
+    }
+};
+
+Grid.prototype.setPosition = function(x, y)
+{
+    this._container.style.left = x;
+    this._container.style.top = y;
+};
+
+Grid.prototype.render = function()
+{
+    this._parent.appendChild(this._container);
+};
+
+Grid.prototype._createContainer = function()
+{
+    var result = window.document.createElement("div");
+    result.style.tableLayout = "fixed";
+    result.style.borderCollapse = "collapse";
+    result.style.emptyCells = "show";
+    result.style.position = "absolute";
+    result.innerHTML = '<table style="table-layout:fixed;border-collapse:collapse;empty-cells:show;"><tbody id="tableBody"></tbody></table>';
+    return  result;
+};
+
diff --git a/trunk/web2d/src/test/javascript/render/web2dLibraryLoader.js b/trunk/web2d/src/test/javascript/render/web2dLibraryLoader.js
new file mode 100644
index 00000000..31da5f34
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/web2dLibraryLoader.js
@@ -0,0 +1,150 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// Modulue initializer.
+web2d = {
+    peer: {}
+};
+
+web2d.peer =
+{
+    svg: {},
+    vml: {}
+};
+
+web2d.peer.utils = {};
+web2d.Loader =
+{
+    load: function(scriptPath, stylePath, jsFileName)
+    {
+        var headElement = document.getElementsByTagName('head');
+        var htmlDoc = headElement.item(0);
+        var baseUrl = this.baseUrl(jsFileName);
+
+        if (scriptPath && scriptPath.length > 0)
+        {
+            for (var i = 0; i < scriptPath.length; i++)
+            {
+
+                this.includeScriptNode(baseUrl + scriptPath[i]);
+            }
+        }
+    },
+    baseUrl: function(jsFileName)
+    {
+        var headElement = document.getElementsByTagName('head');
+        var htmlDoc = headElement.item(0);
+        var headChildren = htmlDoc.childNodes;
+        var result = null;
+        for (var i = 0; i < headChildren.length; i++)
+        {
+            var node = headChildren.item(i);
+            if (node.nodeName && node.nodeName.toLowerCase() == "script")
+            {
+                var libraryUrl = node.src;
+                if (libraryUrl.indexOf(jsFileName) != -1)
+                {
+                    var index = libraryUrl.lastIndexOf("/");
+                    index = libraryUrl.lastIndexOf("/", index - 1);
+                    result = libraryUrl.substring(0, index);
+                }
+            }
+        }
+
+        if (result == null)
+        {
+            throw "Could not obtain the base url directory.";
+        }
+        return result;
+    },
+    includeScriptNode: function(filename) {
+        var html_doc = document.getElementsByTagName('head').item(0);
+        var js = document.createElement('script');
+        js.setAttribute('language', 'javascript');
+        js.setAttribute('type', 'text/javascript');
+        js.setAttribute('src', filename);
+        html_doc.appendChild(js);
+        return false;
+    },
+    includeStyleNode: function(filename) {
+        var html_doc = document.getElementsByTagName('head').item(0);
+        var js = document.createElement('link');
+        js.setAttribute('rel', 'stylesheet');
+        js.setAttribute('type', 'text/css');
+        js.setAttribute('href', filename);
+        html_doc.appendChild(js);
+        return false;
+    }
+};
+
+
+web2d.JsLoader =
+{
+    scriptPath: [
+            "/render/mootools.js",
+            "/../../../../core-js/target/classes/core.js",
+            "/../../../src/main/javascript/EventDispatcher.js",
+            "/../../../src/main/javascript/peer/vml/ElementPeer.js",
+            "/../../../src/main/javascript/peer/svg/ElementPeer.js","" +
+            "/../../../src/main/javascript/Element.js",
+            "/../../../src/main/javascript/Workspace.js",
+            "/../../../src/main/javascript/peer/svg/WorkspacePeer.js",
+            "/../../../src/main/javascript/peer/vml/WorkspacePeer.js",
+            "/../../../src/main/javascript/Toolkit.js",
+            "/../../../src/main/javascript/Elipse.js",
+            "/../../../src/main/javascript/peer/svg/ElipsePeer.js",
+            "/../../../src/main/javascript/peer/vml/ElipsePeer.js",
+            "/../../../src/main/javascript/Line.js",
+            "/../../../src/main/javascript/peer/svg/LinePeer.js",
+            "/../../../src/main/javascript/peer/vml/LinePeer.js",
+            "/../../../src/main/javascript/PolyLine.js",
+            "/../../../src/main/javascript/peer/svg/PolyLinePeer.js",
+            "/../../../src/main/javascript/peer/vml/PolyLinePeer.js",
+            "/../../../src/main/javascript/Group.js",
+            "/../../../src/main/javascript/peer/svg/GroupPeer.js",
+            "/../../../src/main/javascript/peer/vml/GroupPeer.js",
+            "/../../../src/main/javascript/Rect.js",
+            "/../../../src/main/javascript/peer/svg/RectPeer.js",
+            "/../../../src/main/javascript/peer/vml/RectPeer.js",
+            "/../../../src/main/javascript/Text.js",
+            "/../../../src/main/javascript/peer/svg/TextPeer.js",
+            "/../../../src/main/javascript/peer/vml/TextPeer.js",
+            "/../../../src/main/javascript/peer/vml/TextBoxPeer.js",
+            "/../../../src/main/javascript/peer/utils/TransformUtils.js",
+            "/../../../src/main/javascript/peer/utils/EventUtils.js",
+            "/../../../src/main/javascript/Font.js",
+            "/../../../src/main/javascript/peer/svg/Font.js",
+            "/../../../src/main/javascript/peer/vml/Font.js",
+            "/../../../src/main/javascript/peer/svg/TahomaFont.js",
+             "/../../../src/main/javascript/peer/svg/TimesFont.js",
+            "/../../../src/main/javascript/peer/svg/ArialFont.js",
+             "/../../../src/main/javascript/peer/svg/VerdanaFont.js",
+            "/../../../src/main/javascript/peer/vml/TahomaFont.js",
+            "/../../../src/main/javascript/peer/vml/TimesFont.js",
+            "/../../../src/main/javascript/peer/vml/ArialFont.js",
+            "/../../../src/main/javascript/peer/vml/VerdanaFont.js"],
+
+    stylePath: [],
+    load: function()
+    {
+        web2d.Loader.load(this.scriptPath, this.stylePath, "web2dLibraryLoader.js");
+    }
+};
+
+web2d.JsLoader.load();
diff --git a/trunk/web2d/src/test/javascript/render/workspace.html b/trunk/web2d/src/test/javascript/render/workspace.html
new file mode 100755
index 00000000..a0a24277
--- /dev/null
+++ b/trunk/web2d/src/test/javascript/render/workspace.html
@@ -0,0 +1,374 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <script type="text/javascript">
+        web2d = {
+            peer: {}
+        };
+
+        web2d.peer =
+        {
+            svg: {},
+            vml: {}
+        };
+
+        web2d.peer.utils = {};
+    </script>
+
+    <script type="text/javascript" src="mootools.js"></script>
+    <script type="text/javascript" src="../../../../../core-js/target/classes/core.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/EventDispatcher.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ElementPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ElementPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Element.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Workspace.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/WorkspacePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/WorkspacePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Toolkit.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Elipse.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ElipsePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ElipsePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Line.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/LinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/LinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/PolyLine.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/PolyLinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/PolyLinePeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Group.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/GroupPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/GroupPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Rect.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/RectPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/RectPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Text.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TextPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TextPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TextBoxPeer.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/utils/TransformUtils.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/utils/EventUtils.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/Font.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/Font.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/Font.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TahomaFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/TimesFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ArialFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/svg/VerdanaFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TahomaFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/TimesFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/ArialFont.js"></script>
+    <script type="text/javascript" src="../../../../src/main/javascript/peer/vml/VerdanaFont.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
+</head>
+
+<body>
+
+<h1>Workspace Render Tests </h1>
+
+<table border="1">
+<colgroup style="width:80%;">
+    <col style="width:30%">
+    <col style="width:60%">
+</colgroup>
+<tr>
+    <td>
+        The Workspace's size defines the visible work area. If an element is outside the workspace, it must not be
+        visible.
+        In this example, The back circle is bigger than the workspace area. A big portion of the circle will not be
+        displayed.
+    </td>
+    <td>
+        <div id="overflowExample"></div>
+    </td>
+
+</tr>
+<script type="text/javascript">
+
+    web2d.peer.Toolkit.init();
+
+    var overflowWorkspace = new web2d.Workspace();
+    overflowWorkspace.setSize("100px", "100px");
+    var elipse1 = new web2d.Elipse();
+    elipse1.setSize(200, 200);
+    elipse1.setPosition(0, 0);
+    overflowWorkspace.appendChild(elipse1);
+    overflowWorkspace.addItAsChildTo($("overflowExample"));
+
+</script>
+<!--**************************************************************************-->
+<tr>
+    <td>
+        Workspace will be added as child of a div element. That's why, Its parent will define this position.
+    </td>
+    <td>
+        <div id="positionExample" style="position:relative;left:0;top:0;width:100px"></div>
+    </td>
+</tr>
+
+<script type="text/javascript">
+
+    var workspacePosition = function()
+    {
+
+        var elipseAttr = {width:100,height:100,x:100,y:100};
+
+        var divElem = $("positionExample");
+        var workPosition = new web2d.Workspace();
+        workPosition.setSize("100px", "100px");
+        elipse = new web2d.Elipse(elipseAttr);
+        workPosition.appendChild(elipse);
+        workPosition.addItAsChildTo(divElem);
+
+        var x = 100;
+        var executer = function()
+        {
+            x = (x + 10) % 100;
+            divElem.style.left = x + "px";
+        };
+        executer.periodical(100);
+
+    };
+    workspacePosition();
+
+</script>
+<!--**************************************************************************-->
+<tr>
+    <td>
+        Workspaces size can be defined using standard CSS measures.
+        In this example, the first workspace is defined using pixes and the second one
+        using inchs.
+    </td>
+    <td>
+        <div id="sizeExampleContainer" style="position:relative;width:400px;">
+            <div id="sizeExamplePixels" style="float:left;margin:20px"></div>
+
+            <div id="sizeExampleInch" style="float:left;margin:20px"></div>
+        </div>
+    </td>
+</tr>
+<script type="text/javascript">
+
+    // Draw a reference grid.
+    var container = document.getElementById("sizeExampleContainer");
+    var grid = new Grid(container, 35, 12);
+    grid.setPosition("0px", "0px")
+    grid.render();
+
+    // Define a workspace using pixels and inchs.
+    var workspacePixel = new web2d.Workspace();
+    workspacePixel.setSize("100px", "100px");
+    elipse = new web2d.Elipse();
+    elipse.setSize(100, 100);
+    elipse.setPosition(100, 100);
+
+    workspacePixel.appendChild(elipse);
+    workspacePixel.addItAsChildTo($("sizeExamplePixels"));
+
+    var workspaceInchs = new web2d.Workspace();
+    workspaceInchs.setSize("1in", "1in");
+    elipse = new web2d.Elipse();
+    elipse.setSize(100, 100);
+    elipse.setPosition(100, 100);
+
+    workspaceInchs.appendChild(elipse);
+    workspaceInchs.addItAsChildTo($("sizeExampleInch"));
+
+</script>
+<!--**************************************************************************-->
+<tr>
+    <td>
+        Workspace coordsize defines how many units there are along the width of the containing block.
+        In all the examples,the coordsize of the workspaces have been set to (100,100) and the circles have been
+        positioned
+        at (0,0),(0,100),(100,0),(100,100)(50,50).<br/>
+        <br/>
+        1) Workspace with CoordSize(100,100)<br/>
+        2) Workspace with CoordSize(100,200)<br/>
+        3) Workspace with CoordSize(200,100)<br/>
+        4) Workspace animation changing the coordsize from (30,30) to (100,100)<br/>
+    </td>
+    <td>
+        <div style="position:relative;width:100%;">
+            <div id="coordsizeExample100x100" style="float:left;margin:20px;">
+                (1)
+            </div>
+
+            <div id="coordsizeExample100x200" style="float:left;margin:20px;">
+                (2)
+            </div>
+
+            <div id="coordsizeExample200x100" style="float:left;margin:20px;">
+                (3)
+            </div>
+
+            <div id="coordsizeExampleDynamic" style="float:left;margin:20px;">
+                (4)
+            </div>
+        </div>
+    </td>
+</tr>
+
+<script type="text/javascript">
+    var workspaceCoordSizeSample = function()
+    {
+        // Workspace with CoordSize(100,100);
+        var coordSizeSampleBuilder = function(width, height)
+        {
+            var workspace = new web2d.Workspace();
+            workspace.setSize("100px", "100px");
+            workspace.setCoordSize(width, height);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(50, 50);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(0, 0);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(0, 100);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(100, 0);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(100, 100);
+            workspace.appendChild(elipse);
+            return workspace;
+        };
+
+        var workspace100x100 = coordSizeSampleBuilder(100, 100);
+        workspace100x100.addItAsChildTo($("coordsizeExample100x100"));
+
+        var workspace100x200 = coordSizeSampleBuilder(100, 200);
+        workspace100x200.addItAsChildTo($("coordsizeExample100x200"));
+
+        var workspace200x100 = coordSizeSampleBuilder(200, 100);
+        workspace200x100.addItAsChildTo($("coordsizeExample200x100"));
+
+        var dynamicWorkspace = coordSizeSampleBuilder(100, 100);
+        dynamicWorkspace.addItAsChildTo($("coordsizeExampleDynamic"));
+
+        var size = 100;
+        var executer = function()
+        {
+            size = (size + 1) % 100;
+            if (size < 30)
+            {
+                size = 30;
+            }
+
+            dynamicWorkspace.setCoordSize(size, size);
+        };
+        executer.periodical(100);
+        dynamicWorkspace.setCoordSize(size, size);
+    };
+
+    workspaceCoordSizeSample();
+</script>
+
+<!--**************************************************************************-->
+<tr>
+    <td>
+        Workspace coordorigin defines the coordinate at the top left corner of the containing block.
+        In all the examples,the coordsize of the workspaces have been set to (100,100) and the circles have been
+        positioned
+        at (0,0),(0,100),(100,0),(100,100)(50,50). <br/>
+        <br/>
+        1) Workspace with CoordOrigin(0,0)<br/>
+        2) Workspace with CoordOrigin(0,50)<br/>
+        3) Workspace with CoordOrigin(50,0)<br/>
+        4) Workspace animation changing the coordorigin from (0,0) to (50,50)<br/>
+    </td>
+    <td>
+        <div style="position:relative;width:100%;">
+            <div id="coordorigin0x0" style="float:left;margin:20px">
+                (1)
+            </div>
+
+            <div id="coordorigin0x50" style="float:left;margin:20px">
+                (2)
+            </div>
+
+            <div id="coordorigin50x0" style="float:left;margin:20px">
+                (3)
+            </div>
+
+            <div id="coordoriginExampleDynamic" style="float:left;margin:20px">
+                (4)
+            </div>
+        </div>
+    </td>
+</tr>
+
+<script type="text/javascript">
+    var workspaceCoordOriginSample = function()
+    {
+
+        var coordOriginSampleBuilder = function(x, y)
+        {
+            // Workspace with CoordOrigin(100,100);
+            var workspace = new web2d.Workspace();
+            workspace.setSize("100px", "100px");
+            workspace.setCoordSize(100, 100);
+            workspace.setCoordOrigin(x, y);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(0, 0);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(0, 100);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(100, 0);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(100, 100);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(50, 50);
+            workspace.appendChild(elipse);
+
+            elipse = new web2d.Elipse();
+            elipse.setPosition(100, 100);
+            workspace.appendChild(elipse);
+
+            return workspace;
+        };
+
+        var workspace0x0 = coordOriginSampleBuilder(0, 0);
+        workspace0x0.addItAsChildTo($("coordorigin0x0"));
+
+        var workspace0x50 = coordOriginSampleBuilder(0, 50);
+        workspace0x50.addItAsChildTo($("coordorigin0x50"));
+
+        var workspace50x0 = coordOriginSampleBuilder(50, 0);
+        workspace50x0.addItAsChildTo($("coordorigin50x0"));
+
+        // Workspace animation changing the coordsize from (30,30) to (100,100)
+        var dynamicWorkspace = coordOriginSampleBuilder(100, 100);
+        dynamicWorkspace.addItAsChildTo($("coordoriginExampleDynamic"));
+
+        var x = 50;
+        var y = 50;
+        executer = function() {
+            x = (x + 1) % 50;
+            y = (y + 1) % 50;
+
+            dynamicWorkspace.setCoordOrigin(x, y);
+        };
+        executer.periodical(100);
+    };
+    workspaceCoordOriginSample();
+</script>
+
+</table>
+</body>
+</html>
diff --git a/trunk/wise-webapp/pom.xml b/trunk/wise-webapp/pom.xml
new file mode 100644
index 00000000..f4255b72
--- /dev/null
+++ b/trunk/wise-webapp/pom.xml
@@ -0,0 +1,445 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wise-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>WiseMapping Webapp</name>
+    <url>http://www.wisemapping.org</url>
+    <parent>
+        <groupId>org.wisemapping</groupId>
+        <artifactId>wisemapping</artifactId>
+        <relativePath>../pom.xml</relativePath>                                                
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wisemapping</groupId>
+            <artifactId>core-js</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wisemapping</groupId>
+            <artifactId>mindplot</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.5</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>5.8</version>
+            <scope>test</scope>
+            <classifier>jdk15</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>2.5.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc-struts</artifactId>
+            <version>2.5.6</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-tiles</artifactId>
+            <version>1.3.8</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>2.5.6</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>2.5.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>2.5.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-ws-support</artifactId>
+            <version>1.5.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-ws-core-tiger</artifactId>
+            <version>1.5.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-ws-core-tiger</artifactId>
+            <version>1.5.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate</artifactId>
+            <version>3.1.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+                <groupId>org.apache.xmlgraphics</groupId>
+                <artifactId>batik-codec</artifactId>
+                <version>1.7</version>
+                <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
+            <version>2.0.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-svg-dom</artifactId>
+            <version>1.7</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-transcoder</artifactId>
+            <version>1.7</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.octo.captcha</groupId>
+            <artifactId>jcaptcha</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.acegisecurity</groupId>
+            <artifactId>acegi-security</artifactId>
+            <version>1.0.7</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-dao</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-support</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-remoting</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.5</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.2.2</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- Only for test purposes -->
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.7</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sql-maven-plugin</artifactId>
+                <version>1.2</version>
+
+                <configuration>
+                    <driver>org.hsqldb.jdbcDriver</driver>
+                    <url>jdbc:hsqldb:file:${basedir}/target/db/wisemapping</url>
+                    <username>sa</username>
+                    <!--all executions are ignored if -Dmaven.test.skipDB=true
+                     Use this flag if you want to reuse an already created HSQL database instance
+                    -->
+                    <skip>${maven.test.skipDB}</skip>
+                </configuration>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>5.1.5</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>hsqldb</groupId>
+                        <artifactId>hsqldb</artifactId>
+                        <version>1.8.0.1</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>drop-schemas</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <onError>continue</onError>
+                            <orderFile>ascending</orderFile>
+                            <fileset>
+                                <basedir>${basedir}</basedir>
+                                <includes>
+                                    <include>src/test/sql/hsql/drop-schemas.sql</include>
+                                </includes>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-schema</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <orderFile>ascending</orderFile>
+                            <fileset>
+                                <basedir>${basedir}</basedir>
+                                <includes>
+                                    <include>src/test/sql/hsql/create-schemas.sql</include>
+                                </includes>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-data</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <orderFile>ascending</orderFile>
+                            <fileset>
+                                <basedir>${basedir}</basedir>
+                                <includes>
+                                    <include>src/test/sql/hsql/test-data.sql</include>
+                                </includes>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warName>wisemapping</warName>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>core-js</artifactId>
+                            <type>jar</type>
+                            <targetPath>js</targetPath>
+                            <includes>
+                                <include>*.js</include>
+                            </includes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>mindplot</artifactId>
+                            <type>jar</type>
+                            <targetPath>js</targetPath>
+                            <includes>
+                                <include>*.js</include>
+                            </includes>
+                        </overlay>
+                    </overlays>
+                    <archiveClasses>true</archiveClasses>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/resources</directory>
+                            <targetPath>WEB-INF</targetPath>
+                            <includes>
+                                <include>*.wsdl</include>
+                                <include>*.xsd</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>net.sf.alchim</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>compress</goal>
+                        </goals>
+                        <configuration>
+                            <aggregations>
+                                <aggregation>
+                                    <output>
+                                        ${project.build.directory}/${project.build.finalName}/js/wiseLibrary.js
+                                    </output>
+                                    <includes>
+                                        <include>mootools.js</include>
+                                        <include>common.js</include>
+                                        <include>shadedborder.js</include>
+                                        <include>transcorners.js</include>
+                                        <include>windoo.js</include>
+                                        <include>menu.js</include>
+                                        <include>slideShow.js</include>
+                                        <include>mooRainbow.js</include>
+                                        <include>help.js</include>
+                                        <include>helpPanel.js</include>
+                                        <include>IconPanel.js</include>
+                                    </includes>
+                                </aggregation>
+                            </aggregations>
+                            <nosuffix>true</nosuffix>
+                            <nomunge>true</nomunge>
+                            <jswarn>false</jswarn>
+                            <statistics>false</statistics>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <destDir>${project.build.directory}/generated-sources/jaxws</destDir>
+                    <sourceDestDir>${project.build.directory}/generated-sources/jaxws</sourceDestDir>
+                    <target>2.1</target>
+                    <packageName>com.wisemapping.ws</packageName>
+                    <wsdlDirectory>${basedir}/src/main/resources/</wsdlDirectory>
+                    <wsdlFiles>
+                        <wsdlFile>wiseservices.wsdl</wsdlFile>
+                    </wsdlFiles>
+                </configuration>
+            </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>testng.xml</suiteXmlFile>
+                    </suiteXmlFiles>
+                    <excludedGroups>WiseWebServicesGroup</excludedGroups>
+                </configuration>
+            </plugin>
+
+
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <configuration>
+                    <reload>false</reload>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8080</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <webApp>${project.build.directory}/wisemapping.war</webApp>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/trunk/wise-webapp/src/license.txt b/trunk/wise-webapp/src/license.txt
new file mode 100644
index 00000000..9f45ba26
--- /dev/null
+++ b/trunk/wise-webapp/src/license.txt
@@ -0,0 +1,19 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ActivationController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ActivationController.java
new file mode 100755
index 00000000..3daee656
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ActivationController.java
@@ -0,0 +1,73 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.service.UserService;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.Controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+public class ActivationController
+    implements Controller, InitializingBean
+{
+
+    //~ Instance fields ......................................................................................
+    private UserService userService;
+
+    //~ Methods ..............................................................................................
+
+    public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
+            throws Exception
+    {
+        ModelAndView modelAndView;
+        try
+        {
+            final String code = request.getParameter("code");
+            userService.activateAcount(Long.parseLong(code));
+            modelAndView = new ModelAndView("activationAccountConfirmation");
+        }
+        catch (Throwable exc)
+        {
+            // TODO Fix it !
+            exc.printStackTrace();
+            // Any type of error
+            modelAndView = new ModelAndView("activationAccountConfirmationFail");
+        }
+        return modelAndView;
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    /**
+     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+     */
+    public void afterPropertiesSet()
+            throws Exception {
+        if (userService == null) {
+            throw new RuntimeException("userService was not set!");
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/BaseMultiActionController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/BaseMultiActionController.java
new file mode 100644
index 00000000..97bf7fb6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/BaseMultiActionController.java
@@ -0,0 +1,159 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.MindMapCriteria;
+import com.wisemapping.model.MindmapUser;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.service.UserService;
+import com.wisemapping.view.MindMapBean;
+import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class BaseMultiActionController
+        extends MultiActionController {
+
+    private MindmapService mindmapService;
+    private UserService userService;
+
+    protected List<MindmapUser> getMindmapUsersFromRequest(HttpServletRequest request) {
+        List<MindmapUser> result = new ArrayList<MindmapUser>();
+        final String mindmapIds = request.getParameter("mindmapIds");
+
+        final String ids[] = mindmapIds.split(",");
+        for (String id : ids)
+            if (mindmapIds.length()!=0){
+                result.add(getMindmapUser(Integer.parseInt(id), request));
+            }
+        return result;
+    }
+
+    protected List<MindMap> getMindmapsFromRequest(HttpServletRequest request) {
+        List<MindMap> result = new ArrayList<MindMap>();
+        final String mindmapIds = request.getParameter("mindmapIds");
+
+        final String ids[] = mindmapIds.split(",");
+        for (String id : ids) {
+            MindMap map = mindmapService.getMindmapById(Integer.parseInt(id));
+            result.add(map);
+        }
+        return result;
+    }
+
+    protected List<MindMapBean> getMindMapBeanList(User user) {
+        final List<MindmapUser> userMindmaps = getMindmapService().getMindmapUserByUser(user);
+
+        final List<MindMapBean> mindMapBeans = new ArrayList<MindMapBean>(userMindmaps.size());
+        for (MindmapUser mindmap : userMindmaps) {
+            mindMapBeans.add(new MindMapBean(mindmap.getMindMap()));
+        }
+        return mindMapBeans;
+    }
+
+    protected MindMapCriteria getMindMapCriteriaFromRequest(HttpServletRequest request) {
+        final MindMapCriteria criteria = new MindMapCriteria();
+
+        final String titleOrTags = request.getParameter("titleOrTags");
+        if (titleOrTags != null && titleOrTags.length() != 0) {
+            criteria.orCriteria();
+            criteria.setTitle(titleOrTags);
+            final String tag[] = titleOrTags.split(MindmapService.TAG_SEPARATOR);
+            // Add new Tags to User
+            for (String searchTag : tag) {
+                criteria.getTags().add(searchTag);
+            }
+        }
+
+        final String title = request.getParameter("name");
+        if (title != null && title.length() != 0) {
+            criteria.setTitle(title);
+        }
+        final String description = request.getParameter("description");
+        if (description != null && description.length() != 0) {
+            criteria.setDescription(description);
+        }
+
+        final String tags = request.getParameter("tags");
+        if (tags != null && tags.length() != 0) {
+            final String tag[] = tags.split(MindmapService.TAG_SEPARATOR);
+            // Add new Tags to User
+            for (String searchTag : tag) {
+                criteria.getTags().add(searchTag);
+            }
+        }
+
+        return criteria;
+    }
+
+    protected MindMap getMindmapFromRequest(HttpServletRequest request) {
+        final String mapIdStr = request.getParameter(MAP_ID_PARAMNAME);
+        assert mapIdStr != null : "mapId parameter can not be null";
+        logger.info("MapIdStr:" + mapIdStr);
+        MindMap map = null;
+        int mapId;
+        try
+        {
+            mapId = Integer.parseInt(mapIdStr);
+            map = mindmapService.getMindmapById(mapId);
+        }
+        catch (Exception e)
+        {
+            logger.debug("An error ocurred trying to get mapId "+ mapIdStr + "'",e);            
+        }
+
+        if (map == null) {
+            throw new IllegalStateException("Map with id '" + mapIdStr + "' can not be found");
+        }
+        return map;
+    }
+
+    private MindmapUser getMindmapUser(Integer mapId, HttpServletRequest request) {
+        assert mapId != null : "EDIT action: mindmapId is required!";
+        assert request != null : "EDIT action: request is required!";
+        final User user = Utils.getUser(request);
+        return mindmapService.getMindmapUserBy(mapId, user);
+    }
+
+    public MindmapService getMindmapService() {
+        return mindmapService;
+    }
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+
+    public UserService getUserService() {
+        return userService;
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    public static final String MAP_ID_PARAMNAME = "mapId";
+    public static final String MINDMAP_EMAILS_PARAMNAME = "userEmails";
+    public static final String MINDMAP_EMAIL_PARAMNAME = "userEmail";
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/BaseSimpleFormController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/BaseSimpleFormController.java
new file mode 100644
index 00000000..86805ed0
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/BaseSimpleFormController.java
@@ -0,0 +1,84 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.service.UserService;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.SimpleFormController;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+public class BaseSimpleFormController extends SimpleFormController
+{
+
+    private MindmapService mindmapService;
+    private UserService userService;
+    private String errorView;
+
+    public UserService getUserService() {
+        return userService;
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    public MindmapService getMindmapService() {
+        return mindmapService;
+    }
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+
+    public String getErrorView() {
+        return errorView;
+    }
+
+    public void setErrorView(String errorView) {
+        this.errorView = errorView;
+    }
+
+    @Override protected org.springframework.web.servlet.ModelAndView showForm(javax.servlet.http.HttpServletRequest httpServletRequest, javax.servlet.http.HttpServletResponse httpServletResponse, org.springframework.validation.BindException bindException) throws java.lang.Exception
+     {
+        final ModelAndView view = super.showForm(httpServletRequest, httpServletResponse,bindException);
+        final String viewName = getErrorView();
+        if(viewName !=null && bindException.getAllErrors().size()>0)
+        {
+            view.setViewName(viewName);
+            view.addObject("errorView",true);
+        }
+        return view;
+    }
+
+    /* TODO codigo repetido en BaseMultiActionController */
+     protected MindMap getMindmapFromRequest(HttpServletRequest request) {
+        final String mapIdStr = request.getParameter(BaseMultiActionController.MAP_ID_PARAMNAME);
+        assert mapIdStr != null : "mapId parameter can not be null";
+        logger.info("MapIdStr:" + mapIdStr);
+        int mapId = Integer.parseInt(mapIdStr);
+        return mindmapService.getMindmapById(mapId);
+    }
+}
+
+
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/CaptchaController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/CaptchaController.java
new file mode 100644
index 00000000..347f4399
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/CaptchaController.java
@@ -0,0 +1,94 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+
+import javax.servlet.ServletOutputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.Controller;
+
+import com.octo.captcha.service.image.ImageCaptchaService;
+
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGImageEncoder;
+
+public class CaptchaController
+	implements Controller, InitializingBean
+{
+    private ImageCaptchaService captchaService;
+
+    public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) 
+		throws Exception 
+    {
+    
+		byte[] captchaChallengeAsJpeg;
+		// the output stream to render the captcha image as jpeg into
+		final ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();
+        
+    	// get the session id that will identify the generated captcha. 
+		//the same id must be used to validate the response, the session id is a good candidate!
+    	final String captchaId = request.getSession().getId();
+    	
+		// call the ImageCaptchaService getChallenge method
+      final BufferedImage challenge = captchaService.getImageChallengeForID(captchaId,request.getLocale());
+        	
+		// a jpeg encoder
+		final JPEGImageEncoder jpegEncoder = JPEGCodec.createJPEGEncoder(jpegOutputStream);
+		jpegEncoder.encode(challenge);
+     
+       captchaChallengeAsJpeg = jpegOutputStream.toByteArray();
+
+		// flush it in the response
+      response.setHeader("Cache-Control", "no-store");
+		response.setHeader("Pragma", "no-cache");
+		response.setDateHeader("Expires", 0);
+      response.setContentType("image/jpeg");
+		final ServletOutputStream responseOutputStream = response.getOutputStream();
+		responseOutputStream.write(captchaChallengeAsJpeg);
+    	responseOutputStream.flush();
+		responseOutputStream.close();
+		return null;	
+    }	
+	
+    /** Set captcha service
+     *  @param captchaService The captchaService to set.
+     */
+    public void setCaptchaService(ImageCaptchaService captchaService) {
+    	this.captchaService = captchaService;		
+    }	
+	
+    /**
+     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+     */
+    public void afterPropertiesSet() 
+		throws Exception 
+    {
+		if(captchaService == null){
+			throw new RuntimeException("captcha service wasn`t set!");
+		}
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/CaptchaFormController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/CaptchaFormController.java
new file mode 100644
index 00000000..61ce78e3
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/CaptchaFormController.java
@@ -0,0 +1,110 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.octo.captcha.service.CaptchaServiceException;
+import com.octo.captcha.service.image.ImageCaptchaService;
+import org.springframework.validation.BindException;
+import org.springframework.web.servlet.mvc.SimpleFormController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Convenient superclass for form controller implementations which need
+ * CAPTCHA support.
+ */
+public class CaptchaFormController extends SimpleFormController {
+    /**
+     * Default paramter name for CAPTCHA response in <code>{@link HttpServletRequest}</code>
+     */
+    private static final String DEFAULT_CAPTCHA_RESPONSE_PARAMETER_NAME = "j_captcha_response";
+
+    protected ImageCaptchaService captchaService;
+    protected String captchaResponseParameterName = DEFAULT_CAPTCHA_RESPONSE_PARAMETER_NAME;
+
+    /**
+     * Delegates request to CAPTCHA validation, subclasses which overrides this
+     * method must manually call <code>{@link #validateCaptcha(HttpServletRequest,BindException)}</code>
+     * or explicitly call super method.
+     *
+     * @see #validateCaptcha(HttpServletRequest,BindException)
+     * @see org.springframework.web.servlet.mvc.BaseCommandController#onBindAndValidate(javax.servlet.http.HttpServletRequest,java.lang.Object,org.springframework.validation.BindException)
+     */
+    @Override
+    protected void onBindAndValidate(HttpServletRequest request, Object command, BindException errors) throws Exception {
+        validateCaptcha(request, errors);
+    }
+
+    /**
+     * Validate CAPTCHA response, if response isn`t valid creates new error object
+     * and put him to errors holder.
+     *
+     * @param request current servlet request
+     * @param errors  errors holder
+     */
+    protected void validateCaptcha(HttpServletRequest request, BindException errors) {
+        boolean isResponseCorrect = false;
+
+        //remenber that we need an id to validate!
+        String captchaId = request.getSession().getId();
+        //retrieve the response
+        String response = request.getParameter(captchaResponseParameterName);
+        //validate response
+        try {
+            if (response != null) {
+                isResponseCorrect =
+                        captchaService.validateResponseForID(captchaId, response);
+            }
+        } catch (CaptchaServiceException e) {
+            //should not happen, may be thrown if the id is not valid
+        }
+
+        if (!isResponseCorrect) {
+            //prepare object error, captcha response isn`t valid
+//	        String objectName = "Captcha";
+//			String[] codes = {"invalid"};
+//			Object[] arguments = {};
+//			String defaultMessage = "Wrong control text!";
+//			ObjectError oe = new ObjectError(objectName, codes, arguments, defaultMessage);
+//
+//            errors.addError(oe);
+            errors.rejectValue("captcha", Messages.CAPTCHA_ERROR);
+        }
+    }
+
+    /**
+     * Set captcha service
+     *
+     * @param captchaService the captchaService to set.
+     */
+    public void setCaptchaService(ImageCaptchaService captchaService) {
+        this.captchaService = captchaService;
+    }
+
+    /**
+     * Set paramter name for CAPTCHA response in <code>{@link HttpServletRequest}</code>
+     *
+     * @param captchaResponseParameterName the captchaResponseParameterName to set.
+     */
+    public void setCaptchaResponseParameterName(String captchaResponseParameterName) {
+        this.captchaResponseParameterName = captchaResponseParameterName;
+	}
+}
+
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ChangePasswordController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ChangePasswordController.java
new file mode 100644
index 00000000..832a356f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ChangePasswordController.java
@@ -0,0 +1,63 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// ...........................................................................................................
+// (C) Copyright  1996/2007 Fuego Inc.  All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF Fuego Inc.
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+//
+// Last changed on 2007-04-03 09:29:20 (-0300), by: nachomanz. $Revision$
+// ...........................................................................................................
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import com.wisemapping.service.UserService;
+import com.wisemapping.view.ChangePasswordBean;
+import org.springframework.validation.BindException;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class ChangePasswordController
+        extends BaseSimpleFormController {
+
+    //~ Methods ..............................................................................................
+
+    public ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command,
+                                 BindException errors)
+            throws ServletException {
+        final ChangePasswordBean bean = (ChangePasswordBean) command;
+        // Reload user only in case of beeing necessary...
+        final User model = Utils.getUser(request);
+
+        final UserService userService = this.getUserService();
+        final User user = userService.reloadUser(model);
+
+        user.setPassword(bean.getPassword());
+        userService.changePassword(user);
+
+        return new ModelAndView(getSuccessView());
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/EditProfileController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/EditProfileController.java
new file mode 100755
index 00000000..823978be
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/EditProfileController.java
@@ -0,0 +1,66 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import com.wisemapping.service.UserService;
+import com.wisemapping.view.UserBean;
+import org.springframework.validation.BindException;
+import org.springframework.web.servlet.ModelAndView;
+
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class EditProfileController extends BaseSimpleFormController {
+
+
+    protected Object formBackingObject(HttpServletRequest httpServletRequest) throws Exception {
+        final User model = Utils.getUser(httpServletRequest);
+        return new UserBean(model);
+    }
+
+    //~ Methods ..............................................................................................
+
+    public ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command,
+                                 BindException errors)
+            throws ServletException {
+        final UserBean bean = (UserBean) command;
+        final UserService userService = this.getUserService();
+
+        // Reload user only in case of beeing necessary...
+        final User model = Utils.getUser(request);
+        final User user = userService.reloadUser(model);
+
+        user.setFirstname(bean.getFirstname());
+        user.setLastname(bean.getLastname());
+        // trim() the email email in order to remove spaces
+        user.setEmail(bean.getEmail().trim());
+        user.setAllowSendEmail(bean.isAllowSendEmail());
+
+        // Sync Acegi user and DB user
+        model.setAllowSendEmail(bean.isAllowSendEmail());
+        userService.updateUser(user);
+
+        return new ModelAndView(getSuccessView());
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/EmbeddedViewController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/EmbeddedViewController.java
new file mode 100644
index 00000000..7a2c323c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/EmbeddedViewController.java
@@ -0,0 +1,80 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.filter.UserAgent;
+
+import java.lang.reflect.UndeclaredThrowableException;
+
+public class EmbeddedViewController extends BaseMultiActionController {
+
+    protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+
+        ModelAndView view;
+        try {
+            final MindMap mindmap = this.getMindmapFromRequest(httpServletRequest);
+            if (mindmap == null) {
+                throw new IllegalStateException("Map could not be found");
+            }
+
+            final String fullViewStr = httpServletRequest.getParameter("fullView");
+            final boolean fullView = Boolean.parseBoolean(fullViewStr);
+
+            final UserAgent userAgent = UserAgent.create(httpServletRequest);
+
+            if (userAgent.isBrowserSupported()) {
+                view = new ModelAndView("embeddedView");
+                view.addObject("mindmap", mindmap);
+                final String xmlMap = mindmap.getNativeXmlAsJsLiteral();
+                view.addObject("mapXml", xmlMap);
+
+                final String zoomStr = httpServletRequest.getParameter("zoom");
+                float zoom = 1;
+                if(zoomStr!=null)
+                {
+                    try {
+                        zoom = Float.parseFloat(zoomStr);
+                    } catch (NumberFormatException e) {
+                    }
+                }
+                view.addObject("zoom",zoom);
+
+            } else {
+
+                view = new ModelAndView("embeddedViewImg");
+                view.addObject("mindmap", mindmap);
+            }
+            view.addObject("fullView", fullView);
+
+        } catch (UndeclaredThrowableException e) {
+            // Security exception ....
+            view = new ModelAndView("embeddedViewError");
+        }
+
+        return view;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java
new file mode 100644
index 00000000..d02dd641
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java
@@ -0,0 +1,166 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.exporter.ExportFormat;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.view.MindMapBean;
+import com.wisemapping.exporter.ExportProperties;
+import com.wisemapping.filter.UserAgent;
+import org.apache.batik.transcoder.TranscoderException;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.JAXBException;
+import java.io.IOException;
+
+public class ExportController extends BaseMultiActionController {
+    private static final String IMG_EXPORT_FORMAT = "IMG_EXPORT_FORMAT";
+    private static final String MAP_ID_PARAMETER = "mapId";
+    private static final String EXPORT_FORMAT_PARAMETER = "exportFormat";
+    private static final String IMG_SIZE_PARAMETER = "imgSize";
+
+
+    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        logger.info("Mindmap Controller: EXPORT action");
+        final MindMap mindmap = getMindmapFromRequest(httpServletRequest);
+        return new ModelAndView("mindmapExport", "mindmap", new MindMapBean(mindmap));
+    }
+
+    public ModelAndView export(HttpServletRequest request, HttpServletResponse response) throws TranscoderException, IOException, JAXBException {
+        logger.info("Export Controller: exporting WiseMap action");
+
+        final String mapIdStr = request.getParameter(MAP_ID_PARAMETER);
+        if (mapIdStr != null) {
+            try {
+
+                int mindmapId = Integer.parseInt(mapIdStr);
+
+                String formatStr = request.getParameter(EXPORT_FORMAT_PARAMETER);
+                if (IMG_EXPORT_FORMAT.endsWith(formatStr)) {
+                    formatStr = request.getParameter("imgFormat");
+                }
+
+                final MindmapService service = getMindmapService();
+                final MindMap mindMap = service.getMindmapById(mindmapId);
+
+                // Build format properties ...
+                final ExportFormat format = ExportFormat.valueOf(formatStr);
+                final ExportProperties properties = ExportProperties.create(format);
+                if (properties instanceof ExportProperties.ImageProperties) {
+                    final String sizeStr = request.getParameter(IMG_SIZE_PARAMETER);
+                    final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
+                    if (sizeStr != null) {
+                        final ExportProperties.ImageProperties.Size size = ExportProperties.ImageProperties.Size.valueOf(sizeStr);
+                        imageProperties.setSize(size);
+                    } else {
+                        imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
+                    }
+                }
+
+                // Change image link URL.
+                setBaseBaseImgUrl(format, properties);
+
+                // Set format content type...
+                final String contentType = format.getContentType();
+                response.setContentType(contentType);
+
+                // Set file name...
+                final String fileName = mindMap.getTitle() + "." + format.getFileExtension();
+                response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+
+                // Write content ...
+                final ServletOutputStream outputStream = response.getOutputStream();
+                mindMap.export(properties, outputStream);
+
+
+            } catch (Throwable e) {
+                logger.error("Unexpexted error during export process", e);
+                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+            }
+        } else {
+            logger.warn("mapIdStr is null.Image could not be imported. UserAgent:" + request.getHeaders(UserAgent.USER_AGENT_HEADER));
+            response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+        }
+        return null;
+    }
+
+    private void setBaseBaseImgUrl(ExportFormat format, ExportProperties properties) {
+
+        final String baseUrl;
+        if (format == ExportFormat.SVG) {
+            baseUrl = "http://www.wisemapping.com/images";
+        } else {
+            final ServletContext servletContext = this.getServletContext();
+            baseUrl = "file://" + servletContext.getRealPath("/images/");
+        }
+        properties.setBaseImagePath(baseUrl);
+    }
+
+    public ModelAndView print(HttpServletRequest request, HttpServletResponse response) throws TranscoderException, IOException, JAXBException {
+        logger.info("Export Controller: printing WiseMap action");
+
+        final String mapIdStr = request.getParameter(MAP_ID_PARAMETER);
+        int mindmapId = Integer.parseInt(mapIdStr);
+        final MindmapService service = getMindmapService();
+        final MindMap mindMap = service.getMindmapById(mindmapId);
+
+        return new ModelAndView("mindmapPrint", "mindmap", mindMap);
+
+    }
+
+    public ModelAndView image(HttpServletRequest request, HttpServletResponse response) throws TranscoderException, IOException, JAXBException {
+        try {
+            logger.info("Export Controller: generating image WiseMap action");
+
+            final String mapIdStr = request.getParameter(MAP_ID_PARAMETER);
+            int mindmapId = Integer.parseInt(mapIdStr);
+            final MindmapService service = getMindmapService();
+            final MindMap mindMap = service.getMindmapById(mindmapId);
+
+            //Image Format
+            ExportFormat imageFormat = ExportFormat.PNG;
+
+            // Build format properties ...
+            final ExportProperties.ImageProperties imageProperties = new ExportProperties.ImageProperties(imageFormat);
+            imageProperties.setSize(ExportProperties.ImageProperties.Size.XMEDIUM);
+
+            // Change image link URL.
+            setBaseBaseImgUrl(imageFormat, imageProperties);
+
+            // Set format content type...
+            response.setContentType(imageFormat.getContentType());
+
+            // Write content ...
+            final ServletOutputStream outputStream = response.getOutputStream();
+            mindMap.export(imageProperties, outputStream);
+
+
+        } catch (Throwable e) {
+            logger.error("Unexpexted error generating the image", e);
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ForgotPasswordController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ForgotPasswordController.java
new file mode 100755
index 00000000..5148fc27
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ForgotPasswordController.java
@@ -0,0 +1,67 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+
+// ...........................................................................................................
+// (C) Copyright  1996/2007 Fuego Inc.  All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF Fuego Inc.
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+//
+// Last changed on 2007-04-03 09:29:20 (-0300), by: nachomanz. $Revision$
+// ...........................................................................................................
+
+package com.wisemapping.controller;
+
+import com.wisemapping.exceptions.EmailNotExistsException;
+import com.wisemapping.service.InvalidUserEmailException;
+import com.wisemapping.service.UserService;
+import com.wisemapping.view.ForgotPasswordBean;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import javax.servlet.ServletException;
+
+public class ForgotPasswordController
+    extends BaseSimpleFormController
+{
+
+    //~ Instance fields ......................................................................................
+
+    private UserService userService;
+
+    //~ Methods ..............................................................................................
+
+    public ModelAndView onSubmit(Object command)
+            throws ServletException, EmailNotExistsException {
+        
+        final ForgotPasswordBean bean = (ForgotPasswordBean) command;
+        try {
+            userService.sendEmailPassword(bean.getEmail());
+        } catch (InvalidUserEmailException e) {
+            throw new EmailNotExistsException(e);
+        }
+        return new ModelAndView(new RedirectView(getSuccessView()));
+    }
+
+    public void setUserService(UserService userService)
+    {
+        this.userService = userService;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java
new file mode 100755
index 00000000..0b9b90f8
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java
@@ -0,0 +1,83 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.MindMapHistory;
+import com.wisemapping.view.HistoryBean;
+import com.wisemapping.view.MindMapBean;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class HistoryController
+    extends BaseMultiActionController
+{
+    private static final String HISTORY_ID = "historyId";
+
+    public ModelAndView list(HttpServletRequest request, HttpServletResponse response)
+            throws java.lang.Exception {
+
+        final MindMap map = getMindmapFromRequest(request);
+        final List<HistoryBean> historyBeanList = createHistoryBeanList(map);
+
+        final Map<String,Object> attr = new HashMap<String,Object>();
+        attr.put("minmap",new MindMapBean(map));
+        attr.put("goToMindmapList",request.getParameter("goToMindmapList"));
+        attr.put("historyBeanList",historyBeanList);
+        return new ModelAndView("mindmapHistory",attr);
+    }
+
+    public ModelAndView revert(HttpServletRequest request, HttpServletResponse response)
+            throws java.lang.Exception {
+
+        final MindMap map = getMindmapFromRequest(request);
+        final int revertId = Integer.parseInt(request.getParameter(HISTORY_ID));
+        getMindmapService().revertMapToHistory(map, revertId);
+        final StringBuilder redirectionTo = new StringBuilder("redirect:");
+
+        String goToMindmapList = request.getParameter("goToMindmapList");
+        if (goToMindmapList != null)
+        {
+            redirectionTo.append("mymaps.htm");
+        }
+        else
+        {
+            redirectionTo.append("editor.htm?mapId=");
+            redirectionTo.append(map.getId());
+            redirectionTo.append("&action=open");
+        }
+        return new ModelAndView(redirectionTo.toString());
+    }
+
+    private List<HistoryBean> createHistoryBeanList(MindMap map) {
+        final List<MindMapHistory> list = getMindmapService().getMindMapHistory(map.getId());
+        final List<HistoryBean> historyBeanList = new ArrayList<HistoryBean>(list.size());
+        for (MindMapHistory mindMapHistory : list) {
+            historyBeanList.add(new HistoryBean(mindMapHistory.getMindmapId(),mindMapHistory.getId(),mindMapHistory.getCreator(),mindMapHistory.getCreationTime()));
+        }
+        return historyBeanList;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java
new file mode 100644
index 00000000..0d3802ee
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java
@@ -0,0 +1,74 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.importer.ImporterException;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.service.UserService;
+import com.wisemapping.view.ImportMapBean;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.ServletRequestDataBinder;
+import org.springframework.web.multipart.support.StringMultipartFileEditor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class ImportController
+        extends BaseSimpleFormController {
+
+    //~ Methods ..............................................................................................
+    protected Object formBackingObject(HttpServletRequest httpServletRequest) throws Exception {
+        return new ImportMapBean();
+    }
+
+    public ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
+            throws ServletException, WiseMappingException, ImporterException {
+        final ImportMapBean bean = (ImportMapBean) command;
+ 
+        User user = Utils.getUser();
+        final UserService userService = this.getUserService();
+
+        user = userService.getUserBy(user.getId());
+        final MindMap mindMap = bean.getImportedMap();
+        mindMap.setOwner(user);
+
+        final MindmapService mindmapService = this.getMindmapService();
+        mindmapService.addMindmap(mindMap,user);
+
+        final StringBuilder redirectionTo = new StringBuilder("redirect:editor.htm?mapId=");
+        redirectionTo.append(mindMap.getId());
+        redirectionTo.append("&action=open");
+        return new ModelAndView(redirectionTo.toString());
+    }
+
+     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder)
+        throws ServletException {
+        // to actually be able to convert Multipart instance to a String
+        // we have to register a custom editor
+        binder.registerCustomEditor(String.class, new StringMultipartFileEditor());
+        // now Spring knows how to handle multipart object and convert them
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java
new file mode 100644
index 00000000..06de0435
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java
@@ -0,0 +1,37 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class KeyboardController extends BaseMultiActionController {
+    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return newsPage(httpServletRequest, httpServletResponse);
+    }
+
+    public ModelAndView newsPage(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Keyboard");
+        return new ModelAndView("keyboard");
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java
new file mode 100755
index 00000000..f0cdb243
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java
@@ -0,0 +1,63 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.UserLogin;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Calendar;
+
+public class LoginController
+        extends BaseMultiActionController {
+
+    protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest request, HttpServletResponse httpServletResponse) throws Exception {
+        // Reload user only in case of beeing necessary...
+        final User user = Utils.getUser(request);
+
+        ModelAndView result;
+        if (user != null) {
+            result = new ModelAndView("forward:/c/mymaps.htm");
+
+        } else {
+            result = new ModelAndView("login");
+        }
+
+        return result;
+    }
+
+    public ModelAndView auditLogin(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Login Controller: auditLogin");
+
+        final String username = request.getUserPrincipal().getName();
+
+        final UserLogin userLogin = new UserLogin();
+        final Calendar now = Calendar.getInstance();
+        userLogin.setLoginDate(now);
+        userLogin.setEmail(username);
+        //userManager.auditLogin(userLogin);
+
+        return new ModelAndView("forward:/c/mymaps.htm");
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/Messages.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/Messages.java
new file mode 100644
index 00000000..033219af
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/Messages.java
@@ -0,0 +1,31 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+public interface Messages {
+    String EMAIL_ALREADY_EXIST = "EMAIL_ALREADY_EXIST";
+    String NO_VALID_EMAIL_ADDRESS = "NO_VALID_EMAIL_ADDRESS";
+    String USERNAME_ALREADY_EXIST = "USERNAME_ALREADY_EXIST";
+    String FIELD_REQUIRED = "FIELD_REQUIRED";
+    String IMPORT_MAP_ERROR = "IMPORT_MAP_ERROR";
+    String MAP_TITLE_ALREADY_EXISTS = "MAP_TITLE_ALREADY_EXISTS";
+    String PASSWORD_MISSMATCH = "PASSWORD_MISSMATCH";
+    String CAPTCHA_ERROR = "CAPTCHA_ERROR";
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapController.java
new file mode 100644
index 00000000..5d8826e7
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapController.java
@@ -0,0 +1,145 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.MindmapUser;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import com.wisemapping.view.MindMapBean;
+import com.wisemapping.filter.UserAgent;
+import com.wisemapping.exceptions.WiseMappingException;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+public class MindmapController extends BaseMultiActionController {
+    protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return list(httpServletRequest, httpServletResponse);
+    }
+
+    public ModelAndView list(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Mindmap Controller: myMindmap action");
+        final HttpSession session = request.getSession(false);
+
+        // Try to loaded from the request ...
+        UserAgent userAgent = null;
+        if (session != null) {
+            userAgent = (UserAgent) session.getAttribute(USER_AGENT);
+        }
+
+        // I could not loaded. I will create a new one...
+        if (userAgent == null) {
+            userAgent = UserAgent.create(request);
+            if (session != null) {
+                session.setAttribute(USER_AGENT, userAgent);
+            }
+        }
+
+        // It's a supported browser ?.
+        final UserAgent.OS os = userAgent.getOs();
+
+        final User user = Utils.getUser(request);
+        final ModelAndView view = new ModelAndView("mindmapList", "wisemapsList", getMindMapBeanList(user));
+        view.addObject("isMAC", os == UserAgent.OS.MAC);
+        view.addObject("user", user);
+        return view;
+    }
+
+    public ModelAndView edit(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Mindmap Controller: EDIT action");
+        final MindMap mindmap = getMindmapFromRequest(request);
+        return new ModelAndView("mindmapEditor", "wisemapsList", new MindMapBean(mindmap));
+    }
+
+    public ModelAndView collaborator(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Mindmap Controller: COLLABORATE action");
+        final MindMap mindmap = getMindmapFromRequest(request);
+        return new ModelAndView("mindmapCollaborator", "mindmap", new MindMapBean(mindmap));
+    }
+
+    public ModelAndView viewer(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Mindmap Controller: VIEWER action");
+        final MindMap mindmap = getMindmapFromRequest(request);
+        return new ModelAndView("mindmapViewer", "wisemapsList", new MindMapBean(mindmap));
+    }
+
+    public ModelAndView delete(HttpServletRequest request, HttpServletResponse response) throws WiseMappingException {
+        logger.info("Mindmap Controller: DELETE action");
+        final User user = Utils.getUser(request);
+
+        final MindMap mindmap = getMindmapFromRequest(request);
+        getMindmapService().removeColaboratorFromMindmap(mindmap, user.getId());
+
+        return list(request, response);
+    }
+
+    public ModelAndView deleteAll(HttpServletRequest request, HttpServletResponse response) throws WiseMappingException {
+        logger.info("Mindmap Controller: DELETE ALL action");
+
+        final List<MindmapUser> mindmaps = getMindmapUsersFromRequest(request);
+        final User user = Utils.getUser(request);
+        for (MindmapUser mindmap : mindmaps)
+            getMindmapService().removeMindmap(mindmap.getMindMap(), user);
+        return list(request, response);
+    }
+
+    public ModelAndView detail(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Mindmap Controller: DETAIL action");
+        final MindMap mindMap = getMindmapFromRequest(request);
+        final ModelAndView view = new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindMap));
+        view.addObject("user", Utils.getUser());
+        return view;
+    }
+
+    public ModelAndView changeStatus(HttpServletRequest request, HttpServletResponse response) throws WiseMappingException {
+        final MindMap mindmap = getMindmapFromRequest(request);
+        boolean isPublic = !mindmap.isPublic();
+        mindmap.setPublic(isPublic);
+        getMindmapService().updateMindmap(mindmap, false);
+        return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap));
+    }
+
+    public ModelAndView editMindmap(HttpServletRequest request, HttpServletResponse response) throws WiseMappingException {
+        final MindMap mindmap = getMindmapFromRequest(request);
+        final ModelAndView view = new ModelAndView("editMindmap", "mindmap", new MindMapBean(mindmap));
+        view.addObject("user", Utils.getUser());
+        return view;
+    }
+
+    public ModelAndView updateMindmap(HttpServletRequest request, HttpServletResponse response) throws WiseMappingException {
+        final MindMap mindmap = getMindmapFromRequest(request);
+
+        final String title = request.getParameter("title");
+        final String description = request.getParameter("description");
+
+        mindmap.setTitle(title);
+        mindmap.setDescription(description);
+
+        getMindmapService().updateMindmap(mindmap, false);
+        return list(request, response);
+    }
+
+    private static final String USER_AGENT = "wisemapping.userAgent";
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java
new file mode 100644
index 00000000..95883114
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java
@@ -0,0 +1,64 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.wisemapping.model.MindMap;
+
+/**
+ * Usage: http://localhost:8080/wisemapping/c/cooker.htm?action=edit&mapId=12
+ */
+public class MindmapCooker extends BaseMultiActionController {
+
+    public static final String MINDMAP_ID_PARAMETER = "mapId";
+    public static final String MAP_XML_PARAM = "mapXml";
+
+    public ModelAndView edit(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+
+        final String mindmapId = httpServletRequest.getParameter(MINDMAP_ID_PARAMETER);
+        final int mapId = Integer.parseInt(mindmapId);
+        final MindMap mindmap = getMindmapService().getMindmapById(mapId);
+
+        // Mark as try mode...
+        final ModelAndView view = new ModelAndView("mindmapCooker", "mindmap", mindmap);
+        return view;
+    }
+
+    public ModelAndView save(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+
+        final String mindmapId = httpServletRequest.getParameter(MINDMAP_ID_PARAMETER);
+        final int mapId = Integer.parseInt(mindmapId);
+        final MindMap mindmap = getMindmapService().getMindmapById(mapId);
+
+        String nativeXml = httpServletRequest.getParameter("nativeXml");
+        mindmap.setNativeXml(nativeXml);
+
+        getMindmapService().updateMindmap(mindmap, false);
+
+        // Mark as try mode...
+        final ModelAndView view = new ModelAndView("mindmapCooker", "mindmap", mindmap);
+        return view;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
new file mode 100644
index 00000000..bbe4cf0c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
@@ -0,0 +1,62 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.security.Utils;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+import org.springframework.web.servlet.view.RedirectView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class MindmapEditorController extends BaseMultiActionController {
+
+    public static final String MINDMAP_ID_PARAMETER = "mapId";
+    public static final String MAP_XML_PARAM = "mapXml";
+
+    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView(new RedirectView("mymaps.htm"));
+    }
+
+    public ModelAndView open(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+
+        final String mindmapId = httpServletRequest.getParameter(MINDMAP_ID_PARAMETER);
+        final int mapId = Integer.parseInt(mindmapId);
+        final MindMap mindmap = getMindmapService().getMindmapById(mapId);
+
+        // Mark as try mode...
+        final ModelAndView view = new ModelAndView("mindmapEditor", "mindmap", mindmap);
+        view.addObject("editorTryMode", false);
+        final boolean showHelp = isWelcomeMap(mindmap);
+        view.addObject("showHelp", showHelp);
+        final String xmlMap = mindmap.getNativeXmlAsJsLiteral();
+        view.addObject(MAP_XML_PARAM, xmlMap);
+        view.addObject("user", Utils.getUser());
+
+        return view;
+    }
+
+    private boolean isWelcomeMap(MindMap map) {
+        return map.getTitle().startsWith("Welcome ");
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapPublishController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapPublishController.java
new file mode 100644
index 00000000..7cc473e1
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapPublishController.java
@@ -0,0 +1,70 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class MindmapPublishController extends BaseMultiActionController {
+
+    protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+
+        final MindMap mindmap = this.getMindmapFromRequest(httpServletRequest);
+        if (mindmap == null) {
+            throw new IllegalStateException("Map could not be found");
+        }
+
+        return new ModelAndView("mindmapPublish", "mindmap", mindmap);
+    }
+
+    public ModelAndView save(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws WiseMappingException {
+
+        final MindMap mindmap = this.getMindmapFromRequest(httpServletRequest);
+        if (mindmap == null) {
+            throw new IllegalStateException("Map could not be found");
+        }
+
+        User user = Utils.getUser();
+        if (!mindmap.getOwner().equals(user)) {
+            throw new IllegalStateException("No enought right to execute this operation");
+        }
+
+
+        final String publicViewStr = httpServletRequest.getParameter("publicView");
+        boolean publicView = Boolean.valueOf(publicViewStr);
+
+        if (mindmap.isPublic() != publicView) {
+            mindmap.setPublic(publicView);
+            getMindmapService().updateMindmap(mindmap, false);
+        }
+
+
+        return new ModelAndView("closeDialog");
+    }
+
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapSharingController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapSharingController.java
new file mode 100644
index 00000000..3997c63b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/MindmapSharingController.java
@@ -0,0 +1,93 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.ColaborationEmail;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.model.UserRole;
+import com.wisemapping.security.Utils;
+import com.wisemapping.service.InvalidColaboratorException;
+import com.wisemapping.view.MindMapBean;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class MindmapSharingController extends BaseMultiActionController {
+    private static final String COLABORATOR_ID = "colaboratorId";          
+
+    public ModelAndView addCollaborator(HttpServletRequest request, HttpServletResponse response)
+            throws InvalidColaboratorException {
+        logger.info("Sharing Controller: add collaborators action");
+        addColaborator(request, UserRole.COLLABORATOR);
+        return new ModelAndView("closeDialog");
+    }
+
+    public ModelAndView addViewer(HttpServletRequest request, HttpServletResponse response)
+            throws InvalidColaboratorException {
+        logger.info("Sharing Controller: add viewer action");
+        addColaborator(request, UserRole.VIEWER);
+        return new ModelAndView("closeDialog");
+    }
+
+    public ModelAndView removeCollaborator(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Sharing Controller: remove collaborator action");
+        final MindMap mindmap = removeColaborator(request);
+        return new ModelAndView("mindmapCollaborator", "mindmap", new MindMapBean(mindmap));
+    }
+
+    private MindMap removeColaborator(HttpServletRequest request) {
+        final MindMap mindmap = getMindmapFromRequest(request);
+        final String colaboratorId = request.getParameter(COLABORATOR_ID);
+        long colaborator = Long.parseLong(colaboratorId);
+        getMindmapService().removeColaboratorFromMindmap(mindmap, colaborator);
+        return mindmap;
+    }
+
+    private String[] getEmailsToAdd(final HttpServletRequest request) {
+        final String[] result;
+        String collaboratorEmails = request.getParameter(MINDMAP_EMAILS_PARAMNAME);
+        if (collaboratorEmails != null && collaboratorEmails.trim().length() > 0) {
+            result = collaboratorEmails.split("\\s*[,|\\;|\\s]\\s*");
+        } else {
+            result = null;
+        }
+        return result;
+    }
+
+    private MindMapBean addColaborator(HttpServletRequest request, UserRole role) throws InvalidColaboratorException {
+        final MindMap mindMap = getMindmapFromRequest(request);
+        User user = Utils.getUser();
+        if (!mindMap.getOwner().equals(user)) {
+            throw new IllegalStateException("No enought right to execute this operation");
+        }
+
+
+        final String[] emails = getEmailsToAdd(request);
+
+        final ColaborationEmail email = new ColaborationEmail();
+        email.setSubject(request.getParameter("subject"));
+        email.setMessage(request.getParameter("message"));
+        getMindmapService().addColaborators(mindMap, emails, role, email);
+
+        return new MindMapBean(mindMap);
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/NewMindmapController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/NewMindmapController.java
new file mode 100644
index 00000000..de84f18c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/NewMindmapController.java
@@ -0,0 +1,79 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.MindMapNative;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.view.MindMapInfoBean;
+import org.springframework.validation.BindException;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class NewMindmapController
+        extends BaseSimpleFormController {
+
+    public ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
+            throws ServletException, WiseMappingException, IOException {
+        final MindMapInfoBean bean = (MindMapInfoBean) command;
+
+        final String title = bean.getTitle();
+        final String description = bean.getDescription();
+
+        final User user = Utils.getUser();
+        final MindmapService service = getMindmapService();
+
+        // The map has not been created. Create a new one ...
+        MindMap mindmap = new MindMap();
+        mindmap.setDescription(description);
+        mindmap.setTitle(title);
+        mindmap.setOwner(user);
+
+        final String defaultNativeMap = getDefaultMindmapXml(title);
+        mindmap.setNativeXml(defaultNativeMap);
+
+        final MindMapNative nativeBrowser = new MindMapNative();
+        mindmap.setNativeBrowser(nativeBrowser);
+        final User dbUSer = getUserService().getUserBy(user.getId());
+
+        service.addMindmap(mindmap, dbUSer);
+      
+        return new ModelAndView("redirect:editor.htm?mapId=" + mindmap.getId() + "&action=open");
+    }
+
+
+    private String getDefaultMindmapXml(final String title) {
+
+        final StringBuffer map = new StringBuffer();
+        map.append("<map>");
+        map.append("<topic central=\"true\" text=\"");
+        map.append(title);
+        map.append("\"/></map>");
+        return map.toString();
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java
new file mode 100644
index 00000000..cff78bc3
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java
@@ -0,0 +1,78 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.wisemapping.model.MindMap;
+
+public class PublicPagesController extends BaseMultiActionController {
+
+    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return this.home(httpServletRequest, httpServletResponse);
+    }
+
+    public ModelAndView faq(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView("faq");
+    }
+
+    public ModelAndView aboutUs(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView("aboutUs");
+    }
+
+    public ModelAndView video(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView("video");
+    }
+
+    public ModelAndView crew(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView("crew");
+    }
+
+    public ModelAndView privacyPolicy(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView("privacyPolicy");
+    }
+
+    public ModelAndView home(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView("homepage");
+    }
+
+    public ModelAndView tryEditor(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+
+        final MindMap mindmap = getMindmapService().getMindmapById(TRY_EXAMPLE_MINDMAP_ID);
+
+        ModelAndView view = new ModelAndView("mindmapEditor", "mindmap", mindmap);
+        final String xmlMap = mindmap.getNativeXmlAsJsLiteral();
+        view.addObject(MindmapEditorController.MAP_XML_PARAM, xmlMap);
+        view.addObject("editorTryMode", true);
+        view.addObject("showHelp", true);
+        return view;
+    }
+
+    public ModelAndView termsOfUse(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return new ModelAndView("termsOfUse");
+    }
+
+    public static final int TRY_EXAMPLE_MINDMAP_ID = 3;
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/PublicViewController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/PublicViewController.java
new file mode 100644
index 00000000..464cfd43
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/PublicViewController.java
@@ -0,0 +1,44 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.wisemapping.model.MindMap;
+
+public class PublicViewController extends BaseMultiActionController {
+    private static final String MAP_ID = "mapId";
+
+    protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
+            throws Exception
+    {
+
+        final MindMap mindmap = super.getMindmapFromRequest(httpServletRequest);     
+
+        final ModelAndView view = new ModelAndView("mindmapPublicView");
+        view.addObject("mindmap", mindmap);
+        view.addObject("viewTitle","'"+mindmap.getTitle()+"' Map View");
+        return view;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/RenameMindmapController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/RenameMindmapController.java
new file mode 100755
index 00000000..baab7197
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/RenameMindmapController.java
@@ -0,0 +1,59 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.view.MindMapInfoBean;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import org.springframework.validation.BindException;
+import org.springframework.web.servlet.ModelAndView;
+
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class RenameMindmapController
+        extends BaseSimpleFormController {
+
+    //~ Methods ..............................................................................................
+    protected Object formBackingObject(HttpServletRequest httpServletRequest) throws Exception {
+        final MindMap mindMap = getMindmapFromRequest(httpServletRequest);
+        User user = Utils.getUser();
+        if (!mindMap.getOwner().equals(user)) {
+            throw new IllegalStateException("No enought right to execute this operation");
+        }
+
+
+        return new MindMapInfoBean(mindMap);
+    }
+
+    public ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
+            throws ServletException, WiseMappingException {
+        final MindMapInfoBean bean = (MindMapInfoBean) command;
+        final MindmapService mindmapService = this.getMindmapService();
+        mindmapService.updateMindmap(bean.getMindMap(), false);
+
+        return new ModelAndView(getSuccessView());
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/SearchController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/SearchController.java
new file mode 100755
index 00000000..f706e597
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/SearchController.java
@@ -0,0 +1,99 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.MindMapCriteria;
+import com.wisemapping.security.Utils;
+import com.wisemapping.view.MindMapBean;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SearchController extends BaseMultiActionController {
+    private static final int MAX_RESULT = 20;
+
+    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
+        return searchPage(httpServletRequest, httpServletResponse);
+    }
+
+    public ModelAndView searchPage(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("Search");
+        return new ModelAndView("search");
+    }
+
+    public ModelAndView showAll(HttpServletRequest request, HttpServletResponse response)
+    {
+        final Map<String, Object> viewAttrMap = getRequestAttributes(request);
+        
+        viewAttrMap.put("emptyCriteria", false);
+        com.wisemapping.model.User user = Utils.getUser();
+        viewAttrMap.put("user",user);
+
+        final List<MindMap> searchResult = getMindmapService().getPublicMaps(MAX_RESULT);
+        final List<MindMapBean> result = new ArrayList<MindMapBean>();
+        for (MindMap mindMap : searchResult) {
+            result.add(new MindMapBean(mindMap));
+        }
+        viewAttrMap.put("wisemapsList", result);
+
+
+        return new ModelAndView("searchResult", viewAttrMap);
+    }
+
+    public ModelAndView search(HttpServletRequest request, HttpServletResponse response) {
+
+        logger.info("Search Result");
+
+        final Map<String, Object> viewAttrMap = getRequestAttributes(request);
+
+        final MindMapCriteria criteria = getMindMapCriteriaFromRequest(request);
+        viewAttrMap.put("emptyCriteria", criteria.isEmpty());
+        com.wisemapping.model.User user = Utils.getUser();
+        viewAttrMap.put("user",user);
+        if (!criteria.isEmpty()) {
+            final List<MindMap> searchResult = getMindmapService().search(criteria);
+            final List<MindMapBean> result = new ArrayList<MindMapBean>();
+            for (MindMap mindMap : searchResult) {
+                result.add(new MindMapBean(mindMap));
+            }
+            viewAttrMap.put("wisemapsList", result);
+        }
+
+        return new ModelAndView("searchResult", viewAttrMap);
+    }   
+
+     private Map<String, Object> getRequestAttributes(HttpServletRequest request) {
+        final Map<String, Object> viewAttrMap = new HashMap<String, Object>();
+        viewAttrMap.put("titleOrTags", request.getParameter("titleOrTags"));
+        final String name = request.getParameter("name");
+        viewAttrMap.put("name", name);
+        viewAttrMap.put("description", request.getParameter("description"));
+        viewAttrMap.put("tags", request.getParameter("tags"));
+        viewAttrMap.put("advanceSearch", request.getParameter("advanceSearch"));
+        return viewAttrMap;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/SettingsController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/SettingsController.java
new file mode 100755
index 00000000..d4a9bf5a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/SettingsController.java
@@ -0,0 +1,34 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class SettingsController extends BaseMultiActionController {
+
+    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
+            throws Exception {
+        return new ModelAndView("setting");
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/TagsController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/TagsController.java
new file mode 100644
index 00000000..890701b3
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/TagsController.java
@@ -0,0 +1,61 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.controller;
+
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.importer.ImporterException;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import com.wisemapping.view.TagBean;
+import org.springframework.validation.BindException;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class TagsController
+        extends BaseSimpleFormController {
+
+    //~ Methods ..............................................................................................
+    protected Object formBackingObject(HttpServletRequest httpServletRequest) throws Exception {
+
+        final MindMap mindmap = getMindmapFromRequest(httpServletRequest);
+        final User user = Utils.getUser(httpServletRequest);
+        final User dbUser = getUserService().getUserBy(user.getId());
+
+        final TagBean tagBean = new TagBean();
+        tagBean.setUserTags(dbUser.getTags());
+        tagBean.setMindmapId(mindmap.getId());
+        tagBean.setMindmapTags(mindmap.getTags());
+        tagBean.setMindmapTitle(mindmap.getTitle());
+        return tagBean;
+    }
+
+    public ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
+            throws ServletException, WiseMappingException, ImporterException
+    {
+        final TagBean bean = (TagBean) command;
+        final MindMap mindmap = getMindmapService().getMindmapById(bean.getMindmapId());
+        getMindmapService().addTags(mindmap, bean.getMindmapTags());
+        return new ModelAndView(getSuccessView());
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/controller/UserController.java b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/UserController.java
new file mode 100644
index 00000000..8740e85f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/controller/UserController.java
@@ -0,0 +1,66 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// ...........................................................................................................
+// (C) Copyright  1996/2007 Fuego Inc.  All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF Fuego Inc.
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+//
+// Last changed on 2007-04-03 09:29:20 (-0300), by: nachomanz. $Revision$
+// ...........................................................................................................
+
+package com.wisemapping.controller;
+
+import com.wisemapping.model.User;
+import com.wisemapping.service.UserService;
+import com.wisemapping.view.UserBean;
+import com.wisemapping.exceptions.WiseMappingException;
+import org.springframework.web.servlet.ModelAndView;
+
+public class UserController
+        extends CaptchaFormController {
+
+    //~ Instance fields ......................................................................................
+
+    private UserService userService;
+
+    //~ Methods ..............................................................................................
+
+    public ModelAndView onSubmit(Object command) throws WiseMappingException {
+        final UserBean userBean = ((UserBean) command);
+
+        if (userBean != null) {
+            final User user = new User();
+            // trim() the email email in order to remove spaces
+            user.setEmail(userBean.getEmail().trim());
+            user.setUsername(userBean.getUsername());
+            user.setFirstname(userBean.getFirstname());
+            user.setLastname(userBean.getLastname());
+            user.setPassword(userBean.getPassword());
+            userService.createUser(user);
+        }
+
+        return new ModelAndView(getSuccessView());
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
new file mode 100644
index 00000000..adc7d5a9
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
@@ -0,0 +1,67 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.dao;
+
+import com.wisemapping.model.*;
+
+import java.util.List;
+
+public interface MindmapManager {
+
+    Colaborator getColaboratorBy(String email);
+
+    Colaborator getColaboratorBy(long id);
+    
+    List<MindmapUser> getMindmapUserByColaborator(final long colaboratorId);
+
+    List<MindmapUser> getMindmapUserByRole(final UserRole userRole);
+
+    MindmapUser getMindmapUserBy(final int mindmapId, final User user);
+
+    List<MindMap> getAllMindmaps();
+
+    MindMap getMindmapById(int mindmapId);
+
+    MindMap getMindmapByTitle(final String name, final User user);
+
+    void addColaborator (Colaborator colaborator);
+
+    void addMindmap(User user, MindMap mindMap);
+
+    public void addView(int mapId);
+
+    void saveMindmap(MindMap mindMap);
+
+    void updateMindmap(MindMap mindMap, boolean saveHistory);
+
+    void removeColaborator(Colaborator colaborator);
+
+    void removeMindmap(MindMap mindap);
+
+    void removeMindmapUser(MindmapUser mindmapUser);
+
+    public List<MindMap> search(MindMapCriteria criteria);
+
+    public List<MindMap> search(MindMapCriteria criteria, int maxResult);
+
+    public List<MindMapHistory> getHistoryFrom(int mindmapId);
+
+    public MindMapHistory getHistory(int historyId);
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
new file mode 100644
index 00000000..aee57185
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
@@ -0,0 +1,203 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.dao;
+
+import com.wisemapping.model.*;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.criterion.SimpleExpression;
+import org.hibernate.criterion.Junction;
+import org.hibernate.criterion.Order;
+import org.hibernate.Criteria;
+
+import java.util.List;
+import java.util.Calendar;
+
+public class MindmapManagerImpl
+        extends HibernateDaoSupport
+        implements MindmapManager {
+
+    public Colaborator getColaboratorBy(final String email) {
+        final Colaborator colaborator;
+        final List colaborators = getHibernateTemplate().find("from com.wisemapping.model.Colaborator colaborator where email=?", email);
+        if (colaborators != null && !colaborators.isEmpty()) {
+            assert colaborators.size() == 1 : "More than one user with the same username!";
+            colaborator = (Colaborator) colaborators.get(0);
+        } else {
+            colaborator = null;
+        }
+        return colaborator;
+    }
+
+    public List<MindMap> search(MindMapCriteria criteria) {
+        return search(criteria,-1);
+    }
+
+    public List<MindMapHistory> getHistoryFrom(int mindmapId)
+    {        
+        final Criteria hibernateCriteria = getSession().createCriteria(MindMapHistory.class);
+        hibernateCriteria.add(Restrictions.eq("mindmapId",mindmapId));
+        hibernateCriteria.addOrder( Order.desc("creationTime"));
+        // Mientras no haya paginacion solo los 10 primeros
+        hibernateCriteria.setMaxResults(10);
+        return hibernateCriteria.list();
+    }
+
+    public MindMapHistory getHistory(int historyId)
+    {
+       return (MindMapHistory) getHibernateTemplate().get(MindMapHistory.class, historyId);
+    }
+
+    public List<MindMap> search(MindMapCriteria criteria, int maxResult) {
+        final Criteria hibernateCriteria = getSession().createCriteria(MindMap.class);
+        //always search public maps
+        hibernateCriteria.add(Restrictions.like("public", Boolean.TRUE));
+
+        if (criteria != null) {
+            final Junction junction;
+            if (criteria.isOrCriteria()) {
+                junction = Restrictions.disjunction();
+            } else {
+                junction = Restrictions.conjunction();
+            }
+
+            if (criteria.getTitle() != null && criteria.getTitle().length() > 0) {
+                final SimpleExpression titleRestriction = Restrictions.like("title", "%" + criteria.getTitle() + "%");
+                junction.add(titleRestriction);
+            }
+
+            if (criteria.getDescription() != null && criteria.getDescription().length() > 0) {
+                final SimpleExpression descriptionRestriction = Restrictions.like("description", "%" + criteria.getDescription() + "%");
+                junction.add(descriptionRestriction);
+            }
+            if (criteria.getTags().size() > 0) {
+                for (String tag : criteria.getTags()) {
+                    final SimpleExpression tagRestriction = Restrictions.like("tags", "%" + tag + "%");
+                    junction.add(tagRestriction);
+                }
+            }
+
+            hibernateCriteria.add(junction);
+        }
+//        if (maxResult>0)
+//        {
+//            hibernateCriteria.setMaxResults(maxResult);
+//        }
+        return hibernateCriteria.list();
+    }
+
+    public Colaborator getColaboratorBy(long id) {
+        return (Colaborator) getHibernateTemplate().get(Colaborator.class, id);
+    }
+
+    public List<MindmapUser> getMindmapUserByColaborator(final long colaboratorId) {
+        return getHibernateTemplate().find("from com.wisemapping.model.MindmapUser mindmapUser where colaborator_id=?", colaboratorId);
+    }
+
+    public List<MindmapUser> getMindmapUserByRole(final UserRole userRole) {
+        return getHibernateTemplate().find("from com.wisemapping.model.MindmapUser mindmapUser where roleId=?", userRole.ordinal());
+    }
+
+    public MindmapUser getMindmapUserBy(final int mindmapId, final User user) {
+        final MindmapUser result;
+
+        final List<MindmapUser> mindMaps = getHibernateTemplate().find("from com.wisemapping.model.MindmapUser mindmapUser where mindMap.id=? and colaborator_id=?", new Object[]{mindmapId, user.getId()});
+        if (mindMaps != null && !mindMaps.isEmpty()) {
+            result = mindMaps.get(0);
+        } else {
+            result = null;
+        }
+
+        return result;
+    }
+
+    public void addColaborator(Colaborator colaborator) {
+        assert colaborator != null : "ADD MINDMAP COLABORATOR: Colaborator is required!";
+        getHibernateTemplate().save(colaborator);
+    }
+
+    public void removeMindmapUser(MindmapUser mindmapUser) {
+        getHibernateTemplate().delete(mindmapUser);
+    }
+
+    public void removeColaborator(Colaborator colaborator) {
+        getHibernateTemplate().delete(colaborator);
+    }
+
+    public List<MindMap> getAllMindmaps() {
+        return getHibernateTemplate().find("from com.wisemapping.model.MindMap wisemapping");
+    }
+
+    public MindMap getMindmapById(int mindmapId) {
+        return (MindMap) getHibernateTemplate().get(MindMap.class, mindmapId);
+    }
+
+    public MindMap getMindmapByTitle(final String title, final User user) {
+        final MindMap result;
+        List<MindMap> mindMaps = getHibernateTemplate().find("from com.wisemapping.model.MindMap wisemapping where title=? and creator=?", new Object[]{title, user.getUsername()});
+        if (mindMaps != null && !mindMaps.isEmpty()) {
+            result = mindMaps.get(0);
+        } else {
+            result = null;
+        }
+        return result;
+    }
+
+    public void addView(int mapId)
+    {
+        
+    }
+
+    public void addMindmap(User user, MindMap mindMap) {
+        saveMindmap(mindMap);
+    }
+
+    public void saveMindmap(MindMap mindMap) {
+        assert mindMap != null : "Save Mindmap: Mindmap is required!";
+        getSession().saveOrUpdate(mindMap.getNativeBrowser());
+        getSession().save(mindMap);
+    }
+
+    public void updateMindmap(MindMap mindMap, boolean saveHistory) {
+        assert mindMap != null : "Save Mindmap: Mindmap is required!";
+        getHibernateTemplate().saveOrUpdate(mindMap.getNativeBrowser());
+        getHibernateTemplate().saveOrUpdate(mindMap);
+        if (saveHistory)
+        {
+            saveHistory(mindMap);
+        }
+    }
+
+    public void removeMindmap(MindMap mindMap) {
+        getHibernateTemplate().delete(mindMap);
+    }
+
+    public void saveHistory(MindMap mindMap)
+    {
+        final MindMapHistory history = new MindMapHistory();
+
+        history.setXml(mindMap.getXml());
+        history.setCreationTime(Calendar.getInstance());
+        history.setCreator(mindMap.getLastModifierUser());
+        history.setMindmapId(mindMap.getId());
+        getHibernateTemplate().saveOrUpdate(history);
+    }
+}
+
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
new file mode 100644
index 00000000..c6bfd3d4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
@@ -0,0 +1,51 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.dao;
+
+import com.wisemapping.model.User;
+import com.wisemapping.model.UserLogin;
+import com.wisemapping.model.Colaborator;
+
+import java.util.List;
+
+public interface UserManager {
+
+    List<User> getAllUsers();
+
+    User getUserBy(String email);
+
+    public User getUserBy(long id);
+
+    User getUserByUsername(String username);
+
+    boolean authenticate(String email, String password);
+
+    void createUser(User user);
+
+    void auditLogin(UserLogin userLogin);
+
+    void updateUser(User user);
+
+    User getUserByActivationCode(long code);
+
+    public Colaborator getColaboratorBy(String email);
+
+    public User createUser(User user, Colaborator col);
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
new file mode 100644
index 00000000..61d1a157
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
@@ -0,0 +1,143 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.dao;
+
+import com.wisemapping.model.Colaborator;
+import com.wisemapping.model.MindmapUser;
+import com.wisemapping.model.User;
+import com.wisemapping.model.UserLogin;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+import org.acegisecurity.providers.encoding.PasswordEncoder;
+
+import java.util.List;
+import java.util.Set;
+
+public class UserManagerImpl
+        extends HibernateDaoSupport
+        implements UserManager {
+
+    private PasswordEncoder passwordEncoder;
+
+    public void setPasswordEncoder(PasswordEncoder passwordEncoder)
+    {
+        this.passwordEncoder = passwordEncoder;
+    }
+
+    public List<User> getAllUsers() {
+        return getHibernateTemplate().find("from com.wisemapping.model.User user");
+    }
+
+    public User getUserBy(final String email) {
+        final User user;
+        final List users = getHibernateTemplate().find("from com.wisemapping.model.User colaborator where email=?", email);
+        if (users != null && !users.isEmpty()) {
+            assert users.size() == 1 : "More than one user with the same email!";
+            user = (User) users.get(0);
+        } else {
+            user = null;
+        }
+        return user;
+    }
+
+    public Colaborator getColaboratorBy(final String email) {
+        final Colaborator cola;
+        final List cols = getHibernateTemplate().find("from com.wisemapping.model.Colaborator colaborator where email=?", email);
+        if (cols != null && !cols.isEmpty()) {
+            assert cols.size() == 1 : "More than one colaborator with the same email!";
+            cola = (Colaborator) cols.get(0);
+        } else {
+            cola = null;
+        }
+        return cola;
+    }
+
+    public User getUserBy(long id)
+    {
+        return (User)getHibernateTemplate().get(User.class,id);
+    }
+
+    public User getUserByUsername(String username) {
+        final User user;
+        final List users = getHibernateTemplate().find("from com.wisemapping.model.User colaborator where username=?", username);
+        if (users != null && !users.isEmpty()) {
+            assert users.size() == 1 : "More than one user with the same username!";
+            user = (User) users.get(0);
+        } else {
+            user = null;
+        }
+        return user;
+    }
+
+    public boolean authenticate(final String email, final String password) {
+        final boolean result;
+        final User user = getUserBy(email);
+        result = user != null && user.getPassword().equals(password);
+        return result;
+    }
+
+    public void createUser(User user) {
+        assert user != null : "Trying to store a null user";
+        user.setPassword(passwordEncoder.encodePassword(user.getPassword(),null));
+        getHibernateTemplate().saveOrUpdate(user);
+    }
+
+    public User createUser(User user, Colaborator col)
+    {
+        user.setPassword(passwordEncoder.encodePassword(user.getPassword(),null));
+        assert user != null : "Trying to store a null user";
+
+        final Set<MindmapUser> set = col.getMindmapUsers();
+        for (MindmapUser mindmapUser : set) {
+            MindmapUser newMapUser = new MindmapUser();            
+            newMapUser.setRoleId(mindmapUser.getRole().ordinal());
+            newMapUser.setMindMap(mindmapUser.getMindMap());
+            newMapUser.setColaborator(user);
+            user.addMindmapUser(newMapUser);
+        }
+
+        getHibernateTemplate().delete(col);
+        getHibernateTemplate().flush();
+        getHibernateTemplate().saveOrUpdate(user);
+        return user;
+    }
+
+    public void auditLogin(UserLogin userLogin) {
+        assert userLogin != null : "userLogin is null";
+        getHibernateTemplate().save(userLogin);
+    }
+
+    public void updateUser(User user) {
+        assert user != null : "user is null";
+        user.setPassword(passwordEncoder.encodePassword(user.getPassword(),null));
+        getHibernateTemplate().update(user);
+    }
+
+    public User getUserByActivationCode(long code) {
+        final User user;
+        final List users = getHibernateTemplate().find("from com.wisemapping.model.User user where activationCode=?", code);
+        if (users != null && !users.isEmpty()) {
+            assert users.size() == 1 : "More than one user with the same username!";
+            user = (User) users.get(0);
+        } else {
+            user = null;
+        }
+        return user;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/BaseDwrService.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/BaseDwrService.java
new file mode 100644
index 00000000..5bedaba4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/BaseDwrService.java
@@ -0,0 +1,59 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.dwr;
+
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.service.UserService;
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import org.directwebremoting.WebContextFactory;
+import org.directwebremoting.WebContext;
+
+import javax.servlet.http.HttpServletRequest;
+
+abstract public class BaseDwrService {
+    private MindmapService mindmapService;
+    private UserService userService;
+
+    public MindmapService getMindmapService() {
+        return mindmapService;
+    }
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+
+    public UserService getUserService() {
+        return userService;
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    public User getUser() {
+
+        WebContext ctx = WebContextFactory.get();
+        final HttpServletRequest request = ctx.getHttpServletRequest();
+
+        return Utils.getUser(request);
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/JavaScriptErrorLoggerService.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/JavaScriptErrorLoggerService.java
new file mode 100644
index 00000000..34dbdf25
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/JavaScriptErrorLoggerService.java
@@ -0,0 +1,91 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// ...........................................................................................................
+// (C) Copyright  1996/2007 Fuego Inc.  All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF Fuego Inc.
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+//
+// Last changed on 2007-08-01 19:08:20 (-0300), by: imanzano. $Revision$
+// ...........................................................................................................
+
+package com.wisemapping.dwr;
+
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.directwebremoting.WebContext;
+import org.directwebremoting.WebContextFactory;
+import com.wisemapping.model.User;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class JavaScriptErrorLoggerService
+        extends BaseDwrService {
+
+    final Log logger = LogFactory.getLog(JavaScriptErrorLoggerService.class);
+    private static final int ERROR_MESSAGE = 3;
+    private static final int FATAL_MESSAGE = 4;
+    private static final String USER_AGENT = "User-Agent";
+
+    JavaScriptErrorLoggerService() {
+        LogFactory.getLog(JavaScriptErrorLoggerService.class);
+    }
+    //~ Methods ..............................................................................................
+
+    public void logError(final int severity, final String logMsg)
+            throws IOException {
+
+        final User user = getUser();
+
+        final WebContext ctx = WebContextFactory.get();
+        final HttpServletRequest request = ctx.getHttpServletRequest();
+
+
+        final String userAgent = request.getHeader(USER_AGENT);
+        synchronized (logger) {
+            // Log user info ...
+            if (user != null) {
+                log(severity, "UserId:" + user.getId() + ", UserEmail:" + user.getEmail());
+            } else {
+                log(severity, "Anonymous user");
+            }
+
+            // Log browser details ...
+            log(severity, "Browser:" + userAgent);
+
+            // Log error message ...
+            log(severity, logMsg);
+        }
+    }
+
+    void log(final int severity, final String msg) {
+        // Log error message ...
+        if (severity == ERROR_MESSAGE && logger.isErrorEnabled()) {
+            logger.error(msg);
+        } else if (severity == FATAL_MESSAGE && logger.isFatalEnabled()) {
+            logger.fatal(msg);
+        } else if (logger.isInfoEnabled()) {
+            logger.info(msg);
+        }
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/MapEditorService.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/MapEditorService.java
new file mode 100644
index 00000000..f952110a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/MapEditorService.java
@@ -0,0 +1,95 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// ...........................................................................................................
+// (C) Copyright  1996/2007 Fuego Inc.  All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF Fuego Inc.
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+//
+// Last changed on 2007-08-01 19:08:21 (-0300), by: imanzano. $Revision$
+// ...........................................................................................................
+
+package com.wisemapping.dwr;
+
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.MindMapNative;
+import com.wisemapping.model.User;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.exceptions.WiseMappingException;
+
+public class MapEditorService
+        extends BaseDwrService {
+
+    //~ Methods ..............................................................................................
+
+    public ResponseMessage draftMap(final int mapId, final String nativeXml) {
+        final ResponseMessage response = new ResponseMessage();
+        response.setMsgCode(ResponseMessage.Code.OK.name());
+        response.setMsgDetails("Map Saved Successfully");
+        return response;
+    }
+
+    public ResponseMessage saveMap(final int mapId, final String nativeXml, final String chartType,
+                                   String chartXml, final String editorProperties,boolean saveHistory)
+            throws IOException, WiseMappingException {
+        final MindmapService serservice = getMindmapService();
+        final MindMap mindMap = serservice.getMindmapById(mapId);
+        final User user = this.getUser();
+
+
+        MindMapNative nativeBrowser = mindMap.getNativeBrowser();
+
+        if (nativeBrowser == null) {
+            nativeBrowser = new MindMapNative();
+        }
+
+        if ("SVG".equals(chartType)) {
+            nativeBrowser.setSvgXml(chartXml);
+            nativeBrowser.setVmlXml((byte[]) null);
+        } else {
+            nativeBrowser.setVmlXml(chartXml);
+            nativeBrowser.setSvgXml((byte[]) null);
+        }
+
+        mindMap.setNativeBrowser(nativeBrowser);
+        mindMap.setProperties(editorProperties);
+
+        final Calendar now = Calendar.getInstance();
+        mindMap.setLastModificationTime(now);
+        mindMap.setLastModifierUser(user.getUsername());
+
+        final Calendar lastModification = Calendar.getInstance();
+        lastModification.setTime(new Date());
+        mindMap.setLastModificationTime(lastModification);
+
+        mindMap.setNativeXml(nativeXml);
+        serservice.updateMindmap(mindMap,saveHistory);
+
+        final ResponseMessage response = new ResponseMessage();
+        response.setMsgCode(ResponseMessage.Code.OK.name());
+        response.setMsgDetails("Map Saved Successfully");
+
+        return response;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/ResponseMessage.java b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/ResponseMessage.java
new file mode 100644
index 00000000..652099b5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/dwr/ResponseMessage.java
@@ -0,0 +1,67 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.dwr;
+
+public class ResponseMessage {
+    private ResponseMessage.Code msgCode;
+    private String msgDetails;
+    private String content;
+    private String contentType;
+
+    public ResponseMessage() {
+        this.contentType = "text/xml;charset=UTF-8";
+    }
+
+    public String getMsgCode() {
+        return msgCode.name();
+    }
+
+    public void setMsgCode(String msgCode) {
+        this.msgCode = Code.valueOf(msgCode);
+    }
+
+    public String getMsgDetails() {
+        return msgDetails;
+    }
+
+    public void setMsgDetails(String msgDetails) {
+        this.msgDetails = msgDetails;
+    }
+
+    public enum Code {
+        OK, ERROR
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java
new file mode 100755
index 00000000..3f25ea30
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exceptions;
+
+public class AccessDeniedSecurityException
+    extends Exception
+{
+    public AccessDeniedSecurityException(String msg)
+    {
+        super(msg);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java
new file mode 100755
index 00000000..a7f704b4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exceptions;
+
+public class EmailNotExistsException
+        extends Exception
+{
+    public EmailNotExistsException(Exception e)
+    {
+        super(e);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/NoMapFoundException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/NoMapFoundException.java
new file mode 100644
index 00000000..20bc2d93
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/NoMapFoundException.java
@@ -0,0 +1,27 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exceptions;
+
+public class NoMapFoundException extends WiseMappingException
+{
+    public NoMapFoundException(final long mapId) {
+        super("Could not find a mindmap with id '" + mapId + "'");
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/UnexpectedArgumentException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/UnexpectedArgumentException.java
new file mode 100755
index 00000000..65a4e6df
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/UnexpectedArgumentException.java
@@ -0,0 +1,30 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exceptions;
+
+
+public class UnexpectedArgumentException
+    extends Exception
+{
+    public UnexpectedArgumentException(String msg)
+    {
+        super(msg);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java
new file mode 100644
index 00000000..2fb680dd
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java
@@ -0,0 +1,24 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exceptions;
+
+public class UnsupportedBrowserException extends Exception {
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java
new file mode 100755
index 00000000..a098048a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exceptions;
+
+public class WiseMappingException
+    extends Exception
+{
+    public WiseMappingException(String str)
+    {
+        super(str);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportException.java
new file mode 100755
index 00000000..63f95c75
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportException.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exporter;
+
+public class ExportException
+    extends Exception
+{
+    public ExportException(Throwable e)
+    {
+        super(e);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java
new file mode 100644
index 00000000..57c53475
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java
@@ -0,0 +1,45 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exporter;
+
+public enum ExportFormat {
+    SVG("image/svg+xml", "xml"),
+    JPEG("image/jpeg", "jpg"),
+    PNG("image/png", "png"),
+    MINDJET("text/xml", "xml"),
+    PDF("application/pdf", "pdf"),
+    FREEMIND("text/xml", "mm");
+    
+    private String contentType;
+    private String fileExtension;
+
+    ExportFormat(String contentType, String fileExtension) {
+        this.contentType = contentType;
+        this.fileExtension = fileExtension;
+    }
+
+    public String getFileExtension() {
+        return fileExtension;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
new file mode 100644
index 00000000..1e0dd0ee
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
@@ -0,0 +1,87 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exporter;
+
+public class ExportProperties {
+    private ExportFormat format;
+    private String baseImgPath;
+
+    public ExportFormat getFormat() {
+        return format;
+    }
+
+    private ExportProperties(final ExportFormat format) {
+        this.format = format;
+    }
+
+    public static ExportProperties create(final ExportFormat format) {
+        ExportProperties result;
+        if (format == ExportFormat.JPEG || format == ExportFormat.PNG) {
+            result = new ImageProperties(format);
+        } else {
+            result = new GenericProperties(format);
+        }
+        return result;
+    }
+
+    public void setBaseImagePath(String baseUrl) {
+        this.baseImgPath = baseUrl;
+    }
+
+    public String getBaseImgPath() {
+        return baseImgPath;
+    }
+
+    static public class GenericProperties extends ExportProperties {
+        private GenericProperties(ExportFormat format) {
+            super(format);
+        }
+    }
+
+    static public class ImageProperties extends ExportProperties {
+        private Size size;
+
+        public Size getSize() {
+            return size;
+        }
+
+        public void setSize(Size size) {
+            this.size = size;
+        }
+
+        public ImageProperties(ExportFormat format) {
+            super(format);
+        }
+
+        public enum Size {
+            SMALL(100), MEDIUM(800), XMEDIUM(1024), LARGE(2048);
+            private int width;
+
+            Size(int width) {
+                this.width = width;
+            }
+
+            public Float getWidth() {
+                return (float) width;
+            }
+        }
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java
new file mode 100755
index 00000000..0c1eb09e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exporter;
+
+import com.wisemapping.model.MindMap;
+
+import java.io.OutputStream;
+
+public interface Exporter {
+    public void export(byte[] xml, OutputStream outputStream) throws ExportException;
+    public void export(MindMap map, OutputStream outputStream) throws ExportException;
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java
new file mode 100644
index 00000000..9c69f8e5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/SvgExporter.java
@@ -0,0 +1,276 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exporter;
+
+import com.wisemapping.exporter.freemind.FreemindExporter;
+import com.wisemapping.model.MindMap;
+import org.apache.batik.transcoder.Transcoder;
+import org.apache.batik.transcoder.TranscoderException;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.ImageTranscoder;
+import org.apache.batik.transcoder.image.JPEGTranscoder;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.apache.fop.svg.PDFTranscoder;
+import org.w3c.dom.*;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
+
+public class SvgExporter {
+    private static final String GROUP_NODE_NAME = "g";
+    private static final String RECT_NODE_NAME = "rect";
+    private static final String IMAGE_NODE_NAME = "image";
+
+    private SvgExporter() {
+    }
+
+    public static void export(ExportProperties properties, MindMap map, OutputStream output) throws TranscoderException, IOException, ParserConfigurationException, SAXException, XMLStreamException, TransformerException, JAXBException, ExportException {
+        final ExportFormat format = properties.getFormat();
+
+        final String imgPath = properties.getBaseImgPath();
+        switch (format) {
+            case PNG: {
+                // Create a JPEG transcoder
+                final Transcoder transcoder = new PNGTranscoder();
+                final ExportProperties.ImageProperties imageProperties =
+                        (ExportProperties.ImageProperties) properties;
+                final ExportProperties.ImageProperties.Size size = imageProperties.getSize();
+                transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth());
+
+                // Create the transcoder input.
+                char[] xml = map.generateSvgXml();
+                xml = normalizeSvg(xml, imgPath);
+                final CharArrayReader is = new CharArrayReader(xml);
+                TranscoderInput input = new TranscoderInput(is);
+                TranscoderOutput trascoderOutput = new TranscoderOutput(output);
+
+                // Save the image.
+                transcoder.transcode(input, trascoderOutput);
+                break;
+            }
+            case JPEG: {
+                // Create a JPEG transcoder
+                final Transcoder transcoder = new JPEGTranscoder();
+                transcoder.addTranscodingHint(JPEGTranscoder.KEY_QUALITY, new Float(.99));
+
+                final ExportProperties.ImageProperties imageProperties =
+                        (ExportProperties.ImageProperties) properties;
+                final ExportProperties.ImageProperties.Size size = imageProperties.getSize();
+                transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth());
+
+                // Create the transcoder input.
+                final char[] xml = map.generateSvgXml();
+                char[] svgXml = normalizeSvg(xml, imgPath);
+                final CharArrayReader is = new CharArrayReader(svgXml);
+                TranscoderInput input = new TranscoderInput(is);
+                TranscoderOutput trascoderOutput = new TranscoderOutput(output);
+
+                // Save the image.
+                transcoder.transcode(input, trascoderOutput);
+                break;
+            }
+            case PDF: {
+                // Create a JPEG transcoder
+                final Transcoder transcoder = new PDFTranscoder();
+
+                // Create the transcoder input.
+                final char[] xml = map.generateSvgXml();
+                char[] svgXml = normalizeSvg(xml, imgPath);
+                final CharArrayReader is = new CharArrayReader(svgXml);
+                TranscoderInput input = new TranscoderInput(is);
+                TranscoderOutput trascoderOutput = new TranscoderOutput(output);
+
+                // Save the image.
+                transcoder.transcode(input, trascoderOutput);
+                break;
+            }
+            case SVG: {
+                final char[] xml = map.generateSvgXml();
+                char[] svgXml = normalizeSvg(xml, imgPath);
+                output.write(new String(svgXml).getBytes("UTF-8"));
+                break;
+            }
+            case FREEMIND: {
+                final FreemindExporter exporter = new FreemindExporter();
+                exporter.export(map.getUnzippedXml().getBytes(), output);
+                break;
+            }
+            default:
+                throw new UnsupportedOperationException("Export method not supported.");
+        }
+    }
+
+    private static char[] normalizeSvg(final char[] svgXml, final String imgBaseUrl) throws XMLStreamException, ParserConfigurationException, IOException, SAXException, TransformerException {
+        final Reader in = new CharArrayReader(svgXml);
+
+        // Load document ...
+        final InputSource is = new InputSource(in);
+
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder documentBuilder = factory.newDocumentBuilder();
+
+        final Document svgDocument = documentBuilder.parse(is);
+
+        fitSvg(svgDocument);
+
+        fixImageTagHref(svgDocument, imgBaseUrl);
+
+        DOMSource domSource = new DOMSource(svgDocument);
+
+        // Save document ...
+
+        // Create a string writer
+        final CharArrayWriter outDocument = new CharArrayWriter();
+
+        // Create the result stream for the transform
+        StreamResult result = new StreamResult(outDocument);
+
+        // Create a Transformer to serialize the document
+        TransformerFactory tFactory = TransformerFactory.newInstance();
+
+        Transformer transformer = tFactory.newTransformer();
+        transformer.setOutputProperty("indent", "yes");
+
+        // Transform the document to the result stream
+        transformer.transform(domSource, result);
+
+        return outDocument.toCharArray();
+
+    }
+
+    private static void fixImageTagHref(Document svgDocument, String imgBaseUrl) {
+        final Node child = svgDocument.getFirstChild();
+        fixImageTagHref((Element) child, imgBaseUrl);
+    }
+
+    private static void fixImageTagHref(Element element, String imgBaseUrl) {
+
+        final NodeList list = element.getChildNodes();
+
+        for (int i = 0; i < list.getLength(); i++) {
+            final Node node = list.item(i);
+            // find all groups
+            if (GROUP_NODE_NAME.equals(node.getNodeName())) {
+                // Must continue looking ....
+                fixImageTagHref((Element) node, imgBaseUrl);
+
+            } else if (IMAGE_NODE_NAME.equals(node.getNodeName())) {
+
+                Element elem = (Element) node;
+
+                // Cook image href ...
+                String imgName = elem.getAttribute("href");
+                int index = imgName.lastIndexOf("/");
+                elem.removeAttribute("href");
+                if (index != -1)
+                {
+                    imgName = imgName.substring(index);
+                    final String imgPath = imgBaseUrl + imgName;                    
+                    elem.setAttribute("xlink:href", imgPath);
+                }
+            }
+        }
+    }
+
+    private static void fitSvg(Document document) {
+        // viewBox size
+        int mapWidth = 1024;
+        int mapHeight = 768;
+        // some browser return width and heigth with precision
+        float currentMaxWidth = 0;
+        float currentMaxHeight = 0;
+
+        final Element svgNode = (Element) document.getFirstChild();
+        final NodeList list = svgNode.getChildNodes();
+
+        for (int i = 0; i < list.getLength(); i++) {
+            final Node node = list.item(i);
+            // find all groups
+            if (GROUP_NODE_NAME.equals(node.getNodeName())) {
+                final NamedNodeMap groupAttributes = node.getAttributes();
+
+                final String[] transformUnit = getTransformUnit(groupAttributes);
+
+                int groupPositionX = Integer.parseInt(transformUnit[0].trim());
+                int groupPositionY = 0;
+                if (transformUnit.length > 1) {
+                    groupPositionY = Integer.parseInt(transformUnit[1].trim());
+                }
+
+                int signumX = Integer.signum(groupPositionX);
+                int signumY = Integer.signum(groupPositionY);
+
+                final NodeList groupChildren = node.getChildNodes();
+                for (int idx = 0; idx < groupChildren.getLength(); idx++) {
+                    final Node rectNode = groupChildren.item(idx);
+                    float curentHeight = 0 ;
+                    float curentWidth = 0;
+
+                    // If has a rect use the rect to calcular the real width of the topic
+                    if (RECT_NODE_NAME.equals(rectNode.getNodeName())) {
+                        final NamedNodeMap rectAttributes = rectNode.getAttributes();
+
+                        final Node attributeHeight = rectAttributes.getNamedItem("height");
+                        final Node attributeWidth = rectAttributes.getNamedItem("width");
+
+                        curentHeight = Float.valueOf(attributeHeight.getNodeValue());
+                        curentWidth = Float.valueOf(attributeWidth.getNodeValue());
+                    }
+
+                    float newMaxWidth = groupPositionX + (curentWidth * signumX);
+                    if (Math.abs(currentMaxWidth) < Math.abs(newMaxWidth)) {
+                        currentMaxWidth = newMaxWidth;
+                    }
+
+                    float newMaxHeight = groupPositionY + curentHeight * signumY;
+                    if (Math.abs(currentMaxHeight) < Math.abs(newMaxHeight)) {
+                        currentMaxHeight = newMaxHeight;
+                    }
+                }
+            }
+        }
+
+        svgNode.setAttribute("viewBox", -Math.abs(currentMaxWidth) + " " + -Math.abs(currentMaxHeight) + " " + Math.abs(currentMaxWidth * 2) + " " + Math.abs(currentMaxHeight * 2));
+        svgNode.setAttribute("width", Float.toString(mapWidth / 2));
+        svgNode.setAttribute("height", Float.toString(mapHeight / 2));
+        svgNode.setAttribute("preserveAspectRatio", "xMinYMin");
+    }
+
+    private static String[] getTransformUnit(NamedNodeMap groupAttributes) {
+        final String value = groupAttributes.getNamedItem("transform").getNodeValue();
+        final int pos = value.indexOf("translate");
+        final int initTranslate = value.indexOf("(", pos);
+        final int endTranslate = value.indexOf(")", pos);
+        final String transate = value.substring(initTranslate + 1, endTranslate);
+        return transate.split(",");
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/freemind/FreemindExporter.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/freemind/FreemindExporter.java
new file mode 100755
index 00000000..725413ed
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/freemind/FreemindExporter.java
@@ -0,0 +1,223 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exporter.freemind;
+
+import com.wisemapping.exporter.ExportException;
+import com.wisemapping.exporter.Exporter;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.util.JAXBUtils;
+import com.wisemapping.xml.freemind.Font;
+import com.wisemapping.xml.freemind.Node;
+import com.wisemapping.xml.freemind.Edge;
+import com.wisemapping.xml.freemind.Hook;
+import com.wisemapping.xml.mindmap.TopicType;
+import com.wisemapping.xml.mindmap.Icon;
+
+import javax.xml.bind.JAXBException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.ByteArrayInputStream;
+import java.math.BigInteger;
+import java.util.List;
+
+public class FreemindExporter
+    implements Exporter
+{
+
+    private com.wisemapping.xml.freemind.ObjectFactory freemindObjectFactory;
+
+    public void export(MindMap map, OutputStream outputStream) throws ExportException {
+        try {
+            export(map.getUnzippedXml().getBytes(),outputStream);
+        } catch (IOException e) {
+            throw new ExportException(e);
+        }
+    }
+
+    public void export(byte[] xml, OutputStream outputStream) throws ExportException {
+
+        freemindObjectFactory = new com.wisemapping.xml.freemind.ObjectFactory();
+        final com.wisemapping.xml.mindmap.Map mindmapMap;
+
+        try {
+            final ByteArrayInputStream stream = new ByteArrayInputStream(xml);
+            mindmapMap = (com.wisemapping.xml.mindmap.Map) JAXBUtils.getMapObject(stream,"com.wisemapping.xml.mindmap");
+
+            final com.wisemapping.xml.freemind.Map freemindMap = freemindObjectFactory.createMap();
+
+            final List<TopicType> topics = mindmapMap.getTopic();
+
+            // Insolated Topic doesn´t exists in Freemind only take the center topic
+            TopicType centerTopic = null;
+            if (topics.size() >1)
+            {
+                for (TopicType topic : topics) {
+                    if (topic.isCentral())
+                    {
+                        centerTopic = topic;
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                centerTopic = topics.get(0);
+            }
+
+            final Node main = freemindObjectFactory.createNode();
+            freemindMap.setNode(main);
+            if (centerTopic != null)
+            {
+                setTopicPropertiesToNode(main,centerTopic);
+                addNodeFromTopic(centerTopic,main);
+            }
+
+            JAXBUtils.saveMap(freemindMap,outputStream,"com.wisemapping.xml.freemind");
+         } catch (JAXBException e) {
+            throw new ExportException(e);
+        }
+    }
+
+    private void addNodeFromTopic(TopicType mainTopic, Node destNode)
+    {
+        final List<TopicType> currentTopic = mainTopic.getTopic();
+
+        for (TopicType topicType : currentTopic) {
+            final Node newNode = freemindObjectFactory.createNode();
+            setTopicPropertiesToNode(newNode,topicType);
+            destNode.getArrowlinkOrCloudOrEdge().add(newNode);
+            addNodeFromTopic(topicType,newNode);
+        }
+    }
+
+    private void setTopicPropertiesToNode(com.wisemapping.xml.freemind.Node freemindNode, com.wisemapping.xml.mindmap.TopicType mindmapTopic)
+    {
+        freemindNode.setTEXT(mindmapTopic.getText());
+        freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor());
+        String style = "line"; // default style for freemind
+        if ("rounded rectagle".equals(mindmapTopic.getShape()))
+        {
+            style = "bubble";
+        }
+        freemindNode.setSTYLE(style);
+        addIconNode(freemindNode,mindmapTopic);
+        addLinkNode(freemindNode,mindmapTopic);
+        addFontNode(freemindNode,mindmapTopic);
+        addEdgeNode(freemindNode,mindmapTopic);
+        addNote(freemindNode,mindmapTopic);
+
+    }
+
+    private void addNote(com.wisemapping.xml.freemind.Node freemindNode,com.wisemapping.xml.mindmap.TopicType mindmapTopic)
+    {
+        if (mindmapTopic.getNote() != null)
+        {
+            final Hook note = new Hook();
+            String textNote = mindmapTopic.getNote().getText();
+            textNote = textNote.replaceAll("%0A","\n");
+            note.setNAME("accessories/plugins/NodeNote.properties");
+            note.setText(textNote);
+            freemindNode.getArrowlinkOrCloudOrEdge().add(note);
+        }
+    }
+
+    private void addLinkNode(com.wisemapping.xml.freemind.Node freemindNode,com.wisemapping.xml.mindmap.TopicType mindmapTopic)
+    {
+        if (mindmapTopic.getLink() != null)
+        {
+            final String url = mindmapTopic.getLink().getUrl();
+            freemindNode.setLINK(url); 
+        }
+    }
+
+    private void addIconNode(com.wisemapping.xml.freemind.Node freemindNode,com.wisemapping.xml.mindmap.TopicType mindmapTopic)
+    {
+        if (mindmapTopic.getIcon() != null)
+        {
+            final List<Icon> iconsList = mindmapTopic.getIcon();
+            for (Icon icon : iconsList) {
+                final String id = icon.getId();
+                com.wisemapping.xml.freemind.Icon freemindIcon = new com.wisemapping.xml.freemind.Icon();
+                final String freemindIconId = FreemindIconMapper.getFreemindIcon(id);
+                freemindIcon.setBUILTIN(freemindIconId);
+                freemindNode.getArrowlinkOrCloudOrEdge().add(freemindIcon);
+            }
+        }
+    }
+
+    private void addEdgeNode(com.wisemapping.xml.freemind.Node freemindNode,com.wisemapping.xml.mindmap.TopicType mindmapTopic)
+    {
+        if (mindmapTopic.getBrColor() != null)
+        {
+            final Edge edgeNode = freemindObjectFactory.createEdge();
+            edgeNode.setCOLOR(mindmapTopic.getBrColor());            
+            freemindNode.getArrowlinkOrCloudOrEdge().add(edgeNode);
+        }
+    }
+
+    /*
+     * MindmapFont format : fontName ; size ; color ; bold; italic;
+     * eg: Verdana;10;#ffffff;bold;italic;
+     *
+     */
+    private void addFontNode(com.wisemapping.xml.freemind.Node freemindNode,com.wisemapping.xml.mindmap.TopicType mindmapTopic)
+    {
+        final String fontStyle = mindmapTopic.getFontStyle();
+        if (fontStyle!= null && fontStyle.length()!=0)
+        {
+            final Font font = freemindObjectFactory.createFont();
+            final String[] part = fontStyle.split(";",6);
+            int countParts = part.length;
+            int idx=0;
+            // Font name
+            if (idx < countParts && part[idx].length()!=0)
+            {
+                font.setNAME(part[idx]);
+            }
+            idx++;
+            // Font size
+            String size = "10"; // default value
+            if (idx < countParts && part[idx].length()!=0)
+            {
+                size = part[idx];
+            }
+
+            font.setSIZE(new BigInteger(size));
+            idx++;
+
+            // Font Color
+            if (idx < countParts && part[idx].length()!=0)
+            {
+                freemindNode.setCOLOR(part[idx]);
+            }
+             idx++;
+             if (idx < countParts && part[idx].length()!=0)
+            {
+                font.setBOLD(Boolean.TRUE.toString());
+            }
+            idx++;
+            if (idx < countParts && part[idx].length()!=0)
+            {
+                font.setITALIC(Boolean.TRUE.toString());
+            }
+            freemindNode.getArrowlinkOrCloudOrEdge().add(font);
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/freemind/FreemindIconMapper.java b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/freemind/FreemindIconMapper.java
new file mode 100755
index 00000000..69826313
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/exporter/freemind/FreemindIconMapper.java
@@ -0,0 +1,87 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.exporter.freemind;
+
+import com.wisemapping.model.MindmapImagesFactory;
+import com.wisemapping.model.ImageFamily;
+import com.wisemapping.model.MindmapImage;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+
+public class FreemindIconMapper {
+
+
+    private static Map<String,String> mindmapImageToFreemind = new HashMap<String,String>();
+    private static final String DEFAULT_ICON = "button_ok";
+
+    public FreemindIconMapper()
+    {
+
+    }
+
+    public static String getFreemindIcon(String mindmapImageId)
+    {
+
+        String freemindIconId = mindmapImageToFreemind.get(mindmapImageId);
+
+        // The image doesn´t exists in freemind select he default image
+        if (freemindIconId == null)
+        {
+            freemindIconId = DEFAULT_ICON;
+        }
+        return freemindIconId;
+    }
+
+    static {
+
+        List<MindmapImage> images = MindmapImagesFactory.getImagesByFamily(ImageFamily.BULLET);
+
+        for (int idx=0; idx < images.size() ; idx++)
+        {
+            mindmapImageToFreemind.put(images.get(idx).getId(), "full-"+(idx+1));
+        }
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.FLAG);
+        for (MindmapImage mindmapImage : images) {
+            mindmapImageToFreemind.put(mindmapImage.getId(), "flag");
+        }
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.BULB);
+        mindmapImageToFreemind.put(images.get(0).getId(), "idea");
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.TICK);
+        mindmapImageToFreemind.put(images.get(0).getId(), "button_ok");
+        mindmapImageToFreemind.put(images.get(1).getId(), "button_cancel");
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.ARROW);
+        mindmapImageToFreemind.put(images.get(2).getId(), "back");
+        mindmapImageToFreemind.put(images.get(3).getId(), "forward");
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.FACE);
+        mindmapImageToFreemind.put(images.get(3).getId(), "ksmiletris");
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.FLAG);
+        for (MindmapImage mindmapImage : images) {
+            mindmapImageToFreemind.put(mindmapImage.getId(), "flag");
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java b/trunk/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java
new file mode 100644
index 00000000..5813c298
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java
@@ -0,0 +1,72 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.filter;
+
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import com.wisemapping.exceptions.UnsupportedBrowserException;
+
+import java.util.List;
+
+public class BrowserSupportInterceptor extends HandlerInterceptorAdapter {
+    private List<String> exclude;
+    public static final String USER_AGENT = "wisemapping.userAgent";
+
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object object) throws Exception {
+
+        final String servletPath = httpServletRequest.getServletPath();
+        if (exclude != null && !exclude.contains(servletPath)) {
+            final HttpSession session = httpServletRequest.getSession(false);
+
+            // Try to loaded from the request ...
+            UserAgent userAgent = null;
+            if (session != null) {
+                userAgent = (UserAgent) session.getAttribute(USER_AGENT);
+            }
+
+            // I could not loaded. I will create a new one...
+            if (userAgent == null) {
+                userAgent = UserAgent.create(httpServletRequest);
+                if (session != null) {
+                    session.setAttribute(USER_AGENT, userAgent);
+                }
+            }
+
+            // It's a supported browser ?.
+            if (!userAgent.isBrowserSupported()) {
+                throw new UnsupportedBrowserException();
+            }
+        }
+        return true;
+    }
+
+
+    public List<String> getExclude() {
+        return exclude;
+    }
+
+    public void setExclude(List<String> exclude) {
+        this.exclude = exclude;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java b/trunk/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java
new file mode 100644
index 00000000..915eb7c6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java
@@ -0,0 +1,321 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.filter;
+
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
+
+public class UserAgent implements Serializable {
+    public static final String USER_AGENT_HEADER = "User-Agent";
+    private int versionMajor = -1;
+    private int versionVariation = -1;
+    private Product product;
+    private OS os;
+    private final org.apache.commons.logging.Log logger = LogFactory.getLog(UserAgent.class.getName());
+
+    public static void main(final String argv[]) {
+      //  UserAgent explorer = UserAgent.create("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)");
+       // UserAgent firefox = UserAgent.create("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20050302 Firefox/0.9.6");
+        //UserAgent safari = UserAgent.create("iCab/2.9.5 (Macintosh; U; PPC; Mac OS X)");
+        //UserAgent opera = UserAgent.create("Opera/9.21 (Windows NT 5.1; U; en)");
+
+
+
+          UserAgent firefox = UserAgent.create("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20050302 Firefox/1.9.6");
+         assert firefox.isBrowserSupported();
+
+
+         firefox = UserAgent.create("Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.8.1.7) Gecko/20070914 Firefox/2.0.0.7 Creative ZENcast v1.02.08 FirePHP/0.0.5.13");
+         assert firefox.isBrowserSupported();
+
+         firefox = UserAgent.create("Mozilla/5.0 (X11; U; Linux i686; es-ES; rv:1.8.0.12) Gecko/20070731 Ubuntu/dapper-security Firefox/1.5.0.12");
+         assert firefox.isBrowserSupported();
+
+        firefox = UserAgent.create("'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.7) Gecko/20070914 firefox 2.0'");
+        assert firefox.isBrowserSupported();
+
+        firefox = UserAgent.create("Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1.12) Gecko/20080129 Iceweasel/2.0.0.12 (Debian-2.0.0.12-0etch1)");
+        assert firefox.isBrowserSupported();
+
+
+
+
+    }
+
+
+    public boolean isVersionGreatedOrEqualThan(final int mayor, final int variation) {
+        return this.versionMajor > mayor || (mayor == this.versionMajor && this.versionVariation >= variation);
+    }
+
+    public int getVersionMajor() {
+        return versionMajor;
+    }
+
+    public int getVersionVariation() {
+        return versionVariation;
+    }
+
+    public Product getProduct() {
+        return product;
+    }
+
+    public OS getOs() {
+        return os;
+    }
+
+    public enum Product {
+        EXPLORER, FIREFOX, CAMINO, NETSCAPE, OPERA, SAFARI, KONQUEOR, KMELEON, MOZILLA, LYNX, ROBOT;
+    }
+
+    public enum OS {
+        WINDOWS, LINUX, MAC, KNOWN
+    }
+
+
+    private UserAgent(final String header) {
+        parse(header);
+    }
+
+    private void parse(String userAgentHeader) {
+        // Format ApplicationName/ApplicationVersion ();
+
+        try {
+            int detailStart = userAgentHeader.indexOf('(');
+            int detailEnd = userAgentHeader.indexOf(')');
+
+            // Parse base format = application (productDetails) productAddition
+            String application = userAgentHeader.substring(0, detailStart);
+            application = application.trim();
+
+            String productDetails = userAgentHeader.substring(detailStart + 1, detailEnd);
+            productDetails = productDetails.trim();
+
+            String productAddition = userAgentHeader.substring(detailEnd + 1, userAgentHeader.length());
+            productAddition = productAddition.trim();
+
+            this.os = parseOS(productDetails);
+
+            if (userAgentHeader.indexOf("MSIE") != -1) {
+                // Explorer Browser : http://msdn2.microsoft.com/en-us/library/ms537503.aspx
+                // Format: Mozilla/MozVer (compatible; MSIE IEVer[; Provider]; Platform[; Extension]*) [Addition]
+                // SampleTest: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
+
+                // Parse version ...
+                int index = productDetails.indexOf("MSIE") + 4;
+                int lastIndex = productDetails.indexOf(';', index);
+
+                final String versionStr = productDetails.substring(index + 1, lastIndex);
+                parseVersion(versionStr);
+
+                // Explorer Parse ...
+                this.product = Product.EXPLORER;
+            } else if (userAgentHeader.indexOf("iCab") != -1 || userAgentHeader.indexOf("Safari") != -1) {
+                // Safari:
+                //Formats:  Mozilla/5.0 (Windows; U; Windows NT 5.1; en) AppleWebKit/522.13.1 (KHTML, like Gecko) Version/3.0.2 Safari/522.13.1
+                this.product = Product.SAFARI;
+
+            } else if (userAgentHeader.indexOf("Konqueror") != -1) {
+                this.product = Product.KONQUEOR;
+            } else if (userAgentHeader.indexOf("KMeleon") != -1) {
+                this.product = Product.KMELEON;
+            } else if (userAgentHeader.indexOf("Gecko") != -1) {
+                // Firefox/Mozilla/Camino:
+                // Mozilla/MozVer (Platform; Security; SubPlatform; Language; rv:Revision[; Extension]*) Gecko/GeckVer [Product/ProdVer]
+                // SampleTest: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20050302 Firefox/0.9.6
+                // Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.8.1.7) Gecko/20070914 Firefox/2.0.0.7 Creative ZENcast v1.02.08 FirePHP/0.0.5.13
+                // 'Mozilla/5.0 (Windows; U; Windows NT 5.1; es-ES; rv:1.7.12) Gecko/20050915'
+                // 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.7) Gecko/20070914 firefox 2.0'
+                // 'Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.8.1.6) Gecko/20060601 Firefox/2.0.0.6 (Ubuntu-edgy)'
+                // 'Mozilla/5.0 (X11; U; Linux i686; es-ES; rv:1.8.0.12) Gecko/20070731 Ubuntu/dapper-security Firefox/1.5.0.12'
+                // "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1.12) Gecko/20080129 Iceweasel/2.0.0.12 (Debian-2.0.0.12-0etch1)
+
+                // Remove gecko string
+                // Debian Firefox is remamed to  iceweasel.
+                productAddition = productAddition.replace("Iceweasel","firefox");
+
+
+                productAddition = productAddition.substring(productAddition.indexOf(' ') + 1);
+                productAddition = productAddition.toLowerCase();
+                String prodDesc = null;
+                if (productAddition.contains("firefox")) {
+                    this.product = Product.FIREFOX;
+                    prodDesc = "firefox";
+                } else if (productAddition.contains("netscape")) {
+                    this.product = Product.NETSCAPE;
+                    prodDesc = "netscape";
+                } else if (productAddition.contains("camino")) {
+                    this.product = Product.CAMINO;
+                    prodDesc = "camino";
+                } else {
+                    this.product = Product.MOZILLA;
+                    // @todo: How it can get the mozilla vesion?
+                }
+
+                // Now, parse product version ...
+                if(prodDesc!=null)
+                {
+                    int sI = productAddition.indexOf(prodDesc) + prodDesc.length() + 1;
+                    int eI = productAddition.indexOf(' ',sI);
+                    if(eI==-1)
+                    {
+                        eI = productAddition.length();
+                    }
+
+                    final String productVersion = productAddition.substring(sI,eI);
+                    parseVersion(productVersion);
+
+                }
+
+            } else if (userAgentHeader.indexOf("Opera") != -1) {
+                // Opera:
+                // Samples: Opera/9.0 (Windows NT 5.1; U; en)
+                // Opera/8.5 (Macintosh; PPC Mac OS X; U; en)
+                // Mozilla/5.0 (Macintosh; PPC Mac OS X; U; en) Opera 8.5
+                // Mozilla/4.0 (compatible; MSIE 6.0; Mac_PowerPC Mac OS X; en) Opera 8.5
+                // Opera/9.21 (Windows NT 5.1; U; en)
+                this.product = Product.OPERA;
+                String productVersion;
+                if (application.startsWith("Opera")) {
+                    productVersion = application.substring(application.indexOf('/') + 1, application.length());
+
+                } else {
+                    productVersion = productAddition.substring(application.lastIndexOf(' ') + 1, application.length());
+                }
+                parseVersion(productVersion);
+
+            } else if (userAgentHeader.indexOf("4.7") != -1) {
+                this.product = Product.NETSCAPE;
+            } else if (userAgentHeader.indexOf("Lynx") != -1) {
+                this.product = Product.LYNX;
+            } else {
+                // It's a robot ..
+                for (String botAgent : botAgents) {
+                    if (userAgentHeader.indexOf(botAgent) != -1) {
+                        // set a key in the session, so the next time we don't have to manually
+                        // detect the robot again
+                        this.product = Product.ROBOT;
+                        break;
+                    }
+                }
+                logger.info("UserAgent could not be detected: '" + userAgentHeader + "'");
+            }
+        } catch (Throwable e) {
+            logger.error("Could not detect the browser based on the user agent: '" + userAgentHeader + "'");
+            // Mark as an unsupported browser...
+            this.product = Product.ROBOT;
+        }
+    }
+
+    private OS parseOS(String details) {
+        OS result;
+        if (details.contains("Windows"))
+            result = OS.WINDOWS;
+        else if (details.contains("Mac") || details.contains("Macintosh"))
+            result = OS.MAC;
+        else if (details.contains("X11"))
+            result = OS.LINUX;
+        else
+            result = OS.KNOWN;
+        return result;
+    }
+
+    public static UserAgent create(final HttpServletRequest request) {
+        final String userAgent = request.getHeader(USER_AGENT_HEADER);
+        return new UserAgent(userAgent);
+    }
+
+
+    public static UserAgent create(final String userAgent) {
+        return new UserAgent(userAgent);
+    }
+
+    private void parseVersion(final String version) {
+        final int index = version.indexOf('.');
+        final String vm = version.substring(0, index);
+        final String vv = version.substring(index + 1, version.length());
+        this.versionMajor = Integer.parseInt(vm);
+        char c = vv.charAt(0);
+        this.versionVariation = Integer.valueOf(String.valueOf(c));
+    }
+
+    /**
+     * All known robot user-agent headers (list can be found
+     * <a href="http://www.robotstxt.org/wc/active.html">here</a>).
+     * <p/>
+     * <p>NOTE: To avoid bad detection:</p>
+     * <p/>
+     * <ul>
+     * <li>Robots with ID of 2 letters only were removed</li>
+     * <li>Robot called "webs" were removed</li>
+     * <li>directhit was changed in direct_hit (its real id)</li>
+     * </ul>
+     */
+    private static final String[] botAgents = {
+            "acme.spider", "ahoythehomepagefinder", "alkaline", "appie", "arachnophilia",
+            "architext", "aretha", "ariadne", "aspider", "atn.txt", "atomz", "auresys",
+            "backrub", "bigbrother", "bjaaland", "blackwidow", "blindekuh", "bloodhound",
+            "brightnet", "bspider", "cactvschemistryspider", "calif", "cassandra",
+            "cgireader", "checkbot", "churl", "cmc", "collective", "combine", "conceptbot",
+            "core", "cshkust", "cusco", "cyberspyder", "deweb", "dienstspider", "diibot",
+            "direct_hit", "dnabot", "download_express", "dragonbot", "dwcp", "ebiness",
+            "eit", "emacs", "emcspider", "esther", "evliyacelebi", "fdse", "felix",
+            "ferret", "fetchrover", "fido", "finnish", "fireball", "fish", "fouineur",
+            "francoroute", "freecrawl", "funnelweb", "gazz", "gcreep", "getbot", "geturl",
+            "golem", "googlebot", "grapnel", "griffon", "gromit", "gulliver", "hambot",
+            "harvest", "havindex", "hometown", "wired-digital", "htdig", "htmlgobble",
+            "hyperdecontextualizer", "ibm", "iconoclast", "ilse", "imagelock", "incywincy",
+            "informant", "infoseek", "infoseeksidewinder", "infospider", "inspectorwww",
+            "intelliagent", "iron33", "israelisearch", "javabee", "jcrawler", "jeeves",
+            "jobot", "joebot", "jubii", "jumpstation", "katipo", "kdd", "kilroy",
+            "ko_yappo_robot", "labelgrabber.txt", "larbin", "legs", "linkscan",
+            "linkwalker", "lockon", "logo_gif", "lycos", "macworm", "magpie", "mediafox",
+            "merzscope", "meshexplorer", "mindcrawler", "moget", "momspider", "monster",
+            "motor", "muscatferret", "mwdsearch", "myweb", "netcarta", "netmechanic",
+            "netscoop", "newscan-online", "nhse", "nomad", "northstar", "nzexplorer",
+            "occam", "octopus", "orb_search", "packrat", "pageboy", "parasite", "patric",
+            "perignator", "perlcrawler", "phantom", "piltdownman", "pioneer", "pitkow",
+            "pjspider", "pka", "plumtreewebaccessor", "poppi", "portalb", "puu", "python",
+            "raven", "rbse", "resumerobot", "rhcs", "roadrunner", "robbie", "robi",
+            "roverbot", "safetynetrobot", "scooter", "search_au", "searchprocess",
+            "senrigan", "sgscout", "shaggy", "shaihulud", "sift", "simbot", "site-valet",
+            "sitegrabber", "sitetech", "slurp", "smartspider", "snooper", "solbot",
+            "spanner", "speedy", "spider_monkey", "spiderbot", "spiderman", "spry",
+            "ssearcher", "suke", "sven", "tach_bw", "tarantula", "tarspider", "tcl",
+            "techbot", "templeton", "titin", "titan", "tkwww", "tlspider", "ucsd",
+            "udmsearch", "urlck", "valkyrie", "victoria", "visionsearch", "voyager",
+            "vwbot", "w3index", "w3m2", "wanderer", "webbandit", "webcatcher", "webcopy",
+            "webfetcher", "webfoot", "weblayers", "weblinker", "webmirror", "webmoose",
+            "webquest", "webreader", "webreaper", "websnarf", "webspider", "webvac",
+            "webwalk", "webwalker", "webwatch", "wget", "whowhere", "wmir", "wolp",
+            "wombat", "worm", "wwwc", "wz101", "xget", "nederland.zoek"
+    };
+
+    public boolean isBrowserSupported() {
+        // Is it a supported browser ?.
+        final UserAgent.Product product = this.getProduct();
+        boolean result = product == UserAgent.Product.FIREFOX && this.isVersionGreatedOrEqualThan(1, 5);
+        result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(6, 0) && this.getOs() == UserAgent.OS.WINDOWS;
+        result = result || product == UserAgent.Product.OPERA && this.isVersionGreatedOrEqualThan(9, 2);
+        return result;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImportFormat.java b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImportFormat.java
new file mode 100755
index 00000000..63c3031d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImportFormat.java
@@ -0,0 +1,24 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.importer;
+
+public enum ImportFormat {
+     FREEMIND()
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java
new file mode 100755
index 00000000..4fb13df2
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.importer;
+
+import com.wisemapping.model.MindMap;
+
+import java.io.InputStream;
+
+public interface Importer
+{
+    public MindMap importMap(String mapName,String description,InputStream input) throws ImporterException;
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImporterException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImporterException.java
new file mode 100755
index 00000000..8bbd6e6f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImporterException.java
@@ -0,0 +1,33 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.importer;
+
+public class ImporterException
+    extends Exception
+{
+    public ImporterException(String str)
+    {
+        super(str);
+    }
+    public ImporterException(Throwable exc)
+    {
+        super(exc);
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImporterFactory.java b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImporterFactory.java
new file mode 100755
index 00000000..bfe7fccc
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/ImporterFactory.java
@@ -0,0 +1,55 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.importer;
+
+import com.wisemapping.importer.freemind.FreemindImporter;
+
+public class ImporterFactory
+{
+    
+    private static ImporterFactory instance = null;
+
+    private ImporterFactory() {}
+
+    public static ImporterFactory getInstance()
+    {
+        if (instance == null)
+        {
+            instance = new ImporterFactory();
+        }
+        return instance;
+    }
+
+    public Importer getImporter(ImportFormat format)
+            throws ImporterException
+    {
+        Importer importer;
+        switch (format)
+        {
+            case FREEMIND:
+                importer = new FreemindImporter();
+                break;
+            default:
+                throw new ImporterException("Invalid format type:" + format);
+        }
+
+        return importer;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconMapper.java b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconMapper.java
new file mode 100755
index 00000000..303accb2
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconMapper.java
@@ -0,0 +1,85 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.importer.freemind;
+
+import com.wisemapping.model.MindmapImage;
+import com.wisemapping.model.MindmapImagesFactory;
+import com.wisemapping.model.ImageFamily;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+
+public class FreemindIconMapper {
+
+
+    private static Map<String,String> freemindToMindmapIcon = new HashMap<String,String>();
+    private static final MindmapImage DEFAULT_ICON = MindmapImagesFactory.getImagesByFamily(ImageFamily.BULLET).get(3);
+
+    public FreemindIconMapper()
+    {
+
+    }
+
+    public static String getMindmapIcon(String freemindIconId)
+    {
+
+        String iconId = freemindToMindmapIcon.get(freemindIconId);
+
+        // The image doesn´t exists in freemind select he default image
+        if (iconId == null)
+        {
+            iconId = DEFAULT_ICON.getId();
+        }
+        return iconId;
+    }
+
+    static {
+
+        List<MindmapImage> images = MindmapImagesFactory.getImagesByFamily(ImageFamily.BULLET);
+
+        freemindToMindmapIcon.put( "full-1",images.get(0).getId());
+        freemindToMindmapIcon.put( "full-2",images.get(1).getId());
+        freemindToMindmapIcon.put( "full-3",images.get(2).getId());
+        freemindToMindmapIcon.put( "full-4",images.get(3).getId());
+        freemindToMindmapIcon.put( "full-5",images.get(4).getId());
+        freemindToMindmapIcon.put( "full-6",images.get(5).getId());
+        freemindToMindmapIcon.put( "full-7",images.get(6).getId());
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.BULB);
+        freemindToMindmapIcon.put( "idea",images.get(0).getId());
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.TICK);
+        freemindToMindmapIcon.put( "button_ok",images.get(0).getId());
+        freemindToMindmapIcon.put( "button_cancel",images.get(1).getId());
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.ARROW);
+        freemindToMindmapIcon.put( "back",images.get(2).getId());
+        freemindToMindmapIcon.put( "forward",images.get(3).getId());
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.FACE);
+        freemindToMindmapIcon.put( "ksmiletris",images.get(3).getId());
+
+        images = MindmapImagesFactory.getImagesByFamily(ImageFamily.FLAG);
+
+        final MindmapImage orangeFlag = images.get(2);
+        freemindToMindmapIcon.put("flag", orangeFlag.getId());
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
new file mode 100755
index 00000000..0300addc
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
@@ -0,0 +1,231 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.importer.freemind;
+
+import com.wisemapping.importer.Importer;
+import com.wisemapping.importer.ImporterException;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.ShapeStyle;
+import com.wisemapping.model.MindMapNative;
+import com.wisemapping.util.JAXBUtils;
+import com.wisemapping.xml.freemind.*;
+import com.wisemapping.xml.mindmap.TopicType;
+import com.wisemapping.xml.mindmap.Link;
+
+import javax.xml.bind.JAXBException;
+import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.math.BigInteger;
+
+public class FreemindImporter
+    implements Importer
+{
+
+    private com.wisemapping.xml.mindmap.ObjectFactory mindmapObjectFactory;
+    private static final String POSITION_LEFT = "left";
+    private static final String BOLD = "bold";
+    private static final String ITALIC = "italic";
+    private static final String EMPTY_NOTE = "";
+
+    public MindMap importMap(String mapName,String description,InputStream input) throws ImporterException {
+
+        final MindMap map;
+        mindmapObjectFactory = new com.wisemapping.xml.mindmap.ObjectFactory();
+        try {
+            final Map freemindMap = (Map) JAXBUtils.getMapObject(input,"com.wisemapping.xml.freemind");
+
+            final com.wisemapping.xml.mindmap.Map mindmapMap = mindmapObjectFactory.createMap();
+
+            final Node centralNode = freemindMap.getNode();
+            final TopicType centralTopic = mindmapObjectFactory.createTopicType();
+            centralTopic.setCentral(true);
+
+            setNodePropertiesToTopic(centralTopic,centralNode);
+            centralTopic.setShape(ShapeStyle.ROUNDED_RETAGLE.getStyle());
+            mindmapMap.getTopic().add(centralTopic);
+            mindmapMap.setName(mapName);
+
+            addTopicFromNode(centralNode,centralTopic);
+
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            JAXBUtils.saveMap(mindmapMap,out,"com.wisemapping.xml.mindmap");
+
+            map = new MindMap();
+            map.setNativeXml(out.toString());
+            map.setTitle(mapName);
+            map.setDescription(description);
+            map.setNativeBrowser(new MindMapNative());
+
+        } catch (JAXBException e) {
+            throw new ImporterException(e);
+        } catch (IOException e) {
+            throw new ImporterException(e);
+        }
+
+        return map;
+    }
+
+    private void addTopicFromNode(Node mainNode, TopicType topic)
+    {
+        final List<Object> freemindNodes = mainNode.getArrowlinkOrCloudOrEdge();
+        TopicType currentTopic = topic;
+        int order = 0;
+        for (Object freemindNode : freemindNodes) {
+
+            if (freemindNode instanceof Node)
+            {
+                final Node node = (Node) freemindNode;
+                TopicType newTopic = mindmapObjectFactory.createTopicType();
+                newTopic.setOrder(order++);
+                String url = node.getLINK();
+                if (url != null)
+                {
+                    final Link link = new Link();
+                    link.setUrl(url);
+                    newTopic.setLink(link);
+                }
+                setNodePropertiesToTopic(newTopic, node);
+                addTopicFromNode(node,newTopic);
+                if (!newTopic.equals(topic))
+                {
+                    topic.getTopic().add(newTopic);
+                }
+                currentTopic = newTopic;
+            }
+            else if (freemindNode instanceof Font)
+            {
+                final Font font = (Font)freemindNode;
+                final String fontStyle = generateFontStyle(mainNode, font);
+                currentTopic.setFontStyle(fontStyle);
+            }
+            else if (freemindNode instanceof Edge)
+            {
+                final Edge edge = (Edge)freemindNode;
+                currentTopic.setBrColor(edge.getCOLOR());
+            }
+            else if (freemindNode instanceof Icon)
+            {
+                final Icon freemindIcon = (Icon)freemindNode;
+                final com.wisemapping.xml.mindmap.Icon mindmapIcon = new com.wisemapping.xml.mindmap.Icon();
+                final String mindmapIconId = FreemindIconMapper.getMindmapIcon(freemindIcon.getBUILTIN());
+                mindmapIcon.setId(mindmapIconId);
+                currentTopic.getIcon().add(mindmapIcon);
+            }
+            else if (freemindNode instanceof Hook)
+            {
+                final Hook hook = (Hook)freemindNode;
+                final com.wisemapping.xml.mindmap.Note mindmapNote = new com.wisemapping.xml.mindmap.Note();
+                String textNote = hook.getText();
+                if (textNote == null) // It is not a note is a BlinkingNodeHook or AutomaticLayout Hook
+                {
+                    textNote = textNote != null ? textNote.replaceAll("\n","%0A") : EMPTY_NOTE;
+                    mindmapNote.setText(textNote);
+                    currentTopic.setNote(mindmapNote);
+                }
+            }
+        }
+    }
+
+    private void setNodePropertiesToTopic( com.wisemapping.xml.mindmap.TopicType mindmapTopic,com.wisemapping.xml.freemind.Node freemindNode)
+    {
+        mindmapTopic.setText(freemindNode.getTEXT());
+        mindmapTopic.setBgColor(freemindNode.getBACKGROUNDCOLOR());
+
+        final String shape = getShapeFormFromNode(freemindNode);
+        mindmapTopic.setShape(shape);
+        int pos = 1;
+        if (POSITION_LEFT.equals(freemindNode.getPOSITION()))
+        {
+            pos = -1;
+        }
+        Integer orderPosition = mindmapTopic.getOrder() != null ? mindmapTopic.getOrder() : 0;
+        int position = pos * 200 + (orderPosition +1)*10;
+
+        mindmapTopic.setPosition( position+","+200 * orderPosition);
+        generateFontStyle(freemindNode,null);
+    }
+
+    private String generateFontStyle(Node node,Font font)
+    {
+        /*
+        * MindmapFont format : fontName ; size ; color ; bold; italic;
+        * eg: Verdana;10;#ffffff;bold;italic;
+        *
+        */
+        StringBuilder fontStyle = new StringBuilder();
+        if (font != null)
+        {
+            fontStyle.append(fixFontName(font));
+            fontStyle.append(";");
+            BigInteger bigInteger = font.getSIZE().intValue() < 8 ? BigInteger.valueOf(8) : font.getSIZE();
+            fontStyle.append(bigInteger);
+            fontStyle.append(";");
+            fontStyle.append(node.getCOLOR());
+            fontStyle.append(";");
+
+            boolean hasBold = Boolean.parseBoolean(font.getBOLD());
+
+            fontStyle.append(hasBold ? BOLD : null);
+            fontStyle.append(";");
+
+            boolean hasItalic = Boolean.parseBoolean(font.getITALIC());
+            fontStyle.append(hasItalic ? ITALIC : null);
+            fontStyle.append(";");
+        }
+        else
+        {
+            fontStyle.append(";");
+            fontStyle.append(";");
+            fontStyle.append(node.getCOLOR());
+            fontStyle.append(";");
+            fontStyle.append(";");
+            fontStyle.append(";");
+        }
+
+        return fontStyle.toString();
+    }
+
+    private String fixFontName(Font font)
+    {
+        String fontName = com.wisemapping.model.Font.ARIAL.getFontName(); // Default Font
+        if (com.wisemapping.model.Font.isValidFont(font.getNAME()))
+        {
+            fontName = font.getNAME();
+        }
+        return fontName;
+    }
+    
+    private String getShapeFormFromNode(Node node)
+    {
+        String shape = node.getSTYLE();
+        // In freemind a node without style is a line
+        if ("bubble".equals(shape))
+        {
+            shape= ShapeStyle.ROUNDED_RETAGLE.getStyle();
+        }
+        else
+        {
+            shape=ShapeStyle.LINE.getStyle();
+        }
+        return shape;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java b/trunk/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
new file mode 100644
index 00000000..a17f2322
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
@@ -0,0 +1,96 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// ...........................................................................................................
+// (C) Copyright  1996/2007 Fuego Inc.  All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF Fuego Inc.
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+//
+// Last changed on 2007-04-03 09:29:20 (-0300), by: nachomanz. $Revision$
+// ...........................................................................................................
+
+package com.wisemapping.mail;
+
+import org.apache.velocity.app.VelocityEngine;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.mail.javamail.MimeMessagePreparator;
+import org.springframework.ui.velocity.VelocityEngineUtils;
+
+import javax.mail.internet.MimeMessage;
+import java.util.Map;
+
+public final class Mailer {
+
+    //~ Instance fields ......................................................................................
+
+    private JavaMailSender mailSender;
+    private VelocityEngine velocityEngine;
+    private String registrationEmail;
+    private String siteEmail;
+
+    //~ Methods ..............................................................................................
+
+    public Mailer(String registrationEmail, String siteEmail)
+    {
+        this.registrationEmail = registrationEmail;
+        this.siteEmail = siteEmail;
+    }
+
+    public String getRegistrationEmail()
+    {
+        return registrationEmail;
+    }
+
+    public String getSiteEmail()
+    {
+        return siteEmail;
+    }
+
+    public void sendEmail(final String from, final String to, final String subject, final Map model,
+                          final String templateMail) {
+        final MimeMessagePreparator preparator =
+                new MimeMessagePreparator() {
+                    public void prepare(MimeMessage mimeMessage)
+                            throws Exception {
+                        final MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
+                        message.setTo(to);
+                        message.setFrom(from);
+                        message.setSubject(subject);
+
+                        final String text =
+                                VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, "/mail/" + templateMail,
+                                        model);
+
+                        message.setText(text, true);
+                    }
+                };
+
+        this.mailSender.send(preparator);
+    }
+
+    public void setMailSender(JavaMailSender mailer) {
+        this.mailSender = mailer;
+    }
+
+    public void setVelocityEngine(VelocityEngine engine) {
+        this.velocityEngine = engine;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/mail/SmtpAuthenticator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/mail/SmtpAuthenticator.java
new file mode 100755
index 00000000..f2080c11
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/mail/SmtpAuthenticator.java
@@ -0,0 +1,42 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.mail;
+
+import javax.mail.Authenticator;
+import javax.mail.PasswordAuthentication;
+
+public class SmtpAuthenticator 
+	extends Authenticator 
+{
+	private String username;
+	private String password;
+
+	public SmtpAuthenticator(String username, String password) 
+	{
+		super();
+		this.username = username;
+		this.password = password;
+	}
+
+	public PasswordAuthentication getPasswordAuthentication() 
+	{
+		return new PasswordAuthentication(username, password);
+	}
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/ColaborationEmail.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/ColaborationEmail.java
new file mode 100755
index 00000000..d353879d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/ColaborationEmail.java
@@ -0,0 +1,44 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public class ColaborationEmail
+{
+    private String subject;
+    private String message;
+
+    public ColaborationEmail(){}
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/Colaborator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/Colaborator.java
new file mode 100755
index 00000000..745282df
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/Colaborator.java
@@ -0,0 +1,77 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+import java.util.Calendar;
+import java.util.Set;
+import java.util.HashSet;
+
+
+public class Colaborator {
+    private long id;
+    private String email;
+    private Calendar creationDate;
+    private Set<MindmapUser> mindmapUsers = new HashSet<MindmapUser>();
+
+    public Colaborator() {}
+
+     public Colaborator(Set<MindmapUser> mindmapUsers) {
+        this.mindmapUsers = mindmapUsers;
+    }
+
+    public void setMindmapUsers(Set<MindmapUser> mindmapUsers)
+    {
+        this.mindmapUsers = mindmapUsers;
+    }
+
+    public void addMindmapUser(MindmapUser mindmaUser)
+    {
+       mindmapUsers.add(mindmaUser);
+    }
+
+    public Set<MindmapUser> getMindmapUsers()
+    {
+        return mindmapUsers;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Calendar getCreationDate() {
+        return creationDate;
+    }
+
+    public void setCreationDate(Calendar creationDate) {
+        this.creationDate = creationDate;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/Constants.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/Constants.java
new file mode 100755
index 00000000..d83c0c9a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/Constants.java
@@ -0,0 +1,34 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public class Constants {
+
+    public static int WELCOME_MAP_ID =49 ;
+    public  static final int MAX_MAP_NAME_LENGTH = 512;
+    public static final int MAX_MAP_DESCRIPTION_LENGTH = 512;
+    public static final int MAX_USER_USERNAME_LENGTH = 255;
+    public static final int MAX_USER_LASTNAME_LENGTH = 255;
+    public static final int MAX_USER_FIRSTNAME_LENGTH = 255;
+    public static final int MAX_USER_PASSWORD_LENGTH = 255;
+    public static final int MAX_COMMENT_LENGTH = 512;
+    public static final int MAX_SUBJECT_LENGTH = 100;
+    public static final int MAX_TAGS_LENGTH=1014;
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/Font.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/Font.java
new file mode 100755
index 00000000..9a1612f0
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/Font.java
@@ -0,0 +1,53 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public enum Font {
+
+    VERDANA("Verdana"),
+    TIMES("Times"),
+    TAHOMA("Tahoma"),
+    ARIAL("Arial");
+
+    private String fontName;
+
+    Font (String name)
+    {
+        this.fontName = name;
+    }
+
+    public String getFontName()
+    {
+        return fontName;
+    }
+
+    public static boolean isValidFont(String font) {
+        boolean isValid = false;
+        try {
+            if (font != null) {
+                isValid = Font.valueOf(font.toUpperCase()) != null;
+            }
+        }
+        catch (IllegalArgumentException ignote) {
+        }
+
+        return isValid;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/ImageFamily.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/ImageFamily.java
new file mode 100755
index 00000000..9b29e6a4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/ImageFamily.java
@@ -0,0 +1,55 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public enum ImageFamily {
+    FLAG("FLAG","flag_"),
+    BULLET("BULLET","bullet_"),
+    TAG("TAG","tag_"),
+    NUMBER("NUMBER","number_"),
+    FACE("FACE","face_"),
+    FACE_FUNY("FACEFUNY","facefuny_"),
+    ARROW("ARROW","arrow_"),
+    ARROWC("ARROWC","arrowc_"),
+    CONN("CONN","conn_"),
+    BULB("BULB","bulb_"),
+    THUMB("THUMB","thumb_"),
+    TICK("TICK","tick_"),
+    ONOFF("ONOFF","onoff_"),
+    MONEY("MONEY","money_"),
+    CHART("CHART","chart_"),
+    TASK("TASK","task_");
+
+    private String prefix;
+    private String name;
+
+    ImageFamily(String name, String prefix) {
+        this.name = name;
+        this.prefix = prefix;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
new file mode 100644
index 00000000..85bb5f64
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
@@ -0,0 +1,288 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+// ...........................................................................................................
+// (C) Copyright  1996/2007 Fuego Inc.  All Rights Reserved
+// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF Fuego Inc.
+// The copyright notice above does not evidence any actual or intended
+// publication of such source code.
+//
+// Last changed on 2007-08-01 19:08:21 (-0300), by: imanzano. $Revision$
+// ...........................................................................................................
+
+package com.wisemapping.model;
+
+import com.wisemapping.exporter.ExportProperties;
+import com.wisemapping.exporter.SvgExporter;
+import com.wisemapping.util.ZipUtils;
+import com.wisemapping.xml.VmlToSvgConverter;
+import com.wisemapping.exporter.ExportException;
+import org.apache.batik.transcoder.TranscoderException;
+import org.apache.log4j.Logger;
+import org.xml.sax.SAXException;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.TransformerException;
+import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+public class MindMap {
+
+    //~ Instance fields ......................................................................................
+
+    final Logger logger = Logger.getLogger(MindMap.class.getName());
+    private Calendar creationTime;
+    private String creator;
+    private String description;
+
+    private int id;
+    private boolean isPublic;
+    private Calendar lastModificationTime;
+    private String lastModifierUser;
+
+    private Set<MindmapUser> mindmapUsers = new HashSet<MindmapUser>();
+    private MindMapNative nativeBrowser;
+    private User owner;
+    private String properties;
+    private String tags;
+    private String title;
+    private byte[] xml;
+
+    public static void main(String argv[]) {
+
+        String xml = "pepe\n hole";
+        xml = xml.replace("'", "\\'");
+        xml = xml.replace("\n", "");
+        xml = xml.trim();
+
+        System.out.println("xml:" + xml);
+
+    }
+
+    //~ Constructors .........................................................................................
+
+    public MindMap() {
+    }
+
+    public MindMap(Set<MindmapUser> mindmapUsers) {
+        this.mindmapUsers = mindmapUsers;
+    }
+
+    //~ Methods ..............................................................................................
+
+    public void setXml(byte[] xml) {
+        this.xml = xml;
+    }
+
+    public byte[] getXml() {
+        return xml;
+    }
+
+    public String getUnzippedXml()
+            throws IOException {
+        return ZipUtils.zipToString(xml);
+    }
+
+    public void setProperties(String properties) {
+        this.properties = properties;
+    }
+
+    public String getProperties() {
+        String ret;
+        if (properties == null) {
+            ret = "{zoom:0.7,saveOnLoad:true}";
+        } else {
+            ret = properties;
+        }
+
+        return ret;
+    }
+
+    public Set<MindmapUser> getMindmapUsers() {
+        return mindmapUsers;
+    }
+
+    public void setMindmapUsers(Set<MindmapUser> mindmapUsers) {
+        this.mindmapUsers = mindmapUsers;
+    }
+
+    public void addMindmapUser(MindmapUser mindmaUser) {
+        mindmapUsers.add(mindmaUser);
+    }
+
+    public boolean isPublic() {
+        return isPublic;
+    }
+
+    public void setPublic(boolean isPublic) {
+        this.isPublic = isPublic;
+    }
+
+    public Calendar getLastModificationTime() {
+        return lastModificationTime;
+    }
+
+    public Date getLastModificationDate() {
+        return new Date();
+    }
+
+    public void setLastModificationTime(Calendar lastModificationTime) {
+        this.lastModificationTime = lastModificationTime;
+    }
+
+    public String getLastModifierUser() {
+        return lastModifierUser;
+    }
+
+    public void setLastModifierUser(String lastModifierUser) {
+        this.lastModifierUser = lastModifierUser;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creatorUser) {
+        this.creator = creatorUser;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getNativeXml()
+            throws IOException {
+        return getUnzippedXml();
+    }
+
+
+    public String getNativeXmlAsJsLiteral()
+            throws IOException {
+        String xml = getNativeXml();
+        if (xml != null) {
+            xml = xml.replace("'", "\\'");
+            xml = xml.replace("\n", "");
+            xml = xml.trim();
+        }
+        return xml;
+    }
+
+    public void setNativeXml(String nativeXml)
+            throws IOException {
+        this.xml = ZipUtils.stringToZip(nativeXml);
+    }
+
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
+
+    public String getTags() {
+        return tags;
+    }
+
+    public char[] generateSvgXml()
+            throws IOException, JAXBException {
+        final MindMapNative mindmapNativeBrowser = this.getNativeBrowser();
+        String svgText = mindmapNativeBrowser.getUnzippedSvgXml();
+
+        if (svgText == null || svgText.length() == 0) {
+            // The map must be saved using IE. Convert VML to SVG.
+
+            // Add namespace to the converter ...
+            String vmlXml = mindmapNativeBrowser.getUnzippedVmlXml();
+            vmlXml = vmlXml.replaceFirst("<v:group ", "<v:group xmlns:v=\"http://wisemapping.com/xml/vmlmap\" ");
+
+            char[] bytes = vmlXml.toCharArray();
+            final CharArrayReader is = new CharArrayReader(bytes);
+
+            // Convert Map ...
+            final VmlToSvgConverter converter = new VmlToSvgConverter();
+            converter.convert(is);
+
+            final CharArrayWriter os = new CharArrayWriter();
+            converter.toXml(os);
+
+            return os.toCharArray();
+        } else {
+            String result = "<?xml version='1.0' encoding='UTF-8'?>\n" + svgText;
+
+            // Add namespace...
+            result = result.replaceFirst("<svg ", "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" ");
+            result = result.replaceAll("<image([^>]+)>", "<image$1/>");
+
+            return result.toCharArray();
+        }
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Calendar getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Calendar creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public void export(final ExportProperties properties, OutputStream output) throws JAXBException, TranscoderException, TransformerException, IOException, ParserConfigurationException, ExportException, SAXException, XMLStreamException {
+        SvgExporter.export(properties, this, output);
+    }
+
+    public void setOwner(User owner) {
+        this.owner = owner;
+    }
+
+    public User getOwner() {
+        return owner;
+    }
+
+    public MindMapNative getNativeBrowser() {
+        return nativeBrowser;
+    }
+
+    public void setNativeBrowser(MindMapNative nativeBrowser) {
+        this.nativeBrowser = nativeBrowser;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java
new file mode 100644
index 00000000..6ce01a6b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java
@@ -0,0 +1,86 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class MindMapCriteria {
+    private String title;
+    private String description;
+    private List<String> tags = new ArrayList<String>();
+    private boolean orConnector = false;
+    private int pageNro = 0;
+
+    public MindMapCriteria() {
+    }
+
+    public int getPageNro()
+    {
+        return pageNro;
+    }
+
+    public void setPageNro(int page)
+    {
+        this.pageNro = page;
+    }
+
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public void setTags(List<String> tags) {
+        this.tags = tags;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void orCriteria() {
+        this.orConnector = true;
+    }
+
+    public void andCriteria() {
+        this.orConnector = false;
+    }
+
+    public boolean isOrCriteria() {
+        return this.orConnector;
+    }
+
+    public boolean isEmpty() {
+        return !(getTags() != null && !getTags().isEmpty() || getTitle() != null || getDescription() != null);
+    }
+
+    public static MindMapCriteria EMPTY_CRITERIA = new MindMapCriteria();
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java
new file mode 100755
index 00000000..cee13fd6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java
@@ -0,0 +1,85 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+import com.wisemapping.util.ZipUtils;
+
+import java.util.Calendar;
+import java.io.IOException;
+
+public class MindMapHistory {
+
+    private int id;
+    private Calendar creationTime;
+    private String creator;
+    private byte[] xml;
+    private int mindmapId;
+
+    public MindMapHistory()
+    {
+
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getMindmapId() {
+        return mindmapId;
+    }
+
+    public void setMindmapId(int id) {
+        this.mindmapId = id;
+    }
+
+    public Calendar getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Calendar creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public byte[] getXml() {
+        return xml;
+    }
+
+    public void setXml(byte[] xml) {
+        this.xml = xml;
+    }
+
+    public String getNativeXml()
+            throws IOException
+    {
+        return ZipUtils.zipToString(xml);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapNative.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapNative.java
new file mode 100755
index 00000000..d44d6029
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindMapNative.java
@@ -0,0 +1,80 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+import com.wisemapping.util.ZipUtils;
+
+import java.io.IOException;
+
+/**
+ * This class contains the SVG and VML representation of the MindMap
+ */
+public class MindMapNative {
+    private int id;
+
+    private byte[] svgXml;
+    private byte[] vmlXml;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public byte[] getSvgXml() {
+        return svgXml;
+    }
+
+    public void setSvgXml(byte[] svgXml) {
+        this.svgXml = svgXml;
+    }
+
+    public byte[] getVmlXml() {
+        return vmlXml;
+    }
+
+    public void setVmlXml(byte[] vmlXml) {
+        this.vmlXml = vmlXml;
+    }
+
+    public String getUnzippedVmlXml()
+            throws IOException
+    {
+        return ZipUtils.zipToString(vmlXml);
+    }
+
+    public String getUnzippedSvgXml()
+            throws IOException
+    {
+        return ZipUtils.zipToString(svgXml);
+    }
+
+    public void setVmlXml(String xml) throws IOException {
+        // compress and set
+        vmlXml = ZipUtils.stringToZip(xml);
+    }
+
+     public void setSvgXml(String xml) throws IOException {
+        // compress and set
+        svgXml = ZipUtils.stringToZip(xml);
+    }    
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapImage.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapImage.java
new file mode 100755
index 00000000..10d8fa56
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapImage.java
@@ -0,0 +1,47 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public class MindmapImage 
+{
+    private String name;
+    private ImageFamily family;
+
+    public MindmapImage(String name, ImageFamily family)
+    {
+        this.name = name;
+        this.family = family;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public ImageFamily getFamily()
+    {
+        return family;
+    }
+
+    public String getId()
+    {
+        return family.getPrefix() + name;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapImagesFactory.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapImagesFactory.java
new file mode 100755
index 00000000..b72756c0
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapImagesFactory.java
@@ -0,0 +1,217 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+import java.util.*;
+
+public class MindmapImagesFactory {
+
+    private static Map<ImageFamily,List<MindmapImage>> images = new HashMap<ImageFamily,List<MindmapImage>>();
+
+    static {
+        images.put(ImageFamily.BULLET, getImagesBullet());
+        images.put(ImageFamily.FLAG,getImagesFlag());
+        images.put(ImageFamily.NUMBER,getImagesNumber());
+        images.put(ImageFamily.TAG,getImagesTag());
+        images.put(ImageFamily.TASK,getImagesTask());
+        images.put(ImageFamily.FACE,getImagesFaces());
+        images.put(ImageFamily.BULB,getImagesBulb());
+        images.put(ImageFamily.ARROW,getImagesArrow());
+        images.put(ImageFamily.ARROWC,getImagesArrowC());
+        images.put(ImageFamily.CONN,getImagesConn());
+        images.put(ImageFamily.THUMB,getImagesThumbs());
+        images.put(ImageFamily.TICK,getImagesTick());
+        images.put(ImageFamily.ONOFF,getImagesOnOff());
+        images.put(ImageFamily.MONEY,getImagesMoney());
+        images.put(ImageFamily.CHART,getImagesChart());
+    }
+
+    private static List<MindmapImage> getImagesFaces()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("plain",ImageFamily.FACE));
+        images.add(new MindmapImage("sad",ImageFamily.FACE));
+        images.add(new MindmapImage("crying",ImageFamily.FACE));
+        images.add(new MindmapImage("smile",ImageFamily.FACE));
+        images.add(new MindmapImage("surprise",ImageFamily.FACE));
+        images.add(new MindmapImage("wink",ImageFamily.FACE));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesArrow()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("up",ImageFamily.ARROW));
+        images.add(new MindmapImage("down",ImageFamily.ARROW));
+        images.add(new MindmapImage("left",ImageFamily.ARROW));
+        images.add(new MindmapImage("right",ImageFamily.ARROW));
+        return images;
+    }
+
+     private static List<MindmapImage> getImagesArrowC()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("undo",ImageFamily.ARROWC));
+        images.add(new MindmapImage("rotate_anticlockwise",ImageFamily.ARROWC));
+        images.add(new MindmapImage("rotate_clockwise",ImageFamily.ARROWC));
+        images.add(new MindmapImage("turn_left",ImageFamily.ARROWC));
+        images.add(new MindmapImage("turn_right",ImageFamily.ARROWC));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesBulb()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("light_on",ImageFamily.BULB));
+        images.add(new MindmapImage("light_off",ImageFamily.BULB));        
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesTick()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("tick",ImageFamily.TICK));
+        images.add(new MindmapImage("cross",ImageFamily.TICK));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesChart()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("bar",ImageFamily.CHART));
+        images.add(new MindmapImage("line",ImageFamily.CHART));
+        images.add(new MindmapImage("curve",ImageFamily.CHART));
+        images.add(new MindmapImage("pie",ImageFamily.CHART));
+        images.add(new MindmapImage("organisation",ImageFamily.CHART));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesOnOff()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("clock",ImageFamily.ONOFF));
+        images.add(new MindmapImage("clock_red",ImageFamily.ONOFF));
+        images.add(new MindmapImage("add",ImageFamily.ONOFF));
+        images.add(new MindmapImage("delete",ImageFamily.ONOFF));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesMoney()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("money",ImageFamily.MONEY));
+        images.add(new MindmapImage("dollar",ImageFamily.MONEY));
+        images.add(new MindmapImage("euro",ImageFamily.MONEY));
+        images.add(new MindmapImage("pound",ImageFamily.MONEY));
+        images.add(new MindmapImage("yen",ImageFamily.MONEY));
+        images.add(new MindmapImage("coins",ImageFamily.MONEY));
+        images.add(new MindmapImage("ruby",ImageFamily.MONEY));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesThumbs()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("thumb_up",ImageFamily.THUMB));
+        images.add(new MindmapImage("thumb_down",ImageFamily.THUMB));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesConn()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("connect",ImageFamily.CONN));
+        images.add(new MindmapImage("disconnect",ImageFamily.CONN));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesBullet()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("black",ImageFamily.BULLET));
+        images.add(new MindmapImage("blue",ImageFamily.BULLET));
+        images.add(new MindmapImage("green",ImageFamily.BULLET));
+        images.add(new MindmapImage("orange",ImageFamily.BULLET));
+        images.add(new MindmapImage("red",ImageFamily.BULLET));
+        images.add(new MindmapImage("pink",ImageFamily.BULLET));
+        images.add(new MindmapImage("purple",ImageFamily.BULLET));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesFlag()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("blue",ImageFamily.FLAG));
+        images.add(new MindmapImage("green",ImageFamily.FLAG));
+        images.add(new MindmapImage("orange",ImageFamily.FLAG));
+        images.add(new MindmapImage("pink",ImageFamily.FLAG));
+        images.add(new MindmapImage("purple",ImageFamily.FLAG));
+        images.add(new MindmapImage("yellow",ImageFamily.FLAG));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesNumber()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("one",ImageFamily.NUMBER));
+        images.add(new MindmapImage("two",ImageFamily.NUMBER));
+        images.add(new MindmapImage("three",ImageFamily.NUMBER));
+        images.add(new MindmapImage("four",ImageFamily.NUMBER));
+        images.add(new MindmapImage("five",ImageFamily.NUMBER));
+        images.add(new MindmapImage("six",ImageFamily.NUMBER));
+        images.add(new MindmapImage("seven",ImageFamily.NUMBER));
+        images.add(new MindmapImage("eight",ImageFamily.NUMBER));
+        images.add(new MindmapImage("nine",ImageFamily.NUMBER));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesTag()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("blue",ImageFamily.TAG));
+        images.add(new MindmapImage("green",ImageFamily.TAG));
+        images.add(new MindmapImage("orange",ImageFamily.TAG));
+        images.add(new MindmapImage("red",ImageFamily.TAG));
+        images.add(new MindmapImage("pink",ImageFamily.TAG));
+        images.add(new MindmapImage("yellow",ImageFamily.TAG));
+        return images;
+    }
+
+    private static List<MindmapImage> getImagesTask()
+    {
+        final List<MindmapImage> images = new ArrayList<MindmapImage>();
+        images.add(new MindmapImage("one",ImageFamily.TASK));
+        images.add(new MindmapImage("two",ImageFamily.TASK));
+        images.add(new MindmapImage("three",ImageFamily.TASK));
+        images.add(new MindmapImage("four",ImageFamily.TASK));
+        images.add(new MindmapImage("five",ImageFamily.TASK));
+        return images;
+    }
+
+    public static Collection<List<MindmapImage>> getAllImages()
+    {
+        return images.values();
+    }
+
+    public static List<MindmapImage> getImagesByFamily(ImageFamily family)
+    {
+        return images.get(family);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapUser.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapUser.java
new file mode 100644
index 00000000..4549159e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/MindmapUser.java
@@ -0,0 +1,89 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public class MindmapUser {
+
+    private int id;
+    private int roleId;
+    private MindMap mindMap;   
+    private Colaborator colaborator;
+
+    public MindmapUser(){ }
+
+    public MindmapUser(int role, Colaborator colaborator , MindMap mindmap)
+    {
+        this.roleId = role;
+        this.mindMap =mindmap;
+        this.colaborator = colaborator;
+
+        // Guarantee referential integrity
+		mindmap.addMindmapUser(this);
+		colaborator.addMindmapUser(this);
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(int roleId) {
+        this.roleId = roleId;
+    }
+
+    public UserRole getRole() {
+        return UserRole.values()[roleId];
+    }
+
+    public boolean isOwner() {
+        return getRole() == UserRole.OWNER;
+    }
+
+    public boolean isCollaborator() {
+        return getRole() == UserRole.COLLABORATOR;
+    }
+
+    public boolean isViewer() {
+        return getRole() == UserRole.VIEWER;
+    }
+
+    public MindMap getMindMap() {
+        return mindMap;
+    }
+
+    public void setMindMap(MindMap mindMap) {
+        this.mindMap = mindMap;
+    }
+
+    public Colaborator getColaborator() {
+        return colaborator;
+    }
+
+    public void setColaborator(Colaborator colaborator) {
+        this.colaborator = colaborator;
+    }    
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java
new file mode 100755
index 00000000..5ab943de
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java
@@ -0,0 +1,40 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public enum ShapeStyle
+{
+    LINE("line"),
+    ROUNDED_RETAGLE("rounded rectagle"),
+    RECTAGLE("rectagle"),
+    ELIPSE("elipse");
+
+    private String style;
+
+    ShapeStyle(String style)
+    {
+        this.style = style;
+    }
+
+    public String getStyle()
+    {
+        return style;
+    }    
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/User.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/User.java
new file mode 100644
index 00000000..e046dc8c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/User.java
@@ -0,0 +1,141 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+import java.io.Serializable;
+import java.util.*;
+
+public class User
+    extends Colaborator
+    implements Serializable
+{
+
+    private String firstname;
+    private String lastname;
+    private String password;
+    private long activationCode;
+    private Calendar activationDate;
+    private String username;
+    private Set<String> tags = new HashSet<String>();
+    private boolean allowSendEmail = false;
+
+    public User() {
+    }
+
+    public void setTags(Set<String> tags)
+    {
+        this.tags = tags;
+    }
+
+    public Set<String> getTags()
+    {
+        return tags;
+    }
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public boolean isActive() {
+        return activationDate != null;
+    }
+
+    public void setActivationCode(long code) {
+        this.activationCode = code;
+    }
+
+    public long getActivationCode() {
+        return activationCode;
+    }
+
+    public void setActivationDate(Calendar date) {
+        this.activationDate = date;
+    }
+
+    public Calendar getActivationDate() {
+        return activationDate;
+    }
+
+    public boolean isAllowSendEmail()
+    {
+        return allowSendEmail;
+    }
+
+    public void setAllowSendEmail(boolean allowSendEmail)
+    {
+        this.allowSendEmail = allowSendEmail;
+    }
+
+    public boolean getAllowSendEmail()
+    {
+        return allowSendEmail;
+    }    
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        final User user = (User) o;
+
+        if (!getEmail().equals(user.getEmail())) return false;
+        if (firstname != null ? !firstname.equals(user.firstname) : user.firstname != null) return false;
+        if (lastname != null ? !lastname.equals(user.lastname) : user.lastname != null) return false;
+        if (password != null ? !password.equals(user.password) : user.password != null) return false;
+
+        return true;
+    }
+
+    public int hashCode() {
+        int result;
+        result = (firstname != null ? firstname.hashCode() : 0);
+        result = 29 * result + (lastname != null ? lastname.hashCode() : 0);
+        result = 29 * result + (password != null ? password.hashCode() : 0);
+        result = 29 * result + getEmail().hashCode();
+        return result;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/UserLogin.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/UserLogin.java
new file mode 100755
index 00000000..07781347
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/UserLogin.java
@@ -0,0 +1,84 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+import java.io.Serializable;
+import java.util.Calendar;
+
+public class UserLogin
+    implements Serializable
+{
+
+	private int id;
+	private Calendar loginDate = null;
+	private String email = null;
+	
+    	public UserLogin()
+    	{
+	}
+
+	public int getId() {
+	        return id;
+    	}
+
+    	public void setId(int id) {
+        	this.id = id;
+    	}
+	
+	public void setLoginDate(Calendar loginDate)
+	{
+		this.loginDate = loginDate;
+	}
+		
+	public Calendar getLoginDate()
+	{
+		return loginDate;
+	}
+	
+	public void setEmail(String email)
+	{
+		this.email = email;
+	}
+	
+	public String getEmail()
+	{
+		return email;
+	}
+/*
+	public boolean equals(Object o) {
+        	if (this == o) return true;
+        	if (o == null || getClass() != o.getClass()) return false;
+
+        	final UserLogin userLogin = (UserLogin) o;
+
+        	if (loginDate.equals(userLogin.loginDate)) return false;
+        	if (email.equals(userLogin.email)) return false;        	
+
+        	return true;
+    	}
+
+    	public int hashCode() {
+        	int result;
+        	result = (loginDate!= null ? loginDate.hashCode() : 0);
+        	result = 29 * result + (email != null ? email.hashCode() : 0);        	
+        	return result;
+    	}
+    	*/
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/model/UserRole.java b/trunk/wise-webapp/src/main/java/com/wisemapping/model/UserRole.java
new file mode 100644
index 00000000..01d6e89c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/model/UserRole.java
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.model;
+
+public enum UserRole {
+    OWNER(true, true, true), COLLABORATOR(true, true, false), VIEWER(false, true, false);
+
+    private final boolean hasEditPermission;
+    private final boolean hasViewPermission;
+    private final boolean hasDeletePermission;
+
+    private UserRole(boolean hasEditPermission, boolean hasViewPermission, boolean hasDeletePermission) {
+        this.hasEditPermission = hasEditPermission;
+        this.hasViewPermission = hasViewPermission;
+        this.hasDeletePermission = hasDeletePermission;
+    }
+
+    public boolean hasEditPermission() {
+        return hasEditPermission;
+    }
+
+    public boolean hasViewPermission() {
+        return hasViewPermission;
+    }
+
+    public boolean hasDeletePermission() {
+        return hasDeletePermission;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/SVGWiseMap.xsd b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/SVGWiseMap.xsd
new file mode 100644
index 00000000..21f14e08
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/SVGWiseMap.xsd
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/2000/svg"
+           xmlns:svg="http://www.w3.org/2000/svg">
+
+    <xs:element name="ellipse">
+        <xs:complexType>
+            <xs:attribute name="visibility" use="required">
+                <xs:simpleType>
+                    <xs:restriction base="xs:NMTOKEN">
+                        <xs:enumeration value="hidden"/>
+                        <xs:enumeration value="visible"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="ry" type="xs:float" use="required"/>
+            <xs:attribute name="width" type="xs:float" use="required"/>
+            <xs:attribute name="rx" type="xs:float" use="required"/>
+            <xs:attribute name="cy" use="required" type="xs:float"/>
+            <xs:attribute name="cx" use="required" type="xs:float"/>
+            <xs:attribute name="stroke-width" type="xs:NMTOKEN" use="required"/>
+            <xs:attribute name="height" type="xs:float" use="required"/>
+            <xs:attribute name="fill" type="xs:string" use="required" fixed="#E0E5EF"/>
+            <xs:attribute name="stroke" type="xs:string" use="required" fixed="#023BB9"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="g">
+        <xs:complexType>
+            <xs:choice>
+                <xs:element ref="svg:ellipse"/>
+                <xs:element ref="svg:line"/>
+                <xs:element ref="svg:rect"/>
+                <xs:element ref="svg:text"/>
+            </xs:choice>
+            <xs:attribute name="height" type="xs:NMTOKEN" use="required" fixed="100"/>
+            <xs:attribute name="transform" type="xs:string" use="required"/>
+            <xs:attribute name="width" type="xs:NMTOKEN" use="required" fixed="100"/>
+            <xs:attribute name="preserveAspectRatio" type="xs:NMTOKEN" use="required" fixed="none"/>
+            <xs:attribute name="focusable" type="xs:NMTOKEN" use="required" fixed="true"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="line">
+        <xs:complexType>
+            <xs:attribute name="style" type="xs:string" use="optional"/>
+            <xs:attribute name="visibility" use="optional">
+                <xs:simpleType>
+                    <xs:restriction base="xs:NMTOKEN">
+                        <xs:enumeration value="hidden"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="stroke-opacity" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="fill-opacity" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="x1" use="required" type="xs:float"/>
+            <xs:attribute name="y1" use="required" type="xs:float"/>
+            <xs:attribute name="x2" use="required" type="xs:float"/>
+            <xs:attribute name="y2" use="required" type="xs:float"/>
+            <xs:attribute name="stroke-width" type="xs:NMTOKEN" use="required" fixed="1px"/>
+            <xs:attribute name="stroke" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="polyline">
+        <xs:complexType>
+            <xs:attribute name="fill-opacity" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="visibility" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="stroke-width" type="xs:NMTOKEN" use="required" fixed="1px"/>
+            <xs:attribute name="points" type="xs:string" use="optional"/>
+            <xs:attribute name="stroke-opacity" use="required">
+                <xs:simpleType>
+                    <xs:restriction base="xs:NMTOKEN">
+                        <xs:enumeration value="0.4"/>
+                        <xs:enumeration value="1"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="stroke" type="xs:string" use="required"/>
+            <xs:attribute name="fill" type="xs:NMTOKEN" use="required" fixed="none"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="rect">
+        <xs:complexType>
+            <xs:attribute name="visibility" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="style" type="xs:string" use="optional"/>
+            <xs:attribute name="ry" use="optional" type="xs:float"/>
+            <xs:attribute name="width" type="xs:NMTOKEN" use="required"/>
+            <xs:attribute name="rx" use="optional" type="xs:float"/>
+            <xs:attribute name="stroke-opacity" use="optional" type="xs:float"/>
+            <xs:attribute name="fill-opacity" use="optional" type="xs:float"/>
+            <xs:attribute name="y" use="required" type="xs:float"/>
+            <xs:attribute name="x" use="required" type="xs:float"/>
+            <xs:attribute name="stroke-width" use="required" type="xs:string"/>
+            <xs:attribute name="height" use="required" type="xs:float"/>
+            <xs:attribute name="fill" type="xs:string" use="required"/>
+            <xs:attribute name="stroke" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="svg">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="svg:polyline" maxOccurs="unbounded"/>
+                <xs:element ref="svg:line" maxOccurs="unbounded"/>
+                <xs:element ref="svg:g" maxOccurs="unbounded"/>
+                <xs:element ref="svg:rect" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="height" type="xs:NMTOKEN" use="required"/>
+            <xs:attribute name="width" type="xs:NMTOKEN" use="required"/>
+            <xs:attribute name="viewBox" type="xs:string" use="required"/>
+            <xs:attribute name="preserveAspectRatio" type="xs:NMTOKEN" use="required"/>
+            <xs:attribute name="focusable" type="xs:NMTOKEN" use="required"/>
+            <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="text">
+        <xs:complexType mixed="true">
+            <xs:attribute name="font-style" use="required">
+                <xs:simpleType>
+                    <xs:restriction base="xs:NMTOKEN">
+                        <xs:enumeration value="italic"/>
+                        <xs:enumeration value="normal"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="style" type="xs:string" use="required"/>
+            <xs:attribute name="font-size" use="required" type="xs:float"/>
+            <xs:attribute name="font-family" type="xs:NMTOKEN" use="required" fixed="verdana"/>
+            <xs:attribute name="font-weight" use="required">
+                <xs:simpleType>
+                    <xs:restriction base="xs:NMTOKEN">
+                        <xs:enumeration value="bold"/>
+                        <xs:enumeration value="normal"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="y" use="required" type="xs:float"/>
+            <xs:attribute name="focusable" type="xs:NMTOKEN" use="required" fixed="true"/>
+            <xs:attribute name="x" use="required" type="xs:float"/>
+            <xs:attribute name="fill" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/VMLWiseMap.xsd b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/VMLWiseMap.xsd
new file mode 100644
index 00000000..94dd6a0b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/VMLWiseMap.xsd
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://mindmap.com/xml/vmlmap"
+           xmlns:v="http://mindmap.com/xml/vmlmap">
+
+    <xs:complexType name="element">
+        <xs:attribute name="style" type="xs:string" use="optional"/>
+        <xs:attribute name="strokecolor" type="xs:string" use="required"/>
+        <xs:attribute name="fillcolor" type="xs:string" use="optional"/>
+        <xs:attribute name="strokeweight" type="xs:string" use="optional"/>
+        <xs:attribute name="opacity" use="optional" type="xs:string"/>
+    </xs:complexType>
+
+    <xs:element name="fill">
+        <xs:complexType>
+            <xs:attribute name="opacity" use="optional" type="xs:string"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="group">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+                    <xs:choice>
+                        <xs:element ref="v:group" maxOccurs="unbounded"/>
+                        <xs:element ref="v:line" maxOccurs="unbounded"/>
+                        <xs:element ref="v:oval" maxOccurs="unbounded"/>
+                        <xs:element ref="v:polyline" maxOccurs="unbounded"/>
+                        <xs:element ref="v:rect" maxOccurs="unbounded"/>
+                        <xs:element ref="v:roundrect" maxOccurs="unbounded"/>
+                        <xs:element ref="v:shape" maxOccurs="unbounded"/>
+                    </xs:choice>
+                    <xs:attribute name="coordorigin" type="xs:string" use="optional"/>
+                    <xs:attribute name="coordsize" type="xs:string" use="required"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="line">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+                    <xs:sequence>
+                        <xs:element ref="v:stroke"/>
+                        <xs:element ref="v:fill" minOccurs="0"/>
+                    </xs:sequence>
+                    <xs:attribute name="stroked" type="xs:NMTOKEN" use="required" fixed="t"/>
+                    <xs:attribute name="to" type="xs:string" use="required"/>
+                    <xs:attribute name="from" type="xs:string" use="required"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+
+    </xs:element>
+
+    <xs:element name="oval">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+                    <xs:sequence>
+                        <xs:element ref="v:stroke"/>
+                        <xs:element ref="v:fill"/>
+                    </xs:sequence>
+                    <xs:attribute name="coordsize" type="xs:string" use="required" fixed="21600,21600"/>
+                    <xs:attribute name="stroked" type="xs:NMTOKEN" use="required" fixed="t"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="polyline">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+
+                    <xs:sequence>
+                        <xs:element ref="v:stroke"/>
+                        <xs:element ref="v:fill" minOccurs="0"/>
+                    </xs:sequence>
+                    <xs:attribute name="points" type="xs:string" use="optional"/>
+                    <xs:attribute name="xPoints" type="xs:string" use="optional"/>
+                    <xs:attribute name="filled" type="xs:NMTOKEN" use="required" fixed="f"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="rect">
+
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+
+                    <xs:sequence>
+                        <xs:element ref="v:stroke"/>
+                        <xs:element ref="v:fill"/>
+                    </xs:sequence>
+                    <xs:attribute name="coordsize" type="xs:string" use="required"/>
+                    <xs:attribute name="stroked" type="xs:NMTOKEN" use="required"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+
+    </xs:element>
+
+    <xs:element name="roundrect">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+                    <xs:sequence>
+                        <xs:element ref="v:stroke"/>
+                        <xs:element ref="v:fill"/>
+                    </xs:sequence>
+                    <xs:attribute name="arcsize" type="xs:NMTOKEN" use="required" fixed="9830f"/>
+                    <xs:attribute name="coordsize" type="xs:string" use="required" fixed="21600,21600"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+
+    </xs:element>
+
+    <xs:element name="shape">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+
+                    <xs:sequence>
+                        <xs:element ref="v:textbox"/>
+                    </xs:sequence>
+                    <xs:attribute name="coordsize" type="xs:string" use="required" fixed="100,100"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+
+    </xs:element>
+
+    <xs:element name="stroke">
+        <xs:complexType>
+            <xs:attribute name="dashstyle" use="optional">
+                <xs:simpleType>
+                    <xs:restriction base="xs:NMTOKEN">
+                        <xs:enumeration value="solid"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="textbox">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="v:element">
+
+                    <xs:sequence>
+                        <xs:element name="SPAN">
+                            <xs:complexType>
+                                <xs:sequence>
+                                    <xs:element name="SPAN" type="xs:string"/>
+                                </xs:sequence>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                    <xs:attribute name="inset" type="xs:string" use="required" fixed="0,0,0,0"/>
+                    <xs:attribute name="xFontScale" type="xs:float" use="required"/>
+                    <xs:attribute name="xTextSize" type="xs:string" use="required"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleSVG.xml b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleSVG.xml
new file mode 100644
index 00000000..aa0e5292
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleSVG.xml
@@ -0,0 +1,228 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" viewBox="-433.65 -228.9 867.3 457.8"
+     height="654" width="1239" id="workspace" focusable="true">
+    <polyline points="173.5,100 183.5,100 183.5,129 188.5,134 240,134" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <polyline points="173.5,100 183.5,100 183.5,105 188.5,110 240,110" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <polyline points="173.5,100 183.5,100 183.5,91 188.5,86 240,86" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <polyline points="173.5,100 183.5,100 183.5,67 188.5,62 240,62" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <line y1="0" x1="0" y2="100" x2="-175" stroke="#495879" stroke-width="1px"></line>
+    <polyline points="-229.5,-150 -239.5,-150 -239.5,-121 -244.5,-116 -296,-116" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <polyline points="-229.5,-150 -239.5,-150 -239.5,-145 -244.5,-140 -296,-140" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <polyline points="-229.5,-150 -239.5,-150 -239.5,-159 -244.5,-164 -296,-164" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <polyline points="-229.5,-150 -239.5,-150 -239.5,-183 -244.5,-188 -296,-188" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <line y1="0" x1="0" y2="-150" x2="-163.5" stroke="#495879" stroke-width="1px"></line>
+    <polyline points="206.5,0 216.5,0 216.5,29 221.5,34 261.5,34" stroke-opacity="1" stroke="#495879" stroke-width="1px"
+              fill="none"></polyline>
+    <polyline points="206.5,0 216.5,0 216.5,5 221.5,10 263,10" stroke-opacity="1" stroke="#495879" stroke-width="1px"
+              fill="none"></polyline>
+    <polyline points="206.5,0 216.5,0 216.5,-9 221.5,-14 261.5,-14" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <polyline points="206.5,0 216.5,0 216.5,-33 221.5,-38 263,-38" stroke-opacity="1" stroke="#495879"
+              stroke-width="1px" fill="none"></polyline>
+    <line y1="0" x1="0" y2="0" x2="140.5" stroke="#495879" stroke-width="1px"></line>
+    <rect visibility="hidden" fill-opacity="0.4" stroke-opacity="0.4" fill="#CC0033;" stroke="#FF9933;"
+          stroke-width="1px" y="5" x="5" height="10" width="50"></rect>
+    <polyline visibility="hidden" fill-opacity="0.4" stroke-opacity="0.4" stroke="#CC0033;" stroke-width="1px"
+              fill="none"></polyline>
+    <line visibility="hidden" fill-opacity="0.4" stroke-opacity="0.4" stroke="#CC0033;" stroke-width="1px"></line>
+    <rect visibility="hidden" fill-opacity="0.4" stroke-opacity="0.4" fill="#CC0033;" stroke="#FF9933;"
+          stroke-width="1px" y="5" x="5" height="10" width="50"></rect>
+    <g transform="translate(225, -52) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="42"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="39" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Node 0
+        </text>
+    </g>
+    <g transform="translate(225, -28) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="41"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="38" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Node 1
+        </text>
+    </g>
+    <g transform="translate(225, -4) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="42"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="39" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Node 2
+        </text>
+    </g>
+    <g transform="translate(225, 20) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="41"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="38" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Node 3
+        </text>
+    </g>
+    <g transform="translate(139, -9) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3.6" rx="3.6" height="24" width="71"></rect>
+        <rect style="cursor: move;" fill="#E0E5EF" stroke="#023BB9" stroke-width="0.5px" y="0" x="0" ry="2.7" rx="2.7"
+              height="18" width="67"></rect>
+        <text x="4" y="12" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="10.75" font-family="verdana" focusable="true">Main Topic
+        </text>
+        <ellipse stroke="#023BB9" visibility="visible" fill="#E0E5EF" stroke-width="0.5px" cy="9" cx="70" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+    </g>
+    <g transform="translate(-296, -202) scale(1, 1)" height="100" width="100" focusable="true"
+       preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(-296, -178) scale(1, 1)" height="100" width="100" focusable="true"
+       preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(-296, -154) scale(1, 1)" height="100" width="100" focusable="true"
+       preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(-296, -130) scale(1, 1)" height="100" width="100" focusable="true"
+       preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(-229, -159) scale(1, 1)" height="100" width="100" focusable="true"
+       preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3.6" rx="3.6" height="24" width="71"></rect>
+        <rect style="cursor: move;" fill="#E0E5EF" stroke="#023BB9" stroke-width="0.5px" y="0" x="0" ry="2.7" rx="2.7"
+              height="18" width="67"></rect>
+        <text x="4" y="12" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="10.75" font-family="verdana" focusable="true">Main Topic
+        </text>
+        <ellipse stroke="#023BB9" visibility="visible" fill="#E0E5EF" stroke-width="0.5px" cy="9" cx="-3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+    </g>
+    <g transform="translate(-241, 91) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3.6" rx="3.6" height="24" width="72"></rect>
+        <rect style="cursor: move;" fill="#E0E5EF" stroke="#023BB9" stroke-width="0.5px" y="0" x="0" ry="2.7" rx="2.7"
+              height="18" width="68"></rect>
+        <text x="4" y="12" style="cursor: move;" fill="#00cccc" font-weight="normal" font-style="italic"
+              font-size="10.75" font-family="verdana" focusable="true">Main Topic
+        </text>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+    </g>
+    <g transform="translate(-58, -15) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="5.55" rx="5.55" height="37" width="120"></rect>
+        <rect style="cursor: default;" stroke="#023BB9" fill="#f7f7f7" stroke-width="0.5px" y="0" x="0" ry="4.65"
+              rx="4.65" height="31" width="116"></rect>
+        <text x="9" y="19" style="cursor: default;" fill="#023BB9" font-weight="bold" font-style="normal"
+              font-size="13.4375" font-family="verdana" focusable="true">Central Topic
+        </text>
+    </g>
+    <g transform="translate(192, 48) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(192, 72) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(192, 96) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(192, 120) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3" rx="3" height="20" width="52"></rect>
+        <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+        <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+              stroke-width="1px"></line>
+        <text x="3" y="9" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="8.0625" font-family="verdana" focusable="true">Sub Topic
+        </text>
+    </g>
+    <g transform="translate(86, 91) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+        <rect fill-opacity="0" stroke-opacity="0" fill="#dbe2e6" stroke="#77555a" stroke-width="1px" y="-3" x="-2"
+              ry="3.6" rx="3.6" height="24" width="91"></rect>
+        <rect style="cursor: move;" fill="#E0E5EF" stroke="#023BB9" stroke-width="0.5px" y="0" x="0" ry="2.7" rx="2.7"
+              height="18" width="87"></rect>
+        <text x="4" y="12" style="cursor: move;" fill="#525c61" font-weight="normal" font-style="normal"
+              font-size="10.75" font-family="verdana" focusable="true">Isolated Topic
+        </text>
+        <ellipse stroke="#023BB9" visibility="visible" fill="#E0E5EF" stroke-width="0.5px" cy="9" cx="90" ry="3" rx="3"
+                 height="6" width="6"></ellipse>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleVML.html b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleVML.html
new file mode 100644
index 00000000..5b2dc44f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleVML.html
@@ -0,0 +1,577 @@
+<HTML xmlns:v="urn:schemas-microsoft-com:vml">
+<HEAD>
+    <STYLE>
+        v\:* {
+            behavior: url( #default#VML );
+        }
+
+    </STYLE>
+    <TITLE>VML Sample</TITLE>
+</HEAD>
+<BODY>
+
+
+<DIV id=workspaceContainer
+     style="BORDER-RIGHT: #edf1be 0px solid; BORDER-TOP: #edf1be 0px solid; LEFT: 0px; OVERFLOW: hidden; BORDER-LEFT: #edf1be 0px solid; WIDTH: 1270px; BORDER-BOTTOM: #edf1be 0px solid; POSITION: relative; TOP: 0px; HEIGHT: 705px; BACKGROUND-COLOR: #ffffff"><?xml:namespace prefix = v ns = "urn:schemas-microsoft-com:vml" />
+<v:group style="WIDTH: 1270px; POSITION: absolute; HEIGHT: 705px" coordsize="889,493" coordorigin="-445,-247">
+<v:polyline style="POSITION: absolute"
+            readPoints="167.1, 100.0 177.1, 100.0 177.1, 130.5 182.1, 135.5 230.6, 135.5"
+            points="334,200,344,200,344,230,349,235,397,235" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute"
+            readPoints="167.1, 100.0 177.1, 100.0 177.1, 106.5 182.1, 111.5 230.6, 111.5"
+            points="334,200,344,200,344,206,349,211,397,211" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute"
+            readPoints="167.1, 100.0 177.1, 100.0 177.1, 92.5 182.1, 87.5 230.6, 87.5"
+            points="334,187,344,187,344,179,349,174,397,174" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute"
+            readPoints="167.1, 100.0 177.1, 100.0 177.1, 68.5 182.1, 63.5 230.6, 63.5"
+            points="334,163,344,163,344,131,349,126,397,126" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:line style="POSITION: absolute" from="0,0" to="-176,100" fillcolor="white" stroked="t" strokecolor="#495879"
+        strokeweight="1.5pt">
+    <v:stroke dashstyle="solid"></v:stroke>
+</v:line>
+<v:polyline style="POSITION: absolute"
+            readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -119.5 -241.3, -114.5 -289.6, -114.5"
+            points="-515,-300,-525,-300,-525,-269,-530,-264,-578,-264" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute"
+            readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -143.5 -241.3, -138.5 -289.6, -138.5"
+            points="-515,-300,-525,-300,-525,-293,-530,-288,-578,-288" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute"
+            readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -157.5 -241.3, -162.5 -289.6, -162.5"
+            points="-515,-312,-525,-312,-525,-319,-530,-324,-578,-324" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute"
+            readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -181.5 -241.3, -186.5 -289.6, -186.5"
+            points="-515,-336,-525,-336,-525,-367,-530,-372,-578,-372" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:line style="POSITION: absolute" from="0,0" to="-164,-150" fillcolor="white" stroked="t" strokecolor="#495879"
+        strokeweight="1.5pt">
+    <v:stroke dashstyle="solid"></v:stroke>
+</v:line>
+<v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, 30.5 218.3, 35.5 256.0, 35.5"
+            points="406,0,416,0,416,30,421,35,459,35" filled="f" strokecolor="#495879" strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, 6.5 218.3, 11.5 256.0, 11.5"
+            points="406,0,416,0,416,6,421,11,459,11" filled="f" strokecolor="#495879" strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, -7.5 218.3, -12.5 256.0, -12.5"
+            points="406,-12,416,-12,416,-19,421,-24,459,-24" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, -31.5 218.3, -36.5 256.0, -36.5"
+            points="406,-36,416,-36,416,-67,421,-72,459,-72" filled="f" strokecolor="#495879"
+            strokeweight=".75pt">
+    <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+</v:polyline>
+<v:line style="POSITION: absolute" from="0,0" to="141,0" fillcolor="white" stroked="t" strokecolor="#495879"
+        strokeweight="1.5pt">
+    <v:stroke dashstyle="solid"></v:stroke>
+</v:line>
+<v:rect style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 50px; POSITION: absolute; TOP: 5px; HEIGHT: 10px"
+        coordsize="21600,21600" fillcolor="#c03" stroked="t" strokecolor="#f93" strokeweight="13619emu">
+    <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+    <v:fill opacity="26214f"></v:fill>
+</v:rect>
+<v:polyline style="VISIBILITY: hidden; POSITION: absolute" filled="f" strokecolor="#c03" strokeweight=".75pt">
+    <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+    <v:fill opacity="26214f"></v:fill>
+</v:polyline>
+<v:line style="VISIBILITY: hidden; POSITION: absolute" from="0,0" to="0,0" fillcolor="white" stroked="t"
+        strokecolor="#c03" strokeweight="1.5pt">
+    <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+    <v:fill opacity="26214f"></v:fill>
+</v:line>
+<v:rect style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 50px; POSITION: absolute; TOP: 5px; HEIGHT: 10px"
+        coordsize="21600,21600" fillcolor="#c03" stroked="t" strokecolor="#f93" strokeweight="13619emu">
+    <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+    <v:fill opacity="26214f"></v:fill>
+</v:rect>
+<v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -53px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.031pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.375pt; OVERFLOW: visible; WIDTH: 37.812pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Node 0</SPAN></SPAN></v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -29px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.281pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.375pt; OVERFLOW: visible; WIDTH: 37.812pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Node 1</SPAN></SPAN></v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -5px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.5pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.375pt; OVERFLOW: visible; WIDTH: 37.812pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Node 2</SPAN></SPAN></v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 19px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.375pt; OVERFLOW: visible; WIDTH: 37.812pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Node 3</SPAN></SPAN></v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 140px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -11px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 66px; POSITION: absolute; TOP: -3px; HEIGHT: 29px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:roundrect style="LEFT: 0px; WIDTH: 62px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                 arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                 strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:roundrect>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 3px; WIDTH: 80px; CURSOR: move; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.625pt; LEFT: auto; FONT: 15px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 84.968pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Main Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+    <v:oval style="LEFT: 62px; VISIBILITY: visible; WIDTH: 6px; POSITION: absolute; TOP: 8px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+</v:group>
+<v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -203px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.406pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -179px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.656pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -155px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.125pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -131px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.375pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: -226px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -161px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 66px; POSITION: absolute; TOP: -3px; HEIGHT: 29px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:roundrect style="LEFT: 0px; WIDTH: 62px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                 arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                 strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:roundrect>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 3px; WIDTH: 80px; CURSOR: move; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.25pt; LEFT: auto; FONT: 15px verdana; MARGIN-LEFT: 0.562pt; OVERFLOW: visible; WIDTH: 84.968pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Main Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+    <v:oval style="LEFT: -6px; VISIBILITY: visible; WIDTH: 6px; POSITION: absolute; TOP: 8px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+</v:group>
+<v:group style="LEFT: -238px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 89px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 68px; POSITION: absolute; TOP: -3px; HEIGHT: 29px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:roundrect style="LEFT: 0px; WIDTH: 64px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                 arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                 strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:roundrect>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 3px; WIDTH: 80px; CURSOR: move; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.625pt; LEFT: auto; FONT: italic 15px verdana; MARGIN-LEFT: 0.031pt; OVERFLOW: visible; WIDTH: 84.968pt; COLOR: #00cccc; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Main Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+</v:group>
+<v:group style="LEFT: -59px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -18px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 122px; POSITION: absolute; TOP: -3px; HEIGHT: 43px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:roundrect style="LEFT: 0px; WIDTH: 118px; CURSOR: default; POSITION: absolute; TOP: 0px; HEIGHT: 37px"
+                 arcsize="9830f" coordsize="21600,21600" fillcolor="#f7f7f7" stroked="t" strokecolor="#023bb9"
+                 strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:roundrect>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 8px; WIDTH: 130px; CURSOR: default; POSITION: absolute; TOP: 6px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.718pt; LEFT: auto; FONT: bold 19px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 138.531pt; COLOR: #023bb9; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Central Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 47px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.031pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 71px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.281pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 95px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.5pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 119px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+    <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17"
+            fillcolor="white" stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+        <v:stroke></v:stroke>
+    </v:line>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Sub Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+</v:group>
+<v:group style="LEFT: 86px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 89px; HEIGHT: 100px"
+         coordsize="100,100">
+    <v:roundrect style="LEFT: -2px; WIDTH: 84px; POSITION: absolute; TOP: -3px; HEIGHT: 29px" arcsize="9830f"
+                 coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                 strokeweight="13619emu">
+        <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+        <v:fill opacity="0"></v:fill>
+    </v:roundrect>
+    <v:roundrect style="LEFT: 0px; WIDTH: 80px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                 arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                 strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:roundrect>
+    <v:shape
+            style="Z-INDEX: 10; LEFT: 3px; WIDTH: 112px; CURSOR: move; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+            coordsize="100,100">
+        <v:textbox
+                style="MARGIN-TOP: 0.625pt; LEFT: auto; FONT: 15px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 119.25pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                inset="0,0,0,0"><SPAN style="WIDTH: 100%; HEIGHT: 100%"><SPAN>Isolated Topic</SPAN></SPAN>
+        </v:textbox>
+    </v:shape>
+    <v:oval style="LEFT: 80px; VISIBILITY: visible; WIDTH: 6px; POSITION: absolute; TOP: 8px; HEIGHT: 6px"
+            coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+            strokeweight="6762emu">
+        <v:stroke dashstyle="solid"></v:stroke>
+        <v:fill></v:fill>
+    </v:oval>
+</v:group>
+</v:group>
+</DIV>
+</DIV>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleVML.xml b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleVML.xml
new file mode 100644
index 00000000..f6a0fcac
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/schemas/sampleVML.xml
@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+<v:group style="WIDTH: 1270px; POSITION: absolute; HEIGHT: 705px" coordsize="889,493" coordorigin="-444,-247">
+    <v:rect style="LEFT: -62px; VISIBILITY: visible; WIDTH: 124px; POSITION: absolute; TOP: -21px; HEIGHT: 43px"
+            coordsize="21600,21600" fillcolor="#c03" stroked="t" strokecolor="#f93" strokeweight="13619emu">
+        <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+        <v:fill opacity="26214f"></v:fill>
+    </v:rect>
+    <v:polyline style="VISIBILITY: hidden; POSITION: absolute" filled="f" strokecolor="#c03" strokeweight=".75pt">
+        <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+        <v:fill opacity="26214f"></v:fill>
+    </v:polyline>
+    <v:line style="VISIBILITY: visible; POSITION: absolute" from="258,-250" to="0,0" fillcolor="white" stroked="t"
+            strokecolor="#c03" strokeweight="1.5pt">
+        <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+        <v:fill opacity="26214f"></v:fill>
+    </v:line>
+    <v:polyline style="POSITION: absolute" readPoints="167.1, 100.0 177.1, 100.0 177.1, 130.5 182.1, 135.5 230.6, 135.5"
+                points="334,200,344,200,344,230,349,235,397,235" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute" readPoints="167.1, 100.0 177.1, 100.0 177.1, 106.5 182.1, 111.5 230.6, 111.5"
+                points="334,200,344,200,344,206,349,211,397,211" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute" readPoints="167.1, 100.0 177.1, 100.0 177.1, 92.5 182.1, 87.5 230.6, 87.5"
+                points="334,187,344,187,344,179,349,174,397,174" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute" readPoints="167.1, 100.0 177.1, 100.0 177.1, 68.5 182.1, 63.5 230.6, 63.5"
+                points="334,163,344,163,344,131,349,126,397,126" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:line style="POSITION: absolute" from="0,0" to="-176,100" fillcolor="white" stroked="t" strokecolor="#495879"
+            strokeweight="1.5pt">
+        <v:stroke dashstyle="solid"></v:stroke>
+    </v:line>
+    <v:polyline style="POSITION: absolute"
+                readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -119.5 -241.3, -114.5 -289.6, -114.5"
+                points="-515,-300,-525,-300,-525,-269,-530,-264,-578,-264" filled="f" strokecolor="#495879"
+                strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute"
+                readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -143.5 -241.3, -138.5 -289.6, -138.5"
+                points="-515,-300,-525,-300,-525,-293,-530,-288,-578,-288" filled="f" strokecolor="#495879"
+                strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute"
+                readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -157.5 -241.3, -162.5 -289.6, -162.5"
+                points="-515,-312,-525,-312,-525,-319,-530,-324,-578,-324" filled="f" strokecolor="#495879"
+                strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute"
+                readPoints="-226.3, -150.0 -236.3, -150.0 -236.3, -181.5 -241.3, -186.5 -289.6, -186.5"
+                points="-515,-336,-525,-336,-525,-367,-530,-372,-578,-372" filled="f" strokecolor="#495879"
+                strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:line style="POSITION: absolute" from="0,0" to="-164,-150" fillcolor="white" stroked="t" strokecolor="#495879"
+            strokeweight="1.5pt">
+        <v:stroke dashstyle="solid"></v:stroke>
+    </v:line>
+    <v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, 30.5 218.3, 35.5 256.0, 35.5"
+                points="406,0,416,0,416,30,421,35,459,35" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, 6.5 218.3, 11.5 256.0, 11.5"
+                points="406,0,416,0,416,6,421,11,459,11" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, -7.5 218.3, -12.5 256.0, -12.5"
+                points="406,-12,416,-12,416,-19,421,-24,459,-24" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:polyline style="POSITION: absolute" readPoints="203.3, 0.0 213.3, 0.0 213.3, -31.5 218.3, -36.5 256.0, -36.5"
+                points="406,-36,416,-36,416,-67,421,-72,459,-72" filled="f" strokecolor="#495879" strokeweight=".75pt">
+        <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+    </v:polyline>
+    <v:line style="POSITION: absolute" from="0,0" to="141,0" fillcolor="white" stroked="t" strokecolor="#495879"
+            strokeweight="1.5pt">
+        <v:stroke dashstyle="solid"></v:stroke>
+    </v:line>
+    <v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -53px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.687pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.562pt; OVERFLOW: visible; WIDTH: 37.843pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Node 0</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -29px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.156pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.562pt; OVERFLOW: visible; WIDTH: 37.843pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Node 1</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -5px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.406pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.562pt; OVERFLOW: visible; WIDTH: 37.843pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Node 2</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 19px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 38px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="35,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 36px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.656pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.562pt; OVERFLOW: visible; WIDTH: 37.843pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Node 3</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 140px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -11px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 66px; CURSOR: text; POSITION: absolute; TOP: -3px; HEIGHT: 29px"
+                     arcsize="9830f" coordsize="21600,21600" fillcolor="#c7d8ff" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+            <v:fill opacity="1"></v:fill>
+        </v:roundrect>
+        <v:roundrect style="LEFT: 0px; WIDTH: 62px; CURSOR: text; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                     arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                     strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:roundrect>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 3px; WIDTH: 80px; CURSOR: text; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.281pt; LEFT: auto; FONT: 15px verdana; MARGIN-LEFT: 0.031pt; OVERFLOW: visible; WIDTH: 84.968pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Main Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+        <v:oval style="LEFT: 62px; VISIBILITY: visible; WIDTH: 6px; POSITION: absolute; TOP: 8px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+    </v:group>
+    <v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -203px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.312pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -179px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.531pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -155px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.031pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: -290px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -131px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.281pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.093pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: -226px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -161px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 66px; POSITION: absolute; TOP: -3px; HEIGHT: 29px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:roundrect style="LEFT: 0px; WIDTH: 62px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                     arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                     strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:roundrect>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 3px; WIDTH: 80px; CURSOR: move; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.656pt; LEFT: auto; FONT: 15px verdana; MARGIN-LEFT: 0.156pt; OVERFLOW: visible; WIDTH: 84.968pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Main Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+        <v:oval style="LEFT: -6px; VISIBILITY: visible; WIDTH: 6px; POSITION: absolute; TOP: 8px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+    </v:group>
+    <v:group style="LEFT: -238px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 89px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 68px; POSITION: absolute; TOP: -3px; HEIGHT: 29px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:roundrect style="LEFT: 0px; WIDTH: 64px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                     arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                     strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:roundrect>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 3px; WIDTH: 80px; CURSOR: move; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.312pt; LEFT: auto; FONT: 15px verdana; MARGIN-LEFT: 0.031pt; OVERFLOW: visible; WIDTH: 84.968pt; COLOR: #00cccc; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Main Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+    </v:group>
+    <v:group style="LEFT: -59px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -18px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 122px; POSITION: absolute; TOP: -3px; HEIGHT: 43px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:roundrect style="LEFT: 0px; WIDTH: 118px; CURSOR: default; POSITION: absolute; TOP: 0px; HEIGHT: 37px"
+                     arcsize="9830f" coordsize="21600,21600" fillcolor="#f7f7f7" stroked="t" strokecolor="#023bb9"
+                     strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:roundrect>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 8px; WIDTH: 130px; CURSOR: default; POSITION: absolute; TOP: 6px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.406pt; LEFT: auto; FONT: bold 19px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 138.531pt; COLOR: #023bb9; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Central Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 47px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.687pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 71px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.156pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 95px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.406pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 186px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 119px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 49px; POSITION: absolute; TOP: -3px; HEIGHT: 23px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+        <v:line style="VISIBILITY: hidden; CURSOR: move; POSITION: absolute" from="-1,17" to="46,17" fillcolor="white"
+                stroked="t" strokecolor="#495879" strokeweight="1.5pt">
+            <v:stroke></v:stroke>
+        </v:line>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 2px; WIDTH: 54px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.656pt; LEFT: auto; FONT: 11px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 57.125pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Sub Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+    </v:group>
+    <v:group style="LEFT: 86px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: 89px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect style="LEFT: -2px; WIDTH: 84px; POSITION: absolute; TOP: -3px; HEIGHT: 29px" arcsize="9830f"
+                     coordsize="21600,21600" fillcolor="#dbe2e6" stroked="t" strokecolor="#77555a"
+                     strokeweight="13619emu">
+            <v:stroke opacity="0" dashstyle="solid"></v:stroke>
+            <v:fill opacity="0"></v:fill>
+        </v:roundrect>
+        <v:roundrect style="LEFT: 0px; WIDTH: 80px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                     arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                     strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:roundrect>
+        <v:shape
+                style="Z-INDEX: 10; LEFT: 3px; WIDTH: 112px; CURSOR: move; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+                coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.312pt; LEFT: auto; FONT: 15px verdana; MARGIN-LEFT: 0.687pt; OVERFLOW: visible; WIDTH: 119.25pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.312pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Isolated Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+        </v:shape>
+        <v:oval style="LEFT: 80px; VISIBILITY: visible; WIDTH: 6px; POSITION: absolute; TOP: 8px; HEIGHT: 6px"
+                coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+            <v:stroke dashstyle="solid"></v:stroke>
+            <v:fill></v:fill>
+        </v:oval>
+    </v:group>
+    <v:group style="LEFT: 249px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -247px; HEIGHT: 100px"
+             coordsize="100,100">
+        <v:roundrect
+                style="LEFT: 0px; VISIBILITY: visible; WIDTH: 62px; CURSOR: default; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+                arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+                strokeweight="6762emu">
+            <v:stroke opacity=".5" dashstyle="solid"></v:stroke>
+            <v:fill opacity=".5"></v:fill>
+        </v:roundrect>
+        <v:shape style="Z-INDEX: 10; LEFT: 3px; WIDTH: 80px; POSITION: absolute; TOP: 1px; HEIGHT: 1px; antialias: true"
+                 coordsize="100,100">
+            <v:textbox
+                    style="MARGIN-TOP: 0.593pt; LEFT: auto; FONT: 15px Arial; MARGIN-LEFT: 0.031pt; OVERFLOW: visible; WIDTH: 84.968pt; COLOR: #525c61; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+                    fontScale="1.4" inset="0,0,0,0">
+                <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+                    <SPAN>Main Topic</SPAN>
+                </SPAN>
+            </v:textbox>
+            <v:stroke opacity=".5"></v:stroke>
+            <v:fill opacity=".5"></v:fill>
+        </v:shape>
+    </v:group>
+    <v:rect style="LEFT: 256px; VISIBILITY: visible; WIDTH: 50px; POSITION: absolute; TOP: -255px; HEIGHT: 10px"
+            coordsize="21600,21600" fillcolor="#c03" stroked="t" strokecolor="#f93" strokeweight="13619emu">
+        <v:stroke opacity="26214f" dashstyle="solid"></v:stroke>
+        <v:fill opacity="26214f"></v:fill>
+    </v:rect>
+</v:group>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationHandler.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationHandler.java
new file mode 100755
index 00000000..7a2589a8
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationHandler.java
@@ -0,0 +1,31 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import org.acegisecurity.AuthenticationException;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface AuthenticationHandler
+{
+
+    AuthenticationToken getAuthenticationToken(HttpServletRequest request) throws AuthenticationException;
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationToken.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationToken.java
new file mode 100755
index 00000000..f9c4973d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationToken.java
@@ -0,0 +1,42 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+public class AuthenticationToken
+{
+    private String username;
+    private String password;
+
+    public AuthenticationToken(String username,String password)
+    {
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java
new file mode 100755
index 00000000..436982db
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java
@@ -0,0 +1,60 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import org.acegisecurity.providers.encoding.PasswordEncoder;
+import org.springframework.dao.DataAccessException;
+
+public class CustomPasswordEncoder
+    implements PasswordEncoder
+{
+    private PasswordEncoder delegateEncoder;
+    private static final String ENC_PREFIX = "ENC:";
+
+    public void setDelegatedEncoder(PasswordEncoder delegateEncoder)
+    {
+        this.delegateEncoder = delegateEncoder;
+    }
+    
+    public String encodePassword(String rawPass, Object salt) throws DataAccessException {
+
+        String password = rawPass;
+        if (!rawPass.startsWith(ENC_PREFIX))
+        {
+            password = ENC_PREFIX + delegateEncoder.encodePassword(rawPass,salt);
+        }
+
+        return password;
+    }
+
+    public boolean isPasswordValid(String encPass, String rawPass, Object salt) throws DataAccessException {
+
+        String pass1 = "" + encPass;
+        String pass2 = rawPass;
+
+        if (pass1.startsWith(ENC_PREFIX))
+        {
+
+            pass2 = encodePassword(rawPass, salt);
+        }
+
+        return pass1.equals(pass2);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/CustomTokenBasedRememberMeServices.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/CustomTokenBasedRememberMeServices.java
new file mode 100644
index 00000000..b5602aa9
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/CustomTokenBasedRememberMeServices.java
@@ -0,0 +1,41 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices;
+import org.acegisecurity.Authentication;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class CustomTokenBasedRememberMeServices extends
+        TokenBasedRememberMeServices {
+    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+    {
+     if(authentication!=null)
+         super.logout(request, response, authentication);
+     else
+     {
+         logger.debug("Session Already Expired. Authentication is null");
+         response.addCookie(makeCancelCookie(request));
+     }
+    }
+
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/DatabaseUserDetailService.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/DatabaseUserDetailService.java
new file mode 100644
index 00000000..16b9f8fe
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/DatabaseUserDetailService.java
@@ -0,0 +1,53 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import com.wisemapping.dao.UserManager;
+import org.acegisecurity.userdetails.UserDetailsService;
+import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.acegisecurity.userdetails.UserDetails;
+import org.acegisecurity.providers.encoding.PasswordEncoder;
+import org.acegisecurity.providers.encoding.Md5PasswordEncoder;
+import org.acegisecurity.providers.dao.SaltSource;
+import org.springframework.dao.DataAccessException;
+
+public class DatabaseUserDetailService
+        implements UserDetailsService {
+    private UserManager userManager;
+
+    public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException, DataAccessException {
+        final com.wisemapping.model.User model = userManager.getUserBy(email);
+
+        if (model != null) {
+            return new User(model);
+        } else {
+            throw new UsernameNotFoundException(email);
+        }
+    }
+
+    public UserManager getUserManager() {
+        return userManager;
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/DefaultAuthenticationHandler.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/DefaultAuthenticationHandler.java
new file mode 100755
index 00000000..dcab594f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/DefaultAuthenticationHandler.java
@@ -0,0 +1,44 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class DefaultAuthenticationHandler
+    implements AuthenticationHandler
+{
+    public AuthenticationToken getAuthenticationToken(HttpServletRequest request)
+        throws AuthenticationException
+    {
+        String username = request.getParameter(AuthenticationProcessingFilter.ACEGI_SECURITY_FORM_USERNAME_KEY);
+        String password = request.getParameter(AuthenticationProcessingFilter.ACEGI_SECURITY_FORM_PASSWORD_KEY);
+        if (username == null) {
+            username = "";
+        }
+
+        if (password == null) {
+            password = "";
+        }
+        return new AuthenticationToken(username,password);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/User.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/User.java
new file mode 100644
index 00000000..78a6ae32
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/User.java
@@ -0,0 +1,68 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import org.acegisecurity.userdetails.UserDetails;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+
+public class User implements UserDetails {
+    private com.wisemapping.model.User model;
+
+    public User(com.wisemapping.model.User model) {
+        this.model = model;
+    }
+
+    public GrantedAuthority[] getAuthorities() {
+        return new GrantedAuthority[]{new GrantedAuthorityImpl("ROLE_USER")};
+    }
+
+    public String getPassword() {        
+        return model.getPassword();
+    }
+
+    public String getUsername() {
+        return model.getEmail();
+    }
+
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    public boolean isAccountNonLocked() {
+       return this.model.isActive();
+    }
+
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    public boolean isEnabled() {
+        return this.model.isActive();
+    }
+
+    public com.wisemapping.model.User getModel() {
+        return model;
+    }
+
+    public String getDisplayName() {
+        return model.getFirstname();
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/Utils.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/Utils.java
new file mode 100644
index 00000000..39d98e6d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/Utils.java
@@ -0,0 +1,59 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import com.wisemapping.model.User;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+
+
+public class Utils {
+    private Utils() {
+    }
+
+    public static User getUser(final HttpServletRequest request) {
+
+        final AbstractAuthenticationToken token = (AbstractAuthenticationToken) request.getUserPrincipal();
+        User result = null;
+        if (token != null) {
+            final com.wisemapping.security.User user = (com.wisemapping.security.User) token.getPrincipal();
+            result = user.getModel();
+        }
+        return result;
+    }
+
+    public static User getUser()
+    {
+        User user = null;
+        final Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        if (auth != null && auth.getDetails() != null)
+        {
+            final Object principal = auth.getPrincipal();
+            if (principal != null && principal instanceof com.wisemapping.security.User) {
+                user = ((com.wisemapping.security.User)principal).getModel();
+            }
+        }
+        return user;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/WiseAuthenticationProcessingFilter.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/WiseAuthenticationProcessingFilter.java
new file mode 100755
index 00000000..16ada5aa
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/WiseAuthenticationProcessingFilter.java
@@ -0,0 +1,67 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security;
+
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class WiseAuthenticationProcessingFilter
+    extends AuthenticationProcessingFilter
+{
+    public static final String ACEGI_SECURITY_FORM_SSO_ID_KEY = "j_sso_id";   
+
+    private AuthenticationHandler authenticationHandler;
+
+    public void setAuthenticationHandler(AuthenticationHandler ssoAuthenticationHandler)
+    {
+        this.authenticationHandler = ssoAuthenticationHandler;
+    }
+
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest request)
+           throws AuthenticationException
+    {
+
+        final AuthenticationToken ssoToken = authenticationHandler.getAuthenticationToken(request);
+
+        final UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(ssoToken.getUsername(), ssoToken.getPassword());
+
+        // Place the last username attempted into HttpSession for views
+        request.getSession().setAttribute(ACEGI_SECURITY_LAST_USERNAME_KEY, ssoToken.getUsername());
+
+        // Allow subclasses to set the "details" property
+        setDetails(request, authRequest);
+
+        return this.getAuthenticationManager().authenticate(authRequest);
+    }
+
+    @Override
+    protected void onPreAuthentication(HttpServletRequest request, HttpServletResponse response)
+        throws AuthenticationException, IOException
+    {
+        assert request != null;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java
new file mode 100755
index 00000000..f602b4e5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java
@@ -0,0 +1,72 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security.aop;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.exceptions.AccessDeniedSecurityException;
+import com.wisemapping.exceptions.UnexpectedArgumentException;
+import com.wisemapping.security.Utils;
+import com.wisemapping.service.MindmapService;
+import org.aopalliance.intercept.MethodInvocation;
+
+public abstract class BaseSecurityAdvice {
+    private MindmapService mindmapService = null;
+
+    public void checkRole(MethodInvocation methodInvocation) throws UnexpectedArgumentException,AccessDeniedSecurityException
+    {
+        final User user = Utils.getUser();
+
+        final Object argument = methodInvocation.getArguments()[0];
+
+        boolean isAllowed;
+
+        if (argument instanceof MindMap)
+        {
+            isAllowed = isAllowed(user,(MindMap)  argument);
+        }
+        else if (argument instanceof Integer)
+        {
+            isAllowed = isAllowed(user, ((Integer)argument));
+        }
+        else
+        {
+            throw new UnexpectedArgumentException("Argument " +argument);
+        }
+
+        if (!isAllowed)
+        {
+            throw new AccessDeniedSecurityException("User not allowed to invoke:" + methodInvocation);
+        }
+    }
+
+    protected abstract boolean isAllowed(User user, MindMap map);
+    protected abstract boolean isAllowed(User user, int mapId);
+
+    protected MindmapService getMindmapService()
+    {
+        return mindmapService;
+    }
+
+    public void setMindmapService(MindmapService service)
+    {
+        this.mindmapService = service;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java
new file mode 100755
index 00000000..d714d929
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java
@@ -0,0 +1,50 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security.aop;
+
+import com.wisemapping.model.UserRole;
+import com.wisemapping.model.User;
+import com.wisemapping.model.MindMap;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+public class UpdateSecurityAdvise
+    extends BaseSecurityAdvice
+    implements MethodInterceptor
+{
+
+    private UserRole grantedRole = UserRole.COLLABORATOR;
+
+    public Object invoke(MethodInvocation methodInvocation) throws Throwable {
+        checkRole(methodInvocation);
+        return methodInvocation.proceed();
+    }
+
+    protected boolean isAllowed(User user, MindMap map)
+    {
+        return getMindmapService().isAllowedToView(user,map,grantedRole);
+    }
+
+    protected boolean isAllowed(User user, int mapId)
+    {
+        return getMindmapService().isAllowedToView(user,mapId,grantedRole);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java b/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java
new file mode 100755
index 00000000..e3af461d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java
@@ -0,0 +1,48 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.security.aop;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import com.wisemapping.model.UserRole;
+import com.wisemapping.model.User;
+import com.wisemapping.model.MindMap;
+
+public class ViewBaseSecurityAdvise
+        extends BaseSecurityAdvice
+        implements MethodInterceptor
+{
+    private UserRole grantedRole = UserRole.VIEWER;
+
+    public Object invoke(MethodInvocation methodInvocation) throws Throwable {
+        checkRole(methodInvocation);
+        return methodInvocation.proceed();
+    }
+
+    protected boolean isAllowed(User user, MindMap map)
+    {
+        return getMindmapService().isAllowedToView(user,map,grantedRole);
+    }
+
+    protected boolean isAllowed(User user, int mapId)
+    {
+        return getMindmapService().isAllowedToView(user,mapId,grantedRole);
+    }    
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java
new file mode 100755
index 00000000..f0b47784
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java
@@ -0,0 +1,40 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
+public class HibernateAppListener implements ServletContextListener {
+
+    /* Application Startup Event */
+    public void	contextInitialized(ServletContextEvent ce) {
+
+        try  {
+
+            Class.forName("tomcatJndi.HibernateUtil").newInstance();
+
+        }         catch (Exception e)  {}
+    }
+
+    /* Application Shutdown	Event */
+    public void	contextDestroyed(ServletContextEvent ce)
+    { }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java
new file mode 100755
index 00000000..f09f5b3d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java
@@ -0,0 +1,43 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+
+public class HibernateUtil {
+
+    private static final SessionFactory sessionFactory;
+
+    static {
+        try {
+
+            sessionFactory = new Configuration().configure().buildSessionFactory();
+        } catch (Throwable ex) {
+            // Make sure you log the exception, as it might be swallowed
+            System.err.println("Initial SessionFactory creation failed." + ex);
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+
+    public static SessionFactory getSessionFactory() {
+        return sessionFactory;
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java
new file mode 100755
index 00000000..6ec7e2c5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+public class InvalidActivationCodeException
+    extends Exception
+{
+    public InvalidActivationCodeException(String msg)
+    {
+        super(msg);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidColaboratorException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidColaboratorException.java
new file mode 100755
index 00000000..228bbf52
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidColaboratorException.java
@@ -0,0 +1,29 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+public class InvalidColaboratorException
+    extends Exception
+{
+    public InvalidColaboratorException(String msg)
+    {
+        super(msg);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java
new file mode 100755
index 00000000..86143f8b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java
@@ -0,0 +1,28 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+public class InvalidUserEmailException  extends Exception
+{
+    public InvalidUserEmailException(String msg)
+    {
+        super(msg);
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
new file mode 100755
index 00000000..538c390e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
@@ -0,0 +1,72 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+import com.wisemapping.model.*;
+import com.wisemapping.exceptions.WiseMappingException;
+
+import java.util.List;
+import java.io.IOException;
+
+public interface MindmapService {
+
+    public static final String TAG_SEPARATOR = " ";
+
+    public MindmapUser getMindmapUserBy(int mindmapId, User user);
+
+    public MindMap getMindmapById(int mindmapId);
+
+    public MindMap getMindmapByTitle(String title, User user);
+
+    public List<MindmapUser> getMindmapUserByUser(User user);
+
+    public void updateMindmap(MindMap mindMap, boolean saveHistory) throws WiseMappingException;
+
+    public void addMindmap(MindMap map, User user) throws WiseMappingException;
+
+    public void addColaborators(MindMap mindmap, String[] colaboratorEmails, UserRole role, ColaborationEmail email)
+            throws InvalidColaboratorException;
+
+    public void addTags(MindMap mindmap, String tags);
+
+    public void removeColaboratorFromMindmap(MindMap mindmap, long colaboratorId);
+
+    public void removeMindmap(MindMap mindmap, User user) throws WiseMappingException;
+
+    public List<MindMap> search(MindMapCriteria criteria);
+
+    public List<MindMap> getPublicMaps(int cant);
+
+    public List<MindMapHistory> getMindMapHistory(int mindmapId);
+
+    public boolean isAllowedToView(User user, MindMap map, UserRole allowedRole);
+
+    public boolean isAllowedToView(User user, int mapId, UserRole allowedRole);
+
+    public boolean isAllowedToColaborate(User user, int mapId, UserRole grantedRole);
+
+    public boolean isAllowedToColaborate(User user, MindMap map, UserRole grantedRole);
+
+    public void addWelcomeMindmap(User user) throws WiseMappingException;
+
+    public void addView(int mapId);
+
+    public void revertMapToHistory(MindMap map, int historyId) throws IOException, WiseMappingException;
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
new file mode 100755
index 00000000..2d6feda6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
@@ -0,0 +1,303 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+import com.wisemapping.dao.MindmapManager;
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.mail.Mailer;
+import com.wisemapping.model.*;
+
+import java.io.IOException;
+import java.util.*;
+
+
+public class MindmapServiceImpl
+        implements MindmapService {
+
+    private MindmapManager mindmapManager;
+    private UserService userService;
+    private Mailer mailer;
+
+    public boolean isAllowedToColaborate(User user, int mapId, UserRole grantedRole) {
+        final MindMap map = mindmapManager.getMindmapById(mapId);
+        return isAllowedToColaborate(user, map, grantedRole);
+    }
+
+    public boolean isAllowedToView(User user, int mapId, UserRole grantedRole) {
+        final MindMap map = mindmapManager.getMindmapById(mapId);
+        return isAllowedToView(user, map, grantedRole);
+    }
+
+    public boolean isAllowedToView(User user, MindMap map, UserRole grantedRole) {
+        boolean isAllowed = false;
+        if (map != null) {
+
+            if (map.isPublic()) {
+                isAllowed = true;
+            } else if (user != null) {
+                isAllowed = isAllowedToColaborate(user, map, grantedRole);
+            }
+        }
+        return isAllowed;
+    }
+
+    public boolean isAllowedToColaborate(User user, MindMap map, UserRole grantedRole) {
+        boolean isAllowed = false;
+        if (map != null) {
+            if (map.getOwner().getId() == user.getId()) {
+                isAllowed = true;
+            } else {
+                final Set<MindmapUser> users = map.getMindmapUsers();
+                UserRole rol = null;
+                for (MindmapUser mindmapUser : users) {
+                    if (mindmapUser.getColaborator().getId() == user.getId()) {
+                        rol = mindmapUser.getRole();
+                        break;
+                    }
+                }
+                // only if the user has a role for the current map
+                isAllowed = rol != null &&
+                        (grantedRole.equals(rol) || rol.ordinal() < grantedRole.ordinal());
+            }
+        }
+        return isAllowed;
+    }
+
+    public MindmapUser getMindmapUserBy(int mindmapId, User user) {
+        return mindmapManager.getMindmapUserBy(mindmapId, user);
+    }
+
+    public MindMap getMindmapByTitle(String title, User user) {
+        return mindmapManager.getMindmapByTitle(title, user);
+    }
+
+    public MindMap getMindmapById(int mindmapId) {
+        return mindmapManager.getMindmapById(mindmapId);
+    }
+
+    public List<MindmapUser> getMindmapUserByUser(User user) {
+        return mindmapManager.getMindmapUserByColaborator(user.getId());
+    }
+
+    public void updateMindmap(MindMap mindMap, boolean saveHistory) throws WiseMappingException {
+        if (mindMap.getTitle() == null || mindMap.getTitle().length() == 0) {
+            throw new WiseMappingException("The tile can not be empty");
+        }
+        mindmapManager.updateMindmap(mindMap, saveHistory);
+    }
+
+    public List<MindMap> getPublicMaps(int cant) {
+        return mindmapManager.search(null, cant);
+    }
+
+    public List<MindMap> search(MindMapCriteria criteria) {
+        return mindmapManager.search(criteria);
+    }
+
+    public void removeColaboratorFromMindmap(MindMap mindmap, long colaboratorId) {
+        // remove colaborator association
+        Set<MindmapUser> mindmapusers = mindmap.getMindmapUsers();
+        MindmapUser mindmapuserToDelete = null;
+        for (MindmapUser mindmapuser : mindmapusers) {
+            if (mindmapuser.getColaborator().getId() == colaboratorId) {
+                mindmapuserToDelete = mindmapuser;
+                //@TODO evaluar si el colaborador no tiene mas asociaciones si hay que eliminarlo, por ahora NO
+//                final List<MindmapUser> otherAsociations = mindmapManager.getMindmapUserByColaborator(colaboratorId);
+//                if (otherAsociations != null)
+//                {
+//
+//                    final User user = userService.getUserBy(colaboratorId);
+//                    // Is not a User
+//                    if (user == null)
+//                    {
+//                        final Colaborator col = mindmapManager.getColaboratorBy(colaboratorId);
+//                        mindmapManager.removeColaborator(col);
+//                    }
+//                }
+                break;
+            }
+        }
+        if (mindmapuserToDelete != null) {
+            // When you delete an object from hibernate you have to delete it from *all* collections it exists in...
+            mindmapusers.remove(mindmapuserToDelete);
+            mindmapManager.removeMindmapUser(mindmapuserToDelete);
+        }
+    }
+
+    public void removeMindmap(MindMap mindmap, User user) throws WiseMappingException {
+        if (mindmap.getOwner().equals(user)) {
+
+            mindmapManager.removeMindmap(mindmap);
+        } else {
+            this.removeColaboratorFromMindmap(mindmap, user.getId());
+        }
+    }
+
+    public void addMindmap(MindMap map, User user) throws WiseMappingException {
+
+        final String title = map.getTitle();
+
+        if (title == null || title.length() == 0) {
+            throw new IllegalArgumentException("The tile can not be empty");
+        }
+
+        if (user==null) {
+            throw new IllegalArgumentException("User can not be null");
+        }
+
+        final Calendar creationTime = Calendar.getInstance();
+        final String username = user.getUsername();
+        map.setCreator(username);
+        map.setLastModifierUser(username);
+        map.setCreationTime(creationTime);
+        map.setLastModificationTime(creationTime);
+        map.setOwner(user);
+
+        final MindmapUser mindmapUser = new MindmapUser(UserRole.OWNER.ordinal(), user, map);
+        map.getMindmapUsers().add(mindmapUser);
+
+        mindmapManager.addMindmap(user, map);
+    }
+
+    public void addColaborators(MindMap mindmap, String[] colaboratorEmails, UserRole role, ColaborationEmail email)
+            throws InvalidColaboratorException {
+        if (colaboratorEmails != null && colaboratorEmails.length > 0) {
+            final Colaborator owner = mindmap.getOwner();
+            final Set<MindmapUser> mindmapUsers = mindmap.getMindmapUsers();
+
+            for (String colaboratorEmail : colaboratorEmails) {
+                if (owner.getEmail().equals(colaboratorEmail)) {
+                    throw new InvalidColaboratorException("The user " + owner.getEmail() + " is the owner");
+                }
+                MindmapUser mindmapUser = getMindmapUserBy(colaboratorEmail, mindmapUsers);
+                if (mindmapUser == null) {
+                    addColaborator(colaboratorEmail, role, mindmap, email);
+                } else if (mindmapUser.getRole() != role) {
+                    // If the relationship already exists and the role changed then only update the role
+                    mindmapUser.setRoleId(role.ordinal());
+                    mindmapManager.updateMindmap(mindmap, false);
+                }
+            }
+        }
+    }
+
+    public void addTags(MindMap mindmap, String tags) {
+        mindmap.setTags(tags);
+        mindmapManager.updateMindmap(mindmap, false);
+        if (tags != null && tags.length() > 0) {
+            final String tag[] = tags.split(TAG_SEPARATOR);
+            final User user = mindmap.getOwner();
+            // Add new Tags to User
+            boolean updateUser = false;
+            for (String userTag : tag) {
+                if (!user.getTags().contains(userTag)) {
+                    user.getTags().add(userTag);
+                    updateUser = true;
+                }
+            }
+            if (updateUser) {
+                //update user
+                userService.updateUser(user);
+            }
+        }
+    }
+
+    public void addWelcomeMindmap(User user) throws WiseMappingException {
+        final MindMap savedWelcome = getMindmapById(Constants.WELCOME_MAP_ID);
+
+        // Is there a welcomed map configured ?        
+        if(savedWelcome!=null)
+        {
+            final MindMap welcomeMap = new MindMap();
+            welcomeMap.setTitle(savedWelcome.getTitle() + " " + user.getFirstname());
+            welcomeMap.setDescription(savedWelcome.getDescription());
+            welcomeMap.setXml(savedWelcome.getXml());
+
+            final MindMapNative mindmapNative = new MindMapNative();
+            mindmapNative.setSvgXml(savedWelcome.getNativeBrowser().getSvgXml());
+            mindmapNative.setVmlXml(savedWelcome.getNativeBrowser().getVmlXml());
+
+            welcomeMap.setNativeBrowser(mindmapNative);
+
+            addMindmap(welcomeMap, user);
+        }
+    }
+
+    public void addView(int mapId) {
+        mindmapManager.addView(mapId);
+    }
+
+    public List<MindMapHistory> getMindMapHistory(int mindmapId) {
+        return mindmapManager.getHistoryFrom(mindmapId);
+    }
+
+    public void revertMapToHistory(MindMap map, int historyId)
+            throws IOException, WiseMappingException {
+        final MindMapHistory history = mindmapManager.getHistory(historyId);
+        map.setNativeXml(history.getNativeXml());
+        updateMindmap(map, false);
+    }
+
+    private MindmapUser getMindmapUserBy(String email, Set<MindmapUser> mindmapUsers) {
+        MindmapUser mindmapUser = null;
+
+        for (MindmapUser user : mindmapUsers) {
+            if (user.getColaborator().getEmail().equals(email)) {
+                mindmapUser = user;
+                break;
+            }
+        }
+        return mindmapUser;
+    }
+
+    private void addColaborator(String colaboratorEmail, UserRole role, MindMap mindmap, ColaborationEmail email) {
+
+        Colaborator colaborator = mindmapManager.getColaboratorBy(colaboratorEmail);
+        if (colaborator == null) {
+            colaborator = new Colaborator();
+            colaborator.setEmail(colaboratorEmail);
+            colaborator.setCreationDate(Calendar.getInstance());
+            mindmapManager.addColaborator(colaborator);
+        }
+
+        final MindmapUser newMindmapUser = new MindmapUser(role.ordinal(), colaborator, mindmap);
+        mindmap.getMindmapUsers().add(newMindmapUser);
+
+        mindmapManager.saveMindmap(mindmap);
+
+        final Map<String, Object> model = new HashMap<String, Object>();
+        model.put("role", role);
+        model.put("map", mindmap);
+        model.put("message", email.getMessage());
+        mailer.sendEmail(mailer.getSiteEmail(), colaboratorEmail, email.getSubject(), model, "newColaborator.vm");
+    }
+
+    public void setMindmapManager(MindmapManager mindmapManager) {
+        this.mindmapManager = mindmapManager;
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    public void setMailer(Mailer mailer) {
+        this.mailer = mailer;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/UserService.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/UserService.java
new file mode 100755
index 00000000..44fa4614
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/UserService.java
@@ -0,0 +1,44 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+import com.wisemapping.model.User;
+import com.wisemapping.exceptions.WiseMappingException;
+
+public interface UserService {
+
+    public void activateAcount(long code) throws InvalidActivationCodeException;
+
+    public void createUser(User user) throws WiseMappingException;
+
+    public void changePassword(User user);
+
+    public User getUserBy(String email);
+
+    public User getUserBy(long id);
+
+    public User getUserByUsername(String username);
+
+    public void updateUser(User user);
+
+    public void sendEmailPassword(String email) throws InvalidUserEmailException;
+
+    public User reloadUser(final User user);
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/trunk/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
new file mode 100755
index 00000000..87d6ee0b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
@@ -0,0 +1,154 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.service;
+
+import com.wisemapping.dao.UserManager;
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.mail.Mailer;
+import com.wisemapping.model.User;
+import com.wisemapping.model.Colaborator;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class UserServiceImpl
+        implements UserService {
+    private UserManager userManager;
+    private MindmapService mindmapService;
+    private Mailer mailer;
+
+    public void activateAcount(long code)
+        throws InvalidActivationCodeException 
+    {
+        final User user = userManager.getUserByActivationCode(code);
+        if (user == null || user.isActive()) {
+            throw new InvalidActivationCodeException("Invalid Activation Code");
+        } else {
+            final Calendar now = Calendar.getInstance();
+            user.setActivationDate(now);
+            userManager.updateUser(user);
+            final Map<String, User> model = new HashMap<String, User>();
+            model.put("user", user);
+            mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "WiseMapping : Active account", model, "activationAccountMail.vm");
+        }
+    }
+
+    public User reloadUser(final User user) {
+        return this.getUserBy(user.getId());
+    }
+
+    public void sendEmailPassword(String email)
+            throws InvalidUserEmailException {
+        final User user = userManager.getUserBy(email);
+        if (user != null) {
+            final Map<String, Object> model = new HashMap<String, Object>();
+            final String password = randomstring(8, 10);
+            user.setPassword(password);
+            changePassword(user);
+            model.put("user", user);
+            model.put("password", password);
+            
+            mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "WiseMapping : Recovery Password", model, "recoveryMail.vm");
+        } else {
+            throw new InvalidUserEmailException("The email '" + email + "' does not exists.");
+        }
+    }
+
+    private String randomstring(int lo, int hi) {
+        int n = rand(lo, hi);
+        byte b[] = new byte[n];
+        for (int i = 0; i < n; i++)
+            b[i] = (byte) rand('@', 'Z');
+        return new String(b);
+    }
+
+    private int rand(int lo, int hi) {
+        java.util.Random rn = new java.util.Random();
+        int n = hi - lo + 1;
+        int i = rn.nextInt() % n;
+        if (i < 0)
+            i = -i;
+        return lo + i;
+    }
+
+    public void createUser(User user) throws WiseMappingException {
+        final UUID uuid = UUID.randomUUID();
+        user.setCreationDate(Calendar.getInstance());
+        user.setActivationDate(null);
+        user.setActivationCode(uuid.getLeastSignificantBits());
+
+        Colaborator col = userManager.getColaboratorBy(user.getEmail());
+        if (col != null)
+        {
+            userManager.createUser(user,col);
+        }
+        else
+        {
+            userManager.createUser(user);
+        }
+
+        //create welcome map
+        mindmapService.addWelcomeMindmap(user);
+
+        final Map<String, Object> model = new HashMap<String, Object>();
+        model.put("user", user);
+        // TODO: ver como no hacer hardcode el url
+        final String activationUrl = "http://wisemapping.com/c/activation.htm?code=" + user.getActivationCode();
+        model.put("emailcheck", activationUrl);
+        mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "Welcome to Wisemapping!", model,
+                "confirmationMail.vm");
+        mailer.sendEmail(mailer.getRegistrationEmail(), mailer.getRegistrationEmail(), "Wisemapping : New User", model,
+                "activeUserAccountMail.vm");
+    }
+
+    public void changePassword(User user) {
+        userManager.updateUser(user);
+    }
+
+    public User getUserBy(String email) {
+        return userManager.getUserBy(email);
+    }
+
+    public User getUserByUsername(String username) {
+        return userManager.getUserByUsername(username);
+    }
+
+    public User getUserBy(long id) {
+        return userManager.getUserBy(id);
+    }
+
+    public void updateUser(User user) {
+        userManager.updateUser(user);
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+
+    public void setMailer(Mailer mailer) {
+        this.mailer = mailer;
+    }
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java b/trunk/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java
new file mode 100755
index 00000000..026e65eb
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.util;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class JAXBUtils {
+
+    public static Object getMapObject(InputStream stream,String pakage) throws JAXBException {
+
+        final JAXBContext context = JAXBContext.newInstance(pakage);
+        final Unmarshaller unmarshaller = context.createUnmarshaller() ;
+
+        return unmarshaller.unmarshal (stream) ;
+    }
+
+    public static void saveMap(Object obj, OutputStream out,String pakage) throws JAXBException {
+
+        final JAXBContext context = JAXBContext.newInstance(pakage);
+        final Marshaller marshaller =   context.createMarshaller();
+
+        marshaller.marshal(obj, out) ;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java b/trunk/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
new file mode 100755
index 00000000..520a90c6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
@@ -0,0 +1,84 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.util;
+
+import java.io.IOException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+import java.util.zip.ZipEntry;
+
+public class ZipUtils {
+
+    public static String zipToString(byte[] zip) throws IOException {
+
+        String result = null;
+        if (zip != null)
+        {
+            final ByteArrayInputStream in = new ByteArrayInputStream(zip);
+            final ZipInputStream zipIn = new ZipInputStream(in);
+            zipIn.getNextEntry();
+
+            byte[] buffer = new byte[512];
+
+            int len;
+            StringBuffer sb_result = new StringBuffer();
+
+            while ((len = zipIn.read(buffer)) > 0) {
+                sb_result.append(new String(buffer, 0, len));
+            }
+
+            zipIn.closeEntry();
+            zipIn.close();
+            result = sb_result.toString();
+        }
+
+        return result;
+    }
+
+    public static  byte[] stringToZip(String content) throws IOException {
+        ZipOutputStream zip = null;
+        ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
+        ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes());
+        try {
+            zip = new ZipOutputStream(byteArray);
+
+            ZipEntry zEntry = new ZipEntry("content");
+            zip.putNextEntry(zEntry);
+            int bytesRead;
+            byte[] buffer = new byte[8192];
+            while ((bytesRead = in.read(buffer, 0, 8192)) != -1) {
+                zip.write(buffer, 0, bytesRead);
+            }
+            zip.closeEntry();
+        }        
+        finally
+        {
+            if (zip != null)
+            {
+                zip.flush();
+                zip.close();
+            }
+        }
+
+        return byteArray.toByteArray();
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ChangePasswordValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ChangePasswordValidator.java
new file mode 100644
index 00000000..0cbb9485
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ChangePasswordValidator.java
@@ -0,0 +1,60 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import org.springframework.validation.Validator;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import com.wisemapping.view.ChangePasswordBean;
+import com.wisemapping.model.Constants;
+
+public class ChangePasswordValidator
+        implements Validator {
+
+    public boolean supports(final Class clazz) {
+        return clazz.equals(ChangePasswordBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        ChangePasswordBean bean = (ChangePasswordBean) obj;
+	
+        if (bean == null) {
+            errors.rejectValue("changePassword", "error.not-specified", null, "Value required.");
+        } else {
+	
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "required", "Field is required.");
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "retryPassword", "required", "Field is required.");
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "password",
+                                "The password must have less than "+ Constants.MAX_USER_PASSWORD_LENGTH + " characters.",
+                                bean.getPassword(),
+                                Constants.MAX_USER_PASSWORD_LENGTH);
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "retryPassword",
+                                "The retryPassword must have less than "+ Constants.MAX_USER_PASSWORD_LENGTH + " characters.",
+                                bean.getRetryPassword(),
+                                Constants.MAX_USER_PASSWORD_LENGTH);
+            final String password = bean.getPassword();
+            if (password != null && !password.equals(bean.getRetryPassword())) {
+                errors.rejectValue("password", "Password mismatch", "Your password entries did not match");
+            }
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/EditProfileValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/EditProfileValidator.java
new file mode 100755
index 00000000..d6f05e28
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/EditProfileValidator.java
@@ -0,0 +1,73 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import com.wisemapping.view.UserBean;
+import com.wisemapping.controller.Messages;
+import com.wisemapping.service.UserService;
+import com.wisemapping.model.User;
+import com.wisemapping.model.Constants;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import org.springframework.validation.Validator;
+
+public class EditProfileValidator implements Validator {
+
+    private UserService userService;
+
+    public boolean supports(final Class clazz) {
+        return clazz.equals(UserBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        UserBean user = (UserBean) obj;
+        if (user == null) {
+            errors.rejectValue("user", "error.not-specified", null, "Value required.");
+        } else {
+
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "firstname", "required", "Field is required.");
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "lastname", "required", "Field is required.");
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "firstname",
+                                "The firstname must have less than "+ Constants.MAX_USER_FIRSTNAME_LENGTH + " characters.",
+                                user.getFirstname(),
+                                Constants.MAX_USER_FIRSTNAME_LENGTH);
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "lastname",
+                                "The lastname must have less than "+ Constants.MAX_USER_LASTNAME_LENGTH + " characters.",
+                                user.getLastname(),
+                                Constants.MAX_USER_LASTNAME_LENGTH);
+            final String email = user.getEmail();
+            boolean isValid = Utils.isValidateEmailAddress(email);
+            if (isValid) {
+                final User oldUser = userService.getUserBy(email);
+                if (oldUser != null && user.getId() != oldUser.getId()) {
+                    errors.rejectValue("email", Messages.EMAIL_ALREADY_EXIST);
+                }
+            } else {
+                Utils.validateEmailAddress(email, errors);
+            }
+        }
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ForgotPasswordValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ForgotPasswordValidator.java
new file mode 100755
index 00000000..5fa23b5d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ForgotPasswordValidator.java
@@ -0,0 +1,48 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import org.springframework.validation.Validator;
+import org.springframework.validation.Errors;
+import com.wisemapping.view.ForgotPasswordBean;
+import com.wisemapping.controller.Messages;
+
+public class ForgotPasswordValidator
+        implements Validator {
+
+
+    public boolean supports(final Class clazz) {
+        return clazz.equals(ForgotPasswordBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        ForgotPasswordBean bean = (ForgotPasswordBean) obj;
+        if (bean == null) {
+            errors.rejectValue("forgotPassword", "error.not-specified", null, "Value required.");
+        } else {
+
+            final String email = bean.getEmail();
+            boolean isValid = Utils.isValidateEmailAddress(email);
+            if (!isValid) {
+                errors.rejectValue("email", Messages.NO_VALID_EMAIL_ADDRESS);
+            }
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ImportMapValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ImportMapValidator.java
new file mode 100644
index 00000000..6d7d2621
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ImportMapValidator.java
@@ -0,0 +1,57 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import com.wisemapping.controller.Messages;
+import com.wisemapping.importer.ImportFormat;
+import com.wisemapping.importer.Importer;
+import com.wisemapping.importer.ImporterException;
+import com.wisemapping.importer.ImporterFactory;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.view.ImportMapBean;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+
+import java.io.ByteArrayInputStream;
+
+public class ImportMapValidator extends MapInfoValidator {
+
+   public boolean supports(final Class clazz) {
+        return clazz.equals(ImportMapBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        ImportMapBean bean = (ImportMapBean) obj;
+
+        super.validate(obj,errors);
+
+        ValidationUtils.rejectIfEmptyOrWhitespace(errors, "mapFile", Messages.FIELD_REQUIRED);
+        try {
+            final Importer importer = ImporterFactory.getInstance().getImporter(ImportFormat.FREEMIND);
+            final ByteArrayInputStream stream = new ByteArrayInputStream(bean.getMapFile().getBytes());
+            final MindMap map = importer.importMap(bean.getTitle(),bean.getDescription(),stream);
+
+            bean.setImportedMap(map);
+
+        } catch (ImporterException e) {
+              errors.rejectValue("mapFile",Messages.IMPORT_MAP_ERROR);
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java
new file mode 100755
index 00000000..3ce2a5cd
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java
@@ -0,0 +1,83 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import com.wisemapping.controller.Messages;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.model.Constants;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.view.MindMapInfoBean;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import org.springframework.validation.Validator;
+
+public class MapInfoValidator implements Validator {
+
+
+    private MindmapService mindmapService;
+
+    public boolean supports(final Class clazz) {
+        return clazz.equals(MindMapInfoBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        final MindMapInfoBean map = (MindMapInfoBean) obj;
+        if (map == null) {
+            errors.rejectValue("map", "error.not-specified", null, "Value required.");
+        } else {
+
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "title", Messages.FIELD_REQUIRED);
+
+            final String title = map.getTitle();
+            final String desc = map.getDescription();
+            if (title != null && title.length() > 0) {
+                if (title.length() > Constants.MAX_MAP_NAME_LENGTH) {
+                    errors.rejectValue("title", "field.max.length",
+                            new Object[]{Constants.MAX_MAP_NAME_LENGTH},
+                            "The title must have less than " + Constants.MAX_MAP_NAME_LENGTH + " characters.");
+                } else {
+                    // Map alredy exists ?
+                    final MindmapService service = this.getMindmapService();
+
+                    final User user = com.wisemapping.security.Utils.getUser();
+                    final MindMap mindMap = service.getMindmapByTitle(title, user);
+                    if (mindMap != null) {
+                        errors.rejectValue("title", Messages.MAP_TITLE_ALREADY_EXISTS);
+                    }
+                }
+            }
+            ValidatorUtils.rejectIfExceeded(errors,
+                                            "description",
+                                            "The description must have less than "+Constants.MAX_MAP_DESCRIPTION_LENGTH + " characters.",
+                                            desc,
+                                            Constants.MAX_MAP_DESCRIPTION_LENGTH);            
+       }
+
+    }
+
+    public MindmapService getMindmapService() {
+        return mindmapService;
+    }
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/RenameMapValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/RenameMapValidator.java
new file mode 100755
index 00000000..7e1991a4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/RenameMapValidator.java
@@ -0,0 +1,83 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import org.springframework.validation.Validator;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.view.MindMapInfoBean;
+import com.wisemapping.controller.Messages;
+import com.wisemapping.model.Constants;
+import com.wisemapping.model.User;
+import com.wisemapping.model.MindMap;
+
+public class RenameMapValidator
+        implements Validator {
+
+    private MindmapService mindmapService;
+
+    public boolean supports(final Class clazz) {
+        return clazz.equals(MindMapInfoBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        final MindMapInfoBean map = (MindMapInfoBean) obj;
+        if (map == null) {
+            errors.rejectValue("map", "error.not-specified", null, "Value required.");
+        } else {
+
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "title", Messages.FIELD_REQUIRED);
+
+            final String title = map.getTitle();
+            final String desc = map.getDescription();
+            if (title != null && title.length() > 0) {
+                if (title.length() > Constants.MAX_MAP_NAME_LENGTH) {
+                    errors.rejectValue("title", "field.max.length",
+                            new Object[]{Constants.MAX_MAP_NAME_LENGTH},
+                            "The title must have less than " + Constants.MAX_MAP_NAME_LENGTH + " characters.");
+                } else {
+                    // Map alredy exists ?
+                    final MindmapService service = this.getMindmapService();
+
+                    final User user = com.wisemapping.security.Utils.getUser();
+                    final MindMap mindMap = service.getMindmapByTitle(title, user);
+                    if (mindMap != null && map.getMindMap().getId() != mindMap.getId() ) {
+                        errors.rejectValue("title", Messages.MAP_TITLE_ALREADY_EXISTS);
+                    }
+                }
+            }
+            ValidatorUtils.rejectIfExceeded(errors,
+                                            "description",
+                                            "The description must have less than "+Constants.MAX_MAP_DESCRIPTION_LENGTH + " characters.",
+                                            desc,
+                                            Constants.MAX_MAP_DESCRIPTION_LENGTH);
+       }
+
+    }
+
+    public MindmapService getMindmapService() {
+        return mindmapService;
+    }
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/TagValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/TagValidator.java
new file mode 100755
index 00000000..0c0f58ed
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/TagValidator.java
@@ -0,0 +1,48 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import com.wisemapping.model.Constants;
+import com.wisemapping.view.TagBean;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+public class TagValidator implements Validator {
+
+    public boolean supports(final Class clazz) {
+        return clazz.equals(TagBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        TagBean tag = (TagBean) obj;
+        if (tag == null) {
+            errors.rejectValue("user", "error.not-specified");
+        } else {
+
+            // Validate email address ...
+            final String tags = tag.getMindmapTags();
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "mindmapTags",
+                                "The tags must have less than "+ Constants.MAX_TAGS_LENGTH + " characters.",
+                                tags,
+                                Constants.MAX_TAGS_LENGTH);
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
new file mode 100644
index 00000000..c7ec6a5e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
@@ -0,0 +1,104 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import com.wisemapping.controller.Messages;
+import com.wisemapping.service.UserService;
+import com.wisemapping.view.UserBean;
+import com.wisemapping.model.Constants;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import org.springframework.validation.Validator;
+
+public class UserValidator
+        implements Validator {
+
+    private UserService userService;
+
+    public boolean supports(final Class clazz) {
+        return clazz.equals(UserBean.class);
+    }
+
+    public void validate(Object obj, Errors errors) {
+        UserBean user = (UserBean) obj;
+        if (user == null) {
+            errors.rejectValue("user", "error.not-specified");
+        } else {
+
+            // Validate email address ...
+            final String email = user.getEmail();
+            boolean isValid = Utils.isValidateEmailAddress(email);
+            if (isValid) {
+                if (userService.getUserBy(email) != null) {
+                    errors.rejectValue("email", Messages.EMAIL_ALREADY_EXIST);
+                }
+            } else {
+                Utils.validateEmailAddress(email, errors);
+            }
+
+            // Validate username ...
+            final String username = user.getUsername();
+            if (username != null && userService.getUserByUsername(username) != null) {
+                errors.rejectValue("username", Messages.USERNAME_ALREADY_EXIST);
+            } else {
+                ValidationUtils.rejectIfEmpty(errors, "username", Messages.FIELD_REQUIRED);
+            }
+
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "firstname", Messages.FIELD_REQUIRED);
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "lastname", Messages.FIELD_REQUIRED);
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", Messages.FIELD_REQUIRED);
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "retypePassword", Messages.FIELD_REQUIRED);
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "firstname",
+                                "The firstname must have less than "+ Constants.MAX_USER_FIRSTNAME_LENGTH + " characters.",
+                                user.getFirstname(),
+                                Constants.MAX_USER_FIRSTNAME_LENGTH);
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "lastname",
+                                "The lastname must have less than "+ Constants.MAX_USER_LASTNAME_LENGTH + " characters.",
+                                user.getLastname(),
+                                Constants.MAX_USER_LASTNAME_LENGTH);
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "username",
+                                "The username must have less than "+ Constants.MAX_USER_USERNAME_LENGTH + " characters.",
+                                username,
+                                Constants.MAX_USER_USERNAME_LENGTH);
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "password",
+                                "The password must have less than "+ Constants.MAX_USER_PASSWORD_LENGTH + " characters.",
+                                user.getPassword(),
+                                Constants.MAX_USER_PASSWORD_LENGTH);
+            ValidatorUtils.rejectIfExceeded(errors,
+                                "retypePassword",
+                                "The retypePassword must have less than "+ Constants.MAX_USER_PASSWORD_LENGTH + " characters.",
+                                user.getRetypePassword(),
+                                Constants.MAX_USER_PASSWORD_LENGTH);
+
+            final String password = user.getPassword();
+            if (password != null && !password.equals(user.getRetypePassword())) {
+                errors.rejectValue("password", Messages.PASSWORD_MISSMATCH);
+            }
+        }
+    }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java
new file mode 100644
index 00000000..5956a3e4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java
@@ -0,0 +1,58 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+import com.wisemapping.controller.Messages;
+
+public class Utils {
+    //Set the email emailPattern string
+
+    static private Pattern emailPattern = Pattern.compile(".+@.+\\.[a-z]+");
+
+    private Utils() {
+
+    }
+
+    static void validateEmailAddress(final String email, final Errors errors) {
+        if (email == null || email.trim().length() == 0) {
+            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "email", Messages.FIELD_REQUIRED);
+        } else {
+            boolean isValid = Utils.isValidateEmailAddress(email);
+            if (!isValid) {
+                errors.rejectValue("email", Messages.NO_VALID_EMAIL_ADDRESS);
+            }
+        }
+    }
+
+    static boolean isValidateEmailAddress(final String email) {
+
+        //Match the given string with the emailPattern
+        final Matcher m = emailPattern.matcher(email);
+
+        //check whether match is found
+        return m.matches();
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java
new file mode 100755
index 00000000..b88989d5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java
@@ -0,0 +1,37 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.validator;
+
+import org.springframework.validation.ValidationUtils;
+
+public class ValidatorUtils
+    extends ValidationUtils
+{
+    public static void rejectIfExceeded(org.springframework.validation.Errors errors,
+                                        java.lang.String title,
+                                        java.lang.String message,
+                                        String value,
+                                        int limit)
+    {
+       if (value != null && value.length() > limit) {
+            errors.rejectValue(title, "field.max.length",message);
+        }
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java
new file mode 100644
index 00000000..bfb8c206
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java
@@ -0,0 +1,42 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+public class ChangePasswordBean {
+
+    private String password;
+    private String retryPassword;
+    
+    public String getPassword() {
+        return password;
+    }
+    
+    public void setPassword(String e) {
+        this.password = e;
+    }
+    
+    public String getRetryPassword() {
+        return retryPassword;
+    }
+    
+    public void setRetryPassword(String e) {
+        this.retryPassword = e;
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/ColaboratorBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ColaboratorBean.java
new file mode 100755
index 00000000..5682cbfa
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ColaboratorBean.java
@@ -0,0 +1,70 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+import com.wisemapping.model.UserRole;
+import com.wisemapping.model.Colaborator;
+import com.wisemapping.model.User;
+
+public class ColaboratorBean
+{
+    private UserRole userRole;
+    private boolean isUser;
+    private Colaborator colaborator;
+
+    public ColaboratorBean(Colaborator colaborator, UserRole role)
+    {
+        this.colaborator = colaborator;
+        this.userRole = role;
+        this.isUser = false;
+    }
+
+    public ColaboratorBean(User user, UserRole role)
+    {
+        this.colaborator = user;
+        this.userRole = role;
+        this.isUser = true;
+    }
+
+    public boolean isUser()
+    {
+        return isUser;
+    }
+
+    public String getRole()
+    {      
+        return userRole.name();
+    }
+
+    public String getUsername()
+    {
+        return isUser ? ((User)colaborator).getUsername() : colaborator.getEmail();
+    }
+
+    public String getEmail()
+    {
+        return colaborator.getEmail();
+    }
+
+    public long getId()
+    {
+        return colaborator.getId();
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/ForgotPasswordBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ForgotPasswordBean.java
new file mode 100755
index 00000000..892bc7fd
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ForgotPasswordBean.java
@@ -0,0 +1,33 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+public class ForgotPasswordBean {
+    
+    private String email;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String e) {
+        this.email = e;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/HistoryBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/HistoryBean.java
new file mode 100755
index 00000000..81ec29e2
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/HistoryBean.java
@@ -0,0 +1,73 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+import java.util.Calendar;
+import java.util.Locale;
+import java.text.DateFormat;
+
+public class HistoryBean
+{
+    private Calendar historyTime;
+    private String author;
+    private int mindmapId;
+    private int historyId;
+
+    public HistoryBean() {}
+
+     public HistoryBean(int mindmapId,int historyId,String author, Calendar time)
+     {
+         this.mindmapId = mindmapId;
+         this.author = author;
+         this.historyTime = time;
+         this.historyId = historyId;
+     }
+
+    public Calendar getHistoryTime() {
+        return historyTime;
+    }
+
+    public String getCreation(Locale locale)
+    {
+        return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.DEFAULT,locale).format(historyTime.getTime());
+    }
+
+    public void setHistoryTime(Calendar historyTime) {
+        this.historyTime = historyTime;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public int getMindMapId()
+    {
+        return mindmapId;
+    }
+
+    public int getHistoryId()
+    {
+        return historyId;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/ImportMapBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ImportMapBean.java
new file mode 100644
index 00000000..78b56090
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/ImportMapBean.java
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+import com.wisemapping.model.MindMap;
+
+public class ImportMapBean extends MindMapInfoBean{
+
+
+    private String mapFile;
+    private MindMap importedMap;
+
+
+    public MindMap getImportedMap() {
+        return importedMap;
+    }
+
+    public void setMapFile(String mapFile) {
+        this.mapFile = mapFile;
+    }
+
+    public String getMapFile() {
+        return mapFile;
+    }
+
+    public void setImportedMap(MindMap map) {
+        this.importedMap = map;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
new file mode 100644
index 00000000..4306742d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
@@ -0,0 +1,168 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.MindmapUser;
+import com.wisemapping.model.UserRole;
+import com.wisemapping.model.User;
+
+import java.text.DateFormat;
+import java.util.*;
+
+public class MindMapBean {
+    private MindMap mindMap;
+    private List<ColaboratorBean> viewers;
+    private List<ColaboratorBean> colaborators;
+
+    public MindMapBean(final MindMap mindmap) {
+        this.mindMap = mindmap;
+        this.colaborators = getColaboratorBy(mindmap.getMindmapUsers(), UserRole.COLLABORATOR);
+        this.viewers = getColaboratorBy(mindmap.getMindmapUsers(), UserRole.VIEWER);
+    }
+
+    public MindMap getMindMap() {
+        return mindMap;
+    }
+
+    public boolean getPublic() {
+        return mindMap.isPublic();
+    }
+
+    public String getTitle() {
+        return mindMap.getTitle();
+    }
+
+    public String getDescription() {
+        return mindMap.getDescription();
+    }
+
+    public int getId() {
+        return mindMap.getId();
+    }
+
+    public List<ColaboratorBean> getViewers() {
+        return viewers;
+    }
+
+    public List<ColaboratorBean> getCollaborators() {
+        return colaborators;
+    }
+
+    public String getLastEditor() {
+        return mindMap.getLastModifierUser();
+    }
+
+    public String getLastEditDate() {
+        String result = "";
+        Calendar lastEditTime = Calendar.getInstance();
+        lastEditTime.setTime(mindMap.getLastModificationTime().getTime());
+        Calendar now = Calendar.getInstance();
+        int dayDiff = getDaysBetween(now, lastEditTime);
+        if (dayDiff > 0) {
+            result = dayDiff + " days ago";
+        } else if (dayDiff == 0) {
+            result = "today";
+        }
+        return result;
+    }
+
+    public Calendar getLastEditTime() {
+        return mindMap.getLastModificationTime();
+    }
+
+    public String getCreationTime() {
+        return DateFormat.getInstance().format(mindMap.getCreationTime().getTime());
+    }
+
+    public String getCreationUser() {
+        return mindMap.getCreator();
+    }
+
+    public String getTags() {
+        return mindMap.getTags();
+    }
+
+    private List<ColaboratorBean> getColaboratorBy(Set<MindmapUser> source, UserRole role) {
+        List<ColaboratorBean> col = new ArrayList<ColaboratorBean>();
+        if (source != null) {
+            for (MindmapUser mu : source) {
+                if (mu.getRole() == role) {
+                    col.add(new ColaboratorBean(mu.getColaborator(), mu.getRole()));
+                }
+            }
+        }
+        return col;
+    }
+
+    private static int getDaysBetween(java.util.Calendar d1, java.util.Calendar d2) {
+        if (d1.after(d2)) {  // swap dates so that d1 is start and d2 is end
+            java.util.Calendar swap = d1;
+            d1 = d2;
+            d2 = swap;
+        }
+        int days = d2.get(java.util.Calendar.DAY_OF_YEAR) -
+                d1.get(java.util.Calendar.DAY_OF_YEAR);
+        int y2 = d2.get(java.util.Calendar.YEAR);
+        if (d1.get(java.util.Calendar.YEAR) != y2) {
+            d1 = (java.util.Calendar) d1.clone();
+            do {
+                days += d1.getActualMaximum(java.util.Calendar.DAY_OF_YEAR);
+                d1.add(java.util.Calendar.YEAR, 1);
+            } while (d1.get(java.util.Calendar.YEAR) != y2);
+        }
+        return days;
+    }
+
+    public static class MindMapBeanComparator implements Comparator<MindMapBean> {
+
+        public int compare(MindMapBean o1, MindMapBean o2) {
+            return o1.getLastEditTime().compareTo(o2.getLastEditTime());
+        }
+    }
+
+    public int getCountColaborators() {
+        return colaborators != null ? colaborators.size() : 0;
+    }
+
+    public int getCountViewers() {
+        return viewers != null ? viewers.size() : 0;
+    }
+
+    public int getCountShared() {
+        return getCountColaborators() + getCountViewers();
+    }
+
+    public boolean isShared() {
+        return getCountShared() > 0;
+    }
+
+    public void setTitle(String t) {
+        mindMap.setTitle(t);
+    }
+
+    public void setDescription(String d) {
+        mindMap.setDescription(d);
+    }
+
+    public User getOwner() {
+        return mindMap.getOwner();
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java
new file mode 100644
index 00000000..29cd24fb
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java
@@ -0,0 +1,66 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+import com.wisemapping.model.MindMap;
+
+
+public class MindMapInfoBean {
+    private String title;
+    private String description;
+    private MindMap mindMap;
+
+    public MindMapInfoBean(MindMap map) {
+        this.title = map.getTitle();
+        this.description = map.getDescription();
+
+        this.mindMap = map;
+    }
+
+    public MindMapInfoBean() {
+        this.title = "";
+        this.description = "";
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+
+    public MindMap getMindMap() {
+        if (mindMap != null) {
+            mindMap.setTitle(title);
+            mindMap.setDescription(description);
+        }
+        return mindMap;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/TagBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/TagBean.java
new file mode 100755
index 00000000..7d86b045
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/TagBean.java
@@ -0,0 +1,68 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+import java.util.Set;
+
+public class TagBean
+{
+    private Set<String> userTags;
+    private String mindmapTitle;
+    private int mindmapId;
+    private String mindmapTags;
+
+    public TagBean(){}
+
+    public Set<String> getUserTags() {
+        return userTags;
+    }
+
+    public void setUserTags(Set<String> tags) {
+        this.userTags = tags;
+    }
+
+    public String getMindmapTags() {
+        return mindmapTags;
+    }
+
+    public void setMindmapTags(String tags) {
+        this.mindmapTags = tags;
+    }
+
+    public String getMindmapTitle()
+    {
+        return mindmapTitle;
+    }
+
+    public void setMindmapTitle(String title)
+    {
+        this.mindmapTitle = title;
+    }
+
+    public int getMindmapId()
+    {
+        return mindmapId;
+    }
+
+    public void setMindmapId(int id)
+    {
+        this.mindmapId = id;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java b/trunk/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java
new file mode 100644
index 00000000..a1c6e862
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java
@@ -0,0 +1,56 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.view;
+
+import com.wisemapping.model.User;
+
+public class UserBean
+        extends User {
+    private String retypePassword;
+    private String captcha;
+
+    public UserBean() {
+
+    }
+
+    public UserBean(User model) {
+        this.setFirstname(model.getFirstname());
+        this.setLastname(model.getLastname());
+        this.setEmail(model.getEmail());
+        this.setId(model.getId());
+        this.setAllowSendEmail(model.isAllowSendEmail());
+    }
+
+    public String getRetypePassword() {
+        return retypePassword;
+    }
+
+    public void setRetypePassword(String retypePassword) {
+        this.retypePassword = retypePassword;
+    }
+
+    public String getCaptcha() {
+        return captcha;
+    }
+
+    public void setCaptcha(String captcha) {
+        this.captcha = captcha;
+    }
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/ws/WiseWsEndpoint.java b/trunk/wise-webapp/src/main/java/com/wisemapping/ws/WiseWsEndpoint.java
new file mode 100644
index 00000000..174632a7
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/ws/WiseWsEndpoint.java
@@ -0,0 +1,161 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.ws;
+
+import org.springframework.ws.server.endpoint.annotation.Endpoint;
+import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
+import org.apache.log4j.Logger;
+import com.sun.istack.internal.NotNull;
+import com.wisemapping.service.MindmapService;
+import com.wisemapping.service.UserService;
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import com.wisemapping.exceptions.NoMapFoundException;
+
+import javax.xml.bind.*;
+import javax.xml.transform.stream.StreamSource;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Calendar;
+
+/**
+ * WiseMapping Web Services API 
+ */
+@Endpoint
+public class WiseWsEndpoint {
+
+    MindmapService mindmapService;
+    private UserService userService;
+    final static Logger logger = Logger.getLogger("org.wisemapping.ws");
+    private JAXBContext jaxbContext;
+
+
+    public WiseWsEndpoint(MindmapService mindmapService, UserService userService) throws JAXBException {
+        this.mindmapService = mindmapService;
+        this.userService = userService;
+        jaxbContext = JAXBContext.newInstance("com.wisemapping.ws");
+    }
+
+    @PayloadRoot(localPart = "loadMindmapRequest", namespace = "http://www.wisemapping.org/ws")
+    public LoadMindmapResponse loadMindmap(final @NotNull LoadMindmapRequest request) throws Throwable {
+
+        logger.debug("Invoking loadMindmap");
+        final LoadMindmapResponse result = new LoadMindmapResponse();
+
+        try {
+            final MindMap mindmap = mindmapService.getMindmapById((int) request.getMapdId());
+            if(mindmap==null)
+            {
+                throw new NoMapFoundException(request.getMapdId());
+            }
+
+            String xml = mindmap.getNativeXml();
+
+            // Hack, we need to unify to only one XSD schema definitions per map ...
+            xml = "<map xmlns=\"http://www.wisemapping.org/mindmap\"" + xml.substring(4,xml.length());
+
+            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+
+            final StringReader stringReader = new StringReader(xml);
+            final StreamSource streamSource = new StreamSource(stringReader);
+            final JAXBElement<MapType> mapElement =  unmarshaller.unmarshal(streamSource,MapType.class);
+
+            // Load map data ...
+            result.creator = mindmap.getCreator();
+            result.setMap(mapElement.getValue());
+        } catch (Throwable e) {
+            logger.fatal("Unexpexted Exception", e);
+            throw e;
+        }
+
+        return result;
+    }
+
+    @PayloadRoot(localPart = "addMindmapRequest", namespace = "http://www.wisemapping.org/ws")
+    public AddMindmapResponse createMindmap(final @NotNull AddMindmapRequest request) throws Throwable {
+
+        logger.debug("Invoking createMindmap");
+        final AddMindmapResponse response = new AddMindmapResponse();
+        try {
+
+            final String creator = request.getCreator();
+            final User user = userService.getUserBy(creator);
+            if(user==null)
+            {
+              throw new IllegalArgumentException("Invalid addMindmapRequest.' " + creator+"' is not valid wisemapping user.");
+            }
+
+
+            final MindMap mindmap =  new MindMap();
+            mindmap.setCreationTime(Calendar.getInstance());
+
+            // Set title ...
+            final String title = request.getTitle();
+            if(title==null)
+            {
+                throw new IllegalArgumentException("Invalid addMindmapRequest. Title element can not be null.");
+            }
+            mindmap.setTitle(title);
+
+            // Set description ...
+            final String description = request.getDescription();
+            if(description==null)
+            {
+                throw new IllegalArgumentException("Invalid addMindmapRequest. Description element can not be null.");
+            }
+            mindmap.setDescription(description);
+
+            // Convert Map to XML
+            final MapType mapType = request.getMap();
+            if(mapType==null)
+            {
+                throw new IllegalArgumentException("Invalid addMindmapRequest. Map element can not be null.");
+            }
+
+            ObjectFactory factory = new ObjectFactory();
+            final Marshaller marshaller = jaxbContext.createMarshaller();
+            StringWriter stringWriter = new StringWriter();
+            marshaller.marshal(factory.createMap(mapType),stringWriter);
+
+            mindmap.setNativeXml(stringWriter.toString());
+            mindmapService.addMindmap(mindmap,user);
+
+
+            // Prepare result ...
+            response.setMapId(mindmap.getId());
+
+        } catch (Throwable e) {
+            logger.fatal("Unexpexted Exception", e);
+            throw e;
+
+        }
+
+        return response;
+    }
+
+
+    public MindmapService getMindmapService() {
+        return mindmapService;
+    }
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/Style.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/Style.java
new file mode 100644
index 00000000..8974135c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/Style.java
@@ -0,0 +1,162 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.xml;
+
+public class Style {
+
+    private float width;
+    private float height;
+    private String left;
+    private String top;
+    private float fontSize;
+    private String fontFamily;
+    private String color;
+    private String fontWidth;
+    private boolean isVisible = true;
+
+    public boolean isVisible() {
+        return isVisible;
+    }
+
+    public void setVisible(boolean visible) {
+        isVisible = visible;
+    }
+
+    public static Style parse(final String styleValue) {
+        Style result = new Style();
+        String[] strings = styleValue.split(";");
+
+        for (String style : strings) {
+            final String key = style.substring(0, style.indexOf(":"));
+            String value = style.substring(style.indexOf(":") + 1, style.length());
+            value = value.trim();
+
+            if (key.trim().equals("WIDTH")) {
+                result.setWidth(parseFloat(value));
+            } else if (key.trim().equals("HEIGHT")) {
+                result.setHeight(parseFloat(value));
+            }
+            if (key.trim().equals("TOP")) {
+                result.setTop(removeUnit(value));
+            } else if (key.trim().equals("LEFT")) {
+                result.setLeft(removeUnit(value));
+            } else if (key.trim().equals("FONT")) {
+                final String[] fontValues = value.split(" ");
+                if (fontValues.length == 3) {
+                    result.setFontWidth(fontValues[0]);
+                    result.setFontSize(parseFloat(fontValues[1]));
+                    result.setFontFamily(fontValues[2]);
+                } else if (fontValues.length == 2) {
+                    result.setFontSize(parseFloat(fontValues[0]));
+                    result.setFontFamily(fontValues[1]);
+                }
+            } else if (key.trim().equals("COLOR")) {
+                result.setColor(value);
+            } else if (key.trim().equals("VISIBILITY")) {
+                result.setVisible(!"hidden".equals(value));
+            }
+
+        }
+        return result;
+    }
+
+    private void setFontWidth(String v) {
+        this.fontWidth = v;
+    }
+
+    private void setColor(String value) {
+        this.color = value;
+    }
+
+    public float getHeight() {
+        return height;
+    }
+
+    public void setHeight(float height) {
+        this.height = height;
+    }
+
+    public float getWidth() {
+        return width;
+    }
+
+    public void setWidth(float width) {
+        this.width = width;
+    }
+
+    public static String removeUnit(String value) {
+        String number;
+        if (value.indexOf("px") != -1 || value.indexOf("pt") != -1) {
+            number = value.substring(0, value.length() - 2);
+        } else {
+            number = value;
+        }
+        return number;
+    }
+
+    public static float parseFloat(String value) {
+        String number = removeUnit(value);
+        return Float.parseFloat(number);
+    }
+
+
+    public String getLeft() {
+        return left;
+    }
+
+    public void setLeft(String left) {
+        this.left = left;
+    }
+
+    public String getTop() {
+        return top;
+    }
+
+    public void setTop(String top) {
+        this.top = top;
+    }
+
+
+    public float getFontSize() {
+        return fontSize;
+    }
+
+    public void setFontSize(float fontSize) {
+        this.fontSize = fontSize;
+    }
+
+    public String getFontFamily() {
+        return fontFamily;
+    }
+
+    public void setFontFamily(String fontFamily) {
+        this.fontFamily = fontFamily;
+    }
+
+    public String getColor() {
+        return this.color;
+    }
+
+    public String getFontWidth() {
+        return fontWidth;
+    }
+}
+
+
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/SvgToVMLConverter.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/SvgToVMLConverter.java
new file mode 100644
index 00000000..e014f220
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/SvgToVMLConverter.java
@@ -0,0 +1,443 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.xml;
+
+import com.wisemapping.xml.svgmap.*;
+import com.wisemapping.xml.svgmap.ObjectFactory;
+import com.wisemapping.xml.vmlmap.*;
+import com.wisemapping.xml.vmlmap.Line;
+import com.wisemapping.xml.vmlmap.Polyline;
+import com.wisemapping.xml.vmlmap.Rect;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.Marshaller;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+
+public class SvgToVMLConverter {
+    private ObjectFactory svgObjectFactory;
+    private static final int CORRECTION_HANDCODE = 5;
+    private Object svgRootElem;
+
+    public SvgToVMLConverter() {
+        this.svgObjectFactory = new ObjectFactory();
+
+    }
+
+    public void convert(final InputStream vmlDocument) throws JAXBException {
+
+        final JAXBContext vmlContext = JAXBContext.newInstance("com.wisemapping.xml.vmlmap");
+        final Unmarshaller umarshaller = vmlContext.createUnmarshaller();
+        final Group rootElem = (Group) umarshaller.unmarshal(vmlDocument);
+
+        this.svgRootElem = convert(rootElem);
+    }
+
+    private Svg convert(Group g) {
+        final Svg svgElement = svgObjectFactory.createSvg();
+        svgElement.setPreserveAspectRatio("none");
+
+        /*
+           <v:group style="WIDTH: 1270px; POSITION: absolute; HEIGHT: 705px" coordsize="889,493" coordorigin="-445,-247">
+            <svgElement preserveAspectRatio="none" viewBox="-445.9 -221.9 891.8 443.8" height="634" width="1274" id="workspace" focusable="true">
+         */
+
+        final String coordorigin = g.getCoordorigin();
+        String coordSize = g.getCoordsize();
+        svgElement.setViewBox(coordorigin + ", " + coordSize);
+
+        final Style style = Style.parse(g.getStyle());
+        float width = style.getWidth();
+        svgElement.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgElement.setHeight(String.valueOf(height));
+
+        // Convert connection lines ...
+        final List<Polyline> polylines = g.getPolyline();
+        final List<com.wisemapping.xml.svgmap.Polyline> svgPolylines = svgElement.getPolyline();
+        for (Polyline vmlPolyline : polylines) {
+            final com.wisemapping.xml.svgmap.Polyline svgPolyline = convert(vmlPolyline);
+            svgPolylines.add(svgPolyline);
+        }
+
+        final List<Line> vmlLines = g.getLine();
+        final List<com.wisemapping.xml.svgmap.Line> svgLines = svgElement.getLine();
+        for (Line vmlLine : vmlLines) {
+            final com.wisemapping.xml.svgmap.Line svgPolyline = convert(vmlLine);
+            svgLines.add(svgPolyline);
+        }
+
+        // Convert Topics ...
+        final List<Group> vmlTopics = g.getGroup();
+        final List<G> svgTopics = svgElement.getG();
+        for (Group topic : vmlTopics) {
+            G svgTopic = convertTopicGroup(topic);
+            svgTopics.add(svgTopic);
+        }
+
+        // Convert connectors ...
+        g.getOval();
+
+        return svgElement;
+    }
+
+    private G convertTopicGroup(final Group vmlTopic) {
+        /**
+         *     <v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -53px; HEIGHT: 100px" coordsize="100,100">
+         *    <g transform="translate(225, -52) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+         */
+        final G svgTopic = new G();
+
+        final String styleStr = vmlTopic.getStyle();
+        final Style style = Style.parse(styleStr);
+
+        String transform = "translate(" + style.getLeft() + ", " + style.getTop() + ") scale(1, 1)";
+        svgTopic.setTransform(transform);
+
+        float width = style.getWidth();
+        svgTopic.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgTopic.setHeight(String.valueOf(height));
+
+        svgTopic.setPreserveAspectRatio("none");
+
+        // Convert InnerShape ...
+        final List<Roundrect> roundrects = vmlTopic.getRoundrect();
+        float rectWidth = 0;
+        float rectHeight = 0;
+        for (Roundrect vmlRect : roundrects) {
+
+            // Skip outerShape figure...
+            final Fill vmlFill = vmlRect.getFill();
+            if (vmlFill == null || !"0".equals(vmlFill.getOpacity())) {
+                final com.wisemapping.xml.svgmap.Rect svgRect = convert(vmlRect);
+                svgTopic.setRect(svgRect);
+                final Style rectStyle = Style.parse(vmlRect.getStyle());
+
+                rectWidth = rectStyle.getWidth();
+                rectHeight = rectStyle.getHeight();
+            }
+        }
+
+        final List<Rect> vmlRects = vmlTopic.getRect();
+        for (Rect vmlRect : vmlRects) {
+
+            // Skip outerShape figure...
+            final Fill vmlFill = vmlRect.getFill();
+            if (vmlFill == null || !"0".equals(vmlFill.getOpacity())) {
+                final com.wisemapping.xml.svgmap.Rect svgRect = convert(vmlRect);
+                svgTopic.setRect(svgRect);
+                final Style rectStyle = Style.parse(vmlRect.getStyle());
+
+                rectWidth = rectStyle.getWidth();
+                rectHeight = rectStyle.getHeight();
+            }
+        }
+
+        final List<Line> vmlLines = vmlTopic.getLine();
+        for (final Line vmlLine : vmlLines) {
+
+            final String lineStyleStr = vmlLine.getStyle();
+            final Style lineStyle = Style.parse(lineStyleStr);
+            if (lineStyle.isVisible()) {
+                com.wisemapping.xml.svgmap.Line line = convert(vmlLine);
+                svgTopic.setLine(line);
+            } else {
+                // Shape is line...
+                final String from = vmlLine.getFrom();
+                String[] formPoints = from.split(",");
+
+                final String to = vmlLine.getTo();
+                String[] toPoints = to.split(",");
+
+                rectWidth = Float.parseFloat(formPoints[0]) - Float.parseFloat(toPoints[0]);
+                rectWidth = Math.abs(rectWidth);
+
+                rectHeight = Float.parseFloat(formPoints[1]);
+            }
+        }
+
+        // Convert connection ovals..
+        final List<Oval> vmlOvals = vmlTopic.getOval();
+        for (Oval vmlOval : vmlOvals) {
+
+            // Skip outerShape figure...
+            final Ellipse svgElipse = convert(vmlOval);
+            if (svgElipse != null) {
+                svgTopic.setEllipse(svgElipse);
+            }
+        }
+
+        // Convert Text ...
+        final List<Shape> vmlTextShape = vmlTopic.getShape();
+        final Text svgText = convertTextShape(vmlTextShape.get(0), rectWidth, rectHeight);
+        svgTopic.setText(svgText);
+
+        return svgTopic;
+    }
+
+    private com.wisemapping.xml.svgmap.Rect convert(Rect vmlRect) {
+        final com.wisemapping.xml.svgmap.Rect svgRect = new com.wisemapping.xml.svgmap.Rect();
+        final Style style = Style.parse(vmlRect.getStyle());
+
+        float width = style.getWidth();
+        svgRect.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgRect.setHeight(height);
+
+        String top = style.getTop();
+        svgRect.setY(Float.parseFloat(top));
+
+        String left = style.getLeft();
+        svgRect.setX(Float.parseFloat(left));
+
+        // Fill properties ...
+        final String fillColor = vmlRect.getFillcolor();
+        svgRect.setFill(fillColor);
+
+        // Stroke properties ...
+        final String strokeColor = vmlRect.getStrokecolor();
+        svgRect.setStroke(strokeColor);
+        svgRect.setStrokeWidth("0.5px");
+        return svgRect;
+
+    }
+
+    private Ellipse convert(final Oval vmlOval) {
+
+        /**
+         * <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+         *       coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+         *   <v:stroke dashstyle="solid"></v:stroke>
+         *   <v:fill></v:fill>
+         * </v:oval>
+         *
+         *
+         * SVG:
+         *   <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+         *        height="6" width="6"></ellipse>
+         */
+        final Style style = Style.parse(vmlOval.getStyle());
+        Ellipse svgElipse = null;
+        if (style.isVisible()) {
+            svgElipse = new Ellipse();
+
+            float width = style.getWidth();
+            svgElipse.setWidth(width);
+            svgElipse.setRx(width / 2);
+
+            float height = style.getHeight();
+            svgElipse.setHeight(height);
+            svgElipse.setRy(height / 2);
+
+            String top = style.getTop();
+            svgElipse.setCy(Float.parseFloat(top) + (width / 2));
+
+            String left = style.getLeft();
+            svgElipse.setCx(Float.parseFloat(left) + (height / 2));
+
+            // Fill properties ...
+            final String fillColor = vmlOval.getFillcolor();
+            svgElipse.setFill(fillColor);
+
+            // Stroke properties ...
+            final String strokeColor = vmlOval.getStrokecolor();
+            svgElipse.setStroke(strokeColor);
+            svgElipse.setStrokeWidth("0.5px");
+        }
+        return svgElipse;
+    }
+
+    private com.wisemapping.xml.svgmap.Line convert(final Line vmlLine) {
+        /**
+         * VML:
+         * <v:line style="POSITION: absolute" from="0,0" to="157,-150" fillcolor="white" stroked="t" strokecolor="#495879"
+         *       strokeweight="1px">
+         * <:stroke dashstyle="solid"></v:stroke>
+         * </v:line>
+         *
+         * SVG:
+         *  <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+         stroke-width="1px"></line>
+         */
+
+        com.wisemapping.xml.svgmap.Line svgLine = new com.wisemapping.xml.svgmap.Line();
+        final String from = vmlLine.getFrom();
+        final String[] fromPoints = from.split(",");
+
+        svgLine.setX1(Float.parseFloat(fromPoints[0]));
+        svgLine.setY1(Float.parseFloat(fromPoints[1]));
+
+        final String to = vmlLine.getTo();
+        final String[] toPoints = to.split(",");
+
+        svgLine.setX2(Float.parseFloat(toPoints[0]));
+        svgLine.setY2(Float.parseFloat(toPoints[1]));
+
+        String strokeweight = vmlLine.getStrokeweight();
+        svgLine.setStrokeWidth(strokeweight);
+
+        String stokeColor = vmlLine.getStrokecolor();
+        svgLine.setStroke(stokeColor);
+
+        return svgLine;
+    }
+
+    private Text convertTextShape(Shape vmlTextShape, float boxWidth, float boxHeigth) {
+        /**
+         * <v:shape
+         *        style="Z-INDEX: 10; LEFT: 9px; WIDTH: 130px; CURSOR: default; POSITION: absolute; TOP: 9px; HEIGHT: 1px; antialias: true"
+         *        coordsize="100,100">
+         *   <v:textbox
+         *            style="MARGIN-TOP: 0.187pt; LEFT: auto; FONT: bold 19px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 138.531pt; COLOR: #023bb9; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+         *            xFontScale="1.4" xTextSize="100.1,16.0" inset="0,0,0,0">
+         *        <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+         *            <SPAN>Central Topic</SPAN>
+         *        </SPAN>
+         *    </v:textbox>
+         * </v:shape>
+         * SVG:
+         *  <text x="9" y="19" style="cursor: default;" fill="#023BB9" font-weight="bold" font-style="normal"
+         *     font-size="13.4375" font-family="verdana" focusable="true">Central Topic
+         *  </text>
+         */
+        final Text svgText = new Text();
+        Textbox vmlTextBox = vmlTextShape.getTextbox();
+        final String textBoxStyleStr = vmlTextBox.getStyle();
+        final Style textBoxStyle = Style.parse(textBoxStyleStr);
+
+        // @todo: Take this hardcode from javascript ...
+        float fontSize = textBoxStyle.getFontSize();
+        float scale = vmlTextBox.getXFontScale();
+        float svgFontSize = fontSize / scale;
+
+        svgText.setFontSize(svgFontSize);
+
+        // Set text properties...
+        final String textValue = vmlTextBox.getSPAN().getSPAN();
+        svgText.setContent(textValue);
+
+        final String color = textBoxStyle.getColor();
+        svgText.setFill(color);
+
+        final String fontWidth = textBoxStyle.getFontWidth();
+        svgText.setFontWeight(fontWidth);
+
+        // Positionate font...
+        final String textSize = vmlTextBox.getXTextSize();
+        final String[] split = textSize.split(",");
+        float textWidth = Float.valueOf(split[0]);
+        float textHeight = Float.valueOf(split[1]);
+
+        svgText.setX(boxWidth - textWidth);
+        svgText.setY(boxHeigth - textHeight + CORRECTION_HANDCODE);
+
+        return svgText;
+
+    }
+
+    private com.wisemapping.xml.svgmap.Rect convert(Roundrect vmlRect) {
+
+        /*
+         * VML:
+         *  <v:roundrect style="LEFT: 0px; WIDTH: 62px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+         *            arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+         *            strokeweight="6762emu">
+         *       <v:stroke dashstyle="solid"></v:stroke>
+         *       <v:fill></v:fill>
+         *   </v:roundrect>
+         *
+         * SVG:
+         *   <rect style="cursor: move;" fill="#E0E5EF" stroke="#023BB9" stroke-width="0.5px" y="0" x="0" ry="2.7" rx="2.7"
+         *      height="18" width="68"></rect>
+         *
+        */
+        final com.wisemapping.xml.svgmap.Rect svgRect = new com.wisemapping.xml.svgmap.Rect();
+        final Style style = Style.parse(vmlRect.getStyle());
+        svgRect.setRy(2.7F);
+        svgRect.setRx(2.7F);
+
+        float width = style.getWidth();
+        svgRect.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgRect.setHeight(height);
+
+        String top = style.getTop();
+        svgRect.setY(Float.parseFloat(top));
+
+        String left = style.getLeft();
+        svgRect.setX(Float.parseFloat(left));
+
+        // Fill properties ...
+        final String fillColor = vmlRect.getFillcolor();
+        svgRect.setFill(fillColor);
+
+        // Stroke properties ...
+        final String strokeColor = vmlRect.getStrokecolor();
+        svgRect.setStroke(strokeColor);
+        svgRect.setStrokeWidth("0.5px");
+
+        return svgRect;
+
+    }
+
+    private com.wisemapping.xml.svgmap.Polyline convert(Polyline vmlPolyline) {
+
+        /*
+         *     <v:polyline style="POSITION: absolute" rPoints="167.1, 100.0 177.1, 100.0 177.1, 130.5 182.1, 135.5 230.6, 135.5"
+         *       filled="f" strokecolor="#495879" strokeweight=".75pt">
+         *       <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+         *       </v:polyline>
+         *
+         *     <polyline points="173.5,100 183.5,100 183.5,129 188.5,134 240,134" stroke-opacity="1" stroke="#495879"
+         *     stroke-width="1px" fill="none"></polyline>
+         */
+        final com.wisemapping.xml.svgmap.Polyline svgPolyline = svgObjectFactory.createPolyline();
+
+        final String rPoints = vmlPolyline.getXPoints();
+        svgPolyline.setPoints(rPoints);
+
+        final String strokeColor = vmlPolyline.getStrokecolor();
+        svgPolyline.setStroke(strokeColor);
+
+        // @todo: Take from SVG.
+        svgPolyline.setFill("none");
+        svgPolyline.setStrokeWidth("1px");
+        svgPolyline.setStrokeOpacity("1");
+
+        return svgPolyline;
+    }
+
+
+    public void toXml(OutputStream os) throws JAXBException {
+        final JAXBContext svgContext = JAXBContext.newInstance("com.wisemapping.xml.svgmap");
+        Marshaller m = svgContext.createMarshaller();
+        m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        m.marshal(svgRootElem, os);
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/VmlToSvgConverter.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/VmlToSvgConverter.java
new file mode 100644
index 00000000..93b3bd89
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/VmlToSvgConverter.java
@@ -0,0 +1,451 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.xml;
+
+import com.wisemapping.xml.vmlmap.*;
+import com.wisemapping.xml.vmlmap.Polyline;
+import com.wisemapping.xml.vmlmap.Line;
+import com.wisemapping.xml.vmlmap.Rect;
+import com.wisemapping.xml.svgmap.*;
+import com.wisemapping.xml.svgmap.ObjectFactory;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.Marshaller;
+import java.io.*;
+import java.util.List;
+
+public class VmlToSvgConverter {
+    private ObjectFactory svgObjectFactory;
+    private static final int CORRECTION_HARDCODE = 5;
+    private Object svgRootElem;
+
+    public VmlToSvgConverter() {
+        this.svgObjectFactory = new ObjectFactory();
+
+    }
+
+    public void convert(final Reader vmlDocument) throws JAXBException, IOException {
+
+        final JAXBContext vmlContext = JAXBContext.newInstance("com.wisemapping.xml.vmlmap");
+        final Unmarshaller umarshaller = vmlContext.createUnmarshaller();
+        final Group rootElem = (Group) umarshaller.unmarshal(vmlDocument);
+        this.svgRootElem = convert(rootElem);
+    }
+
+    private Svg convert(Group g) {
+        final Svg svgElement = svgObjectFactory.createSvg();
+        svgElement.setPreserveAspectRatio("none");
+
+        /*
+           <v:group style="WIDTH: 1270px; POSITION: absolute; HEIGHT: 705px" coordsize="889,493" coordorigin="-445,-247">
+            <svgElement preserveAspectRatio="none" viewBox="-445.9 -221.9 891.8 443.8" height="634" width="1274" id="workspace" focusable="true">
+         */
+
+        final String coordorigin = g.getCoordorigin();
+        String coordSize = g.getCoordsize();
+        svgElement.setViewBox(coordorigin + ", " + coordSize);
+
+        final Style style = Style.parse(g.getStyle());
+        float width = style.getWidth();
+        svgElement.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgElement.setHeight(String.valueOf(height));
+
+        // Convert connection lines ...
+        final List<Polyline> polylines = g.getPolyline();
+        final List<com.wisemapping.xml.svgmap.Polyline> svgPolylines = svgElement.getPolyline();
+        for (Polyline vmlPolyline : polylines) {
+            final com.wisemapping.xml.svgmap.Polyline svgPolyline = convert(vmlPolyline);
+            svgPolylines.add(svgPolyline);
+        }
+
+        final List<Line> vmlLines = g.getLine();
+        final List<com.wisemapping.xml.svgmap.Line> svgLines = svgElement.getLine();
+        for (Line vmlLine : vmlLines) {
+            final com.wisemapping.xml.svgmap.Line svgPolyline = convert(vmlLine);
+            svgLines.add(svgPolyline);
+        }
+
+        // Convert Topics ...
+        final List<Group> vmlTopics = g.getGroup();
+        final List<G> svgTopics = svgElement.getG();
+        for (Group topic : vmlTopics) {
+            G svgTopic = convertTopicGroup(topic);
+            svgTopics.add(svgTopic);
+        }
+
+        // Convert connectors ...
+        g.getOval();
+
+        return svgElement;
+    }
+
+    private G convertTopicGroup(final Group vmlTopic) {
+        /**
+         *     <v:group style="LEFT: 222px; WIDTH: 100px; CURSOR: move; POSITION: absolute; TOP: -53px; HEIGHT: 100px" coordsize="100,100">
+         *    <g transform="translate(225, -52) scale(1, 1)" height="100" width="100" focusable="true" preserveAspectRatio="none">
+         */
+        final G svgTopic = new G();
+
+        final String styleStr = vmlTopic.getStyle();
+        final Style style = Style.parse(styleStr);
+
+        String transform = "translate(" + style.getLeft() + ", " + style.getTop() + ") scale(1, 1)";
+        svgTopic.setTransform(transform);
+
+        float width = style.getWidth();
+        svgTopic.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgTopic.setHeight(String.valueOf(height));
+
+        svgTopic.setPreserveAspectRatio("none");
+
+        // Convert InnerShape ...
+        final List<Roundrect> roundrects = vmlTopic.getRoundrect();
+        float rectWidth = 0;
+        float rectHeight = 0;
+        for (Roundrect vmlRect : roundrects) {
+
+            // Skip outerShape figure...
+            final Fill vmlFill = vmlRect.getFill();
+            if (vmlFill == null || !"0".equals(vmlFill.getOpacity())) {
+                final com.wisemapping.xml.svgmap.Rect svgRect = convert(vmlRect);
+                svgTopic.setRect(svgRect);
+                final Style rectStyle = Style.parse(vmlRect.getStyle());
+
+                rectWidth = rectStyle.getWidth();
+                rectHeight = rectStyle.getHeight();
+            }
+        }
+
+        final List<Rect> vmlRects = vmlTopic.getRect();
+        for (com.wisemapping.xml.vmlmap.Rect vmlRect : vmlRects) {
+
+            // Skip outerShape figure...
+            final Fill vmlFill = vmlRect.getFill();
+            if (vmlFill == null || !"0".equals(vmlFill.getOpacity())) {
+                final com.wisemapping.xml.svgmap.Rect svgRect = convert(vmlRect);
+                svgTopic.setRect(svgRect);
+                final Style rectStyle = Style.parse(vmlRect.getStyle());
+
+                rectWidth = rectStyle.getWidth();
+                rectHeight = rectStyle.getHeight();
+            }
+        }
+
+        final List<Line> vmlLines = vmlTopic.getLine();
+        for (final Line vmlLine : vmlLines) {
+
+            final String lineStyleStr = vmlLine.getStyle();
+            final Style lineStyle = Style.parse(lineStyleStr);
+            if (lineStyle.isVisible()) {
+                com.wisemapping.xml.svgmap.Line line = convert(vmlLine);
+                svgTopic.setLine(line);
+            } else {
+                // Shape is line...
+                final String from = vmlLine.getFrom();
+                String[] formPoints = from.split(",");
+
+                final String to = vmlLine.getTo();
+                String[] toPoints = to.split(",");
+
+                rectWidth = Float.parseFloat(formPoints[0]) - Float.parseFloat(toPoints[0]);
+                rectWidth = Math.abs(rectWidth);
+
+                rectHeight = Float.parseFloat(formPoints[1]);
+            }
+        }
+
+        // Convert connection ovals..
+        final List<Oval> vmlOvals = vmlTopic.getOval();
+        for (Oval vmlOval : vmlOvals) {
+
+            // Skip outerShape figure...
+            final Ellipse svgElipse = convert(vmlOval);
+            if (svgElipse != null) {
+                svgTopic.setEllipse(svgElipse);
+            }
+        }
+
+        // Convert Text ...
+        final List<Shape> vmlTextShape = vmlTopic.getShape();
+        final Text svgText = convertTextShape(vmlTextShape.get(0), rectWidth, rectHeight);
+        svgTopic.setText(svgText);
+
+        return svgTopic;
+    }
+
+    private com.wisemapping.xml.svgmap.Rect convert(Rect vmlRect) {
+        final com.wisemapping.xml.svgmap.Rect svgRect = new com.wisemapping.xml.svgmap.Rect();
+        final Style style = Style.parse(vmlRect.getStyle());
+
+        float width = style.getWidth();
+        svgRect.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgRect.setHeight(height);
+
+        String top = style.getTop();
+        svgRect.setY(Float.parseFloat(top));
+
+        String left = style.getLeft();
+        svgRect.setX(Float.parseFloat(left));
+
+        // Fill properties ...
+        final String fillColor = vmlRect.getFillcolor();
+        svgRect.setFill(fillColor);
+
+        // Stroke properties ...
+        final String strokeColor = vmlRect.getStrokecolor();
+        svgRect.setStroke(strokeColor);
+        svgRect.setStrokeWidth("0.5px");
+        return svgRect;
+
+    }
+
+    private Ellipse convert(final Oval vmlOval) {
+
+        /**
+         * <v:oval style="LEFT: 5px; VISIBILITY: hidden; WIDTH: 6px; POSITION: absolute; TOP: 5px; HEIGHT: 6px"
+         *       coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9" strokeweight="6762emu">
+         *   <v:stroke dashstyle="solid"></v:stroke>
+         *   <v:fill></v:fill>
+         * </v:oval>
+         *
+         *
+         * SVG:
+         *   <ellipse stroke="#023BB9" visibility="hidden" fill="#E0E5EF" stroke-width="0.5px" cy="3" cx="3" ry="3" rx="3"
+         *        height="6" width="6"></ellipse>
+         */
+        final Style style = Style.parse(vmlOval.getStyle());
+        Ellipse svgElipse = null;
+        if (style.isVisible()) {
+            svgElipse = new Ellipse();
+
+            float width = style.getWidth();
+            svgElipse.setWidth(width);
+            svgElipse.setRx(width / 2);
+
+            float height = style.getHeight();
+            svgElipse.setHeight(height);
+            svgElipse.setRy(height / 2);
+
+            String top = style.getTop();
+            svgElipse.setCy(Float.parseFloat(top) + (width / 2));
+
+            String left = style.getLeft();
+            svgElipse.setCx(Float.parseFloat(left) + (height / 2));
+
+            // Fill properties ...
+            final String fillColor = vmlOval.getFillcolor();
+            svgElipse.setFill(fillColor);
+
+            // Stroke properties ...
+            final String strokeColor = vmlOval.getStrokecolor();
+            svgElipse.setStroke(strokeColor);
+            svgElipse.setStrokeWidth("0.5px");
+        }
+        return svgElipse;
+    }
+
+    private com.wisemapping.xml.svgmap.Line convert(final Line vmlLine) {
+        /**
+         * VML:
+         * <v:line style="POSITION: absolute" from="0,0" to="157,-150" fillcolor="white" stroked="t" strokecolor="#495879"
+         *       strokeweight="1px">
+         * <:stroke dashstyle="solid"></v:stroke>
+         * </v:line>
+         *
+         * SVG:
+         *  <line y2="14" x2="49" y1="14" x1="-1" visibility="hidden" style="cursor: move;" stroke="#495879"
+         stroke-width="1px"></line>
+         */
+
+        com.wisemapping.xml.svgmap.Line svgLine = new com.wisemapping.xml.svgmap.Line();
+        final String from = vmlLine.getFrom();
+        final String[] fromPoints = from.split(",");
+
+        svgLine.setX1(Float.parseFloat(fromPoints[0]));
+        svgLine.setY1(Float.parseFloat(fromPoints[1]));
+
+        final String to = vmlLine.getTo();
+        final String[] toPoints = to.split(",");
+
+        svgLine.setX2(Float.parseFloat(toPoints[0]));
+        svgLine.setY2(Float.parseFloat(toPoints[1]));
+
+        String strokeweight = vmlLine.getStrokeweight();
+        svgLine.setStrokeWidth(strokeweight);
+
+        String stokeColor = vmlLine.getStrokecolor();
+        svgLine.setStroke(stokeColor);
+
+        return svgLine;
+    }
+
+    private Text convertTextShape(Shape vmlTextShape, float boxWidth, float boxHeigth) {
+        /**
+         * <v:shape
+         *        style="Z-INDEX: 10; LEFT: 9px; WIDTH: 130px; CURSOR: default; POSITION: absolute; TOP: 9px; HEIGHT: 1px; antialias: true"
+         *        coordsize="100,100">
+         *   <v:textbox
+         *            style="MARGIN-TOP: 0.187pt; LEFT: auto; FONT: bold 19px verdana; MARGIN-LEFT: 0.25pt; OVERFLOW: visible; WIDTH: 138.531pt; COLOR: #023bb9; POSITION: absolute; TOP: auto; HEIGHT: 0.343pt"
+         *            xFontScale="1.4" xTextSize="100.1,16.0" inset="0,0,0,0">
+         *        <SPAN style="WIDTH: 100%; HEIGHT: 100%">
+         *            <SPAN>Central Topic</SPAN>
+         *        </SPAN>
+         *    </v:textbox>
+         * </v:shape>
+         * SVG:
+         *  <text x="9" y="19" style="cursor: default;" fill="#023BB9" font-weight="bold" font-style="normal"
+         *     font-size="13.4375" font-family="verdana" focusable="true">Central Topic
+         *  </text>
+         */
+        final Text svgText = new Text();
+        Textbox vmlTextBox = vmlTextShape.getTextbox();
+        final String textBoxStyleStr = vmlTextBox.getStyle();
+        final Style textBoxStyle = Style.parse(textBoxStyleStr);
+
+        String fontStyle = svgText.getFontStyle();
+        svgText.setFontStyle(fontStyle);
+
+        // @todo: Take this hardcode from javascript ...
+        float fontSize = textBoxStyle.getFontSize();
+        float scale = vmlTextBox.getXFontScale();
+        float svgFontSize = fontSize / scale;
+
+        svgText.setFontSize(svgFontSize);
+
+        // Set text properties...
+        final String textValue = vmlTextBox.getSPAN().getSPAN();
+        svgText.setContent(textValue);
+
+        final String color = textBoxStyle.getColor();
+        svgText.setFill(color);
+
+        final String style = textBoxStyle.getFontWidth();
+        svgText.setFontWeight(style);
+
+        // Positionate font...
+        final String textSize = vmlTextBox.getXTextSize();
+        final String[] split = textSize.split(",");
+        float textWidth = Float.valueOf(split[0]);
+        float textHeight = Float.valueOf(split[1]);
+
+        svgText.setX(boxWidth - textWidth);
+        svgText.setY(boxHeigth - textHeight + CORRECTION_HARDCODE);
+
+        return svgText;
+
+    }
+
+    private com.wisemapping.xml.svgmap.Rect convert(Roundrect vmlRect) {
+
+        /*
+         * VML:
+         *  <v:roundrect style="LEFT: 0px; WIDTH: 62px; CURSOR: move; POSITION: absolute; TOP: 0px; HEIGHT: 23px"
+         *            arcsize="9830f" coordsize="21600,21600" fillcolor="#e0e5ef" stroked="t" strokecolor="#023bb9"
+         *            strokeweight="6762emu">
+         *       <v:stroke dashstyle="solid"></v:stroke>
+         *       <v:fill></v:fill>
+         *   </v:roundrect>
+         *
+         * SVG:
+         *   <rect style="cursor: move;" fill="#E0E5EF" stroke="#023BB9" stroke-width="0.5px" y="0" x="0" ry="2.7" rx="2.7"
+         *      height="18" width="68"></rect>
+         *
+        */
+        final com.wisemapping.xml.svgmap.Rect svgRect = new com.wisemapping.xml.svgmap.Rect();
+        final Style style = Style.parse(vmlRect.getStyle());
+        svgRect.setRy(2.7F);
+        svgRect.setRx(2.7F);
+
+        float width = style.getWidth();
+        svgRect.setWidth(String.valueOf(width));
+
+        float height = style.getHeight();
+        svgRect.setHeight(height);
+
+        String top = style.getTop();
+        svgRect.setY(Float.parseFloat(top));
+
+        String left = style.getLeft();
+        svgRect.setX(Float.parseFloat(left));
+
+        // Fill properties ...
+        final String fillColor = vmlRect.getFillcolor();
+        svgRect.setFill(fillColor);
+
+        // Stroke properties ...
+        final String strokeColor = vmlRect.getStrokecolor();
+        svgRect.setStroke(strokeColor);
+        svgRect.setStrokeWidth("0.5px");
+
+        return svgRect;
+
+    }
+
+    private com.wisemapping.xml.svgmap.Polyline convert(Polyline vmlPolyline) {
+
+        /*
+         *     <v:polyline style="POSITION: absolute" rPoints="167.1, 100.0 177.1, 100.0 177.1, 130.5 182.1, 135.5 230.6, 135.5"
+         *       filled="f" strokecolor="#495879" strokeweight=".75pt">
+         *       <v:stroke opacity="1" dashstyle="solid"></v:stroke>
+         *       </v:polyline>
+         *
+         *     <polyline points="173.5,100 183.5,100 183.5,129 188.5,134 240,134" stroke-opacity="1" stroke="#495879"
+         *     stroke-width="1px" fill="none"></polyline>
+         */
+        final com.wisemapping.xml.svgmap.Polyline svgPolyline = svgObjectFactory.createPolyline();
+
+        final String rPoints = vmlPolyline.getXPoints();
+        svgPolyline.setPoints(rPoints);
+
+        final String strokeColor = vmlPolyline.getStrokecolor();
+        svgPolyline.setStroke(strokeColor);
+
+        // @todo: Take from SVG.
+        svgPolyline.setFill("none");
+        svgPolyline.setStrokeWidth("1px");
+        svgPolyline.setStrokeOpacity("1");
+
+        return svgPolyline;
+    }
+
+
+    public void toXml(OutputStream os) throws JAXBException {
+        final JAXBContext svgContext = JAXBContext.newInstance("com.wisemapping.xml.svgmap");
+        Marshaller m = svgContext.createMarshaller();
+        m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        m.marshal(svgRootElem, os);
+    }
+
+    public void toXml(Writer os) throws JAXBException {
+        final JAXBContext svgContext = JAXBContext.newInstance("com.wisemapping.xml.svgmap");
+        Marshaller m = svgContext.createMarshaller();
+        m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        m.marshal(svgRootElem, os);
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Arrowlink.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Arrowlink.java
new file mode 100755
index 00000000..3461781e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Arrowlink.java
@@ -0,0 +1,248 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="DESTINATION" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ENDARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ENDINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="STARTARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="STARTINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "arrowlink")
+public class Arrowlink {
+
+    @XmlAttribute(name = "COLOR")
+    protected String color;
+    @XmlAttribute(name = "DESTINATION", required = true)
+    protected String destination;
+    @XmlAttribute(name = "ENDARROW")
+    protected String endarrow;
+    @XmlAttribute(name = "ENDINCLINATION")
+    protected String endinclination;
+    @XmlAttribute(name = "ID")
+    protected String id;
+    @XmlAttribute(name = "STARTARROW")
+    protected String startarrow;
+    @XmlAttribute(name = "STARTINCLINATION")
+    protected String startinclination;
+
+    /**
+     * Gets the value of the color property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCOLOR() {
+        return color;
+    }
+
+    /**
+     * Sets the value of the color property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCOLOR(String value) {
+        this.color = value;
+    }
+
+    /**
+     * Gets the value of the destination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDESTINATION() {
+        return destination;
+    }
+
+    /**
+     * Sets the value of the destination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDESTINATION(String value) {
+        this.destination = value;
+    }
+
+    /**
+     * Gets the value of the endarrow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENDARROW() {
+        return endarrow;
+    }
+
+    /**
+     * Sets the value of the endarrow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENDARROW(String value) {
+        this.endarrow = value;
+    }
+
+    /**
+     * Gets the value of the endinclination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENDINCLINATION() {
+        return endinclination;
+    }
+
+    /**
+     * Sets the value of the endinclination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENDINCLINATION(String value) {
+        this.endinclination = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getID() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setID(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the startarrow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTARTARROW() {
+        return startarrow;
+    }
+
+    /**
+     * Sets the value of the startarrow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTARTARROW(String value) {
+        this.startarrow = value;
+    }
+
+    /**
+     * Gets the value of the startinclination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTARTINCLINATION() {
+        return startinclination;
+    }
+
+    /**
+     * Sets the value of the startinclination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTARTINCLINATION(String value) {
+        this.startinclination = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Cloud.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Cloud.java
new file mode 100755
index 00000000..4d8165dc
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Cloud.java
@@ -0,0 +1,86 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "cloud")
+public class Cloud {
+
+    @XmlAttribute(name = "COLOR")
+    protected String color;
+
+    /**
+     * Gets the value of the color property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCOLOR() {
+        return color;
+    }
+
+    /**
+     * Sets the value of the color property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCOLOR(String value) {
+        this.color = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Edge.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Edge.java
new file mode 100755
index 00000000..c33c3316
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Edge.java
@@ -0,0 +1,140 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="STYLE" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="WIDTH" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "edge")
+public class Edge {
+
+    @XmlAttribute(name = "COLOR")
+    protected String color;
+    @XmlAttribute(name = "STYLE")
+    protected String style;
+    @XmlAttribute(name = "WIDTH")
+    protected String width;
+
+    /**
+     * Gets the value of the color property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCOLOR() {
+        return color;
+    }
+
+    /**
+     * Sets the value of the color property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCOLOR(String value) {
+        this.color = value;
+    }
+
+    /**
+     * Gets the value of the style property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTYLE() {
+        return style;
+    }
+
+    /**
+     * Sets the value of the style property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTYLE(String value) {
+        this.style = value;
+    }
+
+    /**
+     * Gets the value of the width property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWIDTH() {
+        return width;
+    }
+
+    /**
+     * Sets the value of the width property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWIDTH(String value) {
+        this.width = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Font.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Font.java
new file mode 100755
index 00000000..67961952
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Font.java
@@ -0,0 +1,181 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import java.math.BigInteger;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="BOLD">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="true"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="ITALIC">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="true"/>
+ *             &lt;enumeration value="false"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="NAME" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="SIZE" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "font")
+public class Font {
+
+    @XmlAttribute(name = "BOLD")
+    protected String bold;
+    @XmlAttribute(name = "ITALIC")
+    protected String italic;
+    @XmlAttribute(name = "NAME", required = true)
+    protected String name;
+    @XmlAttribute(name = "SIZE", required = true)
+    protected BigInteger size;
+
+    /**
+     * Gets the value of the bold property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBOLD() {
+        return bold;
+    }
+
+    /**
+     * Sets the value of the bold property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBOLD(String value) {
+        this.bold = value;
+    }
+
+    /**
+     * Gets the value of the italic property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getITALIC() {
+        return italic;
+    }
+
+    /**
+     * Sets the value of the italic property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setITALIC(String value) {
+        this.italic = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNAME() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNAME(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the size property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getSIZE() {
+        return size;
+    }
+
+    /**
+     * Sets the value of the size property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setSIZE(BigInteger value) {
+        this.size = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Hook.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Hook.java
new file mode 100755
index 00000000..c37f71fd
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Hook.java
@@ -0,0 +1,145 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{}Parameters" minOccurs="0"/>
+ *         &lt;element ref="{}text" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="NAME" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "parameters",
+    "text"
+})
+@XmlRootElement(name = "hook")
+public class Hook {
+
+    @XmlElement(name = "Parameters")
+    protected Parameters parameters;
+    protected String text;
+    @XmlAttribute(name = "NAME", required = true)
+    protected String name;
+
+    /**
+     * Gets the value of the parameters property.
+     *
+     * @return
+     *     possible object is
+     *     {@link Parameters }
+     *
+     */
+    public Parameters getParameters() {
+        return parameters;
+    }
+
+    /**
+     * Sets the value of the parameters property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link Parameters }
+     *
+     */
+    public void setParameters(Parameters value) {
+        this.parameters = value;
+    }
+
+    /**
+     * Gets the value of the text property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setText(String value) {
+        this.text = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getNAME() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setNAME(String value) {
+        this.name = value;
+    }
+
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Icon.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Icon.java
new file mode 100755
index 00000000..2480bc15
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Icon.java
@@ -0,0 +1,86 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="BUILTIN" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "icon")
+public class Icon {
+
+    @XmlAttribute(name = "BUILTIN", required = true)
+    protected String builtin;
+
+    /**
+     * Gets the value of the builtin property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBUILTIN() {
+        return builtin;
+    }
+
+    /**
+     * Sets the value of the builtin property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBUILTIN(String value) {
+        this.builtin = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Map.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Map.java
new file mode 100755
index 00000000..9a76184b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Map.java
@@ -0,0 +1,118 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{}node"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "node"
+})
+@XmlRootElement(name = "map")
+public class Map {
+
+    @XmlElement(required = true)
+    protected Node node;
+    @XmlAttribute(required = true)
+    protected String version;
+
+    /**
+     * Gets the value of the node property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Node }
+     *     
+     */
+    public Node getNode() {
+        return node;
+    }
+
+    /**
+     * Sets the value of the node property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Node }
+     *     
+     */
+    public void setNode(Node value) {
+        this.node = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Node.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Node.java
new file mode 100755
index 00000000..b1d5b9c8
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Node.java
@@ -0,0 +1,517 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{}arrowlink"/>
+ *         &lt;element ref="{}cloud"/>
+ *         &lt;element ref="{}edge"/>
+ *         &lt;element ref="{}font"/>
+ *         &lt;element ref="{}hook"/>
+ *         &lt;element ref="{}icon"/>
+ *         &lt;element ref="{}node"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="BACKGROUND_COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="CREATED" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="ENCRYPTED_CONTENT" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="FOLDED">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="true"/>
+ *             &lt;enumeration value="false"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="HGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       &lt;attribute name="LINK" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="MODIFIED" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="POSITION">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="left"/>
+ *             &lt;enumeration value="right"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="STYLE" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="TEXT" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="VGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="VSHIFT" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "arrowlinkOrCloudOrEdge"
+})
+@XmlRootElement(name = "node")
+public class Node {
+
+    @XmlElements({
+        @XmlElement(name = "cloud", type = Cloud.class),
+        @XmlElement(name = "icon", type = Icon.class),
+        @XmlElement(name = "arrowlink", type = Arrowlink.class),
+        @XmlElement(name = "edge", type = Edge.class),
+        @XmlElement(name = "font", type = Font.class),
+        @XmlElement(name = "node", type = Node.class),
+        @XmlElement(name = "hook", type = Hook.class)
+    })
+    protected List<Object> arrowlinkOrCloudOrEdge;
+    @XmlAttribute(name = "BACKGROUND_COLOR")
+    protected String backgroundcolor;
+    @XmlAttribute(name = "COLOR")
+    protected String color;
+    @XmlAttribute(name = "CREATED")
+    protected BigInteger created;
+    @XmlAttribute(name = "ENCRYPTED_CONTENT")
+    protected String encryptedcontent;
+    @XmlAttribute(name = "FOLDED")
+    protected String folded;
+    @XmlAttribute(name = "HGAP")
+    protected BigInteger hgap;
+    @XmlAttribute(name = "ID")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(name = "LINK")
+    protected String link;
+    @XmlAttribute(name = "MODIFIED")
+    protected BigInteger modified;
+    @XmlAttribute(name = "POSITION")
+    protected String position;
+    @XmlAttribute(name = "STYLE")
+    protected String style;
+    @XmlAttribute(name = "TEXT", required = true)
+    protected String text;
+    @XmlAttribute(name = "VGAP")
+    protected BigInteger vgap;
+    @XmlAttribute(name = "VSHIFT")
+    protected BigInteger vshift;
+
+    /**
+     * Gets the value of the arrowlinkOrCloudOrEdge property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the arrowlinkOrCloudOrEdge property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getArrowlinkOrCloudOrEdge().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Cloud }
+     * {@link Icon }
+     * {@link Arrowlink }
+     * {@link Edge }
+     * {@link Font }
+     * {@link Node }
+     * {@link Hook }
+     * 
+     * 
+     */
+    public List<Object> getArrowlinkOrCloudOrEdge() {
+        if (arrowlinkOrCloudOrEdge == null) {
+            arrowlinkOrCloudOrEdge = new ArrayList<Object>();
+        }
+        return this.arrowlinkOrCloudOrEdge;
+    }
+
+    /**
+     * Gets the value of the backgroundcolor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBACKGROUNDCOLOR() {
+        return backgroundcolor;
+    }
+
+    /**
+     * Sets the value of the backgroundcolor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBACKGROUNDCOLOR(String value) {
+        this.backgroundcolor = value;
+    }
+
+    /**
+     * Gets the value of the color property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCOLOR() {
+        return color;
+    }
+
+    /**
+     * Sets the value of the color property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCOLOR(String value) {
+        this.color = value;
+    }
+
+    /**
+     * Gets the value of the created property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getCREATED() {
+        return created;
+    }
+
+    /**
+     * Sets the value of the created property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setCREATED(BigInteger value) {
+        this.created = value;
+    }
+
+    /**
+     * Gets the value of the encryptedcontent property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENCRYPTEDCONTENT() {
+        return encryptedcontent;
+    }
+
+    /**
+     * Sets the value of the encryptedcontent property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENCRYPTEDCONTENT(String value) {
+        this.encryptedcontent = value;
+    }
+
+    /**
+     * Gets the value of the folded property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFOLDED() {
+        return folded;
+    }
+
+    /**
+     * Sets the value of the folded property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFOLDED(String value) {
+        this.folded = value;
+    }
+
+    /**
+     * Gets the value of the hgap property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getHGAP() {
+        return hgap;
+    }
+
+    /**
+     * Sets the value of the hgap property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setHGAP(BigInteger value) {
+        this.hgap = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getID() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setID(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the link property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLINK() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLINK(String value) {
+        this.link = value;
+    }
+
+    /**
+     * Gets the value of the modified property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getMODIFIED() {
+        return modified;
+    }
+
+    /**
+     * Sets the value of the modified property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setMODIFIED(BigInteger value) {
+        this.modified = value;
+    }
+
+    /**
+     * Gets the value of the position property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPOSITION() {
+        return position;
+    }
+
+    /**
+     * Sets the value of the position property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPOSITION(String value) {
+        this.position = value;
+    }
+
+    /**
+     * Gets the value of the style property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTYLE() {
+        return style;
+    }
+
+    /**
+     * Sets the value of the style property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTYLE(String value) {
+        this.style = value;
+    }
+
+    /**
+     * Gets the value of the text property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTEXT() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTEXT(String value) {
+        this.text = value;
+    }
+
+    /**
+     * Gets the value of the vgap property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getVGAP() {
+        return vgap;
+    }
+
+    /**
+     * Sets the value of the vgap property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setVGAP(BigInteger value) {
+        this.vgap = value;
+    }
+
+    /**
+     * Gets the value of the vshift property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getVSHIFT() {
+        return vshift;
+    }
+
+    /**
+     * Sets the value of the vshift property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setVSHIFT(BigInteger value) {
+        this.vshift = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/ObjectFactory.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/ObjectFactory.java
new file mode 100755
index 00000000..3ba2d774
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/ObjectFactory.java
@@ -0,0 +1,143 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.03.26 at 10:38:46 PM ART
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the generated package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups.  Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Text_QNAME = new QName("", "text");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated
+     *
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link Arrowlink }
+     *
+     */
+    public Arrowlink createArrowlink() {
+        return new Arrowlink();
+    }
+
+    /**
+     * Create an instance of {@link Map }
+     *
+     */
+    public Map createMap() {
+        return new Map();
+    }
+
+    /**
+     * Create an instance of {@link Icon }
+     *
+     */
+    public Icon createIcon() {
+        return new Icon();
+    }
+
+    /**
+     * Create an instance of {@link Cloud }
+     *
+     */
+    public Cloud createCloud() {
+        return new Cloud();
+    }
+
+    /**
+     * Create an instance of {@link Font }
+     *
+     */
+    public Font createFont() {
+        return new Font();
+    }
+
+    /**
+     * Create an instance of {@link Parameters }
+     *
+     */
+    public Parameters createParameters() {
+        return new Parameters();
+    }
+
+    /**
+     * Create an instance of {@link Hook }
+     *
+     */
+    public Hook createHook() {
+        return new Hook();
+    }
+
+    /**
+     * Create an instance of {@link Edge }
+     *
+     */
+    public Edge createEdge() {
+        return new Edge();
+    }
+
+    /**
+     * Create an instance of {@link Node }
+     *
+     */
+    public Node createNode() {
+        return new Node();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     *
+     */
+    @XmlElementDecl(namespace = "", name = "text")
+    public JAXBElement<String> createText(String value) {
+        return new JAXBElement<String>(_Text_QNAME, String.class, null, value);
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Parameters.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Parameters.java
new file mode 100755
index 00000000..c89f3b83
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind/Parameters.java
@@ -0,0 +1,87 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.08.27 at 09:24:17 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import java.math.BigInteger;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="REMINDUSERAT" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "Parameters")
+public class Parameters {
+
+    @XmlAttribute(name = "REMINDUSERAT")
+    protected BigInteger reminduserat;
+
+    /**
+     * Gets the value of the reminduserat property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getREMINDUSERAT() {
+        return reminduserat;
+    }
+
+    /**
+     * Sets the value of the reminduserat property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setREMINDUSERAT(BigInteger value) {
+        this.reminduserat = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind_0_9_0.xsd b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind_0_9_0.xsd
new file mode 100755
index 00000000..8c5a2dad
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/freemind_0_9_0.xsd
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+    <xs:element name='Parameters'>
+        <xs:complexType>
+            <!--Is the time management plugin.-->
+            <xs:attribute name='REMINDUSERAT' type='xs:integer' use='optional'/>
+        </xs:complexType>
+    </xs:element>
+    <!--Used for node notes.-->
+    <xs:element name='text' type="xs:string"/>            
+
+    <xs:element name='arrowlink'>
+        <xs:complexType>
+            <xs:attribute name='COLOR' type='xs:string' use='optional'/>
+            <xs:attribute name='DESTINATION' type='xs:string' use='required'/>
+            <xs:attribute name='ENDARROW' type='xs:string' use='optional'/>
+            <xs:attribute name='ENDINCLINATION' type='xs:string' use='optional'/>
+            <xs:attribute name='ID' type='xs:string' use='optional'/>
+            <xs:attribute name='STARTARROW' type='xs:string' use='optional'/>
+            <xs:attribute name='STARTINCLINATION' type='xs:string' use='optional'/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='cloud'>
+        <xs:complexType>
+            <xs:attribute name='COLOR' type='xs:string' use='optional'/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='edge'>
+        <xs:complexType>
+            <xs:attribute name='COLOR' type='xs:string' use='optional'/>
+            <xs:attribute name='STYLE' type='xs:string' use='optional'/>
+            <xs:attribute name='WIDTH' type='xs:string' use='optional'/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='font'>
+        <xs:complexType>
+            <xs:attribute name='BOLD' use='optional'>
+                <xs:simpleType>
+                    <xs:restriction base='xs:string'>
+                        <xs:enumeration value='true'/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name='ITALIC' use='optional'>
+                <xs:simpleType>
+                    <xs:restriction base='xs:string'>
+                        <xs:enumeration value='true'/>
+                        <xs:enumeration value='false'/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name='NAME' type='xs:string' use='required'/>
+            <xs:attribute name='SIZE' use='required' type='xs:integer'/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='hook'>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref='Parameters' minOccurs='0' maxOccurs='1'/>
+                <xs:element ref='text' minOccurs='0' maxOccurs='1'/>
+            </xs:sequence>
+            <xs:attribute name='NAME' type='xs:string' use='required'/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='icon'>
+        <xs:complexType>
+            <xs:attribute name='BUILTIN' type='xs:string' use='required'/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='map'>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref='node'/>
+            </xs:sequence>
+            <xs:attribute name='version' type='xs:string' use='required'/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='node'>
+        <xs:complexType>
+            <xs:choice minOccurs='0' maxOccurs='unbounded'>
+                <xs:element ref='arrowlink'/>
+                <xs:element ref='cloud'/>
+                <xs:element ref='edge'/>
+                <xs:element ref='font'/>
+                <xs:element ref='hook'/>
+                <xs:element ref='icon'/>
+                <xs:element ref='node'/>
+            </xs:choice>
+            <xs:attribute name='BACKGROUND_COLOR' type='xs:string' use='optional'/>
+            <xs:attribute name='COLOR' type='xs:string' use='optional'/>
+            <xs:attribute name='FOLDED' use='optional'>
+                <xs:simpleType>
+                    <xs:restriction base='xs:string'>
+                        <xs:enumeration value='true'/>
+                        <xs:enumeration value='false'/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name='ID' type='xs:ID' use='optional'/>
+            <xs:attribute name='LINK' type='xs:string' use='optional'/>
+            <xs:attribute name='POSITION' use='optional'>
+                <xs:simpleType>
+                    <xs:restriction base='xs:string'>
+                        <xs:enumeration value='left'/>
+                        <xs:enumeration value='right'/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name='STYLE' type='xs:string' use='optional'/>
+            <xs:attribute name='TEXT' type='xs:string' use='required'/>
+            <xs:attribute name='CREATED' type='xs:integer' use='optional'/>
+            <xs:attribute name='MODIFIED' type='xs:integer' use='optional'/>
+            <xs:attribute name='HGAP' type='xs:integer' use='optional'/>
+            <xs:attribute name='VGAP' type='xs:integer' use='optional'/>
+            <xs:attribute name='VSHIFT' type='xs:integer' use='optional'/>
+            <xs:attribute name='ENCRYPTED_CONTENT' type='xs:string' use='optional'/>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap.xsd b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap.xsd
new file mode 100755
index 00000000..b2287f2d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap.xsd
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+        attributeFormDefault="unqualified"
+        elementFormDefault="qualified"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+    <xsd:element name="map">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="topic" minOccurs="1" maxOccurs='unbounded'/>
+            </xsd:sequence>
+            <xsd:attribute name="name" type="xsd:string"/>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="topic" type="topicType"/>
+
+    <xsd:complexType name="topicType">
+        <xsd:sequence>
+            <xsd:element minOccurs='0' maxOccurs='unbounded' type="icon" name="icon"/>
+            <xsd:element minOccurs='0' maxOccurs='1' type="link" name="link"/>
+            <xsd:element minOccurs='0' maxOccurs='1' type="note" name="note"/>
+            <xsd:element minOccurs='0' maxOccurs='unbounded' ref="topic"/>
+        </xsd:sequence>
+        <xsd:attribute name="text" type="xsd:string"/>
+        <xsd:attribute name="shape" type="xsd:string"/>
+        <xsd:attribute name="fontStyle" type="xsd:string"/>
+        <xsd:attribute name="bgColor" type="xsd:string"/>
+        <xsd:attribute name="brColor" type="xsd:string"/>
+        <xsd:attribute name="order" type="xsd:int"/>
+        <xsd:attribute name="position" type="xsd:string"/>
+        <xsd:attribute name="central" type="xsd:boolean"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="icon">
+        <xsd:attribute name="id" type="xsd:string"/>
+        <xsd:attribute name="order" type="xsd:string"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="link">
+        <xsd:attribute name="url" type="xsd:string"/>
+        <xsd:attribute name="order" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="note">        
+        <xsd:attribute name="text" type="xsd:string"/>
+    </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Icon.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Icon.java
new file mode 100755
index 00000000..cd4ee292
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Icon.java
@@ -0,0 +1,111 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2007.11.01 at 09:40:11 PM ART
+//
+
+
+package com.wisemapping.xml.mindmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for icon complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="icon">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "icon")
+public class Icon {
+
+    @XmlAttribute
+    protected String id;
+    @XmlAttribute
+    protected String order;
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the order property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getOrder() {
+        return order;
+    }
+
+    /**
+     * Sets the value of the order property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setOrder(String value) {
+        this.order = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Link.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Link.java
new file mode 100755
index 00000000..61fd8082
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Link.java
@@ -0,0 +1,111 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2007.11.01 at 09:40:11 PM ART
+//
+
+
+package com.wisemapping.xml.mindmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for link complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="link">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="url" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "link")
+public class Link {
+
+    @XmlAttribute
+    protected String order;
+    @XmlAttribute
+    protected String url;
+
+    /**
+     * Gets the value of the order property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getOrder() {
+        return order;
+    }
+
+    /**
+     * Sets the value of the order property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setOrder(String value) {
+        this.order = value;
+    }
+
+    /**
+     * Gets the value of the url property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * Sets the value of the url property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setUrl(String value) {
+        this.url = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Map.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Map.java
new file mode 100755
index 00000000..6686f744
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Map.java
@@ -0,0 +1,125 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2007.11.01 at 09:40:11 PM ART
+//
+
+
+package com.wisemapping.xml.mindmap;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{}topic" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "topic"
+})
+@XmlRootElement(name = "map")
+public class Map {
+
+    @XmlElement(required = true)
+    protected List<TopicType> topic;
+    @XmlAttribute
+    protected String name;
+
+    /**
+     * Gets the value of the topic property.
+     *
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the topic property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTopic().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TopicType }
+     *
+     *
+     */
+    public List<TopicType> getTopic() {
+        if (topic == null) {
+            topic = new ArrayList<TopicType>();
+        }
+        return this.topic;
+    }
+
+    /**
+     * Gets the value of the name property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Note.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Note.java
new file mode 100755
index 00000000..a5c6a8b2
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Note.java
@@ -0,0 +1,84 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2008.03.26 at 10:28:06 PM ART 
+//
+
+
+package com.wisemapping.xml.mindmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for note complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="note">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="text" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "note")
+public class Note {
+
+    @XmlAttribute
+    protected String text;
+
+    /**
+     * Gets the value of the text property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setText(String value) {
+        this.text = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/ObjectFactory.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/ObjectFactory.java
new file mode 100755
index 00000000..28668b91
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/ObjectFactory.java
@@ -0,0 +1,111 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.03.26 at 10:28:06 PM ART
+//
+
+
+package com.wisemapping.xml.mindmap;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the generated package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups.  Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Topic_QNAME = new QName("", "topic");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated
+     *
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link Link }
+     *
+     */
+    public Link createLink() {
+        return new Link();
+    }
+
+    /**
+     * Create an instance of {@link Icon }
+     *
+     */
+    public Icon createIcon() {
+        return new Icon();
+    }
+
+    /**
+     * Create an instance of {@link Map }
+     *
+     */
+    public Map createMap() {
+        return new Map();
+    }
+
+    /**
+     * Create an instance of {@link TopicType }
+     *
+     */
+    public TopicType createTopicType() {
+        return new TopicType();
+    }
+
+    /**
+     * Create an instance of {@link Note }
+     *
+     */
+    public Note createNote() {
+        return new Note();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TopicType }{@code >}}
+     *
+     */
+    @XmlElementDecl(namespace = "", name = "topic")
+    public JAXBElement<TopicType> createTopic(TopicType value) {
+        return new JAXBElement<TopicType>(_Topic_QNAME, TopicType.class, null, value);
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/TopicType.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/TopicType.java
new file mode 100755
index 00000000..b4b4d2d1
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/TopicType.java
@@ -0,0 +1,397 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2007.11.01 at 09:40:11 PM ART
+//
+
+
+package com.wisemapping.xml.mindmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * <p>Java class for topicType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="topicType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="icon" type="{}icon" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="link" type="{}link" minOccurs="0"/>
+ *         &lt;element name="note" type="{}note" minOccurs="0"/>
+ *         &lt;element ref="{}topic" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="bgColor" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="brColor" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="central" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="shape" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="text" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "topicType", propOrder = {
+    "icon",
+    "link",
+    "note",
+    "topic"
+})
+public class TopicType {
+
+    protected List<Icon> icon;
+    protected Link link;
+    protected Note note;
+    protected List<TopicType> topic;
+    @XmlAttribute
+    protected String bgColor;
+    @XmlAttribute
+    protected String brColor;
+    @XmlAttribute
+    protected Boolean central;
+    @XmlAttribute
+    protected String fontStyle;
+    @XmlAttribute
+    protected Integer order;
+    @XmlAttribute
+    protected String position;
+    @XmlAttribute
+    protected String shape;
+    @XmlAttribute
+    protected String text;
+
+    /**
+     * Gets the value of the icon property.
+     *
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the icon property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getIcon().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Icon }
+     *
+     *
+     */
+    public List<Icon> getIcon() {
+        if (icon == null) {
+            icon = new ArrayList<Icon>();
+        }
+        return this.icon;
+    }
+
+    /**
+     * Gets the value of the link property.
+     *
+     * @return
+     *     possible object is
+     *     {@link Link }
+     *
+     */
+    public Link getLink() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link Link }
+     *
+     */
+    public void setLink(Link value) {
+        this.link = value;
+    }
+
+    /**
+     * Gets the value of the note property.
+     *
+     * @return
+     *     possible object is
+     *     {@link Note }
+     *
+     */
+    public Note getNote() {
+        return note;
+    }
+
+    /**
+     * Sets the value of the note property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link Note }
+     *
+     */
+    public void setNote(Note value) {
+        this.note = value;
+    }
+
+    /**
+     * Gets the value of the topic property.
+     *
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the topic property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTopic().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TopicType }
+     *
+     *
+     */
+    public List<TopicType> getTopic() {
+        if (topic == null) {
+            topic = new ArrayList<TopicType>();
+        }
+        return this.topic;
+    }
+
+    /**
+     * Gets the value of the bgColor property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getBgColor() {
+        return bgColor;
+    }
+
+    /**
+     * Sets the value of the bgColor property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setBgColor(String value) {
+        this.bgColor = value;
+    }
+
+    /**
+     * Gets the value of the brColor property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getBrColor() {
+        return brColor;
+    }
+
+    /**
+     * Sets the value of the brColor property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setBrColor(String value) {
+        this.brColor = value;
+    }
+
+    /**
+     * Gets the value of the central property.
+     *
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *
+     */
+    public Boolean isCentral() {
+        return central;
+    }
+
+    /**
+     * Sets the value of the central property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *
+     */
+    public void setCentral(Boolean value) {
+        this.central = value;
+    }
+
+    /**
+     * Gets the value of the fontStyle property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getFontStyle() {
+        return fontStyle;
+    }
+
+    /**
+     * Sets the value of the fontStyle property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setFontStyle(String value) {
+        this.fontStyle = value;
+    }
+
+    /**
+     * Gets the value of the order property.
+     *
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *
+     */
+    public Integer getOrder() {
+        return order;
+    }
+
+    /**
+     * Sets the value of the order property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *
+     */
+    public void setOrder(Integer value) {
+        this.order = value;
+    }
+
+    /**
+     * Gets the value of the position property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getPosition() {
+        return position;
+    }
+
+    /**
+     * Sets the value of the position property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setPosition(String value) {
+        this.position = value;
+    }
+
+    /**
+     * Gets the value of the shape property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getShape() {
+        return shape;
+    }
+
+    /**
+     * Sets the value of the shape property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setShape(String value) {
+        this.shape = value;
+    }
+
+    /**
+     * Gets the value of the text property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setText(String value) {
+        this.text = value;
+    }
+
+}
+
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Ellipse.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Ellipse.java
new file mode 100644
index 00000000..ccbc5d1e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Ellipse.java
@@ -0,0 +1,270 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="cx" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="cy" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="fill" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="#E0E5EF" />
+ *       &lt;attribute name="height" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="rx" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="ry" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="stroke" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="#023BB9" />
+ *       &lt;attribute name="stroke-width" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="visibility" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="hidden"/>
+ *             &lt;enumeration value="visible"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="width" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "ellipse")
+public class Ellipse {
+
+    @XmlAttribute(required = true)
+    protected float cx;
+    @XmlAttribute(required = true)
+    protected float cy;
+    @XmlAttribute(required = true)
+    protected String fill;
+    @XmlAttribute(required = true)
+    protected float height;
+    @XmlAttribute(required = true)
+    protected float rx;
+    @XmlAttribute(required = true)
+    protected float ry;
+    @XmlAttribute(required = true)
+    protected String stroke;
+    @XmlAttribute(name = "stroke-width", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String strokeWidth;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String visibility;
+    @XmlAttribute(required = true)
+    protected float width;
+
+    /**
+     * Gets the value of the cx property.
+     */
+    public float getCx() {
+        return cx;
+    }
+
+    /**
+     * Sets the value of the cx property.
+     */
+    public void setCx(float value) {
+        this.cx = value;
+    }
+
+    /**
+     * Gets the value of the cy property.
+     */
+    public float getCy() {
+        return cy;
+    }
+
+    /**
+     * Sets the value of the cy property.
+     */
+    public void setCy(float value) {
+        this.cy = value;
+    }
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFill() {
+        if (fill == null) {
+            return "#E0E5EF";
+        } else {
+            return fill;
+        }
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFill(String value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the height property.
+     */
+    public float getHeight() {
+        return height;
+    }
+
+    /**
+     * Sets the value of the height property.
+     */
+    public void setHeight(float value) {
+        this.height = value;
+    }
+
+    /**
+     * Gets the value of the rx property.
+     */
+    public float getRx() {
+        return rx;
+    }
+
+    /**
+     * Sets the value of the rx property.
+     */
+    public void setRx(float value) {
+        this.rx = value;
+    }
+
+    /**
+     * Gets the value of the ry property.
+     */
+    public float getRy() {
+        return ry;
+    }
+
+    /**
+     * Sets the value of the ry property.
+     */
+    public void setRy(float value) {
+        this.ry = value;
+    }
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStroke() {
+        if (stroke == null) {
+            return "#023BB9";
+        } else {
+            return stroke;
+        }
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStroke(String value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the strokeWidth property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokeWidth() {
+        return strokeWidth;
+    }
+
+    /**
+     * Sets the value of the strokeWidth property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokeWidth(String value) {
+        this.strokeWidth = value;
+    }
+
+    /**
+     * Gets the value of the visibility property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getVisibility() {
+        return visibility;
+    }
+
+    /**
+     * Sets the value of the visibility property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setVisibility(String value) {
+        this.visibility = value;
+    }
+
+    /**
+     * Gets the value of the width property.
+     */
+    public float getWidth() {
+        return width;
+    }
+
+    /**
+     * Sets the value of the width property.
+     */
+    public void setWidth(float value) {
+        this.width = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/G.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/G.java
new file mode 100644
index 00000000..7ce658f8
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/G.java
@@ -0,0 +1,289 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}ellipse"/>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}line"/>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}rect"/>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}text"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="focusable" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="true" />
+ *       &lt;attribute name="height" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="100" />
+ *       &lt;attribute name="preserveAspectRatio" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="none" />
+ *       &lt;attribute name="transform" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="width" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="100" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "ellipse",
+        "line",
+        "rect",
+        "text"
+        })
+@XmlRootElement(name = "g")
+public class G {
+
+    protected Ellipse ellipse;
+    protected Line line;
+    protected Rect rect;
+    protected Text text;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String focusable;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String height;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String preserveAspectRatio;
+    @XmlAttribute(required = true)
+    protected String transform;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String width;
+
+    /**
+     * Gets the value of the ellipse property.
+     *
+     * @return possible object is
+     *         {@link Ellipse }
+     */
+    public Ellipse getEllipse() {
+        return ellipse;
+    }
+
+    /**
+     * Sets the value of the ellipse property.
+     *
+     * @param value allowed object is
+     *              {@link Ellipse }
+     */
+    public void setEllipse(Ellipse value) {
+        this.ellipse = value;
+    }
+
+    /**
+     * Gets the value of the line property.
+     *
+     * @return possible object is
+     *         {@link Line }
+     */
+    public Line getLine() {
+        return line;
+    }
+
+    /**
+     * Sets the value of the line property.
+     *
+     * @param value allowed object is
+     *              {@link Line }
+     */
+    public void setLine(Line value) {
+        this.line = value;
+    }
+
+    /**
+     * Gets the value of the rect property.
+     *
+     * @return possible object is
+     *         {@link Rect }
+     */
+    public Rect getRect() {
+        return rect;
+    }
+
+    /**
+     * Sets the value of the rect property.
+     *
+     * @param value allowed object is
+     *              {@link Rect }
+     */
+    public void setRect(Rect value) {
+        this.rect = value;
+    }
+
+    /**
+     * Gets the value of the text property.
+     *
+     * @return possible object is
+     *         {@link Text }
+     */
+    public Text getText() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     *
+     * @param value allowed object is
+     *              {@link Text }
+     */
+    public void setText(Text value) {
+        this.text = value;
+    }
+
+    /**
+     * Gets the value of the focusable property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFocusable() {
+        if (focusable == null) {
+            return "true";
+        } else {
+            return focusable;
+        }
+    }
+
+    /**
+     * Sets the value of the focusable property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFocusable(String value) {
+        this.focusable = value;
+    }
+
+    /**
+     * Gets the value of the height property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getHeight() {
+        if (height == null) {
+            return "100";
+        } else {
+            return height;
+        }
+    }
+
+    /**
+     * Sets the value of the height property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setHeight(String value) {
+        this.height = value;
+    }
+
+    /**
+     * Gets the value of the preserveAspectRatio property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getPreserveAspectRatio() {
+        if (preserveAspectRatio == null) {
+            return "none";
+        } else {
+            return preserveAspectRatio;
+        }
+    }
+
+    /**
+     * Sets the value of the preserveAspectRatio property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setPreserveAspectRatio(String value) {
+        this.preserveAspectRatio = value;
+    }
+
+    /**
+     * Gets the value of the transform property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getTransform() {
+        return transform;
+    }
+
+    /**
+     * Sets the value of the transform property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setTransform(String value) {
+        this.transform = value;
+    }
+
+    /**
+     * Gets the value of the width property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getWidth() {
+        if (width == null) {
+            return "100";
+        } else {
+            return width;
+        }
+    }
+
+    /**
+     * Sets the value of the width property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setWidth(String value) {
+        this.width = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Line.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Line.java
new file mode 100644
index 00000000..45c85af0
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Line.java
@@ -0,0 +1,279 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="fill-opacity" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="stroke" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="stroke-opacity" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="stroke-width" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="1px" />
+ *       &lt;attribute name="style" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="visibility">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="hidden"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="x1" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="x2" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="y1" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="y2" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "line")
+public class Line {
+
+    @XmlAttribute(name = "fill-opacity")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String fillOpacity;
+    @XmlAttribute(required = true)
+    protected String stroke;
+    @XmlAttribute(name = "stroke-opacity")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String strokeOpacity;
+    @XmlAttribute(name = "stroke-width", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String strokeWidth;
+    @XmlAttribute
+    protected String style;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String visibility;
+    @XmlAttribute(required = true)
+    protected float x1;
+    @XmlAttribute(required = true)
+    protected float x2;
+    @XmlAttribute(required = true)
+    protected float y1;
+    @XmlAttribute(required = true)
+    protected float y2;
+
+    /**
+     * Gets the value of the fillOpacity property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFillOpacity() {
+        return fillOpacity;
+    }
+
+    /**
+     * Sets the value of the fillOpacity property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFillOpacity(String value) {
+        this.fillOpacity = value;
+    }
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStroke(String value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the strokeOpacity property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokeOpacity() {
+        return strokeOpacity;
+    }
+
+    /**
+     * Sets the value of the strokeOpacity property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokeOpacity(String value) {
+        this.strokeOpacity = value;
+    }
+
+    /**
+     * Gets the value of the strokeWidth property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokeWidth() {
+        if (strokeWidth == null) {
+            return "1px";
+        } else {
+            return strokeWidth;
+        }
+    }
+
+    /**
+     * Sets the value of the strokeWidth property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokeWidth(String value) {
+        this.strokeWidth = value;
+    }
+
+    /**
+     * Gets the value of the style property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStyle() {
+        return style;
+    }
+
+    /**
+     * Sets the value of the style property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStyle(String value) {
+        this.style = value;
+    }
+
+    /**
+     * Gets the value of the visibility property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getVisibility() {
+        return visibility;
+    }
+
+    /**
+     * Sets the value of the visibility property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setVisibility(String value) {
+        this.visibility = value;
+    }
+
+    /**
+     * Gets the value of the x1 property.
+     */
+    public float getX1() {
+        return x1;
+    }
+
+    /**
+     * Sets the value of the x1 property.
+     */
+    public void setX1(float value) {
+        this.x1 = value;
+    }
+
+    /**
+     * Gets the value of the x2 property.
+     */
+    public float getX2() {
+        return x2;
+    }
+
+    /**
+     * Sets the value of the x2 property.
+     */
+    public void setX2(float value) {
+        this.x2 = value;
+    }
+
+    /**
+     * Gets the value of the y1 property.
+     */
+    public float getY1() {
+        return y1;
+    }
+
+    /**
+     * Sets the value of the y1 property.
+     */
+    public void setY1(float value) {
+        this.y1 = value;
+    }
+
+    /**
+     * Gets the value of the y2 property.
+     */
+    public float getY2() {
+        return y2;
+    }
+
+    /**
+     * Sets the value of the y2 property.
+     */
+    public void setY2(float value) {
+        this.y2 = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/ObjectFactory.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/ObjectFactory.java
new file mode 100644
index 00000000..82daa97a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/ObjectFactory.java
@@ -0,0 +1,105 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the com.mindmap.xml.svgmap package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups.  Factory methods for each of these are
+ * provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.mindmap.xml.svgmap
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link Rect }
+     */
+    public Rect createRect() {
+        return new Rect();
+    }
+
+    /**
+     * Create an instance of {@link Svg }
+     */
+    public Svg createSvg() {
+        return new Svg();
+    }
+
+    /**
+     * Create an instance of {@link Text }
+     */
+    public Text createText() {
+        return new Text();
+    }
+
+    /**
+     * Create an instance of {@link Ellipse }
+     */
+    public Ellipse createEllipse() {
+        return new Ellipse();
+    }
+
+    /**
+     * Create an instance of {@link Line }
+     */
+    public Line createLine() {
+        return new Line();
+    }
+
+    /**
+     * Create an instance of {@link Polyline }
+     */
+    public Polyline createPolyline() {
+        return new Polyline();
+    }
+
+    /**
+     * Create an instance of {@link G }
+     */
+    public G createG() {
+        return new G();
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Polyline.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Polyline.java
new file mode 100644
index 00000000..c39b4ea1
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Polyline.java
@@ -0,0 +1,240 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="fill" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="none" />
+ *       &lt;attribute name="fill-opacity" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="points" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="stroke" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="stroke-opacity" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="0.4"/>
+ *             &lt;enumeration value="1"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="stroke-width" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="1px" />
+ *       &lt;attribute name="visibility" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "polyline")
+public class Polyline {
+
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String fill;
+    @XmlAttribute(name = "fill-opacity")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String fillOpacity;
+    @XmlAttribute
+    protected String points;
+    @XmlAttribute(required = true)
+    protected String stroke;
+    @XmlAttribute(name = "stroke-opacity", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String strokeOpacity;
+    @XmlAttribute(name = "stroke-width", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String strokeWidth;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String visibility;
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFill() {
+        if (fill == null) {
+            return "none";
+        } else {
+            return fill;
+        }
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFill(String value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the fillOpacity property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFillOpacity() {
+        return fillOpacity;
+    }
+
+    /**
+     * Sets the value of the fillOpacity property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFillOpacity(String value) {
+        this.fillOpacity = value;
+    }
+
+    /**
+     * Gets the value of the points property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getPoints() {
+        return points;
+    }
+
+    /**
+     * Sets the value of the points property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setPoints(String value) {
+        this.points = value;
+    }
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStroke(String value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the strokeOpacity property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokeOpacity() {
+        return strokeOpacity;
+    }
+
+    /**
+     * Sets the value of the strokeOpacity property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokeOpacity(String value) {
+        this.strokeOpacity = value;
+    }
+
+    /**
+     * Gets the value of the strokeWidth property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokeWidth() {
+        if (strokeWidth == null) {
+            return "1px";
+        } else {
+            return strokeWidth;
+        }
+    }
+
+    /**
+     * Sets the value of the strokeWidth property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokeWidth(String value) {
+        this.strokeWidth = value;
+    }
+
+    /**
+     * Gets the value of the visibility property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getVisibility() {
+        return visibility;
+    }
+
+    /**
+     * Sets the value of the visibility property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setVisibility(String value) {
+        this.visibility = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Rect.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Rect.java
new file mode 100644
index 00000000..1fd5d0df
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Rect.java
@@ -0,0 +1,342 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="fill" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="fill-opacity" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="height" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="rx" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="ry" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="stroke" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="stroke-opacity" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="stroke-width" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="style" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="visibility" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="width" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "rect")
+public class Rect {
+
+    @XmlAttribute(required = true)
+    protected String fill;
+    @XmlAttribute(name = "fill-opacity")
+    protected Float fillOpacity;
+    @XmlAttribute(required = true)
+    protected float height;
+    @XmlAttribute
+    protected Float rx;
+    @XmlAttribute
+    protected Float ry;
+    @XmlAttribute(required = true)
+    protected String stroke;
+    @XmlAttribute(name = "stroke-opacity")
+    protected Float strokeOpacity;
+    @XmlAttribute(name = "stroke-width", required = true)
+    protected String strokeWidth;
+    @XmlAttribute
+    protected String style;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String visibility;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String width;
+    @XmlAttribute(required = true)
+    protected float x;
+    @XmlAttribute(required = true)
+    protected float y;
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFill() {
+        return fill;
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFill(String value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the fillOpacity property.
+     *
+     * @return possible object is
+     *         {@link Float }
+     */
+    public Float getFillOpacity() {
+        return fillOpacity;
+    }
+
+    /**
+     * Sets the value of the fillOpacity property.
+     *
+     * @param value allowed object is
+     *              {@link Float }
+     */
+    public void setFillOpacity(Float value) {
+        this.fillOpacity = value;
+    }
+
+    /**
+     * Gets the value of the height property.
+     */
+    public float getHeight() {
+        return height;
+    }
+
+    /**
+     * Sets the value of the height property.
+     */
+    public void setHeight(float value) {
+        this.height = value;
+    }
+
+    /**
+     * Gets the value of the rx property.
+     *
+     * @return possible object is
+     *         {@link Float }
+     */
+    public Float getRx() {
+        return rx;
+    }
+
+    /**
+     * Sets the value of the rx property.
+     *
+     * @param value allowed object is
+     *              {@link Float }
+     */
+    public void setRx(Float value) {
+        this.rx = value;
+    }
+
+    /**
+     * Gets the value of the ry property.
+     *
+     * @return possible object is
+     *         {@link Float }
+     */
+    public Float getRy() {
+        return ry;
+    }
+
+    /**
+     * Sets the value of the ry property.
+     *
+     * @param value allowed object is
+     *              {@link Float }
+     */
+    public void setRy(Float value) {
+        this.ry = value;
+    }
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStroke(String value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the strokeOpacity property.
+     *
+     * @return possible object is
+     *         {@link Float }
+     */
+    public Float getStrokeOpacity() {
+        return strokeOpacity;
+    }
+
+    /**
+     * Sets the value of the strokeOpacity property.
+     *
+     * @param value allowed object is
+     *              {@link Float }
+     */
+    public void setStrokeOpacity(Float value) {
+        this.strokeOpacity = value;
+    }
+
+    /**
+     * Gets the value of the strokeWidth property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokeWidth() {
+        return strokeWidth;
+    }
+
+    /**
+     * Sets the value of the strokeWidth property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokeWidth(String value) {
+        this.strokeWidth = value;
+    }
+
+    /**
+     * Gets the value of the style property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStyle() {
+        return style;
+    }
+
+    /**
+     * Sets the value of the style property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStyle(String value) {
+        this.style = value;
+    }
+
+    /**
+     * Gets the value of the visibility property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getVisibility() {
+        return visibility;
+    }
+
+    /**
+     * Sets the value of the visibility property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setVisibility(String value) {
+        this.visibility = value;
+    }
+
+    /**
+     * Gets the value of the width property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getWidth() {
+        return width;
+    }
+
+    /**
+     * Sets the value of the width property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setWidth(String value) {
+        this.width = value;
+    }
+
+    /**
+     * Gets the value of the x property.
+     */
+    public float getX() {
+        return x;
+    }
+
+    /**
+     * Sets the value of the x property.
+     */
+    public void setX(float value) {
+        this.x = value;
+    }
+
+    /**
+     * Gets the value of the y property.
+     */
+    public float getY() {
+        return y;
+    }
+
+    /**
+     * Sets the value of the y property.
+     */
+    public void setY(float value) {
+        this.y = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Svg.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Svg.java
new file mode 100644
index 00000000..a2654724
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Svg.java
@@ -0,0 +1,332 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}polyline" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}line" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}g" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://www.w3.org/2000/svg}rect" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="focusable" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="height" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="preserveAspectRatio" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *       &lt;attribute name="viewBox" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="width" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "polyline",
+        "line",
+        "g",
+        "rect"
+        })
+@XmlRootElement(name = "svg")
+public class Svg {
+
+    @XmlElement(required = true)
+    protected List<Polyline> polyline;
+    @XmlElement(required = true)
+    protected List<Line> line;
+    @XmlElement(required = true)
+    protected List<G> g;
+    @XmlElement(required = true)
+    protected List<Rect> rect;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String focusable;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String height;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String id;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String preserveAspectRatio;
+    @XmlAttribute(required = true)
+    protected String viewBox;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String width;
+
+    /**
+     * Gets the value of the polyline property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the polyline property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPolyline().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Polyline }
+     */
+    public List<Polyline> getPolyline() {
+        if (polyline == null) {
+            polyline = new ArrayList<Polyline>();
+        }
+        return this.polyline;
+    }
+
+    /**
+     * Gets the value of the line property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the line property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getLine().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Line }
+     */
+    public List<Line> getLine() {
+        if (line == null) {
+            line = new ArrayList<Line>();
+        }
+        return this.line;
+    }
+
+    /**
+     * Gets the value of the g property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the g property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getG().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link G }
+     */
+    public List<G> getG() {
+        if (g == null) {
+            g = new ArrayList<G>();
+        }
+        return this.g;
+    }
+
+    /**
+     * Gets the value of the rect property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the rect property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRect().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Rect }
+     */
+    public List<Rect> getRect() {
+        if (rect == null) {
+            rect = new ArrayList<Rect>();
+        }
+        return this.rect;
+    }
+
+    /**
+     * Gets the value of the focusable property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFocusable() {
+        return focusable;
+    }
+
+    /**
+     * Sets the value of the focusable property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFocusable(String value) {
+        this.focusable = value;
+    }
+
+    /**
+     * Gets the value of the height property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getHeight() {
+        return height;
+    }
+
+    /**
+     * Sets the value of the height property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setHeight(String value) {
+        this.height = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the preserveAspectRatio property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getPreserveAspectRatio() {
+        return preserveAspectRatio;
+    }
+
+    /**
+     * Sets the value of the preserveAspectRatio property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setPreserveAspectRatio(String value) {
+        this.preserveAspectRatio = value;
+    }
+
+    /**
+     * Gets the value of the viewBox property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getViewBox() {
+        return viewBox;
+    }
+
+    /**
+     * Sets the value of the viewBox property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setViewBox(String value) {
+        this.viewBox = value;
+    }
+
+    /**
+     * Gets the value of the width property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getWidth() {
+        return width;
+    }
+
+    /**
+     * Sets the value of the width property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setWidth(String value) {
+        this.width = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Text.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Text.java
new file mode 100644
index 00000000..a1632889
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/Text.java
@@ -0,0 +1,299 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+
+package com.wisemapping.xml.svgmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="fill" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="focusable" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="true" />
+ *       &lt;attribute name="font-family" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="verdana" />
+ *       &lt;attribute name="font-size" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="font-style" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="italic"/>
+ *             &lt;enumeration value="normal"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="font-weight" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="bold"/>
+ *             &lt;enumeration value="normal"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="style" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "content"
+        })
+@XmlRootElement(name = "text")
+public class Text {
+
+    @XmlValue
+    protected String content;
+    @XmlAttribute(required = true)
+    protected String fill;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String focusable;
+    @XmlAttribute(name = "font-family", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String fontFamily;
+    @XmlAttribute(name = "font-size", required = true)
+    protected float fontSize;
+    @XmlAttribute(name = "font-style", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String fontStyle;
+    @XmlAttribute(name = "font-weight", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String fontWeight;
+    @XmlAttribute(required = true)
+    protected String style;
+    @XmlAttribute(required = true)
+    protected float x;
+    @XmlAttribute(required = true)
+    protected float y;
+
+    /**
+     * Gets the value of the content property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * Sets the value of the content property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setContent(String value) {
+        this.content = value;
+    }
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFill() {
+        return fill;
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFill(String value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the focusable property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFocusable() {
+        if (focusable == null) {
+            return "true";
+        } else {
+            return focusable;
+        }
+    }
+
+    /**
+     * Sets the value of the focusable property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFocusable(String value) {
+        this.focusable = value;
+    }
+
+    /**
+     * Gets the value of the fontFamily property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFontFamily() {
+        if (fontFamily == null) {
+            return "verdana";
+        } else {
+            return fontFamily;
+        }
+    }
+
+    /**
+     * Sets the value of the fontFamily property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFontFamily(String value) {
+        this.fontFamily = value;
+    }
+
+    /**
+     * Gets the value of the fontSize property.
+     */
+    public float getFontSize() {
+        return fontSize;
+    }
+
+    /**
+     * Sets the value of the fontSize property.
+     */
+    public void setFontSize(float value) {
+        this.fontSize = value;
+    }
+
+    /**
+     * Gets the value of the fontStyle property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFontStyle() {
+        return fontStyle;
+    }
+
+    /**
+     * Sets the value of the fontStyle property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFontStyle(String value) {
+        this.fontStyle = value;
+    }
+
+    /**
+     * Gets the value of the fontWeight property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFontWeight() {
+        return fontWeight;
+    }
+
+    /**
+     * Sets the value of the fontWeight property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFontWeight(String value) {
+        this.fontWeight = value;
+    }
+
+    /**
+     * Gets the value of the style property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStyle() {
+        return style;
+    }
+
+    /**
+     * Sets the value of the style property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStyle(String value) {
+        this.style = value;
+    }
+
+    /**
+     * Gets the value of the x property.
+     */
+    public float getX() {
+        return x;
+    }
+
+    /**
+     * Sets the value of the x property.
+     */
+    public void setX(float value) {
+        this.x = value;
+    }
+
+    /**
+     * Gets the value of the y property.
+     */
+    public float getY() {
+        return y;
+    }
+
+    /**
+     * Sets the value of the y property.
+     */
+    public void setY(float value) {
+        this.y = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/package-info.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/package-info.java
new file mode 100644
index 00000000..88496309
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/svgmap/package-info.java
@@ -0,0 +1,27 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:27:07 PM ART 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/svg", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package com.wisemapping.xml.svgmap;
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Element.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Element.java
new file mode 100644
index 00000000..dcee8e00
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Element.java
@@ -0,0 +1,170 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for element complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="element">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="fillcolor" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="opacity" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="strokecolor" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="strokeweight" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="style" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "element")
+public class Element {
+
+    @XmlAttribute
+    protected String fillcolor;
+    @XmlAttribute
+    protected String opacity;
+    @XmlAttribute(required = true)
+    protected String strokecolor;
+    @XmlAttribute
+    protected String strokeweight;
+    @XmlAttribute
+    protected String style;
+
+    /**
+     * Gets the value of the fillcolor property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFillcolor() {
+        return fillcolor;
+    }
+
+    /**
+     * Sets the value of the fillcolor property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFillcolor(String value) {
+        this.fillcolor = value;
+    }
+
+    /**
+     * Gets the value of the opacity property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getOpacity() {
+        return opacity;
+    }
+
+    /**
+     * Sets the value of the opacity property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setOpacity(String value) {
+        this.opacity = value;
+    }
+
+    /**
+     * Gets the value of the strokecolor property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokecolor() {
+        return strokecolor;
+    }
+
+    /**
+     * Sets the value of the strokecolor property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokecolor(String value) {
+        this.strokecolor = value;
+    }
+
+    /**
+     * Gets the value of the strokeweight property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStrokeweight() {
+        return strokeweight;
+    }
+
+    /**
+     * Sets the value of the strokeweight property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStrokeweight(String value) {
+        this.strokeweight = value;
+    }
+
+    /**
+     * Gets the value of the style property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStyle() {
+        return style;
+    }
+
+    /**
+     * Sets the value of the style property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStyle(String value) {
+        this.style = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Fill.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Fill.java
new file mode 100644
index 00000000..a27bb8b6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Fill.java
@@ -0,0 +1,80 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="opacity" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "fill")
+public class Fill {
+
+    @XmlAttribute
+    protected String opacity;
+
+    /**
+     * Gets the value of the opacity property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getOpacity() {
+        return opacity;
+    }
+
+    /**
+     * Sets the value of the opacity property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setOpacity(String value) {
+        this.opacity = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Group.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Group.java
new file mode 100644
index 00000000..6b073326
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Group.java
@@ -0,0 +1,319 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;choice>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}group" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}line" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}oval" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}polyline" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}rect" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}roundrect" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}shape" maxOccurs="unbounded"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="coordorigin" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="coordsize" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "group",
+        "line",
+        "oval",
+        "polyline",
+        "rect",
+        "roundrect",
+        "shape"
+        })
+@XmlRootElement(name = "group")
+public class Group
+        extends Element {
+
+    protected List<Group> group;
+    protected List<Line> line;
+    protected List<Oval> oval;
+    protected List<Polyline> polyline;
+    protected List<Rect> rect;
+    protected List<Roundrect> roundrect;
+    protected List<Shape> shape;
+    @XmlAttribute
+    protected String coordorigin;
+    @XmlAttribute(required = true)
+    protected String coordsize;
+
+    /**
+     * Gets the value of the group property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the group property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getGroup().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Group }
+     */
+    public List<Group> getGroup() {
+        if (group == null) {
+            group = new ArrayList<Group>();
+        }
+        return this.group;
+    }
+
+    /**
+     * Gets the value of the line property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the line property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getLine().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Line }
+     */
+    public List<Line> getLine() {
+        if (line == null) {
+            line = new ArrayList<Line>();
+        }
+        return this.line;
+    }
+
+    /**
+     * Gets the value of the oval property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the oval property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getOval().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Oval }
+     */
+    public List<Oval> getOval() {
+        if (oval == null) {
+            oval = new ArrayList<Oval>();
+        }
+        return this.oval;
+    }
+
+    /**
+     * Gets the value of the polyline property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the polyline property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPolyline().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Polyline }
+     */
+    public List<Polyline> getPolyline() {
+        if (polyline == null) {
+            polyline = new ArrayList<Polyline>();
+        }
+        return this.polyline;
+    }
+
+    /**
+     * Gets the value of the rect property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the rect property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRect().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Rect }
+     */
+    public List<Rect> getRect() {
+        if (rect == null) {
+            rect = new ArrayList<Rect>();
+        }
+        return this.rect;
+    }
+
+    /**
+     * Gets the value of the roundrect property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the roundrect property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRoundrect().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Roundrect }
+     */
+    public List<Roundrect> getRoundrect() {
+        if (roundrect == null) {
+            roundrect = new ArrayList<Roundrect>();
+        }
+        return this.roundrect;
+    }
+
+    /**
+     * Gets the value of the shape property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the shape property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getShape().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Shape }
+     */
+    public List<Shape> getShape() {
+        if (shape == null) {
+            shape = new ArrayList<Shape>();
+        }
+        return this.shape;
+    }
+
+    /**
+     * Gets the value of the coordorigin property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getCoordorigin() {
+        return coordorigin;
+    }
+
+    /**
+     * Sets the value of the coordorigin property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setCoordorigin(String value) {
+        this.coordorigin = value;
+    }
+
+    /**
+     * Gets the value of the coordsize property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getCoordsize() {
+        return coordsize;
+    }
+
+    /**
+     * Sets the value of the coordsize property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setCoordsize(String value) {
+        this.coordsize = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Line.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Line.java
new file mode 100644
index 00000000..58daffcb
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Line.java
@@ -0,0 +1,185 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}stroke"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}fill" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="stroked" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="t" />
+ *       &lt;attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "stroke",
+        "fill"
+        })
+@XmlRootElement(name = "line")
+public class Line
+        extends Element {
+
+    @XmlElement(required = true)
+    protected Stroke stroke;
+    protected Fill fill;
+    @XmlAttribute(required = true)
+    protected String from;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String stroked;
+    @XmlAttribute(required = true)
+    protected String to;
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link Stroke }
+     */
+    public Stroke getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link Stroke }
+     */
+    public void setStroke(Stroke value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link Fill }
+     */
+    public Fill getFill() {
+        return fill;
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link Fill }
+     */
+    public void setFill(Fill value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the from property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFrom() {
+        return from;
+    }
+
+    /**
+     * Sets the value of the from property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFrom(String value) {
+        this.from = value;
+    }
+
+    /**
+     * Gets the value of the stroked property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStroked() {
+        if (stroked == null) {
+            return "t";
+        } else {
+            return stroked;
+        }
+    }
+
+    /**
+     * Sets the value of the stroked property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStroked(String value) {
+        this.stroked = value;
+    }
+
+    /**
+     * Gets the value of the to property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getTo() {
+        return to;
+    }
+
+    /**
+     * Sets the value of the to property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setTo(String value) {
+        this.to = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/ObjectFactory.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/ObjectFactory.java
new file mode 100644
index 00000000..995b437c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/ObjectFactory.java
@@ -0,0 +1,140 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the com.mindmap.xml.vmlmap package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups.  Factory methods for each of these are
+ * provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.mindmap.xml.vmlmap
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link Textbox }
+     */
+    public Textbox createTextbox() {
+        return new Textbox();
+    }
+
+    /**
+     * Create an instance of {@link Shape }
+     */
+    public Shape createShape() {
+        return new Shape();
+    }
+
+    /**
+     * Create an instance of {@link Roundrect }
+     */
+    public Roundrect createRoundrect() {
+        return new Roundrect();
+    }
+
+    /**
+     * Create an instance of {@link Oval }
+     */
+    public Oval createOval() {
+        return new Oval();
+    }
+
+    /**
+     * Create an instance of {@link Textbox.SPAN }
+     */
+    public Textbox.SPAN createTextboxSPAN() {
+        return new Textbox.SPAN();
+    }
+
+    /**
+     * Create an instance of {@link Rect }
+     */
+    public Rect createRect() {
+        return new Rect();
+    }
+
+    /**
+     * Create an instance of {@link Element }
+     */
+    public Element createElement() {
+        return new Element();
+    }
+
+    /**
+     * Create an instance of {@link Line }
+     */
+    public Line createLine() {
+        return new Line();
+    }
+
+    /**
+     * Create an instance of {@link Group }
+     */
+    public Group createGroup() {
+        return new Group();
+    }
+
+    /**
+     * Create an instance of {@link Stroke }
+     */
+    public Stroke createStroke() {
+        return new Stroke();
+    }
+
+    /**
+     * Create an instance of {@link Polyline }
+     */
+    public Polyline createPolyline() {
+        return new Polyline();
+    }
+
+    /**
+     * Create an instance of {@link Fill }
+     */
+    public Fill createFill() {
+        return new Fill();
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Oval.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Oval.java
new file mode 100644
index 00000000..d9168404
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Oval.java
@@ -0,0 +1,167 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}stroke"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}fill"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="coordsize" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="21600,21600" />
+ *       &lt;attribute name="stroked" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="t" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "stroke",
+        "fill"
+        })
+@XmlRootElement(name = "oval")
+public class Oval
+        extends Element {
+
+    @XmlElement(required = true)
+    protected Stroke stroke;
+    @XmlElement(required = true)
+    protected Fill fill;
+    @XmlAttribute(required = true)
+    protected String coordsize;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String stroked;
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link Stroke }
+     */
+    public Stroke getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link Stroke }
+     */
+    public void setStroke(Stroke value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link Fill }
+     */
+    public Fill getFill() {
+        return fill;
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link Fill }
+     */
+    public void setFill(Fill value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the coordsize property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getCoordsize() {
+        if (coordsize == null) {
+            return "21600,21600";
+        } else {
+            return coordsize;
+        }
+    }
+
+    /**
+     * Sets the value of the coordsize property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setCoordsize(String value) {
+        this.coordsize = value;
+    }
+
+    /**
+     * Gets the value of the stroked property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStroked() {
+        if (stroked == null) {
+            return "t";
+        } else {
+            return stroked;
+        }
+    }
+
+    /**
+     * Sets the value of the stroked property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStroked(String value) {
+        this.stroked = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Polyline.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Polyline.java
new file mode 100644
index 00000000..faa55dc5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Polyline.java
@@ -0,0 +1,185 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}stroke"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}fill" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="filled" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="f" />
+ *       &lt;attribute name="points" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="xPoints" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "stroke",
+        "fill"
+        })
+@XmlRootElement(name = "polyline")
+public class Polyline
+        extends Element {
+
+    @XmlElement(required = true)
+    protected Stroke stroke;
+    protected Fill fill;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String filled;
+    @XmlAttribute
+    protected String points;
+    @XmlAttribute
+    protected String xPoints;
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link Stroke }
+     */
+    public Stroke getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link Stroke }
+     */
+    public void setStroke(Stroke value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link Fill }
+     */
+    public Fill getFill() {
+        return fill;
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link Fill }
+     */
+    public void setFill(Fill value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the filled property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getFilled() {
+        if (filled == null) {
+            return "f";
+        } else {
+            return filled;
+        }
+    }
+
+    /**
+     * Sets the value of the filled property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setFilled(String value) {
+        this.filled = value;
+    }
+
+    /**
+     * Gets the value of the points property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getPoints() {
+        return points;
+    }
+
+    /**
+     * Sets the value of the points property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setPoints(String value) {
+        this.points = value;
+    }
+
+    /**
+     * Gets the value of the xPoints property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getXPoints() {
+        return xPoints;
+    }
+
+    /**
+     * Sets the value of the xPoints property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setXPoints(String value) {
+        this.xPoints = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Rect.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Rect.java
new file mode 100644
index 00000000..a086b763
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Rect.java
@@ -0,0 +1,159 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}stroke"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}fill"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="coordsize" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="stroked" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "stroke",
+        "fill"
+        })
+@XmlRootElement(name = "rect")
+public class Rect
+        extends Element {
+
+    @XmlElement(required = true)
+    protected Stroke stroke;
+    @XmlElement(required = true)
+    protected Fill fill;
+    @XmlAttribute(required = true)
+    protected String coordsize;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String stroked;
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link Stroke }
+     */
+    public Stroke getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link Stroke }
+     */
+    public void setStroke(Stroke value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link Fill }
+     */
+    public Fill getFill() {
+        return fill;
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link Fill }
+     */
+    public void setFill(Fill value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the coordsize property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getCoordsize() {
+        return coordsize;
+    }
+
+    /**
+     * Sets the value of the coordsize property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setCoordsize(String value) {
+        this.coordsize = value;
+    }
+
+    /**
+     * Gets the value of the stroked property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getStroked() {
+        return stroked;
+    }
+
+    /**
+     * Sets the value of the stroked property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setStroked(String value) {
+        this.stroked = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Roundrect.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Roundrect.java
new file mode 100644
index 00000000..0a31f2fe
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Roundrect.java
@@ -0,0 +1,167 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}stroke"/>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}fill"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="arcsize" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" fixed="9830f" />
+ *       &lt;attribute name="coordsize" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="21600,21600" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "stroke",
+        "fill"
+        })
+@XmlRootElement(name = "roundrect")
+public class Roundrect
+        extends Element {
+
+    @XmlElement(required = true)
+    protected Stroke stroke;
+    @XmlElement(required = true)
+    protected Fill fill;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String arcsize;
+    @XmlAttribute(required = true)
+    protected String coordsize;
+
+    /**
+     * Gets the value of the stroke property.
+     *
+     * @return possible object is
+     *         {@link Stroke }
+     */
+    public Stroke getStroke() {
+        return stroke;
+    }
+
+    /**
+     * Sets the value of the stroke property.
+     *
+     * @param value allowed object is
+     *              {@link Stroke }
+     */
+    public void setStroke(Stroke value) {
+        this.stroke = value;
+    }
+
+    /**
+     * Gets the value of the fill property.
+     *
+     * @return possible object is
+     *         {@link Fill }
+     */
+    public Fill getFill() {
+        return fill;
+    }
+
+    /**
+     * Sets the value of the fill property.
+     *
+     * @param value allowed object is
+     *              {@link Fill }
+     */
+    public void setFill(Fill value) {
+        this.fill = value;
+    }
+
+    /**
+     * Gets the value of the arcsize property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getArcsize() {
+        if (arcsize == null) {
+            return "9830f";
+        } else {
+            return arcsize;
+        }
+    }
+
+    /**
+     * Sets the value of the arcsize property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setArcsize(String value) {
+        this.arcsize = value;
+    }
+
+    /**
+     * Gets the value of the coordsize property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getCoordsize() {
+        if (coordsize == null) {
+            return "21600,21600";
+        } else {
+            return coordsize;
+        }
+    }
+
+    /**
+     * Sets the value of the coordsize property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setCoordsize(String value) {
+        this.coordsize = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Shape.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Shape.java
new file mode 100644
index 00000000..8631a1cd
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Shape.java
@@ -0,0 +1,113 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://mindmap.com/xml/vmlmap}textbox"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="coordsize" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="100,100" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "textbox"
+        })
+@XmlRootElement(name = "shape")
+public class Shape
+        extends Element {
+
+    @XmlElement(required = true)
+    protected Textbox textbox;
+    @XmlAttribute(required = true)
+    protected String coordsize;
+
+    /**
+     * Gets the value of the textbox property.
+     *
+     * @return possible object is
+     *         {@link Textbox }
+     */
+    public Textbox getTextbox() {
+        return textbox;
+    }
+
+    /**
+     * Sets the value of the textbox property.
+     *
+     * @param value allowed object is
+     *              {@link Textbox }
+     */
+    public void setTextbox(Textbox value) {
+        this.textbox = value;
+    }
+
+    /**
+     * Gets the value of the coordsize property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getCoordsize() {
+        if (coordsize == null) {
+            return "100,100";
+        } else {
+            return coordsize;
+        }
+    }
+
+    /**
+     * Sets the value of the coordsize property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setCoordsize(String value) {
+        this.coordsize = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Stroke.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Stroke.java
new file mode 100644
index 00000000..fc2acf0f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Stroke.java
@@ -0,0 +1,89 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="dashstyle">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="solid"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "stroke")
+public class Stroke {
+
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String dashstyle;
+
+    /**
+     * Gets the value of the dashstyle property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getDashstyle() {
+        return dashstyle;
+    }
+
+    /**
+     * Sets the value of the dashstyle property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setDashstyle(String value) {
+        this.dashstyle = value;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Textbox.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Textbox.java
new file mode 100644
index 00000000..dad67293
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/Textbox.java
@@ -0,0 +1,212 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+
+package com.wisemapping.xml.vmlmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://mindmap.com/xml/vmlmap}element">
+ *       &lt;sequence>
+ *         &lt;element name="SPAN">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="SPAN" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *       &lt;attribute name="inset" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="0,0,0,0" />
+ *       &lt;attribute name="xFontScale" use="required" type="{http://www.w3.org/2001/XMLSchema}float" />
+ *       &lt;attribute name="xTextSize" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+        "span"
+        })
+@XmlRootElement(name = "textbox")
+public class Textbox
+        extends Element {
+
+    @XmlElement(name = "SPAN", namespace = "", required = true)
+    protected Textbox.SPAN span;
+    @XmlAttribute(required = true)
+    protected String inset;
+    @XmlAttribute(required = true)
+    protected float xFontScale;
+    @XmlAttribute(required = true)
+    protected String xTextSize;
+
+    /**
+     * Gets the value of the span property.
+     *
+     * @return possible object is
+     *         {@link Textbox.SPAN }
+     */
+    public Textbox.SPAN getSPAN() {
+        return span;
+    }
+
+    /**
+     * Sets the value of the span property.
+     *
+     * @param value allowed object is
+     *              {@link Textbox.SPAN }
+     */
+    public void setSPAN(Textbox.SPAN value) {
+        this.span = value;
+    }
+
+    /**
+     * Gets the value of the inset property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getInset() {
+        if (inset == null) {
+            return "0,0,0,0";
+        } else {
+            return inset;
+        }
+    }
+
+    /**
+     * Sets the value of the inset property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setInset(String value) {
+        this.inset = value;
+    }
+
+    /**
+     * Gets the value of the xFontScale property.
+     */
+    public float getXFontScale() {
+        return xFontScale;
+    }
+
+    /**
+     * Sets the value of the xFontScale property.
+     */
+    public void setXFontScale(float value) {
+        this.xFontScale = value;
+    }
+
+    /**
+     * Gets the value of the xTextSize property.
+     *
+     * @return possible object is
+     *         {@link String }
+     */
+    public String getXTextSize() {
+        return xTextSize;
+    }
+
+    /**
+     * Sets the value of the xTextSize property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setXTextSize(String value) {
+        this.xTextSize = value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * <p/>
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p/>
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *         &lt;element name="SPAN" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+            "span"
+            })
+    public static class SPAN {
+
+        @XmlElement(name = "SPAN", namespace = "", required = true)
+        protected String span;
+
+        /**
+         * Gets the value of the span property.
+         *
+         * @return possible object is
+         *         {@link String }
+         */
+        public String getSPAN() {
+            return span;
+        }
+
+        /**
+         * Sets the value of the span property.
+         *
+         * @param value allowed object is
+         *              {@link String }
+         */
+        public void setSPAN(String value) {
+            this.span = value;
+        }
+
+    }
+
+}
diff --git a/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/package-info.java b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/package-info.java
new file mode 100644
index 00000000..6a9734e9
--- /dev/null
+++ b/trunk/wise-webapp/src/main/java/com/wisemapping/xml/vmlmap/package-info.java
@@ -0,0 +1,27 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.04.14 at 05:18:25 PM ART 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://wisemapping.com/xml/vmlmap", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package com.wisemapping.xml.vmlmap;
diff --git a/trunk/wise-webapp/src/main/resources/com/wisemapping/model/Colaborator.hbm.xml b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/Colaborator.hbm.xml
new file mode 100755
index 00000000..dac1f836
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/Colaborator.hbm.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="com.wisemapping.model.Colaborator" table="COLABORATOR">
+        <id name="id">
+            <generator class="increment"/>
+        </id>
+        <property name="email"/>
+        <property name="creationDate" column="creation_date"/>
+
+        <set name="mindmapUsers"			
+			cascade="all, delete-orphan"
+			inverse="true">
+            <key column="COLABORATOR_ID" not-null="true"/>
+            <one-to-many class="com.wisemapping.model.MindmapUser"/>
+	    </set>
+
+        <joined-subclass name="com.wisemapping.model.User" table="USER">
+            <key column="COLABORATOR_ID"/>
+            <property name="username" not-null="true"/>
+            <property name="firstname"/>
+            <property name="lastname"/>
+            <property name="password"/>
+            <property name="activationDate" column="activation_date"/>
+            <property name="activationCode"/>
+            <property name="allowSendEmail"/>
+            <set name="tags" table="TAG">
+                <key column="user_id"/>
+                <element column="name" type="string"/>                
+            </set>
+        </joined-subclass>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindMap.hbm.xml b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindMap.hbm.xml
new file mode 100644
index 00000000..1151e90f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindMap.hbm.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="com.wisemapping.model.MindMap" table="MINDMAP">
+        <id name="id">
+            <generator class="increment"/>
+        </id>
+        <property name="title"/>
+        <property name="public"/>
+        <property name="description"/>        
+        <property name="xml" column="XML"/>
+        <property name="lastModifierUser" column="last_editor"/>
+        <property name="lastModificationTime" column="edition_date"/>
+        <property name="creationTime" column="creation_date"/>
+        <property name="creator" column="creator_user"/>
+        <property name="tags" column="tags"/>
+        <property name="properties" column="editor_properties"/>
+
+        <many-to-one name="owner" column="owner_id" unique="true" not-null="true"/>
+        <many-to-one name="nativeBrowser" column="mindMapNative_id" unique="true" not-null="true"/>
+
+        <set name="mindmapUsers"
+                cascade="all, delete-orphan"
+                inverse="true">
+            <key column="MINDMAP_ID" not-null="true"/>                
+            <one-to-many class="com.wisemapping.model.MindmapUser"/>
+        </set>        
+
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindMapHistory.hbm.xml b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindMapHistory.hbm.xml
new file mode 100755
index 00000000..04087332
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindMapHistory.hbm.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="com.wisemapping.model.MindMapHistory" table="MINDMAP_HISTORY">
+        <id name="id">
+            <generator class="increment"/>
+        </id>
+
+        <property name="mindmapId" column="mindmap_id"/>
+	    <property name="xml" column="XML"/>
+	    <property name="creationTime" column="creation_date"/>
+        <property name="creator" column="creator_user"/>
+    </class>
+
+</hibernate-mapping>
diff --git a/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindmapNative.hbm.xml b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindmapNative.hbm.xml
new file mode 100644
index 00000000..c52bf366
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindmapNative.hbm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="com.wisemapping.model.MindMapNative" table="MINDMAP_NATIVE">
+        <id name="id">
+            <generator class="increment"/>
+        </id>
+
+        <property name="svgXml" type="binary">
+            <column name="SVG_XML" sql-type="blob"/>
+        </property>
+        <property name="vmlXml" type="binary">
+            <column name="VML_XML" sql-type="blob"/>
+        </property>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindmapUser.hbm.xml b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindmapUser.hbm.xml
new file mode 100644
index 00000000..92ae5c75
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/MindmapUser.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="com.wisemapping.model.MindmapUser" table="MINDMAP_COLABORATOR">
+        <id name="id">
+            <generator class="increment"/>
+        </id>
+
+        <property name="roleId" column="ROLE_ID" unique="true" not-null="true"/>
+        
+         <!-- Read-only association property -->
+        <many-to-one name="mindMap"
+                        column="MINDMAP_ID"
+                        not-null="true"
+                        class="com.wisemapping.model.MindMap"
+                />
+
+        <many-to-one name="colaborator"
+                    column="COLABORATOR_ID"
+                    not-null="true"
+                    class="com.wisemapping.model.Colaborator"
+                    />
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/resources/com/wisemapping/model/UserLogin.hbm.xml b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/UserLogin.hbm.xml
new file mode 100755
index 00000000..16118c30
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/com/wisemapping/model/UserLogin.hbm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="com.wisemapping.model.UserLogin" table="USER_LOGIN">
+      	<id name="id">
+            <generator class="increment"/>
+        </id>
+        <property name="loginDate" column="login_Date"/>
+        <property name="email"/>                       
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/resources/mindmap.xsd b/trunk/wise-webapp/src/main/resources/mindmap.xsd
new file mode 100755
index 00000000..de724c11
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/mindmap.xsd
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+        attributeFormDefault="unqualified"
+        elementFormDefault="qualified"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wisemapping.org/mindmap"
+        xmlns="http://www.wisemapping.org/mindmap">
+
+    <xsd:element name="map" type="mapType"/>
+
+    <xsd:complexType name="mapType">
+        <xsd:sequence>
+            <xsd:element ref="topic" minOccurs="1" maxOccurs='unbounded'/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string"/>
+    </xsd:complexType>
+
+
+    <xsd:element name="topic" type="topicType"/>
+
+    <xsd:complexType name="topicType">
+        <xsd:sequence>
+            <xsd:element minOccurs='0' maxOccurs='unbounded' type="icon" name="icon"/>
+            <xsd:element minOccurs='0' maxOccurs='1' type="link" name="link"/>
+            <xsd:element minOccurs='0' maxOccurs='1' type="note" name="note"/>
+            <xsd:element minOccurs='0' maxOccurs='unbounded' ref="topic"/>
+        </xsd:sequence>
+        <xsd:attribute name="text" type="xsd:string"/>
+        <xsd:attribute name="shape" type="xsd:string"/>
+        <xsd:attribute name="fontStyle" type="xsd:string"/>
+        <xsd:attribute name="bgColor" type="xsd:string"/>
+        <xsd:attribute name="brColor" type="xsd:string"/>
+        <xsd:attribute name="order" type="xsd:int"/>
+        <xsd:attribute name="position" type="xsd:string"/>
+        <xsd:attribute name="central" type="xsd:boolean"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="icon">
+        <xsd:attribute name="id" type="xsd:string"/>
+        <xsd:attribute name="order" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="link">
+        <xsd:attribute name="url" type="xsd:string"/>
+        <xsd:attribute name="order" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="note">
+        <xsd:attribute name="text" type="xsd:string"/>
+    </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/resources/wiseservices.wsdl b/trunk/wise-webapp/src/main/resources/wiseservices.wsdl
new file mode 100644
index 00000000..fc66cfec
--- /dev/null
+++ b/trunk/wise-webapp/src/main/resources/wiseservices.wsdl
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:sch="http://www.wisemapping.org/ws" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:tns="http://www.wisemapping.org/ws" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  targetNamespace="http://www.wisemapping.org/ws">
+    <wsdl:types>
+        <xsd:schema xmlns:wm="http://www.wisemapping.org/mindmap" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                    attributeFormDefault="unqualified" elementFormDefault="qualified"
+                    targetNamespace="http://www.wisemapping.org/ws">
+            <xsd:import namespace="http://www.wisemapping.org/mindmap" schemaLocation="mindmap.xsd"/>
+
+            <xsd:element name="loadMindmapRequest">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="mapdId" type="xsd:long"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="loadMindmapResponse">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="creator" type="xsd:string"/>
+                        <xsd:element ref="wm:map"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="addMindmapRequest">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="creator" type="xsd:string"/>
+                        <xsd:element name="title" type="xsd:string"/>
+                        <xsd:element name="description" type="xsd:string"/>
+                        <xsd:element ref="wm:map"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="addMindmapResponse">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="mapId" type="xsd:long"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+
+
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="loadMindmapResponse">
+        <wsdl:part element="tns:loadMindmapResponse" name="loadMindmapResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="addMindmapRequest">
+        <wsdl:part element="tns:addMindmapRequest" name="addMindmapRequest">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="loadMindmapRequest">
+        <wsdl:part element="tns:loadMindmapRequest" name="loadMindmapRequest">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="addMindmapResponse">
+        <wsdl:part element="tns:addMindmapResponse" name="addMindmapResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="WiseServicesPortType">
+        <wsdl:operation name="loadMindmap">
+            <wsdl:input message="tns:loadMindmapRequest" name="loadMindmapRequest">
+            </wsdl:input>
+            <wsdl:output message="tns:loadMindmapResponse" name="loadMindmapResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="addMindmap">
+            <wsdl:input message="tns:addMindmapRequest" name="addMindmapRequest">
+            </wsdl:input>
+            <wsdl:output message="tns:addMindmapResponse" name="addMindmapResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="WiseServicesPortTypeSoap11" type="tns:WiseServicesPortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="loadMindmap">
+            <soap:operation soapAction=""/>
+            <wsdl:input name="loadMindmapRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="loadMindmapResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="addMindmap">
+            <soap:operation soapAction=""/>
+            <wsdl:input name="addMindmapRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="addMindmapResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="WiseServicesPortTypeService">
+        <wsdl:port binding="tns:WiseServicesPortTypeSoap11" name="WiseServicesPortTypeSoap11">
+            <soap:address location="http://localhost:8080/wise-webapp/ws/"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/META-INF/Context.xml b/trunk/wise-webapp/src/main/webapp/META-INF/Context.xml
new file mode 100755
index 00000000..0af54be5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/META-INF/Context.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Context path="/wisemapping" reloadable="true">
+
+    <Resource
+            name="jdbc/wisemapping"
+            auth="Container"
+            type="javax.sql.DataSource"
+            maxActive="100"
+            maxIdle="30" maxWait="10000"
+            username="root"
+            password=""
+            driverClassName="com.mysql.jdbc.Driver"
+            url="jdbc:mysql://localhost/wisemapping?autoReconnect=true"/>
+
+</Context>
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/app.properties b/trunk/wise-webapp/src/main/webapp/WEB-INF/app.properties
new file mode 100755
index 00000000..cce09215
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -0,0 +1,22 @@
+# MySQL 5.X configuration properties
+
+#database.url=jdbc:mysql://localhost/wisemapping
+#database.driver=com.mysql.jdbc.Driver
+#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+#database.username=root
+#database.password=
+
+# HSQL Configuration properties
+database.url=jdbc:hsqldb:file:target/db/wisemapping
+database.driver=org.hsqldb.jdbcDriver
+database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
+database.username=sa
+database.password=
+
+# Mail configuration seccion.
+mail.smtp.socketFactory.port=465
+mail.host=localhost
+mail.user=user
+mail.password=password
+mail.registrationEmail=root@localhost
+mail.siteEmail=root@localhost
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
new file mode 100644
index 00000000..32a2b197
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -0,0 +1,10 @@
+log4j.rootCategory=WARN, stdout
+log4j.net.sf=FATAL,stdout
+log4j.com.wisemapping=DEBUG,stdout
+log4j.org.wisemapping.ws=DEBUG,stdout
+
+##log4j.category.net.sf.acegisecurity=DEBUG,
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail.properties b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail.properties
new file mode 100644
index 00000000..8a8b0f11
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail.properties
@@ -0,0 +1,9 @@
+# Configuration file for javax.mail
+
+# Host whose mail services will be used
+# (Default value : localhost)
+mail.host=mail.wisemapping.com
+
+# Return address to appear on emails
+# (Default value : username@host)
+mail.from=webmaster@wisemapping.com 
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activationAccountMail.vm b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activationAccountMail.vm
new file mode 100644
index 00000000..6c8b0d75
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activationAccountMail.vm
@@ -0,0 +1,22 @@
+<html>
+<body>
+<h3>Welcome to WiseMapping!</h3>
+<p>
+	Your account has been activated.
+	First Name: ${user.firstname}
+    Last Name: ${user.lastname}
+    Username: ${user.username}
+</p>
+<p>
+	Thank you for using WiseMapping.
+</p>
+<p>
+	For questions or concerns regarding your account, send us an email to support@wisemapping.com.
+</p>
+<p>
+Best regards, <br/>
+WiseMapping Team
+<a href="http://www.wisemapping.com">WiseMapping Site</a>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activeUserAccountMail.vm b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activeUserAccountMail.vm
new file mode 100755
index 00000000..c253cc84
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activeUserAccountMail.vm
@@ -0,0 +1,12 @@
+<html>
+<body>
+<h3>We have a new User !!</h3>
+<p>
+    Id: ${user.id} <br/>
+	First Name: ${user.firstname} <br/>
+    Last Name: ${user.lastname} <br/>
+    Username: ${user.username} <br/>
+    Email: ${user.email} <br/>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/confirmationMail.vm b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/confirmationMail.vm
new file mode 100644
index 00000000..be44896c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/confirmationMail.vm
@@ -0,0 +1,24 @@
+<html>
+<body>
+<h3>Welcome to WiseMapping!</h3>
+<p>
+	To active your account and verify your e-mail address, please click on the following link.
+</p>
+	<a href="${emailcheck}">${emailcheck}</a>
+</p>
+<p>
+	If you have received this mail by error, you do not need to take any action to cancel the account. The account will not be activated, and you will not receive any futher emails.
+</p>
+<p>
+	If clicking the link above does not work, copy and paste the URL in a new browser window instead.
+</p>
+<p>
+	For questions or concerns regarding your account, send us an email to support@wisemapping.com.
+</p>
+<p>
+Cheers, <br/>
+The WiseMapping Team.
+<a href="http://www.wisemapping.com">WiseMapping Site</a>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/newColaborator.vm b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/newColaborator.vm
new file mode 100755
index 00000000..392106f0
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/newColaborator.vm
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+	${message}
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/recoveryMail.vm b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/recoveryMail.vm
new file mode 100644
index 00000000..fa8c97a0
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/recoveryMail.vm
@@ -0,0 +1,24 @@
+<html>
+<body>
+<h3>Your password was regenerated from WiseMapping!</h3>
+<p>
+	Your account information is:
+</p>
+	User Login: ${user.email}
+</p>
+<p>
+	New Password: ${password}
+</p>
+<p>
+	Thank you for using WiseMapping.
+</p>
+<p>
+	For questions or concerns regarding your account, send us an email to support@wisemapping.com.
+</p>
+<p>
+Best Regards, <br/>
+The WiseMapping Team.
+<a href="http://www.wisemapping.com">WiseMapping Site</a>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm
new file mode 100755
index 00000000..c051db6e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm
@@ -0,0 +1,21 @@
+<html>
+<body>
+<p>
+	Hi,
+</p>
+<p>
+Thank you so much for your interest in WiseMapping. Your subscription was a success! If you have any questions or have any feedback, please don't hesitate to reply to this email, or use the on line form. We'd love to hear from you.
+</p>
+<p>
+Since we are currently in "private beta" phase, we are inviting people from the list you just signed up for every day. So sit tight because you might be the next one.
+</p>
+<p>
+	For questions or concerns regarding your account, send us an email to support@wisemapping.com.
+</p>
+<p>
+Cheers, <br/>
+The WiseMapping Team.
+<a href="http://www.wisemapping.com">WiseMapping Site</a>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
new file mode 100644
index 00000000..0edb1166
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
@@ -0,0 +1,324 @@
+NEW_MINDMAP=Create a new map
+NAME=Name
+DESCRIPTION=Description
+OK=Ok
+WISEMAPPING=WiseMapping
+ADD=Add
+ACTIONS=Actions
+ADD_COLLABORATORS=Add Collaborators
+CURRENT_COLLABORATORS=Current collaborators
+VIEWERS=Viewers
+ADD_VIEWERS=Add Viewers
+CURRENT_VIEWERS=Current Viewers
+USER_REGISTRATION=User Registration
+CANCEL=Cancel
+SUBMIT=Submit
+FIRSTNAME=Firstname
+LASTNAME=Lastname
+EMAIL=E-mail
+HELP=Help
+LOGOUT=Logout
+PASSWORD=Password
+MY_WISEMAPS=My Wisemaps
+SAVE_AND_CLOSE=Save and Close
+RETYPE_PASSWORD=Retype Password
+REGISTER=Register
+REMEMBER_ME=Remember me on this computer
+SIGN_IN=Sign In
+SIGN_UP=Sign Up
+SETTINGS=Settings
+USERNAME=Username
+BACK=Back
+CLOSE=Close
+NOT_READY_A_USER=Not ready a wisemapper?
+NOT_READY_A_USER_MESSAGE=Registration is free and takes just a moment.
+JOIN_NOW=Join Now!
+REMOVE=Remove
+MINDMAP=Mindmap
+ROLE=Role
+CAPTCHA= Word Verification
+FORGOT_PASSWORD=Forgot Password ?
+CHANGE_PASSWORD=Change your Password
+FAQ=Frequent Asked Questions
+SHORT_FAQ=FAQ
+LOGIN=Login
+SUBJECT=Subject
+SUBJECT_MESSAGE= has shared a mind map with you at WiseMapping
+MSG=Message
+PROBLEM_DETAIL=Description
+EXPORT=Export
+EXPORT_MSG=Export
+EXPORT_FORMAT=Export Format:
+EDIT_PROFILE= Edit your Profile
+JPEG_EXPORT_FORMAT=JPEG
+PNG_EXPORT_FORMAT=Portable Network Graphics (PNG)
+SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
+PDF_EXPORT_FORMAT=Portable Document Format (PDF)
+IMG_EXPORT_FORMAT=Image File
+FREEMIND_EXPORT_FORMAT = Freemind (version 0.8.0)
+
+FILE=File
+FILE_URL=File URL
+STATUS=Status
+LAST_EDITOR=Last Edition
+
+DELETE_SELECTED_CONFIRMATION=All selected Maps will be deleted. Do you want to continue?
+DELETE_CONFIRMATION=Are you sure that you want to delete this map?
+DELETE_SELECTED=Delete selected
+DELETE=Delete
+YES=yes
+NO=no
+
+EDITOR.LOADING=Loading ...
+SITE.TITLE=WiseMapping
+SITE.SLOGAN=Visual Thinking Evolution
+SAVE=Save
+DISCARD_CHANGES=Discard Changes
+ABOUT=About
+ABOUT_TITLE=What is WiseMapping?
+BLOG=Blog
+BLOG_TITLE=WiseMapping Blog
+NEWS=News
+KEYBOARD=Keyboard Shortcuts
+KEYBOARD_MSG=These are the keyboard shortcuts you can use in the editor!
+FIRST_STEPS=Editor First Steps
+FIRST_STEPS_MSG=Make these first steps in 2 minutes, and start running in 5!
+HOME=Home
+LOGIN_ERROR=The email address or password you provided does not match our records.
+USER_INACTIVE=Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!.
+CREW=The Crew
+ALREADY_A_MEMBER=Already a member?
+WORD_VERIFICATION=Word Verification
+TERM_OF_THE_SERVICE=Terms of Service:
+FORGOT_PASSWORD_MESSAGE=Please enter your email to start the password recovery process.
+LOADING_MSG=Loading ...
+SEARCH_TITLE=Search for WiseMaps
+SEARCH_TEXT=Search for public mind maps using either its name or tags
+SEARCH_FIELD=Map Title or Tag
+SEARCH=Search
+SEARCH_RESULTS=Search Results
+NO_SEARCH_RESULTS=No results were found. Go ahead and be the first one to publish a mind map about it!
+NO_SEARCH_TERM=You didn't enter any search terms.
+ADVANCE_SEARCH=Advanced Search
+SIMPLE_SEARCH=Simple Search
+TRYNOW= Try Demo !
+VIDEO=WiseMapping in 2 minutes
+
+FIELD_REQUIRED=Required field cannot be left blank
+EMAIL_ALREADY_EXIST=Email already exists
+NO_VALID_EMAIL_ADDRESS=Invalid email address
+USERNAME_ALREADY_EXIST=Username already exists
+PASSWORD_MISSMATCH=Your password entries did not match
+TYPE_CHARACTER_BELOW=Type the characters you see in the picture below.
+WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
+REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
+REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.<br/>Registration is <b> Free</b> and takes just a moment.
+CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
+DETAIL_INFORMATION=Detail Information
+CREATOR=Creator
+CREATION_TIME=Creation Time
+VIEWS=Views
+STATE=State
+COLLABORATORS=Collaborators
+ADD_COLLABORATOR=Add Collaborator
+EDITORS=Editors
+VIEWER=Viewer
+PRIVATE=Private
+PUBLIC=Public
+SHARED=Shared
+ONLY_VIEW_PRIVATE = This document can be viewed by you only.
+ALL_VIEW_PUBLIC = This document can be viewed by any user.
+
+EMAILS_ADRESSES = E-mails Addresses
+CURRENT_CONTACTS = Current Contacts
+MESSAGE=Message
+COLLABORATION= Collaboration
+SHARE_DETAILS=Share your maps with your colleagues. Invite them to collaborate with you.
+NEW_MAP_MSG=Fill all the fields to create a new map
+
+TAG=Tag
+PUBLISH=Publish
+PUBLISH_MSG = What about using your maps in sites and blogs?
+PUBLISH_DETAILS=By publishing the map you make it visible to everyone on the Internet. Copy the code snippets below to integrate it into your website or blog.
+DETAIL=Detail
+RECENT_FILES=Recent Maps
+MINDMAP_DETAIL = Mind Map Detail
+EDIT=Edit
+INSERT=Insert
+WISE_IT=Wise It!
+EDITOR.LAST_SAVED=last modification by {0}
+SHARE_IT=Share It
+SETTINGS_DETAIL=Do you want to change you user options?. Here is the place.
+SETTINGS_MSG=Please, select what option want to change from you profile:
+TAGS=Tags
+AVAILABLE_TAGS = Available tags
+
+EMPTY_MINDMAP_TABLE=Mapping your ideas is very simple. Create a map and try it!
+EMPTY_RECENT_MINDMAP_TABLE=No recent maps
+TAGS_DETAILS=Add tags you maps is very simple. Try!
+TAG_IT=Tag It
+PUBLISH_IT=Publish It
+USUPPORTED_BROWSER=Unsupported Browser
+FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
+TAGS_MSG=Tagging is a simple way to keep your maps in order and help other people to find your public maps
+COMMA_SEPARATED_EMAILS=Comma separated emails
+INVITE_USERS=Invite Users
+AS_COLLABORATOR=as Collaborators
+AS_VIEWER=as Viewers
+CUSTOMIZE_INVITATION=Customize Invitation
+INVITATION=Invitation
+INVITATION_MSG= I've just shared a mind map with you.\nLog in to www.wisemapping.com and you will see the shared map in your mind map list.
+SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) is an XML markup language for describing two-dimensional vector graphics. This format                         will enable you to print your maps without quality lost at any resolution.
+PDF_EXPORT_FORMAT_DETAILS=Get your map as Portable Document Format(PDF) to share use in your presentations.
+IMG_EXPORT_FORMAT_DETAILS=Get a graphic representation of your map including all colors and shapes to reuse in documents or for archiving
+FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind is a nice desktop mind mapping application that has the great benefit of being free.
+DELETE_MAP=Delete Confirmation
+
+TERMSOFUSE=Terms of Use
+PRIVACYPOLICY= Privacy Policy
+EXPORT_DETAILS=Export this map in the format that you want and start using it in your presentations
+PUBLIC_MAP_VIEW=Public Map Info
+HERE=here
+DETAILS=Details
+PUBLIC_VIEW_TITLE={0} Map View
+WHO_ARE_WE=Who are we?
+MEMBERS=Members
+WELCOME=Welcome
+
+RENAME=Rename
+RENAME_DETAILS=Change map's name and description
+MAX_CHARACTER_SIZE= Maximum allowed message length of 512 characters.
+PUBLISH_MAP_TO_INTERNET=Publish map to the Internet
+URL=URL
+DIRECT_LINK=Direct Link
+BLOG_INCLUSION=For inclusion in blogs and web pages
+OPEN=Open
+OPEN_MSG=Open map for edition
+
+ZOOM=Zoom
+ZOOM_IN=Zoom In
+ZOOM_OUT=Zoom Out
+IN=In
+OUT=Out
+HISTORY=History
+TOPIC=Topic
+TOPIC_BACKGROUND_COLOR=Topic Background Color
+BACKGROUND_COLOR=BgColor
+TOPIC_BORDER_COLOR=Topic Border Color
+BORDER_COLOR=Border Color
+BORDER=Border
+TOPIC_SHAPE=Topic Shape
+SHAPE=Shape
+TOPIC_ADD=Add Topic
+TOPIC_DELETE=Delete Topic
+TOPIC_ICON=Add Icon
+ICON=Icon
+TOPIC_LINK=Add Link
+LINK=Link
+TOPIC_NOTE=Add Note
+NOTE=Note
+
+FONT=Font
+FONT_TYPE=Font Type
+TYPE=Type
+FONT_SIZE=Font Size
+SIZE=Size
+FONT_BOLD=Bold
+BOLD=Bold
+FONT_ITALIC=Italic
+ITALIC=Italic
+FONT_COLOR=Font Color
+COLOR=Color
+SHARE=Share
+UNEXPECTED_ERROR=Outch!!. An unexpected error has occurred.
+UNEXPECTED_ERROR_DETAILS=We're sorry, an error has occurred and we can't process your request. Please try again, or go to the home page.
+NO_ENOUGH_PERMISSIONS=Outch!!. This  map is not available anymore.
+NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted.
+SHARING=Sharing
+IMPORT_MINDMAP=Import map
+IMPORT_MINDMAP_DETAILS=Do you already have maps created with FreeMind?.No problem, Import them!.
+IMPORT_MINDMAP_INFO=You can import FreeMind maps to WiseMapping. Please, select the FreeMind map that want to import. <br/>Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
+PRINT=Print
+FREE_MIND_FILE=FreeMind File
+IMPORT_MAP_ERROR=Imported file seems not to be a valid FreeMind file.
+MAP_TITLE_ALREADY_EXISTS=Map name already exists.
+EMBEDDED_VIEWER=Embed a map viewer in your own web site, blog or post!
+EMBEDDED_VIEWER_MESSAGE=Once you make your map public, you will be able to embed a mind map viewer in your own web site, blog or post just as we did it here!<br/>Try it!!, you can drag nodes, pan the map, and zoom in and out.
+FREEMIND_EXPORT_IMPORT=Import and Export maps from/to FreeMind
+FREEMIND_EXPORT_IMPORT_MESSAGE=You can now easily import and export mind maps from/to FreeMind.
+EDITOR_TOOLBAR_IMPROVED=Usability Improvement: The editor toolbar has been redesign
+EDITOR_TOOLBAR_IMPROVED_MESSAGE= The toolbar has been redesign to improve its usability.
+COLLABORATE=Collaborate
+PRINT_FEATURE_IMPLEMENTED=You can print your maps now
+PRINT_FEATURE_IMPLEMENTED_MESSAGE=You can now easily print your maps from the editor and the map list!
+EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL.
+NEWSLETTER_DESC = Get News delivered to <br>your Inbox
+USABILITY_EDITING_IMPROVED= Usability Improvement: Node text Editing
+USABILITY_EDITING_IMPROVED_ESC= Usability Improvement: Cancelling Node text Editing with the ESC Key
+USABILITY_EDITING_IMPROVED_TEXT=Now you have 3 different ways of editing a node text.</br><ul><li><b>Typing:</b> Start typing to replace the focused node text.</li><li><b>F2:</b> Pressing F2 key, will let you edit the node text</li><li><b>Double click:</b> Double click with the mouse on the node to start editing its text</li></ul>
+USABILITY_EDITING_IMPROVED_TEXT_ESC=Now, You can also cancel the changes that you've made in the text of a node by pressing the ESC key while editing it's text.
+IMPORT-EXPORT_ISSUES_FIXED=Usability Improvement: Import-Export issues have been solved.
+GO_TO= Go to my Wisemaps
+
+NEWS_AND_ARTICLES=News & Articles
+NEWS_TITLE_EMBEDDED_MAPS=Embed your maps in anyplace
+NEWS_DESC_EMBEDDED_MAPS=With this new feature, you can embed your maps in blogs and web pages.
+NEWS_TITLE_FREEMIND=FreeMind import and export
+NEWS_DESC_FREEMIND=Now, you can import and export your FreeMind maps.
+NEWS_TITLE_KEYBOARD_NAVIGATION=WiseMapping Makes Creation of mind maps More Easily and PowerFul
+NEWS_DESC_KEYBOARD_NAVIGATION=WiseMapping let's you create the most powerfull mind maps using the keyboard
+
+MOST_POPULAR_MAPS=Most Popular Maps
+JOIN_WISEMAPPING=Join WiseMapping
+IT_IS_FREE=It's free!
+CREATE_EDIT_ACCESS_FROM_ANYWHERE=Create, edit and access your mindmaps from anywhere over the Web
+
+USABILITY_EDITOR_IMPROVED= Usability Improvement: Help button in the Mind Map Editor
+EDITOR_HELP=A Help button has been placed at the bottom-left corner of the editor. From there you can see all the editor keyboard shortcuts you can use while editing your maps, and a quick tutorial on how to use the editor.
+
+USABILITY_EDITOR_IMPROVED_SHRINK= Usability Improvement: Collapse/Expand nodes
+SHRINK_TEXT=You can now collapse and expand nodes by clicking on the node's dot, or by pressing the space bar button.
+
+EDITOR_LINKS=Mind Map feature: Add links to the topics
+EDITOR_LINKS_SHORT=Add links to the topics
+EDITOR_LINKS_TEXT=You can add Links to the topics very easily using the link icon in the toolbar.
+
+IMPORT_EXPORT_IMPROVEMENTS=We have done some improvements in the import and export features
+
+USERS_1500=We already have 2100 users!!, Thanks to all of you that have trust us in this starting phase...
+NO_PRIVATE_ANY_MORE= We are not private any more! More than 2100 users have tested and used the application, it's time to stop being private!.. Stay tune because we have a lot of new ideas for WiseMapping!!
+NO_PRIVATE_ANY_MORE_SHORT= We are not private any more!
+NO_PRIVATE_ANY_MORE_TEXT=More than 1500 real users have tested the application!, so it's time to stop being private!
+
+NEWS_ADD_ICON=Mind Map feature: Add icons to the topics
+NEWS_ADD_ICON_SHORT=Add icons to the topics
+NEWS_ADD_ICON_TEXT=You can now add Icons to the topics very easily using the link icon in the toolbar
+
+NEWS_TOOLBAR_SHORT =New Editor Toolbar
+NEWS_TOOLBAR_TEXT = We have update our editor toolbar in order to be more intuitive. 
+
+#####FOOTER
+COPYRIGHT=All content Copyright 2007-2009, WiseMapping Corporation
+TERMS_AND_CONDITIONS=Terms and Conditions
+CONTACT=Contact
+
+ACCOUNT_ACTIVED= Your account has been activated
+ACCOUNT_ACTIVED_FAIL = Account Activation failed
+VIEW_ALL_RESULTS= Show All Results
+BROWSE=Browse
+SEARCH_MSG=Discover publich mind maps created by people like you.
+SEARCH_PUBLIC=Search Public Mind Maps
+UNDO_EDITION=Undo Edition
+UNDO=Undo
+REDO_EDITION=Redo Edition
+REDO=Redo
+
+BY=By
+MODIFIED=Modified
+HISTORY_MSG=Looking for an old modification of you map?. Here is the place.
+NO_HISTORY_RESULTS= No History Information was found.
+HISTORY_INFO = Here is the list of the last revisions of you map.
+REVERT=revert
+SAMPLE_MAPS=Sample Maps
+
+INVALID_EMAIL_ERROR = The e-mail was not verified
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties
new file mode 100644
index 00000000..90263de8
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties
@@ -0,0 +1,264 @@
+NEW_MINDMAP=Crear un nuevo mapa
+NAME=Nombre
+DESCRIPTION=Descripci&oacute;n
+OK=Ok
+WISEMAPPING=WiseMapping
+ADD=Agregar
+ACTIONS=Acciones
+ADD_COLLABORATORS=Agregar Colaboradores
+CURRENT_COLLABORATORS=Colaboradores Actuales
+VIEWERS=Lectores
+ADD_VIEWERS=Agregar Lector
+CURRENT_VIEWERS=Lectores Actuales
+USER_REGISTRATION=Registraci&oacute;n de Usuarios
+CANCEL=Cancelar
+SUBMIT=Aceptar
+FIRSTNAME=Nombre
+LASTNAME=Apellido
+EMAIL=E-mail
+HELP=Ayuda
+LOGOUT=Salida
+PASSWORD=Contrase&ntilde;a
+MY_WISEMAPS=Mis mapas
+SAVE_AND_CLOSE=Grabar y Salir
+RETYPE_PASSWORD=Reingresar contrase&ntilde;a
+REGISTER=Registraci&oacute;n
+REMEMBER_ME=Recordar mi sesi&oacute;n
+SIGN_IN=Entrar
+SIGN_UP=Registrate
+SETTINGS=Configuraci&oacute;n
+USERNAME=Nombre de usuario
+BACK=Atr&aacute;s
+CLOSE=Cerrar
+NOT_READY_A_USER=Todav&iacute;a no usa WiseMapping?
+NOT_READY_A_USER_MESSAGE=La registraci&oacute;n es r&aacute;pida y gratuita.
+JOIN_NOW=Inscribite!
+REMOVE=Remover
+MINDMAP=Mindmap
+ROLE=Rol
+CAPTCHA=Verificaci&oacute;n de palabra
+FORGOT_PASSWORD=Se olvid&oacute; la contrase&ntilde;a?
+CHANGE_PASSWORD=Cambiar la contrase&ntilde;a
+FAQ=Preguntas Frecuentes
+SHORT_FAQ=FAQ
+LOGIN=Login
+SUBJECT=Asunto
+SUBJECT_MESSAGE= ha compartido un mapa mental con usted en WiseMapping.com
+MSG=Mensaje
+PROBLEM_DETAIL=Descripci&oacute;n
+EXPORT=Exportar
+EXPORT_MSG=Exportar
+EXPORT_FORMAT=Exportar a formato:
+EDIT_PROFILE= Editar perfil
+JPEG_EXPORT_FORMAT=JPEG
+PNG_EXPORT_FORMAT=Portable Network Graphics (PNG)
+SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
+PDF_EXPORT_FORMAT=Portable Document Format (PDF)
+IMG_EXPORT_FORMAT=Imagen
+FREEMIND_EXPORT_FORMAT = Freemind (version 0.8.0)
+
+FILE=Archivo
+FILE_URL=URL del archivo
+STATUS=Estado
+LAST_EDITOR=&Uacute;ltima Edicion
+
+DELETE_SELECTED_CONFIRMATION=Todos los mapas seleccionados ser&aacute;n borrados. Desea continuar?
+DELETE_CONFIRMATION=Esta seguro de que quiere borrar este mapa?
+DELETE_SELECTED=Borrado seleccionado
+DELETE=Borrar
+YES=Si
+NO=No
+
+EDITOR.LOADING=Cargando...
+SITE.TITLE=WiseMapping
+SITE.SLOGAN=Visual Thinking Evolution
+SAVE=Guardar
+DISCARD_CHANGES=Descartar cambios
+ABOUT=Acerca
+ABOUT_TITLE=Que es WiseMapping?
+BLOG=Blog
+BLOG_TITLE=WiseMapping Blog
+NEWS=Noticias
+HOME=Inicio
+LOGIN_ERROR=Usuario/contrase&ntilde;a no v&aacute;lido/a.
+USER_INACTIVE=Disculpe, su cuenta aun no ha sido activada. Usted recibira una notificaci&oacute;n por email tan pronto la activemos.
+CREW=The Crew
+ALREADY_A_MEMBER=Ya tenes una cuenta en WiseMapping?
+WORD_VERIFICATION=Verificaci&oacute;n de palabra
+TERM_OF_THE_SERVICE=T&eacute;rminos de servicio:
+FORGOT_PASSWORD_MESSAGE=Ingrese su e-mail para iniciar el proceso de recuperaci&oacute;n de su contrase&ntilde;a.
+LOADING_MSG=Cargando...
+SEARCH_TITLE=Busqueda por WiseMaps
+SEARCH_TEXT=Busqueda sobre mapas publicos utilizando el titulo o la etiqueta
+SEARCH_FIELD=T&iacute;tulo o etiqueta del mapa
+SEARCH=Busqueda
+SEARCH_RESULTS=Resultados
+NO_SEARCH_RESULTS=No se encontr&oacute; ningun mapa.
+NO_SEARCH_TERM=No ingres&oacute; un criterio de busqueda.
+ADVANCE_SEARCH=Busqueda avanzada
+SIMPLE_SEARCH=Busqueda simple
+TRYNOW= Prueba la Demo!
+VIDEO=WiseMapping en 2 minutos
+
+FIELD_REQUIRED=Campo requerido
+EMAIL_ALREADY_EXIST=e-mail ya existente
+NO_VALID_EMAIL_ADDRESS=e-mail invalido
+USERNAME_ALREADY_EXIST=Nombre de usuario ya existente
+PASSWORD_MISSMATCH=La contrase&ntilde;a no concuerda
+TYPE_CHARACTER_BELOW=Ingrese los caracteres de la imagen.
+WISEMAPPING_ACCOUNT_MESSAGE=Por favor verifique la informacion que ha ingresado y lea los condiciones del servicio.
+REGISTRATION_CLICK_ADVICE= Seleccionando 'Registraci&oacute;n' esta aceptando las condiciones de uso de arriba y la politica de privacidad.
+REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.<br/> Registration is <b> Free</b> and takes just a moment.
+CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
+DETAIL_INFORMATION=Detalles
+CREATOR=Creador
+CREATION_TIME=Fecha de creaci&oacute;n
+VIEWS=Vistas
+STATE=Estado
+COLLABORATORS=Colaboradores
+ADD_COLLABORATOR=Agregar Colaborador
+EDITORS=Editores
+VIEWER=Lector
+PRIVATE=Privado
+PUBLIC=P&uacute;blico
+SHARED=Compartido
+ONLY_VIEW_PRIVATE = Este documento solo puede ser visualizado por usted.
+ALL_VIEW_PUBLIC = Este documento puede ser visualizado por cualquier usuario.
+
+EMAILS_ADRESSES = Direcciones de e-mail
+CURRENT_CONTACTS = Contactos actuales
+MESSAGE=Mensaje
+COLLABORATION=Colaboraci&oacute;n
+SHARE_DETAILS=Comparta los mapas con sus colegas. Invitelos a colaborar con usted.
+NEW_MAP_MSG=Llene todos los campos para crear un mapa nuevo
+
+TAG=Etiqueta
+PUBLISH=Publicar
+PUBLISH_MSG = Que le parece usar sus mapas desde sus sitios y blogs?
+PUBLISH_DETAILS=Publicando el mapa hara que el mismo sea visible por cualquier persona que utlice Internet. Copie el c&oacute;digo de abajo para integrar el mapa con su sitio web o blog.
+DETAIL=Detalle
+RECENT_FILES=Mapas Recientes
+MINDMAP_DETAIL = Detalle de Mind Map
+EDIT=Editar
+INSERT=Insertar
+WISE_IT=Wise It!
+EDITOR.LAST_SAVED=ultima modificaci&oacute;n hecha por {0}
+SHARE_IT=Compartilo
+SETTINGS_DETAIL=Desea cambiar sus preferencias? Este es el lugar.
+SETTINGS_MSG=Por favor, seleccione que opci&oacute;n desea modificar de su perfil:
+TAGS=Etiquetas
+AVAILABLE_TAGS = Etiquetas disponibles
+
+EMPTY_MINDMAP_TABLE=Mapear sus ideas es muy simple. Cree un mapa y haga la prueba!
+EMPTY_RECENT_MINDMAP_TABLE=No hay mapas recientes
+TAGS_DETAILS=Agregar etiquetas a sus mapas en muy facil! Intentelo!
+TAG_IT=Etiquetalo!
+PUBLISH_IT=Publicalo!
+USUPPORTED_BROWSER=Navegador no soportado
+FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
+TAGS_MSG=Tagging is a simple way to keep your maps in order and help other people to find your public maps
+COMMA_SEPARATED_EMAILS=E-mails separados por comas
+INVITE_USERS=Invitar usuarios
+AS_COLLABORATOR=como Colaborador
+AS_VIEWER=como Lector
+CUSTOMIZE_INVITATION=Editar Invitaci&oacute;n
+INVITATION=Invitaci&oacute;n
+INVITATION_MSG= Acabo de compartir un mapa mental con usted.\nIngrese a www.wisemapping.com y podra visualizarlo en su lista de mapas.
+SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) es un XML markup language para describir greficos vectoriale de dos dimensiones. Este formato le permitira imprimir sus mapas sin perdida de calidad o resoluci&oacute;n.
+PDF_EXPORT_FORMAT_DETAILS=Obtenga su mapa como un documento (PDF) para compartirlo y usarlo en sus presentaciones.
+IMG_EXPORT_FORMAT_DETAILS=Obtenga una representaci&oacute;n grafica de su mapa incluyendo todo los colores y formas para reusarlo en documentos o para ser archivado
+FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind un aplicaci&oacute;n de escritorio gratuita de diseno de mapas mentales
+DELETE_MAP=Confirmaci&oacute;n de borrado
+
+TERMSOFUSE=T&eacute;rminos de uso
+PRIVACYPOLICY= Politica de privacidad
+EXPORT_DETAILS=Exporte el mapa en el formato que desee y comience a utlizarlo en sus presentaciones
+PUBLIC_MAP_VIEW=Informaci&oacute;n del mapa publico
+HERE=aqui
+DETAILS=Detalles
+PUBLIC_VIEW_TITLE={0} vista de mapa
+WHO_ARE_WE=Quienes somos?
+MEMBERS=Miembros
+WELCOME=Bienvenido
+
+RENAME=Renombrar
+RENAME_DETAILS=Cambiar el nombre y descripci&oacute;n del mapa
+MAX_CHARACTER_SIZE= El m&aacute;ximo mensaje permitido puede contener 512 caracteres.
+PUBLISH_MAP_TO_INTERNET=Publicar el mapa en internet
+URL=URL
+DIRECT_LINK=Enlace directo
+BLOG_INCLUSION=Para incluirlo en blogs y web pages
+OPEN=Abrir
+OPEN_MSG=Abrir el mapa para su edici&oacute;n
+
+ZOOM=Lupa
+ZOOM_IN=Acercar
+ZOOM_OUT=Alejar
+
+TOPIC=T&oacute;pico
+TOPIC_BACKGROUND_COLOR=Color de fondo del t&oacute;pico
+TOPIC_BORDER_COLOR=Color del borde de t&oacute;pico
+TOPIC_SHAPE=Forma del t&oacute;pico
+TOPIC_ADD=Agregar t&oacute;pico
+TOPIC_DELETE=Borrar t&oacute;pico
+TOPIC_ICON=Agregar Icono
+TOPIC_LINK=Agregar Enlace
+TOPIC_NOTE=Agregar Nota
+
+FONT=Fuente
+FONT_TYPE=Tipo de fuente
+FONT_SIZE=Tamano de fuente
+FONT_BOLD=Negrita
+FONT_ITALIC=Italica
+FONT_COLOR=Color de texto
+UNEXPECTED_ERROR=Outch!!. Un error inesperado ha ocurrido
+UNEXPECTED_ERROR_DETAILS=Disculpas, un error ha ocurrido y no podremos procesar su pedido. Por favor intente nuevamente o vaya a la pagina de inico.
+NO_ENOUGH_PERMISSIONS=Outch!!. EL mapa buscado no se encuentra disponible.
+NO_ENOUGH_PERMISSIONS_DETAILS=No tiene suficiente permisos de acceso para ver este mapa. El mapa no es mas publico o ha sido borrado.
+SHARING=Colaboraci&oacute;n
+IMPORT_MINDMAP=Importar mapa
+IMPORT_MINDMAP_DETAILS=Tiene mapas creados con FreeMind?. Ningun problema, los puede importar!.
+IMPORT_MINDMAP_INFO=Ahora puedes importar mapas de FreeMind a WiseMapping. Por favor, seleccione el mapa FreeMind que desea importar. <br/>Los campos marcados con un asterisco <span class="fieldRequired">*</span> son requeridos.
+PRINT=Imprimir
+FREE_MIND_FILE=Archivo FreeMind
+IMPORT_MAP_ERROR=El archivo importado no parece ser un archivo FreeMind v&aacute;lido
+MAP_TITLE_ALREADY_EXISTS=Nombre de mapa ya existente.
+EMBEDDED_VIEWER=Incluya un visor de mapa en su sitio web, blog o post.
+EMBEDDED_VIEWER_MESSAGE=Una vez que su mapa es publico, usted podr&aacute; incorporar un visor de mapas mentales en su propio sitio web, blog o post tal como lo hicimos aqu&iacute;! just as we did it here!<br/>Try it!!, you can drag nodes, pan the map, and zoom in and out.
+FREEMIND_EXPORT_IMPORT=Importar y exportar mapas desde/hacia FreeMind
+FREEMIND_EXPORT_IMPORT_MESSAGE=Ahora puedes importar y exportar mapas mentales desde/hacia FreeMind.
+EDITOR_TOOLBAR_IMPROVED=La barra de herramientas ha sido redise&ntilder;ada.
+EDITOR_TOOLBAR_IMPROVED_MESSAGE=La barra de herramientas ha sido redise&ntilde;ada para mejorar la usabilidad.
+COLLABORATE=Colaborar
+PRINT_FEATURE_IMPLEMENTED=Ahora puedes imprimir tus mapas
+PRINT_FEATURE_IMPLEMENTED_MESSAGE=Ahora usted puede imprimir f&aacute;cilmente sus mapas desde el editor o desde el listado de mapas
+EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL.
+
+NEWS_AND_ARTICLES=Noticias y Articulos
+NEWS_TITLE_EMBEDDED_MAPS=Incluya sus mapas en cualquier lugar
+NEWS_DESC_EMBEDDED_MAPS=Con esta nueva funcionalidad puede incluir sus mapas en blogs y sitios web.
+NEWS_TITLE_FREEMIND=Importar y exportar mapas de FreeMind
+NEWS_DESC_FREEMIND=Ahora, puede importar y exportar sus mapas con formato de FreeMind.
+NEWS_TITLE_KEYBOARD_NAVIGATION=La creacion de mapas mentales es mas facil que nunca!
+NEWS_DESC_KEYBOARD_NAVIGATION=WiseMapping lo deja crear sus mapas mentales utilzando solo el teclado.
+
+MOST_POPULAR_MAPS=Los mapas mas populares
+JOIN_WISEMAPPING=Utilice WiseMapping
+IT_IS_FREE=Es gratis!
+CREATE_EDIT_ACCESS_FROM_ANYWHERE=Crear, editar y acceder a sus mapas mentales desde cualquier lugar de Internet
+
+#FOOTER
+COPYRIGHT=All content Copyright 2007, WiseMapping Corporation
+TERMS_AND_CONDITIONS=T&eacute;rminos and Condiciones
+CONTACT=Contacto
+
+KEYBOARD=Atajos de Teclado
+KEYBOARD_MSG=Estos son los atajos de teclado que puede utilizar en el editor!
+FIRST_STEPS=Los Primeros Pasos en el Editor
+FIRST_STEPS_MSG=Haga estos primeros pacitos en 2 minutos, y comience a correr en 5!
+BROWSER=Browse
+SEARCH_MSG=Search and discover mind maps created by people like you.
+SEARCH_PUBLIC=Buscar mapas p&uacute;blicos
+UNDO_EDITION=Undo Edition
+REDO_EDITION=Redo Edition
+REVERT=revert
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
new file mode 100644
index 00000000..90e54b5d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!DOCTYPE tiles-definitions PUBLIC
+        "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
+        "http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
+
+<tiles-definitions>
+
+    <definition name="homepage" page="/jsp/homepage.jsp"/>
+    <definition name="mindmapList" page="/jsp/mindmapList.jsp"/>
+    <definition name="embeddedView" page="/jsp/embeddedView.jsp"/>
+    <definition name="embeddedViewImg" page="/jsp/embeddedViewImg.jsp"/>
+    <definition name="mindmapEditor" page="/jsp/mindmapEditor.jsp"/>
+    <definition name="mindmapCooker" page="/jsp/mindmapCooker.jsp"/>
+    <definition name="closeDialog" page="/jsp/closeDialog.jsp"/>
+    <definition name="embeddedViewError" page="/jsp/embeddedViewError.jsp"/>
+    <definition name="mindmapPrint" page="/jsp/mindmapPrint.jsp"/>
+
+    <!-- Template Declaration -->
+    <definition name="pageTemplate" page="/jsp/template.jsp">
+        <put name="title" value="" type="string"/>
+        <put name="details" value="" type="string"/>
+        <put name="body" value="/jsp/error.jsp" type="page"/>
+    </definition>
+
+    <definition name="formDialogTemplate" page="/jsp/formDialogTemplate.jsp">
+        <put name="title" value="title" type="string"/>
+        <put name="details" value="details" type="string"/>
+        <put name="body" value="/jsp/error.jsp" type="page"/>
+    </definition>
+
+    <definition name="errorTemplate" extends="pageTemplate">
+        <put name="body" value="/jsp/errorTemplate.jsp" type="page"/>
+    </definition>
+
+    <!-- Error Pages -->
+    <definition name="unexpectedError" extends="errorTemplate">
+        <put name="title" value="UNEXPECTED_ERROR"/>
+        <put name="details" value="UNEXPECTED_ERROR_DETAILS"/>
+    </definition>
+
+    <definition name="securityError" extends="errorTemplate">
+        <put name="title" value="NO_ENOUGH_PERMISSIONS"/>
+        <put name="details" value="NO_ENOUGH_PERMISSIONS_DETAILS"/>
+    </definition>
+
+    <definition name="emailNotExistsError" extends="errorTemplate">
+        <put name="title" value="INVALID_EMAIL_ERROR"/>
+        <put name="body" value="/jsp/emailNotExistsError.jsp"/>
+    </definition>
+
+    <!-- Main Pages -->
+    <definition name="forgotPassword" extends="pageTemplate">
+        <put name="title" value="FORGOT_PASSWORD"/>
+        <put name="body" value="/jsp/forgotPassword.jsp"/>
+    </definition>
+
+    <definition name="userRegistration" extends="pageTemplate">
+        <put name="title" value="USER_REGISTRATION"/>
+        <put name="body" value="/jsp/userRegistration.jsp"/>
+    </definition>
+
+    <definition name="userRegistrationConfirmation" extends="pageTemplate">
+        <put name="title" value="USER_REGISTRATION"/>
+        <put name="body" value="/jsp/userRegistrationConfirmation.jsp"/>
+    </definition>
+
+    <definition name="login" extends="pageTemplate">
+        <put name="title" value="LOGIN"/>
+        <put name="body" value="/jsp/login.jsp"/>
+    </definition>
+
+    <definition name="browserNotSupported" extends="pageTemplate">
+        <put name="title" value="USUPPORTED_BROWSER"/>
+        <put name="body" value="/jsp/browserNotSupported.jsp"/>
+    </definition>
+
+    <definition name="mindmapDetail" extends="pageTemplate">
+        <put name="title" value="MINDMAP_DETAIL"/>
+        <put name="body" value="/jsp/mindmapDetail.jsp"/>
+    </definition>
+
+    <definition name="search" extends="pageTemplate">
+        <put name="title" value="SEARCH"/>
+        <put name="body" value="/jsp/search.jsp"/>
+    </definition>
+
+
+    <definition name="searchResult" extends="pageTemplate">
+        <put name="title" value="SEARCH"/>
+        <put name="body" value="/jsp/searchResult.jsp"/>
+    </definition>
+
+    <definition name="mindmapPublicView" extends="pageTemplate">
+        <put name="title" value="PUBLIC_MAP_VIEW"/>
+        <put name="body" value="/jsp/mindmapPublicView.jsp"/>
+    </definition>
+
+
+    <!-- Dialog Forms -->
+    <definition name="newMap" extends="formDialogTemplate">
+        <put name="title" value="NEW_MINDMAP"/>
+        <put name="details" value="FIELD_REQUIRED_MSG"/>
+        <put name="body" value="/jsp/newMap.jsp"/>
+    </definition>
+
+    <definition name="newMapError" extends="pageTemplate">
+        <put name="title" value="NEW_MINDMAP"/>
+        <put name="details" value="FIELD_REQUIRED_MSG"/>
+        <put name="body" value="/jsp/newMapError.jsp"/>
+    </definition>
+
+    <definition name="setting" extends="formDialogTemplate">
+        <put name="title" value="SETTINGS"/>
+        <put name="details" value="SETTINGS_MSG"/>
+        <put name="body" value="/jsp/setting.jsp"/>
+    </definition>
+
+    <definition name="editProfile" extends="formDialogTemplate">
+        <put name="title" value="EDIT_PROFILE"/>
+        <put name="details" value="FIELD_REQUIRED_MSG"/>
+        <put name="body" value="/jsp/editProfile.jsp"/>
+    </definition>
+
+    <definition name="changePassword" extends="formDialogTemplate">
+        <put name="title" value="CHANGE_PASSWORD"/>
+        <put name="details" value="FIELD_REQUIRED_MSG"/>
+        <put name="body" value="/jsp/changePassword.jsp"/>
+    </definition>
+
+    <definition name="mindmapTags" extends="formDialogTemplate">
+        <put name="title" value=""/>
+        <put name="details" value=""/>
+        <put name="body" value="/jsp/mindmapTags.jsp"/>
+    </definition>
+
+    <definition name="mindmapExport" extends="formDialogTemplate">
+        <put name="title" value=""/>
+        <put name="details" value=""/>
+        <put name="body" value="/jsp/mindmapExport.jsp"/>
+    </definition>
+
+    <definition name="mindmapPublish" extends="formDialogTemplate">
+        <put name="title" value=""/>
+        <put name="details" value=""/>
+        <put name="body" value="/jsp/mindmapPublish.jsp"/>
+    </definition>
+
+    <definition name="mindmapCollaborator" extends="formDialogTemplate">
+        <put name="title" value=""/>
+        <put name="details" value=""/>
+        <put name="body" value="/jsp/mindmapCollaborator.jsp"/>
+    </definition>
+
+    <definition name="renameMap" extends="formDialogTemplate">
+        <put name="title" value="RENAME"/>
+        <put name="details" value="FIELD_REQUIRED_MSG"/>
+        <put name="body" value="/jsp/mindmapRename.jsp"/>
+    </definition>
+
+    <definition name="importMap" extends="formDialogTemplate">
+        <put name="title" value="IMPORT_MINDMAP"/>
+        <put name="details" value="IMPORT_MINDMAP_INFO"/>
+        <put name="body" value="/jsp/mindmapImport.jsp"/>
+    </definition>
+
+    <definition name="keyboard" extends="formDialogTemplate">
+        <put name="title" value="KEYBOARD"/>
+        <put name="details" value="KEYBOARD_MSG"/>
+        <put name="body" value="/jsp/keyboard.jsp"/>
+    </definition>
+
+    <definition name="importMapError" extends="pageTemplate">
+        <put name="title" value="IMPORT_MINDMAP"/>
+        <put name="details" value="IMPORT_MINDMAP_INFO"/>
+        <put name="body" value="/jsp/mindmapImportError.jsp"/>
+    </definition>
+
+    <definition name="activationAccountConfirmation" extends="pageTemplate">
+        <put name="title" value="ACCOUNT_ACTIVED"/>
+        <put name="body" value="/jsp/activationAccountConfirmation.jsp"/>
+    </definition>
+
+    <definition name="activationAccountConfirmationFail" extends="pageTemplate">
+        <put name="title" value="ACCOUNT_ACTIVED_FAIL"/>
+        <put name="body" value="/jsp/activationAccountConfirmationFail.jsp"/>
+    </definition>
+
+    <definition name="mindmapHistory" extends="formDialogTemplate">
+        <put name="title" value="HISTORY"/>
+        <put name="details" value="HISTORY_INFO"/>
+        <put name="body" value="/jsp/mindmapHistory.jsp"/>
+    </definition>
+
+</tiles-definitions>
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/dwr.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/dwr.xml
new file mode 100644
index 00000000..11470e35
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/dwr.xml
@@ -0,0 +1,17 @@
+<!DOCTYPE dwr PUBLIC "-//GetAhead Limited//DTD Direct Web Remoting 2.0//EN" "http://getahead.org/dwr//dwr20.dtd">
+<dwr>
+    <allow>
+        <create creator="spring" javascript="MapEditorService">
+            <param name="beanName" value="mapEditorService"/>
+            <include method="saveMap"/>
+            <include method="loadMap"/>
+        </create>
+        <create creator="spring" javascript="LoggerService">
+            <param name="beanName" value="loggerService"/>
+            <include method="logError"/>
+        </create>
+
+        <convert converter="bean" match="com.wisemapping.dwr.ResponseMessage"/>
+    </allow>
+
+</dwr>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/spring.tld b/trunk/wise-webapp/src/main/webapp/WEB-INF/spring.tld
new file mode 100644
index 00000000..40681a11
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/spring.tld
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+    <tlib-version>1.1.2</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>Spring</short-name>
+    <uri>http://www.springframework.org/tags</uri>
+    <description>Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller</description>
+
+    <tag>
+        <name>htmlEscape</name>
+        <tag-class>org.springframework.web.servlet.tags.HtmlEscapeTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Sets default HTML escape value for the current page.
+            Overrides a "defaultHtmlEscape" context-param in web.xml, if any.
+        </description>
+        <attribute>
+            <name>defaultHtmlEscape</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set the default value for HTML escaping, to be put
+                into the current PageContext.
+            </description>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>escapeBody</name>
+        <tag-class>org.springframework.web.servlet.tags.EscapeBodyTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping.
+            The HTML escaping flag participates in a page-wide or application-wide setting
+            (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+        </description>
+        <attribute>
+            <name>htmlEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set HTML escaping for this tag, as boolean value. Overrides the
+                default HTML escaping setting for the current page.
+            </description>
+        </attribute>
+        <attribute>
+            <name>javaScriptEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set JavaScript escaping for this tag, as boolean value.
+                Default is false.
+            </description>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>message</name>
+        <tag-class>org.springframework.web.servlet.tags.MessageTag</tag-class>
+        <body-content>JSP</body-content>
+
+        <description>
+            Retrieves the message with the given code, or text if code isn't resolvable.
+            The HTML escaping flag participates in a page-wide or application-wide setting
+            (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+        </description>
+
+        <attribute>
+            <name>message</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>A MessageSourceResolvable argument (direct or through JSP EL).
+                Fits nicely when used in conjunction with Spring's own validation error
+                classes which all implement the MessageSourceResolvable interface. For
+                example, this allows you to iterate over all of the errors in a form,
+                passing each error (using a runtime expression) as the value of this
+                'message' attribute, thus effecting the easy display of such error
+                messages.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>code</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The code (key) to use when looking up the message.
+                If code is not provided, the text attribute will be used.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>arguments</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set optional message arguments for this tag, as a
+                (comma-)delimited String (each String argument can contain JSP EL),
+                an Object array (used as argument array), or a single Object (used
+                as single argument).
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>argumentSeparator</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The separator character to be used for splitting the
+                arguments string value; defaults to a 'comma' (',').
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>text</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Default text to output when a message for the given code
+                could not be found. If both text and code are not set, the tag will
+                output null.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The string to use when binding the result to the page,
+                request, session or application scope. If not specified, the result
+                gets outputted to the writer (i.e. typically directly to the JSP).
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The scope to use when exporting the result to a variable.
+                This attribute is only used when var is also set. Possible values are
+                page, request, session and application.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>htmlEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set HTML escaping for this tag, as boolean value.
+                Overrides the default HTML escaping setting for the current page.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>javaScriptEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set JavaScript escaping for this tag, as boolean value. Default is false.</description>
+        </attribute>
+    </tag>
+
+    <tag>
+
+        <name>theme</name>
+        <tag-class>org.springframework.web.servlet.tags.ThemeTag</tag-class>
+        <body-content>JSP</body-content>
+
+        <description>
+            Retrieves the theme message with the given code, or text if code isn't resolvable.
+            The HTML escaping flag participates in a page-wide or application-wide setting
+            (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+        </description>
+
+        <attribute>
+            <name>message</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>A MessageSourceResolvable argument (direct or through JSP EL).</description>
+        </attribute>
+
+        <attribute>
+            <name>code</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The code (key) to use when looking up the message.
+                If code is not provided, the text attribute will be used.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>arguments</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set optional message arguments for this tag, as a
+                (comma-)delimited String (each String argument can contain JSP EL),
+                an Object array (used as argument array), or a single Object (used
+                as single argument).
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>argumentSeparator</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The separator character to be used for splitting the
+                arguments string value; defaults to a 'comma' (',').
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>text</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Default text to output when a message for the given code
+                could not be found. If both text and code are not set, the tag will
+                output null.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The string to use when binding the result to the page,
+                request, session or application scope. If not specified, the result
+                gets outputted to the writer (i.e. typically directly to the JSP).
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The scope to use when exporting the result to a variable.
+                This attribute is only used when var is also set. Possible values are
+                page, request, session and application.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>htmlEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set HTML escaping for this tag, as boolean value.
+                Overrides the default HTML escaping setting for the current page.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>javaScriptEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set JavaScript escaping for this tag, as boolean value. Default is false.</description>
+        </attribute>
+
+    </tag>
+
+    <tag>
+        <name>hasBindErrors</name>
+        <tag-class>org.springframework.web.servlet.tags.BindErrorsTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Provides Errors instance in case of bind errors.
+            The HTML escaping flag participates in a page-wide or application-wide setting
+            (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+        </description>
+        <variable>
+            <name-given>errors</name-given>
+            <variable-class>org.springframework.validation.Errors</variable-class>
+        </variable>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The name of the bean in the request, that needs to be
+                inspected for errors. If errors are available for this bean, they
+                will be bound under the 'errors' key.
+            </description>
+        </attribute>
+        <attribute>
+            <name>htmlEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set HTML escaping for this tag, as boolean value.
+                Overrides the default HTML escaping setting for the current page.
+            </description>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>nestedPath</name>
+        <tag-class>org.springframework.web.servlet.tags.NestedPathTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Sets a nested path to be used by the bind tag's path.
+        </description>
+        <variable>
+            <name-given>nestedPath</name-given>
+            <variable-class>java.lang.String</variable-class>
+        </variable>
+        <attribute>
+            <name>path</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set the path that this tag should apply. E.g. 'customer'
+                to allow bind paths like 'address.street' rather than
+                'customer.address.street'.
+            </description>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>bind</name>
+        <tag-class>org.springframework.web.servlet.tags.BindTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Provides BindStatus object for the given bind path.
+            The HTML escaping flag participates in a page-wide or application-wide setting
+            (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+        </description>
+        <variable>
+            <name-given>status</name-given>
+            <variable-class>org.springframework.web.servlet.support.BindStatus</variable-class>
+        </variable>
+        <attribute>
+            <name>path</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The path to the bean or bean property to bind status
+                information for. For instance account.name, company.address.zipCode
+                or just employee. The status object will exported to the page scope,
+                specifically for this bean or bean property
+            </description>
+        </attribute>
+        <attribute>
+            <name>ignoreNestedPath</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set whether to ignore a nested path, if any. Default is to not ignore.</description>
+        </attribute>
+        <attribute>
+            <name>htmlEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set HTML escaping for this tag, as boolean value. Overrides
+                the default HTML escaping setting for the current page.
+            </description>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>transform</name>
+        <tag-class>org.springframework.web.servlet.tags.TransformTag</tag-class>
+        <body-content>JSP</body-content>
+
+        <description>
+            Provides transformation of variables to Strings, using an appropriate
+            custom PropertyEditor from BindTag (can only be used inside BindTag).
+            The HTML escaping flag participates in a page-wide or application-wide setting
+            (i.e. by HtmlEscapeTag or a 'defaultHtmlEscape' context-param in web.xml).
+        </description>
+
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The value to transform. This is the actual object you want
+                to have transformed (for instance a Date). Using the PropertyEditor that
+                is currently in use by the 'spring:bind' tag.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The string to use when binding the result to the page,
+                request, session or application scope. If not specified, the result gets
+                outputted to the writer (i.e. typically directly to the JSP).
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>The scope to use when exported the result to a variable.
+                This attribute is only used when var is also set. Possible values are
+                page, request, session and application.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>htmlEscape</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>Set HTML escaping for this tag, as boolean value. Overrides
+                the default HTML escaping setting for the current page.
+            </description>
+        </attribute>
+
+    </tag>
+
+</taglib>
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/web.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..b7f53b8f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+    <context-param>
+        <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+        <param-value>messages</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+            /WEB-INF/wisemapping-security.xml
+            /WEB-INF/wisemapping-dao.xml                                    
+            /WEB-INF/wisemapping-service.xml
+            /WEB-INF/wisemapping-model.xml
+            /WEB-INF/wisemapping-servlet.xml
+            /WEB-INF/wisemapping-captcha.xml
+            /WEB-INF/wisemapping-acegi-security.xml
+        </param-value>
+    </context-param>
+
+    <!--
+	  - Loads the root application context of this web app at startup.
+	  - The application context is then available via
+	  - WebApplicationContextUtils.getWebApplicationContext(servletContext).
+    -->
+    <listener>
+        <listener-class>com.wisemapping.service.HibernateAppListener</listener-class>
+    </listener>
+
+
+    <filter>
+        <filter-name>charsetFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>charsetFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter>
+        <filter-name>hibernate</filter-name>
+        <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
+        <init-param>
+            <param-name>singleSession</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <init-param>
+            <param-name>sessionFactoryBeanName</param-name>
+            <param-value>mindmapSessionFactory</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>Acegi Filter Chain Proxy</filter-name>
+        <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
+        <init-param>
+            <param-name>targetClass</param-name>
+            <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>Acegi Filter Chain Proxy</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>hibernate</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+    <servlet>
+        <servlet-name>wisemapping</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>dwr-invoker</servlet-name>
+        <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>wisemapping</servlet-name>
+        <url-pattern>*.htm</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>dwr-invoker</servlet-name>
+        <url-pattern>/dwr/*</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>
+            index.jsp
+        </welcome-file>
+    </welcome-file-list>
+    <session-config>
+        <session-timeout>180</session-timeout>
+    </session-config>
+
+
+    <!-- This should be revired -->
+    <!--<resource-ref>-->
+    <!--<res-ref-name>jdbc/wisemapping</res-ref-name>-->
+    <!--<res-type>javax.sql.DataSource</res-type>-->
+    <!--<res-auth>Container</res-auth>-->
+    <!--</resource-ref>-->
+</web-app>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml
new file mode 100644
index 00000000..02a1603a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+    <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
+        <property name="filterInvocationDefinitionSource">
+            <value>
+                CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
+                PATTERN_TYPE_APACHE_ANT
+                /**=httpSessionContextIntegrationFilter,logoutFilter,authenticationProcessingFilter,securityContextHolderAwareRequestFilter,rememberMeProcessingFilter,anonymousProcessingFilter,exceptionTranslationFilter,filterInvocationInterceptor
+            </value>
+        </property>
+    </bean>
+
+    <bean id="shaPasswordEncoder" class="org.acegisecurity.providers.encoding.ShaPasswordEncoder"/>
+
+    <bean id="passwordEncoder" class="com.wisemapping.security.CustomPasswordEncoder">
+        <property name="delegatedEncoder" ref="shaPasswordEncoder"/>
+    </bean>
+
+    <bean id="httpSessionContextIntegrationFilter"
+          class="org.acegisecurity.context.HttpSessionContextIntegrationFilter"/>
+
+    <bean id="logoutFilter" class="org.acegisecurity.ui.logout.LogoutFilter">
+        <property name="filterProcessesUrl" value="/c/logout.htm"/>
+        <constructor-arg value="/c/login.htm"/>
+        <!-- URL redirected to after logout -->
+        <constructor-arg>
+            <list>
+                <ref bean="rememberMeServices"/>
+                <bean class="org.acegisecurity.ui.logout.SecurityContextLogoutHandler"/>
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <bean id="ssoCustomAuthenticationHandler" class="com.wisemapping.security.DefaultAuthenticationHandler"/>
+
+    <bean id="authenticationProcessingFilter" class="com.wisemapping.security.WiseAuthenticationProcessingFilter">
+        <property name="authenticationManager" ref="authenticationManager"/>
+        <property name="authenticationFailureUrl" value="/c/login.htm?login_error=1"/>
+        <property name="defaultTargetUrl" value="/c/login.htm"/>
+        <property name="filterProcessesUrl" value="/c/j_acegi_security_check"/>
+        <property name="rememberMeServices" ref="rememberMeServices"/>
+        <property name="authenticationHandler" ref="ssoCustomAuthenticationHandler"/>
+        <property name="exceptionMappings">
+            <props>
+                <prop key="org.acegisecurity.BadCredentialsException">/c/login.htm?login_error=2</prop>
+                <prop key="org.acegisecurity.LockedException">/c/login.htm?login_error=3</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="securityContextHolderAwareRequestFilter"
+          class="org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter"/>
+
+    <bean id="rememberMeProcessingFilter" class="org.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
+        <property name="authenticationManager" ref="authenticationManager"/>
+        <property name="rememberMeServices" ref="rememberMeServices"/>
+    </bean>
+
+    <bean id="anonymousProcessingFilter" class="org.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
+        <property name="key" value="changeThis"/>
+        <property name="userAttribute" value="anonymousUser,ROLE_ANONYMOUS"/>
+    </bean>
+
+    <bean id="exceptionTranslationFilter" class="org.acegisecurity.ui.ExceptionTranslationFilter">
+        <property name="authenticationEntryPoint">
+            <bean class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+                <property name="loginFormUrl" value="/c/login.htm"/>
+                <property name="forceHttps" value="false"/>
+            </bean>
+        </property>
+        <property name="accessDeniedHandler">
+            <bean class="org.acegisecurity.ui.AccessDeniedHandlerImpl">
+                <property name="errorPage" value="/accessDenied.jsp"/>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
+        <property name="authenticationManager" ref="authenticationManager"/>
+        <property name="accessDecisionManager">
+            <bean class="org.acegisecurity.vote.AffirmativeBased">
+                <property name="allowIfAllAbstainDecisions" value="false"/>
+                <property name="decisionVoters">
+                    <list>
+                        <bean class="org.acegisecurity.vote.RoleVoter"/>
+                        <bean class="org.acegisecurity.vote.AuthenticatedVoter"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="objectDefinitionSource">
+            <value>
+                CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
+                PATTERN_TYPE_APACHE_ANT
+                /index.jsp=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/login*=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/userregistration*=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/activation.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/forgotpassword*=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/captcha*=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/home.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/try.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/search.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/keyboard.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /css/*=IS_AUTHENTICATED_ANONYMOUSLY
+                /js/**=IS_AUTHENTICATED_ANONYMOUSLY
+                /ws/**=IS_AUTHENTICATED_ANONYMOUSLY
+                /images/*=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/embeddedview.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/export.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /c/publicview.htm=IS_AUTHENTICATED_ANONYMOUSLY
+                /dwr/engine.js=IS_AUTHENTICATED_ANONYMOUSLY
+                /dwr/interface/loggerservice.js=IS_AUTHENTICATED_ANONYMOUSLY
+                /dwr/call/plaincall/loggerservice.logerror.dwr=IS_AUTHENTICATED_ANONYMOUSLY
+                /**=IS_AUTHENTICATED_REMEMBERED
+            </value>
+        </property>
+    </bean>
+
+    <bean id="rememberMeServices" class="com.wisemapping.security.CustomTokenBasedRememberMeServices">
+        <property name="userDetailsService" ref="userDetailsService"/>
+        <property name="key" value="changeThis"/>
+    </bean>
+
+    <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
+        <property name="providers">
+            <list>
+                <ref local="daoAuthenticationProvider"/>
+                <bean class="org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
+                    <property name="key" value="changeThis"/>
+                </bean>
+                <bean class="org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
+                    <property name="key" value="changeThis"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+        <property name="userDetailsService" ref="userDetailsService"/>
+        <!-- @Todo: Check if this still required. this was removed in the new spring version.-->
+        <!--<property name="userCache">-->
+        <!--<bean class="org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache">-->
+        <!--<property name="cache">-->
+        <!--<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">-->
+        <!--<property name="cacheManager">-->
+        <!--<bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/>-->
+        <!--</property>-->
+        <!--<property name="cacheName" value="userCache"/>-->
+        <!--</bean>-->
+        <!--</property>-->
+        <!--</bean>-->
+        <!--</property>-->
+        <property name="passwordEncoder" ref="passwordEncoder"/>
+    </bean>
+
+    <bean id="userDetailsService" class="com.wisemapping.security.DatabaseUserDetailService">
+        <property name="userManager" ref="userManager"/>
+    </bean>
+
+    <!-- This bean is optional; it isn't used by any other bean as it only listens and logs -->
+    <bean id="loggerListener" class="org.acegisecurity.event.authentication.LoggerListener"/>
+</beans>
+
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-captcha.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-captcha.xml
new file mode 100755
index 00000000..d7ae09ab
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-captcha.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+    <bean id="colorGenRandomDark" class="com.octo.captcha.component.image.color.RandomRangeColorGenerator">
+        <constructor-arg index="0">
+            <list>
+                <value>0</value>
+                <value>150</value>
+            </list>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <list>
+                <value>0</value>
+                <value>150</value>
+            </list>
+        </constructor-arg>
+        <constructor-arg index="2">
+            <list>
+                <value>0</value>
+                <value>150</value>
+            </list>
+        </constructor-arg>
+        <constructor-arg index="3">
+            <list>
+                <value>255</value>
+                <value>255</value>
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <bean id="fontArial" class="java.awt.Font">
+        <constructor-arg index="0" value="Arial"/>
+        <constructor-arg index="1" value="0"/>
+        <constructor-arg index="2" value="10"/>
+    </bean>
+
+    <bean id="fontTahoma" class="java.awt.Font">
+        <constructor-arg index="0" value="Tahoma"/>
+        <constructor-arg index="1" value="0"/>
+        <constructor-arg index="2" value="10"/>
+    </bean>
+
+    <bean id="fontVerdana" class="java.awt.Font">
+        <constructor-arg index="0" value="Verdana"/>
+        <constructor-arg index="1" value="0"/>
+        <constructor-arg index="2" value="10"/>
+    </bean>
+
+    <bean id="fontComic" class="java.awt.Font">
+        <constructor-arg index="0" value="Comic sans MS"/>
+        <constructor-arg index="1" value="0"/>
+        <constructor-arg index="2" value="10"/>
+    </bean>
+
+    <bean id="fontLucida" class="java.awt.Font">
+        <constructor-arg index="0" value="Lucida console"/>
+        <constructor-arg index="1" value="0"/>
+        <constructor-arg index="2" value="10"/>
+    </bean>
+
+    <bean id="fontGenRandom" class="com.octo.captcha.component.image.fontgenerator.RandomFontGenerator">
+        <constructor-arg index="0" value="20"/>
+        <constructor-arg index="1" value="30"/>
+        <constructor-arg index="2">
+            <list>
+                <ref bean="fontArial"/>
+                <ref bean="fontTahoma"/>
+                <ref bean="fontVerdana"/>
+                <ref bean="fontComic"/>
+                <ref bean="fontLucida"/>
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <bean id="backGenUni" class="com.octo.captcha.component.image.backgroundgenerator.UniColorBackgroundGenerator">
+        <constructor-arg index="0" value="150"/>
+        <constructor-arg index="1" value="50"/>
+    </bean>
+
+    <bean id="path" class="java.lang.String">
+        <constructor-arg value="\home\jcaptcha\conf\gimpybackgrounds"/>
+    </bean>
+
+    <bean id="simpleColoredPaster" class="com.octo.captcha.component.image.textpaster.RandomTextPaster">
+        <constructor-arg type="java.lang.Integer" index="0" value="4"/>
+        <constructor-arg type="java.lang.Integer" index="1" value="6"/>
+        <constructor-arg type="com.octo.captcha.component.image.color.ColorGenerator" index="2"
+                         ref="colorGenRandomDark"/>
+        <constructor-arg index="3" value="true"/>
+    </bean>
+
+    <bean id="wordtoimage" class="com.octo.captcha.component.image.wordtoimage.ComposedWordToImage">
+        <constructor-arg index="0" ref="fontGenRandom"/>
+        <constructor-arg index="1" ref="backGenUni"/>
+        <constructor-arg index="2" ref="simpleColoredPaster"/>
+    </bean>
+
+    <bean id="filedict" class="com.octo.captcha.component.word.FileDictionary">
+        <constructor-arg index="0" value="toddlist"/>
+    </bean>
+
+    <bean id="wordgen" class="com.octo.captcha.component.word.wordgenerator.ComposeDictionaryWordGenerator">
+        <constructor-arg ref="filedict"/>
+    </bean>
+
+    <bean id="imageCaptchaFactory" class="com.octo.captcha.image.gimpy.GimpyFactory">
+        <constructor-arg ref="wordgen"/>
+        <constructor-arg ref="wordtoimage"/>
+    </bean>
+
+    <bean id="imageEngine" class="com.octo.captcha.engine.GenericCaptchaEngine">
+        <constructor-arg index="0">
+            <list>
+                <ref bean="imageCaptchaFactory"/>
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <bean id="captchaService" class="com.octo.captcha.service.multitype.GenericManageableCaptchaService">
+        <constructor-arg index="0" ref="imageEngine"/>
+        <constructor-arg index="1" value="300"/>
+        <constructor-arg index="2" value="200000"/>
+        <!-- Umm...    Why this is requred ...-->
+        <constructor-arg index="3" value="200000"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
new file mode 100644
index 00000000..c84a871b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="location" value="/WEB-INF/app.properties" />
+    </bean>
+
+    <bean id="wiseDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <property name="driverClassName" value="${database.driver}"/>
+        <property name="url" value="${database.url}"/>
+        <property name="username" value="${database.username}"/>
+        <property name="password" value="${database.password}"/>
+    </bean>
+
+     <!--Descoment this lines for production environments -->
+    <!--<bean id="wiseDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">-->
+        <!--<property name="jndiName">-->
+            <!--<value>java:comp/env/jdbc/wisemapping</value>-->
+        <!--</property>-->
+    <!--</bean>-->
+
+    <bean id="mindmapSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+        <property name="dataSource" ref="wiseDataSource"/>
+        <property name="mappingResources">
+            <list>
+                <value>com/wisemapping/model/Colaborator.hbm.xml</value>
+                <value>com/wisemapping/model/MindMap.hbm.xml</value>
+                <value>com/wisemapping/model/MindmapUser.hbm.xml</value>
+                <value>com/wisemapping/model/UserLogin.hbm.xml</value>
+                <value>com/wisemapping/model/MindmapNative.hbm.xml</value>
+                <value>com/wisemapping/model/MindMapHistory.hbm.xml</value>
+            </list>
+        </property>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.dialect">${database.hibernate.dialect}</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+        <property name="sessionFactory">
+            <ref local="mindmapSessionFactory"/>
+        </property>
+    </bean>
+
+    <!-- Spring Data Access Exception Translator Defintion -->
+    <bean id="jdbcExceptionTranslator" class="org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator">
+        <property name="dataSource" ref="wiseDataSource"/>
+    </bean>
+
+    <!-- Hibernate Template Defintion -->
+    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
+        <property name="sessionFactory" ref="mindmapSessionFactory"/>
+        <property name="jdbcExceptionTranslator" ref="jdbcExceptionTranslator"/>
+    </bean>
+
+    <bean id="txAttributes"
+          class="org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource">
+        <property name="properties">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="txInterceptor"
+          class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager" ref="transactionManager"/>
+        <property name="transactionAttributeSource" ref="txAttributes"/>
+    </bean>
+
+</beans>
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml
new file mode 100644
index 00000000..002aa249
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+    <bean id="userManager" class="com.wisemapping.dao.UserManagerImpl">
+        <property name="hibernateTemplate" ref="hibernateTemplate"/>
+        <property name="passwordEncoder" ref="passwordEncoder"/>
+    </bean>
+
+    <bean id="mindmapManager" class="com.wisemapping.dao.MindmapManagerImpl">
+        <property name="hibernateTemplate" ref="hibernateTemplate"/>
+    </bean>    
+    
+</beans>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
new file mode 100755
index 00000000..7bb920c8
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+    <bean id="viewSecurityAdvisor"
+          class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
+        <property name="advice">
+            <ref local="viewSecurityAdvice"/>
+        </property>
+        <property name="mappedNames">
+            <list>
+                <value>getMindmapUserBy</value>
+                <value>getMindmapById</value>                
+            </list>
+        </property>
+    </bean>
+
+    <bean id="updateSecurityAdvisor"
+          class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
+        <property name="advice">
+            <ref local="updateSecurityAdvice"/>
+        </property>
+        <property name="mappedNames">
+            <list>
+                <value>update*</value>
+                <value>add*</value>
+                <value>remove*</value>
+                <value>remove*</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="updateSecurityAdvice" class="com.wisemapping.security.aop.UpdateSecurityAdvise">
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="viewSecurityAdvice" class="com.wisemapping.security.aop.ViewBaseSecurityAdvise">
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+</beans>
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
new file mode 100755
index 00000000..c02cd1e6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+    <bean id="userServiceTarget" class="com.wisemapping.service.UserServiceImpl">
+        <property name="userManager" ref="userManager"/>
+        <property name="mindmapService" ref="mindMapServiceTarget"/>
+        <property name="mailer" ref="mailer"/>
+    </bean>
+
+    <bean id="userService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+        <property name="transactionManager" ref="transactionManager"/>
+        <property name="target">
+            <ref local="userServiceTarget"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="mindMapServiceTarget" class="com.wisemapping.service.MindmapServiceImpl">
+        <property name="mindmapManager" ref="mindmapManager"/>
+        <property name="userService" ref="userService"/>
+        <property name="mailer" ref="mailer"/>
+    </bean>
+
+    <bean id="mindmapService"
+          class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces" value="com.wisemapping.service.MindmapService"/>
+        <property name="interceptorNames">
+            <list>
+                <value>txInterceptor</value>
+                <value>viewSecurityAdvisor</value>
+                <value>updateSecurityAdvisor</value>
+            </list>
+        </property>
+        <property name="target" ref="mindMapServiceTarget"/>
+    </bean>
+
+    <bean id="mapEditorService" class="com.wisemapping.dwr.MapEditorService">
+        <property name="mindmapService">
+            <ref local="mindmapService"/>
+        </property>
+        <property name="userService">
+            <ref local="userService"/>
+        </property>
+    </bean>
+
+    <bean id="loggerService" class="com.wisemapping.dwr.JavaScriptErrorLoggerService">
+        <property name="mindmapService">
+            <ref local="mindmapService"/>
+        </property>
+        <property name="userService">
+            <ref local="userService"/>
+        </property>
+    </bean>
+
+    <bean id="smtpAuthenticator" class="com.wisemapping.mail.SmtpAuthenticator">
+        <constructor-arg value="${mail.user}"/>
+        <constructor-arg value="${mail.password}"/>
+    </bean>
+
+    <bean id="mailSession" class="javax.mail.Session" factory-method="getInstance">
+        <constructor-arg>
+            <props>
+                <prop key="mail.smtp.auth">true</prop>
+                <prop key="mail.smtp.socketFactory.port">${mail.smtp.socketFactory.port}</prop>
+                <prop key="mail.smtp.socketFactory.class">javax.net.ssl.SSLSocketFactory</prop>
+                <prop key="mail.smtp.socketFactory.fallback">false</prop>
+                <prop key="mail.smtp.quitwait">false</prop>
+            </props>
+        </constructor-arg>
+        <constructor-arg ref="smtpAuthenticator"/>
+    </bean>
+
+    <bean id="mailer" class="com.wisemapping.mail.Mailer" singleton="true">
+        <constructor-arg index="0" value="${mail.registrationEmail}" />
+        <constructor-arg index="1" value="${mail.siteEmail}" />
+
+        <property name="mailSender" ref="mailSender"/>
+        <property name="velocityEngine" ref="velocityEngine"/>
+    </bean>
+
+    <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+        <property name="host" value="${mail.host}"/>
+        <!--  <property name="session" ref="mailSession"/> -->
+    </bean>
+
+    <bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+        <property name="velocityProperties">
+            <value>
+                resource.loader=class
+                class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+            </value>
+        </property>
+    </bean>
+</beans>
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
new file mode 100644
index 00000000..785b9ca1
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+    <bean id="browserSupportInterceptor" class="com.wisemapping.filter.BrowserSupportInterceptor">
+        <property name="exclude">
+            <list>
+                <value>/</value>
+                <value>/index.jsp</value>
+                <value>/c/home.htm</value>
+                <value>/c/login.htm</value>
+                <value>/c/userRegistration.htm</value>
+                <value>/c/captcha.htm</value>
+                <value>/c/publicView.htm</value>
+                <value>/c/export.htm</value>
+                <value>/c/search.htm</value>
+                <value>/c/keyboard.htm</value>
+                <value>/c/renameMap.htm</value>
+                <value>/c/embeddedView.htm</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="exceptionHadlerResolver"
+          class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
+        <property name="defaultStatusCode" value="500"/>
+        <property name="defaultErrorView" value="unexpectedError"/>
+        <property name="exceptionMappings">
+            <props>
+                <prop key="com.wisemapping.exceptions.UnsupportedBrowserException">browserNotSupported</prop>
+                <!-- Security exceptions are wrapped in this exceptions -->
+                <prop key="java.lang.reflect.UndeclaredThrowableException">securityError</prop>
+                <prop key="com.wisemapping.exceptions.EmailNotExistsException">emailNotExistsError</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="paramResolverByAction"
+          class="org.springframework.web.servlet.mvc.multiaction.ParameterMethodNameResolver">
+        <property name="paramName" value="action"/>
+    </bean>
+
+    <bean id="paramResolverByAction2"
+          class="org.springframework.web.servlet.mvc.multiaction.ParameterMethodNameResolver">
+        <property name="paramName" value="actionId"/>
+    </bean>
+
+    <bean id="mindmapController" class="com.wisemapping.controller.MindmapController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+        <property name="basenames">
+            <list>
+                <value>messages</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="localeResolver"
+          class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">
+    </bean>
+
+    <bean id="homeResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
+        <property name="mappings">
+            <props>
+                <prop key="/c/try.htm">tryEditor</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="homeController" class="com.wisemapping.controller.PublicPagesController">
+        <property name="methodNameResolver" ref="homeResolver"/>
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="editorController" class="com.wisemapping.controller.MindmapEditorController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="cookerController" class="com.wisemapping.controller.MindmapCooker">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="loginController" class="com.wisemapping.controller.LoginController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="sharingController" class="com.wisemapping.controller.MindmapSharingController">
+        <property name="methodNameResolver" ref="paramResolverByAction2"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="exportController" class="com.wisemapping.controller.ExportController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+    <bean id="publishController" class="com.wisemapping.controller.MindmapPublishController">
+        <property name="methodNameResolver" ref="paramResolverByAction2"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="userValidator" class="com.wisemapping.validator.UserValidator">
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="userController" class="com.wisemapping.controller.UserController">
+        <property name="captchaService" ref="captchaService"/>
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="user"/>
+        <property name="commandClass" value="com.wisemapping.view.UserBean"/>
+        <property name="validator" ref="userValidator"/>
+        <property name="formView" value="userRegistration"/>
+        <property name="successView" value="userRegistrationConfirmation"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="forgotPasswordValidator" class="com.wisemapping.validator.ForgotPasswordValidator"/>
+
+    <bean id="forgotPasswordController" class="com.wisemapping.controller.ForgotPasswordController">
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="forgotPassword"/>
+        <property name="commandClass" value="com.wisemapping.view.ForgotPasswordBean"/>
+        <property name="validator" ref="forgotPasswordValidator"/>
+        <property name="formView" value="forgotPassword"/>
+        <property name="successView" value="mindmap"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="settingResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
+        <property name="mappings">                                    
+            <props>
+                <prop key="/c/settings.htm">settings</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="settingsController" class="com.wisemapping.controller.SettingsController">
+        <property name="methodNameResolver" ref="settingResolver"/>
+    </bean>
+
+    <bean id="changePasswordValidator" class="com.wisemapping.validator.ChangePasswordValidator"/>
+    <bean id="changePasswordController" class="com.wisemapping.controller.ChangePasswordController">
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="changePassword"/>
+        <property name="commandClass" value="com.wisemapping.view.ChangePasswordBean"/>
+        <property name="validator" ref="changePasswordValidator"/>
+        <property name="formView" value="changePassword"/>
+        <property name="successView" value="closeDialog"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="editProfileValidator" class="com.wisemapping.validator.EditProfileValidator">
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="editProfileController" class="com.wisemapping.controller.EditProfileController">
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="editProfile"/>
+        <property name="commandClass" value="com.wisemapping.view.UserBean"/>
+        <property name="validator" ref="editProfileValidator"/>
+        <property name="formView" value="editProfile"/>
+        <property name="successView" value="closeDialog"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="renameMapValidator" class="com.wisemapping.validator.RenameMapValidator">
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="newMapValidator" class="com.wisemapping.validator.MapInfoValidator">
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="importMapValidator" class="com.wisemapping.validator.ImportMapValidator">
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="renameMapController" class="com.wisemapping.controller.RenameMindmapController">
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="renameMap"/>
+        <property name="commandClass" value="com.wisemapping.view.MindMapInfoBean"/>
+        <property name="validator" ref="renameMapValidator"/>
+        <property name="formView" value="renameMap"/>
+        <property name="successView" value="closeDialog"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="historyController" class="com.wisemapping.controller.HistoryController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="newMapController" class="com.wisemapping.controller.NewMindmapController">
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="newMap"/>
+        <property name="commandClass" value="com.wisemapping.view.MindMapInfoBean"/>
+        <property name="validator" ref="newMapValidator"/>
+        <property name="formView" value="newMap"/>
+        <property name="errorView" value="newMapError"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+
+    <bean id="importMapController" class="com.wisemapping.controller.ImportController">
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="importMap"/>
+        <property name="commandClass" value="com.wisemapping.view.ImportMapBean"/>
+        <property name="validator" ref="importMapValidator"/>
+        <property name="formView" value="importMap"/>
+        <property name="errorView" value="importMapError"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="tagValidator" class="com.wisemapping.validator.TagValidator">
+    </bean>
+
+    <bean id="tagsController" class="com.wisemapping.controller.TagsController">
+        <property name="sessionForm" value="false"/>
+        <property name="commandName" value="tag"/>
+        <property name="commandClass" value="com.wisemapping.view.TagBean"/>
+        <property name="validator" ref="tagValidator"/>
+        <property name="formView" value="mindmapTags"/>
+        <property name="successView" value="closeDialog"/>
+        <property name="mindmapService" ref="mindmapService"/>
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="multipartResolver"
+          class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+        <!-- one of the properties available; the maximum file size in bytes -->
+        <property name="maxUploadSize" value="522240"/>
+    </bean>
+
+    <bean id="activationController" class="com.wisemapping.controller.ActivationController">
+        <property name="userService" ref="userService"/>
+    </bean>
+
+    <bean id="searchController" class="com.wisemapping.controller.SearchController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="keyboardController" class="com.wisemapping.controller.KeyboardController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="publicView" class="com.wisemapping.controller.PublicViewController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="embeddedView" class="com.wisemapping.controller.EmbeddedViewController">
+        <property name="methodNameResolver" ref="paramResolverByAction"/>
+        <property name="mindmapService" ref="mindmapService"/>
+    </bean>
+
+    <bean id="captchaController" class="com.wisemapping.controller.CaptchaController">
+        <property name="captchaService" ref="captchaService"/>
+    </bean>
+
+    <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+        <property name="interceptors">
+            <list>
+                <ref bean="browserSupportInterceptor"/>
+            </list>
+        </property>
+        <property name="mappings">
+            <props>
+                <prop key="/c/mymaps.htm">mindmapController</prop>
+                <prop key="/c/userRegistration.htm">userController</prop>
+                <prop key="/c/sharing.htm">sharingController</prop>
+                <prop key="/c/home.htm">homeController</prop>
+                <prop key="/c/login.htm">loginController</prop>
+                <prop key="/c/captcha.htm">captchaController</prop>
+                <prop key="/c/forgotPassword.htm">forgotPasswordController</prop>
+                <prop key="/c/activation.htm">activationController</prop>
+                <prop key="/c/changePassword.htm">changePasswordController</prop>
+                <prop key="/c/editor.htm">editorController</prop>
+                <prop key="/c/cooker.htm">cookerController</prop>
+                <prop key="/c/settings.htm">settingsController</prop>
+                <prop key="/c/export.htm">exportController</prop>
+                <prop key="/c/publish.htm">publishController</prop>
+                <prop key="/c/editProfile.htm">editProfileController</prop>
+                <prop key="/c/tags.htm">tagsController</prop>
+                <prop key="/c/search.htm">searchController</prop>
+                <prop key="/c/keyboard.htm">keyboardController</prop>
+                <prop key="/c/publicView.htm">publicView</prop>
+                <prop key="/c/embeddedView.htm">embeddedView</prop>
+                <prop key="/c/renameMap.htm">renameMapController</prop>
+                <prop key="/c/importMap.htm">importMapController</prop>
+                <prop key="/c/newMap.htm">newMapController</prop>
+                <prop key="/c/history.htm">historyController</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.tiles.TilesJstlView"/>
+    </bean>
+
+    <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles.TilesConfigurer">
+        <property name="definitions">
+            <list>
+                <value>/WEB-INF/defs/definitions.xml</value>
+            </list>
+        </property>
+    </bean>
+
+    <!--<bean id="publicViewTarget" class="com.wisemapping.controller.PublicViewController">-->
+    <!--<property name="methodNameResolver" ref="paramResolverByAction"/>-->
+    <!--<property name="mindmapService">-->
+    <!--<ref bean="mindmapService"/>-->
+    <!--</property>-->
+    <!--</bean>-->
+
+    <!--<bean id="publicView"-->
+    <!--class="org.springframework.aop.framework.ProxyFactoryBean">-->
+    <!--<property name="proxyInterfaces">-->
+    <!--<value>com.wisemapping.controller.BaseMultiActionController</value>-->
+    <!--</property>-->
+    <!--<property name="interceptorNames">-->
+    <!--<list>-->
+    <!--<value>viewsAdvisor</value>-->
+    <!--</list>-->
+    <!--</property>-->
+    <!--<property name="target">-->
+    <!--<ref bean="publicViewTarget"/>-->
+    <!--</property>-->
+    <!--</bean>-->
+
+    <!--<bean id="viewAdvice" class="com.wisemapping.aop.ViewsAdvise">-->
+    <!--<property name="mindmapService">-->
+    <!--<ref bean="mindmapService"/>-->
+    <!--</property>-->
+    <!--</bean>-->
+
+    <!--<bean id="viewsAdvisor"-->
+    <!--class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">-->
+    <!--<property name="advice">-->
+    <!--<ref bean="viewAdvice"/>-->
+    <!--</property>-->
+    <!--<property name="mappedNames">-->
+    <!--<list>-->
+    <!--<value>handleNoSuchRequestHandlingMethod</value>-->
+    <!--</list>-->
+    <!--</property>-->
+    <!--</bean>-->
+
+</beans>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-ws-servlet.xml b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-ws-servlet.xml
new file mode 100644
index 00000000..ddbea891
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/WEB-INF/wisemapping-ws-servlet.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+    <bean id="wiseservices" class="org.springframework.ws.wsdl.wsdl11.SimpleWsdl11Definition">
+        <constructor-arg value="/WEB-INF/wiseservices.wsdl"/>
+    </bean>
+    
+    <bean id="orderEndpoint" class="com.wisemapping.ws.WiseWsEndpoint">
+        <constructor-arg ref="mindmapService"/>
+        <constructor-arg ref="userService"/>
+    </bean>
+
+    <bean class="org.springframework.ws.server.endpoint.adapter.GenericMarshallingMethodEndpointAdapter">
+        <constructor-arg ref="marshaller"/>
+    </bean>
+
+    <bean id="marshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
+        <property name="classesToBeBound">
+            <list>
+                <value>com.wisemapping.ws.LoadMindmapRequest</value>
+                <value>com.wisemapping.ws.LoadMindmapResponse</value>
+                <value>com.wisemapping.ws.AddMindmapRequest</value>
+                <value>com.wisemapping.ws.AddMindmapResponse</value>
+
+            </list>
+        </property>
+    </bean>
+    <bean class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping"/>
+
+    <!-- Security -->
+    <!--<bean id="springSecurityHandler"-->
+    <!--class="org.springframework.ws.soap.security.xwss.callback.SpringPlainTextPasswordValidationCallbackHandler">-->
+    <!--<property name="authenticationManager" ref="wsAuthenticationManager"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="wsAuthenticationManager" class="org.springframework.security.providers.ProviderManager">-->
+    <!--<property name="providers">-->
+    <!--<bean class="org.springframework.security.providers.dao.DaoAuthenticationProvider">-->
+    <!--<property name="userDetailsService" ref="userDetailsService"/>-->
+    <!--</bean>-->
+    <!--</property>-->
+    <!--</bean>-->
+
+
+</beans>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/css/blank.gif b/trunk/wise-webapp/src/main/webapp/css/blank.gif
new file mode 100644
index 00000000..75b945d2
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/css/blank.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/css/bubble.css b/trunk/wise-webapp/src/main/webapp/css/bubble.css
new file mode 100644
index 00000000..f3eb5845
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/bubble.css
@@ -0,0 +1,234 @@
+.bubbleContainer {
+    position:absolute;
+    z-index:50;
+    opacity:0;
+    width:auto;
+    overflow:hidden;
+}
+
+.bublePartContainer {
+    clear:both;
+}
+
+.bubblePart {
+    float:left;
+}
+
+.bubbleLeft {
+    background: transparent url(../images/bubbleTip_left.png) top left;
+    width:12px;
+    height:4px;
+}
+
+.bubbleCenter {
+    background-color:#362d2e;
+    text-align:center;
+    z-index:60;
+}
+
+.bubbleRight {
+    background: transparent url(../images/bubbleTip_right.png) top left;
+    width:23px;
+    height:4px;
+}
+
+.bubbleTopLeft {
+    background: transparent url(../images/bubbleTip_corner_top_left.png) top left;
+    width:12px;
+    height:12px;
+}
+
+.bubbleHintTopLeft {
+    background: transparent url(../images/bubbleTip_pico_corner_top_left.png) top left;
+    width:12px;
+    height:57px;
+}
+
+.bubbleTopRight {
+    background: transparent url(../images/bubbleTip_corner_top_right.png) top left;
+    width:23px;
+    height:12px;
+}
+
+.bubbleHintTopRight {
+    background: transparent url(../images/bubbleTip_pico_corner_top_right.png) top left;
+    width:23px;
+    height:57px;
+}
+
+.bubbleTop {
+    background: transparent url(../images/bubbleTip_top.png) top left;
+    height:12px;
+    width:4px;
+}
+
+.bubbleHintTop {
+    background: transparent url(../images/bubbleTip_pico_top.png) top left;
+    height:57px;
+    width:4px;
+}
+
+.bubbleBottomLeft {
+    background: transparent url(../images/bubbleTip_corner_bottom_left.png) top left;
+    width:12px;
+    height:26px;
+}
+
+.bubbleHintBottomLeft {
+    background: transparent url(../images/bubbleTip_pico_corner_bottom_left.png) top left;
+    width:12px;
+    height:62px;
+}
+
+.bubbleBottomRight {
+    background: transparent url(../images/bubbleTip_corner_bottom_right.png) top left;
+    width:23px;
+    height:26px;
+}
+
+.bubbleHintBottomRight {
+    background: transparent url(../images/bubbleTip_pico_corner_bottom_right.png) top left;
+    width:23px;
+    height:62px;
+}
+
+.bubbleBottom {
+    background: transparent url(../images/bubbleTip_bottom.png) top left;
+    height:26px;
+    width:4px;
+}
+
+.bubbleHintBottom {
+    background: transparent url(../images/bubbleTip_pico_bottom.png) top left;
+    height:62px;
+    width:4px;
+}
+.bubbleBottomHint {
+    background: transparent url(../images/bubbleTip_bottom_pico.png) top left;
+    width:58px;
+    height:62px;
+}
+
+.bubbleTopHint {
+    background: transparent url(../images/bubbleTip_top_pico.png) top left;
+    width:58px;
+    height:57px;
+}
+
+.bubbleLeftBlue {
+    background: transparent url(../images/bubbleTip_left_blue.gif) top left;
+    width:12px;
+    height:4px;
+}
+
+.bubbleCenterBlue {
+    background-color:#BCCCE1;
+    z-index:60;
+    overflow:'hidden';
+}
+
+.bubbleRightBlue {
+    background: transparent url(../images/bubbleTip_right_blue.gif) top left;
+    width:23px;
+    height:3px;
+}
+
+.bubbleTopLeftBlue {
+    background: transparent url(../images/bubbleTip_corner_top_left_blue.gif) top left;
+    width:12px;
+    height:18px;
+}
+
+.bubbleHintTopLeftBlue {
+    background: transparent url(../images/bubbleTip_pico_corner_top_left_blue.gif) top left;
+    width:13px;
+    height:61px;
+}
+
+.bubbleTopRightBlue {
+    background: transparent url(../images/bubbleTip_corner_top_right_blue.gif) top left;
+    width:23px;
+    height:18px;
+}
+
+.bubbleHintTopRightBlue {
+    background: transparent url(../images/bubbleTip_pico_corner_top_right_blue.gif) top left;
+    width:23px;
+    height:61px;
+}
+
+.bubbleTopBlue {
+    background: transparent url(../images/bubbleTip_top_blue.gif) top left;
+    height:18px;
+    width:3px;
+}
+
+.bubbleHintTopBlue {
+    background: transparent url(../images/bubbleTip_pico_top_blue.gif) top left;
+    height:61px;
+    width:3px;
+}
+
+.bubbleBottomLeftBlue {
+    background: transparent url(../images/bubbleTip_corner_bottom_left_blue.gif) top left;
+    width:13px;
+    height:32px;
+}
+
+.bubbleHintBottomLeftBlue {
+    background: transparent url(../images/bubbleTip_pico_corner_bottom_left_blue.gif) top left;
+    width:12px;
+    height:62px;
+}
+
+.bubbleBottomRightBlue {
+    background: transparent url(../images/bubbleTip_corner_bottom_right_blue.gif) top left;
+    width:23px;
+    height:32px;
+}
+
+.bubbleHintBottomRightBlue {
+    background: transparent url(../images/bubbleTip_pico_corner_bottom_right_blue.gif) top left;
+    width:23px;
+    height:62px;
+}
+
+.bubbleBottomBlue {
+    background: transparent url(../images/bubbleTip_bottom_blue.gif) top left;
+    height:32px;
+    width:3px;
+}
+
+.bubbleHintBottomBlue {
+    background: transparent url(../images/bubbleTip_pico_bottom_blue.gif) top left;
+    height:62px;
+    width:3px;
+}
+.bubbleBottomHintBlue {
+    background: transparent url(../images/bubbleTip_bottom_pico_blue.png) top left;
+    width:58px;
+    height:62px;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+.bubbleTopHintBlue {
+    background: transparent url(../images/bubbleTip_top_pico_blue.png) top left;
+    width:58px;
+    height:61px;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+.btn-primary {
+    background: #3399CC;
+    border: 1px solid #006699;
+    color: #FFFFFF;
+    font-family: arial, helvetica, sans-serif;
+    font-size: 72%;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: normal;
+    line-height: normal;
+    overflow: visible;
+    padding: 2px 8px 1px;
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/css/common.css b/trunk/wise-webapp/src/main/webapp/css/common.css
new file mode 100644
index 00000000..38296247
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/common.css
@@ -0,0 +1,587 @@
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td {
+    margin: 0;
+    padding: 0;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+fieldset, img {
+    border: 0;
+}
+
+address, caption, cite, code, dfn, em, strong, th, var {
+    font-style: normal;
+    font-weight: normal;
+}
+
+ol, ul {
+    list-style: none;
+}
+
+caption, th {
+    text-align: left;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-size: 100%;
+    font-weight: normal;
+}
+
+q:before, q:after {
+    content: '';
+}
+
+abbr, acronym {
+    border: 0;
+}
+
+/**
+ * Percents could work for IE, but for backCompat purposes, we are using keywords.
+ * x-small is for IE6/7 quirks mode.
+ *
+ */
+body {
+    font: 13px arial, helvetica, clean, sans-serif;
+* font-size : small;
+* font : x-small;
+}
+
+table {
+    font-size: inherit;
+    font: 100%;
+}
+
+/**
+ * 99% for safari; 100% is too large
+ */
+select, input, textarea {
+    font: 99% arial, helvetica, clean, sans-serif;
+}
+
+/**
+ * Bump up !IE to get to 13px equivalent
+ */
+pre, code {
+    font: 115% monospace;
+* font-size : 100 %;
+}
+
+/**
+ * Default line-height based on font-size rather than "computed-value"
+ * see: http://www.w3.org/TR/CSS21/visudet.html#line-height
+ */
+
+body * {
+    line-height: 1.22em;
+}
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif;
+    background-color: #fff;
+}
+
+img {
+    border: 0;
+}
+
+form {
+    padding: 0px;
+    margin: 0px;
+}
+
+p {
+    margin: 5px 0 5px 0;
+}
+
+ul {
+    list-style-position: inside;
+}
+
+a:link, a:visited {
+    font: bold 100%;
+    text-decoration: underline;
+    color: black;
+}
+
+a:hover, a:active {
+    font: bold 100%;
+    text-decoration: underline;
+    color: black;
+}
+
+h2 {
+    font: 160%;
+    color: #8e9181;
+}
+
+h1 {
+    font: normal 180%;
+    color: white;
+    padding-bottom: 2px;
+}
+
+h3 {
+/* use as subhead on main body */
+    clear: left;
+    font: normal 130%;
+    color: #6b6f5b;
+}
+
+h4 {
+/* use as headers in footer */
+    font: bold 120%;
+    border-bottom: 1px solid #8e9181;
+    color: #e2e3dd;
+    padding-bottom: 10px;
+    width: 400px;
+}
+
+#centerContent {
+    text-align: center;
+}
+
+/* HEADER STYLES */
+
+#header {
+    margin-top: 2px;
+    height: 78px;
+    width: 100%;
+    background: white;
+    border-bottom: 1px solid #bbb4d6;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+#headerToolbar {
+    height: 25px;
+    width: 100%;
+    background-color: #171a17;
+    border-top: 1px solid #999999;
+    border-bottom: 1px solid #424141;
+    color: white;
+    font-size: small;
+    font-style: normal;
+}
+
+#headerContent {
+    width: 800px;
+    height: 78px;
+    position: relative;
+    top: 0;
+    left: 0;
+    margin: auto;
+}
+
+#headerLogo {
+    margin-top: 8px;
+    height: 80px;
+    width: 200px;
+    background-image: url( "../images/logo-small.png" );
+    behavior: url( ../css/iepngfix.htc );
+    background-repeat: no-repeat;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+#headerPBetaLogo {
+    margin-top: 30px;
+    height: 35px;
+    width: 150px;
+    background-image: url( "../images/beta.png" );
+    behavior: url( ../css/iepngfix.htc );
+    background-repeat: no-repeat;
+    position: absolute;
+    top: -4px;
+    left: 140px;
+}
+
+#headerSlogan {
+    position: absolute;
+    border-left: 1px dashed gray;
+    margin-top: 8px;
+    height: 1em;
+    width: 100px;
+    top: 47px;
+    left: 137px;
+    white-space: nowrap;
+    padding-left: 7px;
+    font-weight: bold;
+    vertical-align: middle;
+}
+
+#headerButtons {
+    position: absolute;
+    top: 65px;
+    left: 150px;
+}
+
+#newsLink, #blogLink, #aboutLink, #newsLink, #faqLink, #feedbackLink, #supportLink, #logoutLink{
+    float: right;
+    z-index: 300;
+}
+
+div#headerButtons a {
+    float: left;
+    color: #6F6F6F;
+    padding: 0 10px;
+    text-decoration: none;
+    font-weight: bold;
+    font-size: 120%;
+    white-space: nowrap;
+}
+
+div#headerTitle {
+    float: left;
+    font-weight: bold;
+    font-size: 15px;
+    margin-right: 5px;
+    margin-left: 5px;
+}
+
+div#printHeader {
+    background-color: black;
+    height: 35px;
+    color: white;
+}
+
+span#headerSubTitle {
+    font-weight: lighter;
+    font-size: 12px;
+}
+
+div#headerButtons a:hover {
+/*text-decoration: underline;*/
+    color: #7e72ad;
+}
+
+div#headerButtons activelink a, div#headerButtons activelink a:hover {
+    text-decoration: none;
+    border-top: 0;
+    border-bottom: 0;
+}
+
+#signUpHeader .sb-inner {
+    background-color: white;
+}
+
+#signUpHeader {
+    padding-right: 8px;
+    padding-top: 4px;
+    position: absolute;
+    right: 0;
+    z-index: 50;
+    text-align: center;
+}
+
+#signUpHeader a, #signUpHeader a:hover {
+    font-size: 100%;
+    color: #BBB4D6;
+    text-decoration: underline;
+}
+
+#editorHeader {
+    height: 40px;
+    width: 100%;
+    background: white;
+    border-bottom: 1px solid #bbb4d6;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+#editorHeader #headerToolbar {
+    height: 40px;
+    width: 100%;
+    background-color: #171a17;
+    border-top: 1px solid #999999;
+    border-bottom: 1px solid #424141;
+    color: white;
+    font-size: small;
+    font-style: normal;
+}
+
+div#editorHeader div#headerTitle {
+    float: left;
+    font-weight: bold;
+    font-size: 22px;
+    margin-right: 5px;
+    margin-left: 5px;
+}
+
+div#editorHeader span#headerSubTitle {
+    font-weight: lighter;
+    font-size: 12px;
+}
+
+div#editorHeader div#headerActions {
+    padding-right: 8px;
+    padding-top: 4px;
+    position: absolute;
+    right: 0;
+    top: 4px;
+    z-index: 50;
+}
+
+div#editorHeader div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
+    color: white;
+}
+
+#footer {
+    width: 100%;
+    border-top: 1px solid #8e9181;
+    text-align: center;
+    font-size: 90%;
+    background-color: white;
+    float: left;
+}
+
+div#printFooter {
+    height: 60px;
+    width: 100%;
+    background: #E5E5E5;
+    border-top: 1px solid #bbb4d6;
+}
+
+div#printLogo {
+    height: 50px;
+    width: 80px;
+    float: right;
+    margin: 1px;
+    background: url( ../images/logo-vsmall.png ) no-repeat right top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+.btn-primary {
+    background: #3399CC;
+    border: 1px solid #006699;
+    color: #FFFFFF;
+    font-family: arial, helvetica, sans-serif;
+    font-size: 92%;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: bold;
+    line-height: normal;
+    overflow: visible;
+    padding: 2px 8px 1px;
+    vertical-align: middle;
+}
+
+div#paypal {
+    float: left;
+    margin: -29px;
+}
+
+.errorMsg {
+    color: #990000;
+    font-size: 90%;
+    font-weight: bold;
+    padding-left: 5px;
+}
+
+#headerLogo {
+    cursor: pointer;
+}
+
+#headerLoading {
+    padding-left: 40px;
+    background: url( '../images/ajax-loader.gif' ) #BBB4D6 no-repeat left;
+    position: absolute;
+    right: 3px;
+    top: 5px;
+    width: 75px;
+    height: 20px;
+    color: white;
+    font-weight: bold;
+    border: 1px solid whitesmoke;
+    background-position: 5px 2px;
+    visibility: hidden;
+}
+
+div#headerActions {
+    padding-right: 8px;
+    padding-top: 4px;
+    position: absolute;
+    right: 0;
+    z-index: 50;
+}
+
+div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
+    color: white;
+}
+
+#join .sb-inner {
+    background: #9a8fc3;
+}
+
+#join .sb-shadow {
+    background: white;
+}
+
+#join .sb-border {
+    background: #A29BBF;
+}
+
+/*---   Modal Dialog Form  ---*/
+div.modalDialog {
+    padding: 15px 30px;
+}
+
+div.modalDialog td {
+    padding: 3px;
+}
+
+div.modalDialog h1 {
+    color: #093A9D;
+    font-size: 200%;
+    margin-bottom: 5px;
+    font-weight: bold;
+}
+
+div.modalDialog h2 {
+    color: gray;
+    font-size: 110%;
+    margin: 9px 0px;
+}
+
+div.modalDialog h5 {
+    color: gray;
+    font-size: 90%; /*border-bottom: 1px dashed #BBB4D6;*/
+}
+
+/*---   End Modal Dialog Form  ---*/
+
+/*--   Main Page Style  -- */
+div.pageBody {
+    margin: 10px auto;
+    width: 800px;
+    min-height: 500px;
+}
+
+div.pageBodyContent {
+    padding-top: 30px;
+}
+
+div.pageBodyContent h1 {
+    color: #093A9D;
+    font-size: 200%;
+    margin-bottom: 5px;
+    font-weight: bold;
+}
+
+div.pageBodyContent h2 {
+    color: gray;
+    font-size: 150%;
+    border-bottom: 1px dashed #BBB4D6;
+    margin: 20px 0px;
+}
+
+div.pageBodyContent ul {
+    padding: 5px;
+}
+
+div.pageBodyContent li {
+    list-style-type: disc;
+    margin-left: 12px;
+}
+
+/*--   End Main Page Style -- */
+
+/* Share Styles */
+#userEmails {
+    float: left;
+    width: 50%;
+    padding: 5px;
+}
+
+#userEmails textarea {
+    width: 100%;
+}
+
+#currentUsers {
+    float: left;
+    width: 40%;
+    height: 400px;
+    padding: 5px;
+    padding-left: 15px;
+    margin-left: 15px;
+    border-left: 1px dotted gray;
+}
+
+#currentUsers table {
+    width: 100%;
+}
+
+#invitation {
+    border: 1px dotted gray;
+}
+
+td.formLabel {
+    text-align: right;
+    padding: 2px 10px;
+    white-space: nowrap;
+    font-weight: bolder;
+    vertical-align: top;
+}
+
+span.fieldRequired {
+    font-weight: bold;
+    color: orangered;
+    margin: 0px 4px;
+}
+
+#keyboardTable {
+    clear: both;
+    width: 100%;
+    height: 300px;
+    overflow: auto;
+    border: 0px solid gray;
+    background-color: white;
+    z-index: 2;
+    position: relative;
+}
+
+#keyboardTable table {
+    width: 100%;
+    border: 0px solid gray;
+}
+
+#keyboardTable thead {
+    background-color: #093A9D;
+    font-size: 12px;
+    font-weight: normal;
+    padding: 5px;
+}
+
+#keyboardTable td {
+    border-bottom: 1px solid #EEEEEE;
+    color: #5f5f5f;
+    font-size: 12px;
+    padding: 3px;
+}
+
+#keyboardTable th {
+    color: white;
+    border-right: 1px dotted #ffffff;
+    font-weight: bold;
+    text-align: center;
+    font-size: 12px;
+    padding: 5px;
+}
+
+#keyboardTable tbody tr:hover {
+    background-color: #E2f0f6;
+}
+
+#keyboardTable tr {
+    padding: 5px;
+}
diff --git a/trunk/wise-webapp/src/main/webapp/css/commonLibs.css b/trunk/wise-webapp/src/main/webapp/css/commonLibs.css
new file mode 100644
index 00000000..6bb678ff
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/commonLibs.css
@@ -0,0 +1,73 @@
+/*Moodal Dialog styles*/
+
+/* moodalbox CSS */
+
+div#mb_overlay {
+    position: absolute;
+    left: 0;
+    width: 100%;
+    background-color: #000;
+    cursor: pointer;
+    z-index: 98;
+}
+
+div#mb_center, div#mb_bottom {
+    position: absolute;
+    left: 50%;
+    overflow: hidden;
+    background-color: #DDD;
+    z-index: 98;
+}
+
+div#mb_center {
+    background-color: #FFF;
+}
+
+div#mb_contents {
+    width: 400px;
+    height: 400px;
+    border: 10px solid #DDD;
+    overflow: auto;
+    background-color: #FFF;
+    visibility: hidden;
+}
+
+.mb_loading {
+    background: #DDD url( ../images/loading.gif ) no-repeat center center;
+}
+
+#mb_error {
+    font-size: 1.2em;
+    color: #CD0000;
+    font-weight: bold;
+    text-align: center;
+    padding: 0.5em;
+    font-family: Verdana, Helvetica, sans-serif;
+}
+
+#mb_error em {
+    font-size: 0.8em;
+}
+
+div#mb_bottom {
+    font-family: Verdana, Helvetica, sans-serif;
+    font-size: 10px;
+    color: #666;
+    line-height: 1.4em;
+    text-align: left;
+    border: 10px solid #DDD;
+    border-top-style: none;
+}
+
+a#mb_close_link {
+    display: block;
+    float: right;
+    width: 66px;
+    height: 22px;
+    background: transparent url( ../images/closelabel.gif ) no-repeat center;
+    margin: 5px 0;
+}
+
+div#mb_caption {
+    margin-right: 71px;
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/css/editor.css b/trunk/wise-webapp/src/main/webapp/css/editor.css
new file mode 100644
index 00000000..8a716d83
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/editor.css
@@ -0,0 +1,720 @@
+@import "common.css";
+@import "commonLibs.css";
+@import "thirdparty.css";
+
+html {
+    overflow: hidden;
+}
+
+#waitDialog {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    height: 200px;
+}
+
+#firstHeader {
+    width: 100%;
+}
+
+#subHeader {
+    position: absolute;
+    width: 100%;
+    height: 55px;
+    top: 30px;
+}
+
+#loadingContainer {
+    position: relative;
+    top: 80px;
+    height: 120px; /*background: whitesmoke;*/
+    background: #FEFEFE;
+    opacity: .99;
+    padding: 15px;
+    width: 100%;
+    border: 1px solid darkgray;
+
+}
+
+#loadingContainer .loadingText {
+    position: relative;
+    top: 50%;
+    margin-top: -35px;
+    font-size: 30px;
+    font-weight: bold;
+    vertical-align: text-bottom;
+    height: 30px;
+    float: left;
+}
+
+#loadingContainer .loadingIcon {
+    position: relative;
+    background: url( ../images/loadingIcon.gif ) no-repeat;
+    top: 50%;
+    margin-top: -65px;
+    height: 100px;
+    width: 121px;
+    float: left;
+    clear: both;
+}
+
+#infoContainer {
+    float: left;
+}
+
+#infoContainer {
+    float: left;
+    padding-left: 5px;
+}
+
+#title {
+    position: relative;
+    left: 120px;
+    top: 80px;
+}
+
+#operationsContainer {
+    font-size: 12px;
+    float: right;
+    padding: 0 5px;
+}
+
+#operationsContainer a {
+    padding: 0px 5px;
+}
+
+#user {
+    font-weight: bold;
+    margin-right: 5px;
+}
+
+#toolbar {
+    width: 100%;
+    height: 25px;
+    color: #ffffff;
+    border-bottom: 2px solid black;
+    position: absolute;
+    top: 35px;
+}
+
+div#toolbar .buttonContainer {
+    height: 44px;
+    float: left;
+    color: black;
+}
+
+.buttonContainer fieldset {
+    border: 1px solid #BBB4D6;
+    padding: 2px;
+    margin: 1px;
+    padding-bottom:4px;
+}
+
+.buttonContainer legend {
+    padding: 0.2em 0.5em;
+    border: 1px solid #BBB4D6;
+    background-color: #F5F5F5;
+    color: #BBB4D6;
+    font-size: 11px;
+    text-align: right;
+    margin: 0px;
+    -moz-margin-start:7px;
+    -moz-margin-end:7px;
+}
+
+div#toolbar .button {
+    width: 32px;
+    height: 36px;
+    float: left;
+    margin: 0px 2px 2px 2px;
+    cursor: pointer;
+    text-align:center;
+}
+
+div#toolbar .comboButton {
+    width: 34px;
+}
+
+div#toolbar .button:hover {
+    width: 32px;
+    height: 36px;
+    float: left;
+    margin: 0px 1px;
+    cursor: pointer;
+    border: 1px solid black;
+    border-top-color: white;
+    border-left-color: white;
+}
+
+div#toolbar .comboButton:hover {
+    width: 34px;
+}
+
+div#toolbar .button img{
+    width: 30px;
+    height: 30px;
+    border:0;
+}
+
+div#toolbar .toolbarLabel{
+    position:relative;
+    top:55%;
+    text-align:center;
+    width:34px;
+    height:36px;
+    font-size:10px;
+}
+
+
+.mapSeparator {
+    width: 1px;
+    height: 20px;
+    background-color: #166D66;
+    float: left;
+    margin: 5px 3px;
+}
+
+div#file, div#zoom, div#node, div#font, div#share {
+    position:absolute;
+    top:-6px;
+    left:3px;
+}
+
+div#zoom {
+    left:229px;
+}
+
+div#node {
+    left:311px;
+}
+
+div#font {
+    left:619px;
+    /*left:581px;*/
+}
+
+div#share {
+    left:815px;
+    /*left:777px;*/
+}
+
+div#saveButton {
+    background: url( ../images/save.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#discardButton {
+    background: url( ../images/close.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#history {
+    background: url( ../images/history.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#print {
+    background: url( ../images/file_printer.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#undoEdition {
+    background: url( ../images/file_undo_dis.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#redoEdition {
+    background: url( ../images/file_redo_dis.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#export {
+    background: url( ../images/file_export.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#zoomIn {
+    background: url( ../images/zoom_in.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#zoomOut {
+    background: url( ../images/zoom_out.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#addTopic {
+    background: url( ../images/topic_add.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#deleteTopic {
+    background: url( ../images/topic_delete.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#topicColor {
+    background: url( ../images/topic_bgcolor.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+    z-index: 4;
+}
+
+div#topicIcon {
+    background: url( ../images/topic_icon.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+    z-index: 4;
+}
+
+div#topicNote {
+    background: url( ../images/note.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+    z-index: 4;
+}
+
+div#topicLink {
+    background: url( ../images/topic_link.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+    z-index: 4;
+}
+
+div#topicNote {
+    background-image: url( ../images/note.png );
+    behavior: url( ../css/iepngfix.htc );
+    z-index: 4;
+}
+
+#topicBorder {
+    background: url( ../images/topic_border.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+    width: 30px;
+}
+
+#fontFamily {
+    background: url( ../images/font_type.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#topicShape {
+    background: url( ../images/topic_shape.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+    width: 30px;
+}
+
+#fontBold {
+    background: url( ../images/font_bold.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#fontItalic {
+    background: url( ../images/font_italic.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+div#fontColor {
+    background: url( ../images/font_color.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+    z-index: 4;
+}
+
+#fontSize {
+    float: left;
+    background: url( ../images/font_size.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#font-size {
+    font-size: 10px;
+}
+
+.wiseToolbarButton {
+    float: left;
+    height: 16px;
+    cursor: pointer;
+    font-size: 10px;
+    font-weight: bold;
+    margin-right: 15px;
+}
+
+#shareIt {
+    background: url( ../images/collab_share.png ) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#publishIt {
+    background: url( ../images/collab_publish.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+
+}
+
+#tagIt {
+    background: url( ../images/collab_tag.png) no-repeat center top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#colorPalette {
+    border: 1px solid #bbb4d6;
+    display: none;
+    position: absolute;
+    z-index: 4;
+    width: 160px;
+    top: 89px;
+}
+
+#paletteHeader {
+    background-color: #E5E5E5;
+    height: 4px;
+}
+
+.toolbarPanel {
+    color: black;
+    border: 1px solid #bbb4d6;
+    background: #E5E5E5;
+    display: none;
+    position: absolute;
+    z-index: 4;
+    top: 71px;
+}
+
+div.toolbarPanelLink {
+    cursor: pointer;
+    font-size: 14px;
+    color: black;
+    font-weight: bold;
+    padding: 0 3px 0px 4px;
+    margin: 1px;
+}
+
+div.toolbarPanelLink {
+    cursor: pointer;
+    font-size: 12px;
+    font-weight: bold;
+    padding: 0px 3px 0px 4px;
+    margin: 1px;
+}
+
+div.toolbarPanelLink:hover {
+    cursor: pointer;
+    font-weight: bold;
+    background-color: #c3def5;
+}
+
+div.toolbarPanelLinkSelectedLink {
+    cursor: pointer;
+    color: white;
+    font-weight: bold;
+    padding: 0px 3px 0px 4px;
+    margin: 1px;
+    background-color: #c3def5;
+}
+
+div#actionsContainer {
+    position: absolute;
+    z-index: 50;
+    top: 35px;
+    width: 190px;
+    right: 0;
+    margin: 10px;
+    float:left;
+}
+
+#actionsContainer .button {
+    float: right;
+    font-size: 12px;
+    font-weight: bold;
+    white-space: nowrap;
+    color: #ffffff;
+    cursor: pointer;
+    margin: 2px;
+    z-index: 4;
+}
+
+#actionsContainer .button:hover {
+    color: blue;
+}
+
+#actionsContainer .mainButton {
+    float: right;
+    font-size: 12px;
+    font-weight: bold;
+    white-space: nowrap;
+    color: #ffffff;
+    cursor: pointer;
+    margin: 2px;
+    z-index: 4;
+}
+
+#actionsContainer a {
+    text-decoration: none;
+}
+
+
+#actionsContainer .buttonStart {
+    width: 6px;
+    height: 25px;
+    background: url( ../images/btnStart2.png ) no-repeat left top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+#actionsContainer .buttonBody {
+    background: url( ../images/btnBody2.png );
+    float: left;
+    height: 18px;
+    padding: 0px 5px;
+    padding-top: 5px;
+    text-align: center;
+    color: black;
+}
+
+#actionsContainer .buttonEnd {
+    width: 7px;
+    height: 23px;
+    background: url( ../images/btnEnd2.png ) no-repeat right top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+/* ------------- Footer Styles -------------------------*/
+div#footerEditor {
+    position: absolute;
+    height: 60px;
+    width: 100%;
+    background: #E5E5E5;
+    border-top: 1px solid #bbb4d6;
+    bottom: 0;
+}
+
+#logo {
+    height: 50px;
+    width: 80px;
+    float: right;
+    margin: 5px;
+    background: url( ../images/logo-vsmall.png ) no-repeat right top;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#footerEditor .msgLoggerContainer {
+    position: relative;
+    width: 550px;
+    height: 36px;
+    left: 50%;
+    margin-left: -300px;
+    top: 10px;
+    opacity: 0;
+    visibility: hidden;
+}
+
+div#msgStart {
+    float: left;
+    height: 36px;
+    width: 16px;
+    background: url( ../images/footerStart.png ) no-repeat right top;
+}
+
+div#msgEnd {
+    float: left;
+    height: 36px;
+    width: 16px;
+    background: url( ../images/footerEnd.png ) no-repeat right top;
+
+}
+
+div#msgLogger {
+    float: left;
+    height: 36px;
+    width: 500px;
+    background: url( ../images/footerBody.png ) repeat-x right top;
+    text-align: center;
+    white-space: nowrap;
+    padding: 5px;
+    font-size: 13px;
+    font-weight: bold;
+}
+
+/** Tab labels */
+div#tabsHolder {
+    width: 100%;
+    height: 20px;
+}
+
+div#tabs {
+    float: left;
+}
+
+div.tabContent {
+    clear: left;
+    width: 100%;
+    height: 63px;
+    border-bottom: 1px solid #bbb4d6;
+    border-top: 1px solid #bbb4d6;
+    background: #E5E5E5;
+    display: none;
+    position: absolute;
+    left: 0;
+}
+
+ol#toc {
+    height: 2em;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+ol#toc li {
+    float: left;
+    margin: 0 1px 0 0;
+    border: 0;
+}
+
+ol#toc a {
+    background: #fff url( ../images/tab4.png );
+    color: #008;
+    display: block;
+    float: left;
+    height: 25px;
+    padding-left: 10px;
+    text-decoration: none;
+}
+
+ol#toc a:hover {
+    background-color: #fff;
+    background-position: 0 -121px;
+}
+
+ol#toc a:hover span {
+    background-position: 100% -121px;
+}
+
+ol#toc li.current a {
+    background-color: #fff;
+    background-position: 0 -61px;
+    color: #008;
+    font-weight: bold;
+}
+
+ol#toc li.current span {
+    background-position: 100% -61px;
+}
+
+ol#toc span {
+    background: #fff url( ../images/tab4.png ) 100% 0;
+    display: block;
+    line-height: 2em;
+    padding-right: 10px;
+}
+
+#mindplot {
+    position: relative;
+    top: 103px;
+    left: 0;
+    width: 100%;
+    border: 0;
+}
+
+#workspaceContainer {
+    background: url( ../images/grid.gif ) bottom left repeat !important;
+
+}
+
+div#mapInfo {
+    float: right;
+    color: #008;
+    padding-right: 5px;
+    height: 25px;
+    white-space: nowrap;
+}
+
+span#mapName {
+    font-size: 15px;
+    font-weight: bold;
+}
+
+span#lastSaved {
+    font-size: 10px;
+}
+
+.label {
+    border: none;
+    color: #ffffff;
+    font-weight: bold;
+}
+
+.label :hover {
+    cursor: pointer;
+}
+
+#tryEditorWarning {
+    position: absolute;
+    margin: 20px auto;
+    width: 300px;
+    right: 10px;
+    top: 100px;
+    padding: 20px;
+    opacity: 0.9;
+    cursor: move;
+    background-color: #69686F;
+    filter: alpha( opacity = 90 );
+    color:#000c8f;
+}
+
+#tryEditorWarning a {
+    color: white;
+    font-weight: bold;
+}
+
+#tryEditorWarning h1 {
+    color: whitesmoke;
+    font-weight: bold;
+    margin-bottom: 5px;
+    font-size: 15px;
+}
+
+div#helpContainer {
+    position: absolute;
+    margin: 20px auto;
+    z-index: 3;
+    opacity: 0.9;
+    width: 220px;
+    top: 100px;
+    left: 10px;
+    color: #000c8f;
+    padding: 20px;
+    cursor: move;
+    background-color: #69686F;
+    filter: alpha( opacity = 90 );
+}
+
+div#helpContent h1 {
+    font-weight: bold;
+    color: whitesmoke;
+    font-size: 15px;
+}
+
+div#helpContent h2 {
+    font-weight: bold;
+    padding: 20px 0px 10px 0px;
+    color: #bfbfbf;
+}
+
+div.close {
+    position: absolute;
+    height: 12px;
+    width: 12px;
+    top: 7px;
+    right: 10px;
+    cursor: pointer;
+    background: url( ../images/close12_1.gif ) bottom left no-repeat !important;
+}
+
+div#helpContent li {
+    font-family: arial, helvetica, sans-serif;
+    list-style-type: disc;
+    margin-left: 12px;
+    font-size: 11px;
+}
+
+div#small_error_icon {
+    padding-left: 18px;
+    min-height: 16px;
+    background: url( ../images/error_icon.png ) bottom left no-repeat !important;
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/css/embedded.css b/trunk/wise-webapp/src/main/webapp/css/embedded.css
new file mode 100644
index 00000000..ae997af1
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/embedded.css
@@ -0,0 +1,143 @@
+@import "common.css";
+@import "thirdparty.css";
+
+html {
+    overflow: hidden;
+}
+
+#waitDialog {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    height: 100px;
+}
+
+#firstHeader {
+    width: 100%;
+}
+
+#subHeader {
+    position: absolute;
+    width: 100%;
+    height: 55px;
+    top: 30px;
+}
+
+#loadingContainer {
+    position: relative;
+    top: 80px;
+    height: 120px; /*background: whitesmoke;*/
+    background: #FEFEFE;
+    opacity: .99;
+    padding: 15px;
+    width: 100%;
+    border: 1px solid darkgray;
+
+}
+
+#loadingContainer .loadingText {
+    position: relative;
+    top: 50%;
+    margin-top: -35px;
+    font-size: 30px;
+    font-weight: bold;
+    vertical-align: text-bottom;
+    height: 30px;
+    float: left;
+}
+
+#loadingContainer .loadingIcon {
+    position: relative;
+    background: url( ../images/ajax-loader2.gif ) no-repeat;
+    top: 25px;
+    height: 100px;
+    width: 70px;
+    float: left;
+    clear: both;
+}
+
+/* ------------- Footer Styles -------------------------*/
+div#embFooter {
+    position: absolute;
+    height: 35px;
+    width: 100%;
+    bottom: 0;
+    left: 0px;
+    border-top: 1px solid black;
+    background: #E5E5E5;
+}
+
+div#logo {
+    height: 65px;
+    width: 80px;
+    position: absolute;
+    background: url( ../images/logo-vvsmall.png ) no-repeat right top;
+    behavior: url( ../css/iepngfix.htc );
+    right: 10px;
+    top: -10px;
+}
+
+.button {
+    width: 18px;
+    height: 16px;
+    float: left;
+    cursor: pointer;
+    white-space: nowrap;
+}
+
+.button:hover {
+    float: left;
+    cursor: pointer;
+    border: 1px solid black;
+    border-top-color: white;
+    border-left-color: white;
+}
+
+#zoomIn {
+    background: url( ../images/zoom_in.png ) no-repeat left top;;
+    behavior: url( ../css/iepngfix.htc );
+    margin-top: 10px;
+    margin-left: 10px;
+}
+
+#zoomOut {
+    background: url( ../images/zoom_out.png ) no-repeat left top;;
+    behavior: url( ../css/iepngfix.htc );
+    margin-top: 10px
+}
+
+div#mindplot {
+    position: relative;
+    top: 0;
+    left: 0;
+    width: 100%;
+}
+
+#workspaceContainer {
+    background: url( ../images/grid.gif ) bottom left repeat !important;
+
+}
+
+#workspaceContainer {
+    background: url( ../images/grid.gif ) bottom left repeat !important;
+
+}
+
+div#mapContainer {
+    border-bottom: 1px solid black;
+    padding-bottom: 40px;
+    height: 400px;
+    width: 100%;
+}
+
+div#mapDetails {
+    float: right;
+    padding-top: 10px;
+    margin-right: 100px;
+}
+
+div#mapDetails .title {
+    font-weight: bold;
+    margin-left: 10px;
+    margin-right: 3px;
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/css/iepngfix.htc b/trunk/wise-webapp/src/main/webapp/css/iepngfix.htc
new file mode 100644
index 00000000..6d15f325
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/iepngfix.htc
@@ -0,0 +1,68 @@
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+  (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;
+
+ if (tagName == 'IMG')
+ {
+  if ((/\.png$/i).test(src))
+  {
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   filt(src, 'scale');
+   src = blankImg;
+  }
+  else if (src.indexOf(blankImg) < 0) filt();
+ }
+ else if (bgImg && bgImg != 'none')
+ {
+  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+  {
+   var s = RegExp.$1;
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   style.backgroundImage = 'none';
+   filt(s, 'crop');
+   // IE link fix.
+   for (var n = 0; n < childNodes.length; n++)
+    if (childNodes[n].style) childNodes[n].style.position = 'relative';
+  }
+  else filt();
+ }
+}
+
+doFix();
+
+</script>
+</public:component>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/css/mymaps.css b/trunk/wise-webapp/src/main/webapp/css/mymaps.css
new file mode 100644
index 00000000..286779e8
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/mymaps.css
@@ -0,0 +1,272 @@
+@import "common.css";
+@import "commonLibs.css";
+@import "thirdparty.css";
+
+#recentText {
+    width: 100px;
+    font-size: 12px;
+    font-weight: bold;
+    padding: 5px;
+    padding-left: 0;
+    color: #808080;
+}
+
+#mapListContainer {
+    padding: 15px;
+    height: 400px;
+}
+
+#recentFiles {
+    margin: 10px auto;
+    width: 900px;
+    height: 100%;
+    padding: 8px;
+    margin-bottom: 5px;
+}
+
+#recentFiles a {
+    text-decoration: none;
+    color: #464545;
+}
+
+#recentFiles a:hover {
+    color: #093A9D;
+}
+
+#recentFiles .recentItemContainer {
+    height: 20px;
+    background-color: white;
+}
+
+#recentFiles .recentItemIcon {
+    float: left;
+    width: 20px;
+    height: 15px;
+    background: url( ../images/icon_list.png ) no-repeat left;
+}
+
+#recentFiles .recentItemTitle {
+    float: left;
+    padding-left: 0px;
+    padding-right: 10px;
+    font-size: 12px;
+}
+
+#mydocs {
+    margin: 20px auto;
+    width: 900px;
+    height: 300px;
+    padding: 10px;
+    background-color: #C3DEF5;
+    border: 1px solid #A7C6DF;
+}
+
+#toolbar .button {
+    cursor: pointer;
+    border: 1px solid #E5E5E5;
+    float: left;
+    padding: 5px;
+    margin-right: 10px;
+    margin-left: 5px;
+    background-color: #838383;
+    color: white;
+    font-weight: bold;
+}
+
+#mydocs .button a {
+    color: white;
+    text-decoration: none;
+}
+
+#toolbar {
+    clear: both;
+    width: 900px;
+    height: 35px;
+    vertical-align: middle;
+    z-index: 3;
+    position: relative;
+}
+
+#toolbar .buttonContainer {
+    float: left;
+    position: relative;
+    top: 50%;
+    margin: 0px 5px;
+    margin-top: -12px;
+    height: 24px;
+}
+
+#toolbar .dropDownContainer {
+    margin-top: 5px;
+    height: 24px;
+}
+
+#toolbar .buttonStart {
+    float: left;
+    width: 3px;
+    height: 24px;
+    background: url( ../images/start_btn.gif ) no-repeat left;
+}
+
+#toolbar .buttonBody {
+    float: left;
+    height: 19px;
+    padding: 5px 5px 0px;
+    background: url( ../images/body_btn.gif );
+}
+
+#toolbar .buttonEnd {
+    float: left;
+    width: 3px;
+    height: 24px;
+    background: url( ../images/end_btn.gif ) no-repeat left;
+}
+
+#actionsBtn {
+    float: left;
+    position: relative;
+    top: 50%;
+    margin: 0px 5px;
+    margin-top: -15px;
+    width: 78px;
+    height: 30px;
+}
+
+#newMapButton {
+    float: left;
+    position: relative;
+    top: 50%;
+    margin: 0px 5px;
+    margin-top: -15px;
+    width: 78px;
+    height: 30px;
+}
+
+.menuItem {
+    color: black;
+    padding: 2px;
+    cursor: pointer;
+    text-align: center;
+}
+
+#docTable .button {
+    cursor: pointer;
+}
+
+#docTable {
+    clear: both;
+    width: 100%;
+    height: 250px;
+    overflow: auto;
+    border: 0px solid gray;
+    background-color: white;
+    z-index: 2;
+    position: relative;
+}
+
+#docTable table {
+    width: 100%;
+    border: 0px solid gray;
+}
+
+#docTable thead {
+    background-color: #093A9D;
+    font-size: 12px;
+    font-weight: normal;
+    padding: 5px;
+}
+
+#docTable td {
+    border-bottom: 1px solid #EEEEEE;
+    color: #999999;
+    font-size: 12px;
+    padding: 3px;
+}
+
+#docTable th {
+    color: white;
+    border-right: 1px dotted #ffffff;
+    font-weight: bold;
+    text-align: center;
+    font-size: 12px;
+    padding: 5px;
+}
+
+#docTable tbody tr:hover {
+    background-color: #E2f0f6;
+}
+
+#docTable tr {
+    padding: 5px;
+}
+
+#docTable .mapTitle {
+    font-size: 13px;
+    color: #666666;
+    font-weight: bold;
+}
+
+#docTable .mapTags {
+    font-size: 11px;
+    color: black;
+}
+
+.content {
+    background-color: white;
+    height: 550px;
+}
+
+#myDocsContainer {
+    width: 100%;
+    text-align: center;
+    float: left;
+}
+
+#recentItems {
+    height: 100%;
+    padding: 10px;
+}
+
+#mapListContainer .sb-inner {
+    background: white;
+}
+
+#mapListContainer .sb-shadow {
+    background: white;
+}
+
+#mapListContainer .sb-border {
+    background: #A29BBF;
+}
+
+#recentFiles .sb-inner {
+    background: #EEEEEE;
+}
+
+#recentFiles .sb-border {
+    background: #E5E5E5;
+}
+
+#toolbar .sb-border {
+    background: #A7C6DF;
+}
+
+#toolbar .sb-inner {
+    background: #C3DEF5;
+}
+
+#mydocs .sb-inner {
+    background: #C3DEF5;
+}
+
+#mydocs .sb-border {
+    background: #A7C6DF;
+}
+
+#recentItems .sb-inner {
+    background: white;
+}
+
+#recentItems .sb-border {
+    background: #E5E5E5;
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/css/thirdparty.css b/trunk/wise-webapp/src/main/webapp/css/thirdparty.css
new file mode 100644
index 00000000..77171f92
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/thirdparty.css
@@ -0,0 +1,800 @@
+/************************************************************************************
+*  Windoo Wise CSS
+******************************************/
+div.windoo {
+    position: absolute;
+    overflow: hidden;
+}
+
+div.windoo .windoo-drag {
+    cursor: move;
+}
+
+div.windoo div.windoo-body {
+    position: relative;
+    overflow: auto;
+    width: auto;
+    padding: 0;
+    text-align: left;
+}
+
+div.windoo
+{
+    border: 8px solid #dddddd;
+}
+
+div.windoo div.windoo-frame {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    line-height: 0;
+    background:white;
+}
+
+div.windoo div.windoo-frame .strut {
+    line-height: 0;
+    font-size: 0px;
+}
+
+div.windoo div.windoo-frame .title {
+    overflow: hidden;
+}
+
+div.windoo div.windoo-frame .title .title-text {
+    width: 100%;
+    overflow: hidden;
+}
+
+/* Windoo buttons */
+div.windoo a.windoo-button {
+    position: absolute;
+    display: block;
+    text-align: center;
+    text-decoration: none;
+    overflow: hidden;
+    text-indent: -1000em;
+    outline: none;
+    z-index: 10;
+}
+
+/* Minimized and maximazed states */
+div.windoo-maximized .windoo-sizer, div.windoo-minimized .windoo-sizer, div.windoo-rolled .windoo-sizer, div.windoo-minimized a.windoo-button {
+    display: none !important;
+}
+
+div.windoo-minimized a.windoo-restore {
+    display: block !important;
+}
+
+div.windoo-minimized div.windoo-body, div.windoo-minimized .windoo-pane,
+    div.windoo-rolled div.windoo-body, div.windoo-rolled .windoo-pane {
+    display: none !important;
+}
+
+/* Windoo sizers */
+div.windoo .windoo-sizer {
+    position: absolute;
+    overflow: hidden;
+    background: url( '../images/s.gif' );
+    z-index: 5;
+    -moz-user-select: none;
+}
+
+div.windoo .windoo-north {
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 6px;
+    cursor: n-resize;
+}
+
+div.windoo .windoo-south {
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 6px;
+    cursor: s-resize;
+}
+
+div.windoo .windoo-west {
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 6px;
+    cursor: w-resize;
+}
+
+div.windoo .windoo-east {
+    top: 0;
+    right: 0;
+    height: 100%;
+    width: 6px;
+    cursor: e-resize;
+}
+
+div.windoo .windoo-nw,
+    div.windoo .windoo-ne,
+    div.windoo .windoo-sw,
+    div.windoo .windoo-se {
+    width: 9px;
+    height: 9px;
+}
+
+div.windoo .windoo-nw {
+    top: 0;
+    left: 0;
+    cursor: nw-resize;
+}
+
+div.windoo .windoo-ne {
+    top: 0;
+    right: 0;
+    cursor: ne-resize;
+}
+
+div.windoo .windoo-sw {
+    bottom: 0;
+    left: 0;
+    cursor: sw-resize;
+}
+
+div.windoo .windoo-se {
+    bottom: 0;
+    right: 0;
+    cursor: se-resize;
+}
+
+/* Windoo ghost sizer */
+div.windoo-ghost {
+    border: dotted #0d0 2px;
+    position: absolute;
+    -moz-user-select: none;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    background: transparent url( '../images/s.gif' );
+}
+
+/* Windoo simple shadow */
+div.windoo-shadow-simple {
+    /*position: absolute;*/
+    /*padding: 0;*/
+    /*overflow: hidden;*/
+}
+
+div.windoo-shadow-simple div.c {
+    /*width: 100%;*/
+    /*height: 100%;*/
+    /*opacity: .4;*/
+    /*filter: Alpha( opacity = 40 );*/
+    /*-moz-border-radius: 4px;*/
+    /*-khtml-border-radius: 4px;*/
+    /*-webkit-border-radius: 4px;*/
+    /*border-radius: 4px;*/
+    /*background: #ccc;*/
+}
+
+/* Modal window shadow overlay */
+div.windoo-modal-overlay {
+    background: #000;
+    opacity: .6;
+    filter: Alpha( opacity = 60 );
+}
+
+/*        *********  wise Styles   **********    */
+
+div.windoo-wise div.windoo-body {
+    margin: 50px 20px 0;
+    padding: 0;
+}
+
+div.windoo-wise-ie .windoo-body {
+    top: 28px;
+}
+
+div.windoo-wise-ghost {
+    border: dotted #00a 2px;
+}
+
+div.windoo-wise .windoo-se {
+    bottom: 0;
+    right: 0;
+    width: 11px;
+    height: 11px;
+    cursor: se-resize;
+    /*background: url( ../images/se-handle.gif ) no-repeat left top;*/
+}
+
+div.windoo-wise div.windoo-frame {
+}
+
+div.windoo-wise div.windoo-frame .top-left {
+    /*padding: 0 0 0 3px;*/
+    /*background: transparent url( ../images/hd-sprite.gif ) no-repeat scroll left -41px;*/
+}
+
+div.windoo-wise div.windoo-frame .top-right {
+    padding: 0 3px 0 0;
+    /*background: transparent url( ../images/hd-sprite.gif ) no-repeat scroll right 0;*/
+}
+
+div.windoo-wise div.windoo-frame .title {
+    /*background: #AABACA url( ../images/hd-sprite.gif ) repeat-x scroll 0 -82px;*/
+    color: #15428B;
+    height: 28px;
+    padding: 0 40px 0 .5em;
+    font: bold 13px "Sans Serif", Tahoma, Verdana, Helvetica;
+}
+
+div.windoo-wise div.windoo-frame .title-text {
+    padding-top: 7px;
+    /*line-height: 13px;*/
+    height: 13px;
+    text-align: left;
+}
+
+div.windoo-wise div.windoo-frame .bot-left {
+    padding: 0 0 0 7px;
+    /*background: transparent url( ../images/bg-left.gif ) no-repeat scroll left bottom;*/
+}
+
+div.windoo-wise div.windoo-frame .bot-right {
+    padding: 0 7px 0 0;
+    /*background: transparent url( ../images/bg-right.gif ) no-repeat scroll right bottom;*/
+}
+
+div.windoo-wise div.windoo-frame .strut {
+    /*background: transparent url( ../images/bg-center.gif ) repeat-x scroll center bottom;*/
+    text-align: left;
+}
+
+div.windoo-wise a.windoo-button {
+    width: 23px;
+    height: 19px;
+    /*line-height: 19px;*/
+    font-size: 9pt;
+    text-indent: -1000em;
+    background: url( '../images/buttons.gif' ) no-repeat scroll 0 0;
+}
+
+div.windoo-wise a.windoo-close {
+    top: 0px;
+    right: 10px;
+    background-position: -69px 0;
+}
+
+div.windoo-wise a.windoo-close:hover {
+    background-position: -69px -19px;
+}
+
+div.windoo-wise a.windoo-close-disabled, div.windoo-wise a.windoo-close-disabled:hover {
+    background-position: -69px 0;
+    opacity: .3;
+    filter: Alpha( opacity = 30 );
+}
+
+div.windoo-wise a.windoo-maximize {
+    top: 0px;
+    right: 33px;
+    background-position: -46px 0;
+}
+
+div.windoo-wise a.windoo-maximize:hover {
+    background-position: -46px -19px;
+}
+
+div.windoo-wise a.windoo-maximize-disabled, div.windoo-wise a.windoo-maximize-disabled:hover {
+    background-position: -46px 0;
+    opacity: .3;
+    filter: Alpha( opacity = 30 );
+}
+
+div.windoo-wise a.windoo-minimize {
+    top: 0px;
+    right: 56px;
+    background-position: 0 0;
+}
+
+div.windoo-wise a.windoo-minimize:hover {
+    background-position: 0 -19px;
+}
+
+div.windoo-wise a.windoo-minimize-disabled, div.windoo-wise a.windoo-minimize-disabled:hover {
+    background-position: 0 0;
+    opacity: .3;
+    filter: Alpha( opacity = 30 );
+}
+
+div.windoo-wise a.windoo-restore {
+    display: none;
+    top: 0px;
+    right: 15px;
+    background-position: -46px 0;
+}
+
+div.windoo-wise a.windoo-restore:hover {
+    background-position: -46px -19px;
+}
+
+div.windoo-wise a.windoo-restore-disabled, div.windoo-wise a.windoo-restore-disabled:hover {
+    background-position: -46px 0;
+    opacity: .3;
+    filter: Alpha( opacity = 30 );
+}
+
+div.windoo-wise a.windoo-menu {
+    display: none;
+}
+
+div.windoo-wise-minimized {
+    width: 165px !important;
+}
+
+div.windoo-shadow-wise-maximized {
+    display: none !important;
+}
+
+div.windoo-wise-alert-message {
+}
+
+div.windoo-wise-confirm-message {
+}
+
+div.windoo-wise-alert-pane, div.windoo-wise-confirm-pane {
+    text-align: center;
+}
+
+div.windoo-wise-alert-pane input, div.windoo-wise-confirm-pane input {
+    margin: 0 .5em;
+    width: 4em;
+}
+
+
+div.windoo-wise-confirm-pane input {
+    background: #3399CC;
+    border: 1px solid #006699;
+    color: #FFFFFF;
+    font-family: arial, helvetica, sans-serif;
+    font-size: 92%;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: bold;
+    /*line-height: normal;*/
+    overflow: visible;
+    padding: 2px 8px 1px;
+    vertical-align: middle;
+}
+
+/************************************************************************************
+ *  - mooRainbow: defaultCSS
+ * author: w00fz <w00fzPuppy@gmail.com>
+*******************************************/
+
+#mooRainbow {
+    font-size: 11px;
+    color: #000;
+}
+
+.moor-box {
+    width: 125px;
+    height: 110px;
+    border: 1px solid #636163;
+    background-color: #e5e5e5;
+}
+
+.moor-overlayBox {
+    width: 80px; /* Width and Height of the overlay must be setted here: default 256x256 */
+    height: 80px;
+    margin-top: 3px;
+    margin-left: 3px;
+    border: 1px solid #000;
+}
+
+.moor-slider {
+    border: 1px solid #000;
+    margin-top: 3px;
+    margin-left: 86px;
+    width: 10px; /* if you want a bigger or smaller slider... */
+    height: 80px;
+}
+
+.moor-colorBox {
+/*display: none;*/
+    visibility: hidden;
+    border: 1px solid #000;
+    width: 59px;
+    height: 68px;
+    margin-top: 20px;
+    margin-left: 315px;
+}
+
+.moor-currentColor {
+/* Bottom Box Color, the backup one */
+/*display: none;*/
+    visibility: hidden;
+    margin-top: 55px;
+    margin-left: 316px;
+    width: 59px;
+    height: 34px;
+}
+
+.moor-okButton {
+    font-family: Tahoma;
+    font-weight: bold;
+    font-size: 8px;
+    margin-top: 90px;
+    margin-left: 3px;
+    background: #e6e6e6;
+    height: 15px;
+    border: 1px solid #d6d6d6;
+    border-left-color: #f5f5f5;
+    border-top-color: #f5f5f5;
+}
+
+label {
+    font-family: mono;
+}
+
+/* Following are just <label> */
+.moor-rLabel {
+/*display: none;*/
+    visibility: hidden;
+    margin-top: 100px;
+    margin-left: 315px;
+}
+
+.moor-gLabel {
+/*display: none;*/
+    visibility: hidden;
+    margin-top: 125px;
+    margin-left: 315px;
+}
+
+.moor-bLabel {
+/*display: none;*/
+    visibility: hidden;
+    margin-top: 150px;
+    margin-left: 315px;
+}
+
+.moor-HueLabel {
+/*display: none;*/
+    visibility: hidden;
+    margin-top: 190px;
+    margin-left: 315px;
+}
+
+span.moor-ballino {
+/* Style hue ? (degree) !! */
+/*display: none;*/
+    visibility: hidden;
+    margin-top: 190px;
+    margin-left: 370px;
+}
+
+.moor-SatuLabel {
+/*display: none;*/
+    visibility: hidden;
+    margin-top: 215px;
+    margin-left: 315px;
+}
+
+.moor-BrighLabel {
+    display: none;
+    margin-top: 240px;
+    margin-left: 315px;
+}
+
+.moor-hexLabel {
+    font-size: 0px;
+    margin-top: 90px;
+    margin-left: 70px;
+}
+
+/* <input> */
+.moor-rInput, .moor-gInput, .moor-bInput, .moor-HueInput, .moor-SatuInput, .moor-BrighInput {
+/*display: none;*/
+    visibility: hidden;
+    width: 30px;
+}
+
+.moor-hexInput {
+    font-size: 9px;
+    width: 45px;
+}
+
+.moor-cursor {
+    background-image: url( ../images/moor_cursor.gif );
+    width: 12px;
+    height: 12px;
+}
+
+.moor-arrows {
+/*display: none;*/
+    visibility: hidden; /*background-image: url(images/moor_arrows.gif);*/
+    top: 9px;
+    left: 270px;
+    width: 41px;
+    height: 9px;
+}
+
+.moor-chooseColor {
+    margin-left: 100px;
+    margin-top: 3px;
+    width: 20px;
+    height: 82px;
+}
+
+/***************************************************************************************************
+Title : Lightbox CSS
+Author : Kevin Hale
+URL : http://particletree.com/features/lightbox-gone-wild/
+
+Created : January 13, 2006
+Modified : February 1, 2006
+
+/*******************************************/
+
+#lightbox {
+    display: none;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    z-index: 9999;
+    width: 300px;
+    height: 300px;
+    margin: -150px 0 0 -150px;
+}
+
+#lightbox[id] {
+    position: fixed;
+}
+
+#overlay {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 3000px; /* IE hack */
+    height: 3000px; /* IE hack */
+    z-index: 5000;
+    background-color: snow;
+    -moz-opacity: 0.8;
+    opacity: .80;
+    filter: alpha( opacity = 80 );
+}
+
+#overlay[id] {
+    position: fixed;
+}
+
+#lightbox.done #lbLoadMessage {
+    display: none;
+}
+
+#lightbox.done #lbContent {
+    display: block;
+}
+
+#lightbox.loading #lbContent {
+    display: none;
+}
+
+#lightbox.loading #lbLoadMessage {
+    display: block;
+}
+
+/*Pop Up Menu*/
+.leftMenu {
+    float: left;
+}
+
+.subMenu2 {
+    visibility: hidden;
+    position: absolute;
+    z-index: 4;
+    background-color: white;
+    border: 1px solid black;
+    clear: both;
+    text-align:left;
+    width: 90px;
+}
+
+.subMenu2 {
+
+    border: 1px solid #093a9d;
+    background-color: #E2F0F6;
+}
+
+.subMenu2 a {
+    display: block;
+    text-decoration: none; /*margin: 4px;*/
+    font-size: 13px;
+    padding: 3px;
+}
+
+.subMenu2Sep {
+
+    border-bottom: 1px solid  #093a9d;
+}
+
+.subMenu2 a:hover, .subMenu2 .menuButton:hover {
+    background-color: #4D79CF;
+    color: white;
+}
+
+.subMenu .menuLink {
+    padding: 4px;
+}
+
+.subMenu2 .menuButton {
+    cursor: pointer;
+    font-size: 13px;
+    padding: 5px;
+    color: black;
+}
+
+/* Windoo main window and frames */
+div.windoo {
+    position: absolute;
+    /*overflow: hidden;*/
+}
+
+div.windoo .windoo-drag {
+    cursor: move;
+}
+
+div.windoo div.windoo-body {
+    position: relative;
+    overflow: auto;
+    width: auto;
+    padding: 0;
+    text-align: left;
+}
+
+div.windoo div.windoo-frame {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    line-height: 0;
+}
+
+div.windoo div.windoo-frame .strut {
+    line-height: 0;
+    font-size: 0px;
+}
+
+div.windoo div.windoo-frame .title {
+    overflow: hidden;
+}
+
+div.windoo div.windoo-frame .title .title-text {
+    width: 100%;
+    overflow: hidden;
+}
+
+/* Windoo buttons */
+div.windoo a.windoo-button {
+    position: absolute;
+    display: block;
+    text-align: center;
+    text-decoration: none;
+    overflow: hidden;
+    text-indent: -1000em;
+    outline: none;
+    z-index: 10;
+}
+
+/* Minimized and maximazed states */
+div.windoo-maximized .windoo-sizer, div.windoo-minimized .windoo-sizer, div.windoo-rolled .windoo-sizer, div.windoo-minimized a.windoo-button {
+    display: none !important;
+}
+
+div.windoo-minimized a.windoo-restore {
+    display: block !important;
+}
+
+div.windoo-minimized div.windoo-body, div.windoo-minimized .windoo-pane,
+    div.windoo-rolled div.windoo-body, div.windoo-rolled .windoo-pane {
+    display: none !important;
+}
+
+/* Windoo sizers */
+div.windoo .windoo-sizer {
+    position: absolute;
+    overflow: hidden;
+    background: url( '../images/s.gif' );
+    z-index: 5;
+    -moz-user-select: none;
+}
+
+div.windoo .windoo-north {
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 6px;
+    cursor: n-resize;
+}
+
+div.windoo .windoo-south {
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 6px;
+    cursor: s-resize;
+}
+
+div.windoo .windoo-west {
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 6px;
+    cursor: w-resize;
+}
+
+div.windoo .windoo-east {
+    top: 0;
+    right: 0;
+    height: 100%;
+    width: 6px;
+    cursor: e-resize;
+}
+
+div.windoo .windoo-nw,
+    div.windoo .windoo-ne,
+    div.windoo .windoo-sw,
+    div.windoo .windoo-se {
+    width: 9px;
+    height: 9px;
+}
+
+div.windoo .windoo-nw {
+    top: 0;
+    left: 0;
+    cursor: nw-resize;
+}
+
+div.windoo .windoo-ne {
+    top: 0;
+    right: 0;
+    cursor: ne-resize;
+}
+
+div.windoo .windoo-sw {
+    bottom: 0;
+    left: 0;
+    cursor: sw-resize;
+}
+
+div.windoo .windoo-se {
+    bottom: 0;
+    right: 0;
+    cursor: se-resize;
+}
+
+/* Windoo ghost sizer */
+div.windoo-ghost {
+    border: dotted #0d0 2px;
+    position: absolute;
+    -moz-user-select: none;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    background: transparent url( '../images/s.gif' );
+}
+
+/* Windoo simple shadow */
+div.windoo-shadow-simple {
+    position: absolute;
+    padding: 0;
+    overflow: hidden;
+}
+
+div.windoo-shadow-simple div.c {
+}
+
+/* Modal window shadow overlay */
+div.windoo-modal-overlay {
+}
diff --git a/trunk/wise-webapp/src/main/webapp/css/wisehome.css b/trunk/wise-webapp/src/main/webapp/css/wisehome.css
new file mode 100644
index 00000000..47478088
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/css/wisehome.css
@@ -0,0 +1,718 @@
+/* GLOBAL COMPONENTS */
+@import "common.css";
+@import "commonLibs.css";
+@import "thirdparty.css";
+
+/* INTRO STYLES */
+.button {
+    cursor: pointer;
+}
+
+#intro {
+    width: 100%;
+    height: 310px;
+    border-bottom: 1px solid #bbb4d6;
+    background-color: #e5e5e5;
+}
+
+#introContent {
+    width: 800px;
+    margin: auto;
+    position: relative;
+    height: 250px;
+    clear: both;
+}
+
+#introAnimation {
+    float: left;
+    width: 510px;
+    height: 210px;
+    margin: 40px 12px 0px 10px;
+}
+
+.contentImage {
+    height: 210px;
+    width: 245px;
+    float: left;
+}
+
+.contentText {
+    float: left;
+    width: 255px;
+    margin-left: 50px;
+    margin-top: 25px;
+    font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif;
+}
+
+.contentTitle {
+    width: 100px;
+    font-size: 22px;
+    font-weight: bold;
+    color: #808080;
+    margin-left: -2px;
+}
+
+.contentDescription {
+    font-size: 15px;
+    font-weight: normal;
+}
+
+#introRightContent {
+    float: left;
+    width: 190px;
+    margin-top: 20px;
+}
+
+#searchAdvance {
+    padding: 5px;
+    border: 1px dotted white;
+}
+
+#searchAdvance table {
+    padding: 5px;
+}
+
+#searchResult {
+    clear: both;
+    width: 100%;
+    height: 550px;
+    overflow: auto;
+    border: 0px solid gray;
+    background-color: white;
+    z-index: 2;
+    position: relative;
+    padding: 20px;
+}
+
+#searchResultTable table {
+    width: 100%;
+    border: 0px solid gray;
+    background-color: white;
+}
+
+#searchResultTable thead, #searchAdvance thead {
+    background-color: #093A9D;
+    font-size: 12px;
+    font-weight: normal;
+    padding: 5px;
+}
+
+#searchResultTable td {
+    text-align: center;
+    border-bottom: 1px solid #EEEEEE;
+    color: #999999;
+    font-size: 12px;
+    padding: 3px;
+}
+
+#searchResultTable th, #searchAdvance th {
+    color: white;
+    border-right: 1px dotted #ffffff;
+    font-weight: bold;
+    text-align: center;
+    font-size: 12px;
+    padding: 5px;
+}
+
+#searchResultTable tbody tr:hover {
+    background-color: #E2f0f6;
+}
+
+#searchResultTable tr {
+    padding: 5px;
+}
+
+#searchResultTable .mapTitle {
+    font-size: 13px;
+    color: #666666;
+    font-weight: bold;
+}
+
+#searchResultTable .mapTags {
+    font-size: 11px;
+    color: black;
+}
+
+#searchResult .sb-inner {
+    background: #C3DEF5;
+}
+
+#searchResult .sb-border {
+    background: #A7C6DF;
+}
+
+#search {
+    clear: both;
+    width: 200px;
+    font-size: 12px;
+    padding: 9px 9px 0px;
+}
+
+#searchTitleContainer {
+    background: url( ../images/search3.png ) no-repeat left;
+    padding-left: 35px;
+    padding-bottom: 10px;
+    behavior: url( ../css/iepngfix.htc );
+}
+
+#searchTitle {
+    height: 16px;
+    top: 3px;
+    color: #6186CB;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+#searchText {
+    margin-bottom: 10px;
+}
+
+#searchField {
+    margin-bottom: 5px;
+}
+
+#searchField input {
+    color: gray;
+    width: 93%;
+}
+
+#searchButton {
+    height: 30px;
+}
+
+#searchButtonContainer {
+    float: right;
+    margin-right: 10px;
+}
+
+#searchBtnStart {
+    width: 6px;
+    height: 25px;
+    background: url( ../images/btnStart.png ) no-repeat left top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+#searchBtnBody {
+    background: url( ../images/btnBody.png );
+    height: 18px;
+    float: left;
+    padding: 0px 0px;
+    padding-top: 5px;
+    text-align: center;
+    color: black;
+}
+
+#searchBtnEnd {
+    width: 7px;
+    height: 25px;
+    background: url( ../images/btnEnd.png ) no-repeat right top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+#tryNow {
+    clear: both;
+    font-size: 20px;
+    text-align: center;
+    margin-top: 10px;
+    margin-left: 20px;
+    height:70px;
+}
+
+div#tryNow a {
+    text-decoration: none;
+}
+
+div#tryNow .tryBtnStart {
+    width: 10px;
+    height: 70px;
+    background: url( ../images/tryItStartBtn2.png ) no-repeat left top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+div#tryNow .tryBtnBody {
+    height: 70px;
+    background: url( ../images/tryItBodyBtn2.png );
+    float: left;
+    width: 145px;
+}
+
+div#tryNow .tryBtnEnd {
+    width: 11px;
+    height: 70px;
+    background: url( ../images/tryItEndBtn2.png ) no-repeat right top;
+    float: left;
+}
+
+div#tryNow .tryBtnText {
+    padding: 0px 20px;
+    position: relative;
+    height: 70px;
+    font-size: 20px;
+    color: #093A9D;
+    font-weight: bold;
+    top: 50%;
+    margin-top: -13px;
+    white-space: normal;
+}
+
+#video {
+    clear: both;
+    font-size: 12px;
+    text-align: center;
+    margin-top: 10px;
+    margin-left: 20px;
+    height:51px;
+}
+
+div#video .videoIconContainer {
+    display:inline;
+    height:51px;
+    margin-right:10px;
+    position:relative;
+    top:14px;
+    width:20px;
+}
+
+div#video img {
+    width:20px;
+}
+
+div#video a {
+    text-decoration: none;
+}
+
+div#video .videoBtnStart {
+    width: 10px;
+    height: 51px;
+    background: url( ../images/videoStart.png ) no-repeat left top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+div#video .videoBtnBody {
+    height: 51px;
+    background: url( ../images/videoBody.png );
+    float: left;
+    width: 145px;
+}
+
+div#video .videoBtnEnd {
+    width: 10px;
+    height: 51px;
+    background: url( ../images/videoEnd.png ) no-repeat right top;
+    float: left;
+}
+
+div#video .videoBtnText {
+    position: relative;
+    height: 70px;
+    font-size: 12px;
+    color: #093A9D;
+    font-weight: bold;
+    white-space: normal;
+    display:inline;
+    width:125px;
+    
+}
+/* MAIN CONTENT STYLES */
+
+#main {
+    width: 800px;
+    margin: auto;
+    position: relative;
+    height: 315px;
+    clear: both;
+}
+
+#mainContent, #introContent {
+    padding: 10px 0 15px 0;
+    font-size: 80%;
+    width: 800px;
+}
+
+.separator {
+    width: 520px;
+    padding-bottom: 40px;
+    margin-bottom: 40px;
+}
+
+#newsAndArticles, #recentMaps, #join {
+    width: 230px;
+    float: left;
+    margin-right: 0;
+    padding: 9px;
+}
+
+#recentMaps {
+    margin-right: 10px;
+    margin-left: 10px;
+}
+
+#join {
+
+}
+
+#join a {
+    text-decoration: none;
+}
+
+div#signUpButton {
+    color: black;
+    padding: 5px;
+    margin-bottom: 5px; /*text-align: center;*/
+    font-weight: bold;
+}
+
+div#signUpButton a {
+    font-size: 120%; /*color: #660066;*/
+    width: 100%;
+}
+
+div#signUpButton .signUpBtnContainer {
+    left: 60px;
+}
+
+div#signUpButton .signUpStartBtn {
+    width: 5px;
+    height: 25px;
+    background: url( ../images/signUpStartBtn.png ) no-repeat left top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+div#signUpButton .signUpBodyBtn {
+    height: 25px;
+    width: 70px;
+    background: url( ../images/signUpBodyBtn.png );
+    white-space: nowrap;
+    float: left;
+
+}
+
+div#signUpButton .signUpEndBtn {
+    width: 7px;
+    height: 25px;
+    background: url( ../images/signUpEndBtn.png ) no-repeat right top;
+    behavior: url( ../css/iepngfix.htc );
+    float: left;
+}
+
+div#signUpButton .signUpText {
+    padding: 0px 20px;
+    position: relative;
+    height: 25px;
+    color: #093A9D;
+    font-weight: bold;
+    top: 50%;
+    margin-top: -7px;
+}
+
+#newsAndArticles dl, #recentMaps dl, #join dl, #search dl {
+    width: 100%; /*padding-bottom: 15px;*/
+    color: black;
+}
+
+#newsAndArticles dl dt, #join dl dt, #search dl dt {
+    margin: 0;
+    color: black;
+    font-weight: bold;
+    padding: 10px 0 5px 0;
+}
+
+#newsAndArticles dl dd, #join dl dd, #search dl dd {
+    padding: 0;
+    margin: 0;
+}
+
+div#news {
+    float: left;
+    width: 400px;
+}
+
+#recentMaps dl dt {
+    margin: 0;
+    color: black;
+    font-weight: bold;
+}
+
+#recentMaps dt {
+    padding-top: 3px;
+}
+
+#recentMaps dd {
+    padding-bottom: 3px;
+    margin: 0;
+    border-bottom: 1px solid #E5E5E5;
+}
+
+#newsAndArticles h1, #recentMaps h1, #join h1, #search h1 {
+    color: #093A9D;
+    font-size: 150%;
+    text-align: center;
+    font-weight: bold;
+}
+
+#join dl {
+    padding-bottom: 10px;
+}
+
+#join h1 {
+    color: white;
+}
+
+#join dd {
+    color: white;
+}
+
+#join dt {
+    color: white;
+    font-size: medium;
+}
+
+#join .sb-inner {
+    background: #9a8fc3;
+}
+
+#join .sb-shadow {
+    background: white;
+}
+
+#join .sb-border {
+    background: #A29BBF;
+}
+
+#newsAndArticles .sb-inner, #recentMaps .sb-inner {
+    background: #c3def5;
+}
+
+#newsAndArticles .sb-shadow, #recentMaps .sb-shadow {
+    background: white;
+}
+
+#newsAndArticles .sb-border, #recentMaps .sb-border {
+    background: #A7C6DF;
+}
+
+#recentMapsContent, #newsContent, #joinContent {
+    padding: 5px 10px;
+}
+
+#recentMapsContent .sb-inner, #newsContent .sb-inner {
+    background: white;
+}
+
+#recentMapsContent .sb-border, #newsContent .sb-border {
+    background: #A7C6DF;
+}
+
+#search dl {
+    padding-bottom: 10px;
+}
+
+#search h1 {
+    color: white;
+}
+
+#search dd {
+    color: white;
+}
+
+#search dt {
+    color: white;
+    font-size: medium;
+}
+
+#search .sb-inner {
+    background: white;
+}
+
+#search .sb-shadow {
+    background: white;
+}
+
+#search .sb-border {
+    background: #6186CB;
+}
+
+/* Finish homepage styles  */
+
+div#mainBody {
+    margin: 10px auto;
+    width: 800px; /*margin-bottom: 100px; *//* height brokes all the tables on IE*/
+    height: 300px;
+}
+
+div#news li {
+    background: transparent url( ../images/icon_triangle_grey_12x13.gif ) no-repeat scroll 0pt;
+    list-style-image: none;
+    list-style-position: outside;
+    list-style-type: none;
+    margin-bottom: 12px;
+    padding: 2px 0pt 5px 20px;
+}
+
+div#news ul {
+    padding: 5px 40px;
+}
+
+div#news h1 {
+    font-size: 200%;
+    color: #1E4BA5;
+    font-weight: bold;
+}
+
+div#login {
+    float: right;
+    width: 350px;
+    padding: 10px;
+}
+
+div#login .sb-inner, div#forgotPasswordContainer .sb-inner, div#userRegistration .sb-inner {
+    background-color: #eeeeee;
+}
+
+#forgotPasswordContainer {
+    width: 500px;
+    padding: 10px;
+}
+
+div#login .sb-border, div#forgotPasswordContainer .sb-border, div#userRegistration .sb-border {
+    background-color: #cfcfcf;
+}
+
+/* This is used to fix IE explorer bug rendering rounded corners*/
+div#loginContent {
+    width: 100%;
+    min-height: 250px;
+}
+
+div#loginContent td, div#userRegistrationContent td, div#forgotPasswordContent td {
+    padding: 3px;
+}
+
+div#login h1, div#forgotPasswordContainer h1, div#userRegistration h1 {
+    color: gray;
+    font-size: 200%;
+    margin-bottom: 10px;
+    font-weight: normal;
+}
+
+div#forgotPasswordContainer h2, div#userRegistration h2 {
+    color: black;
+    margin-bottom: 5px;
+    font-size: 110%;
+    border: none;
+    font-weight: normal;
+}
+
+div#userRegistration {
+    padding: 10px;
+}
+
+div#register {
+    position: relative;
+    margin: 10px auto;
+    width: 800px;
+    text-align: center;
+    white-space: nowrap;
+}
+
+div#register a {
+    color: #003399;
+    font-weight: bold;
+}
+
+/* WiseMap details */
+#detailContent {
+    width: 700px;
+    height: 100%;
+    padding: 10px;
+}
+
+#detailContent .sb-inner {
+    background: #C3DEF5;
+}
+
+#detailContent .sb-border {
+    background: #A7C6DF;
+}
+
+#detail {
+    margin: 10px auto;
+    height: 100%;
+    padding: 8px;
+}
+
+#detail table {
+    background-color: white;
+    width: 100%;
+}
+
+#detail td {
+    padding: 5px;
+    vertical-align: top;
+}
+
+#detail .sb-inner {
+    background: white;
+}
+
+#detail .sb-border {
+    background: #E5E5E5;
+}
+
+#detailTitle {
+    color: #093A9D;
+    font-weight: bold;
+    font-size: 14px;
+    padding-left: 5px;
+}
+
+#detailTitle img {
+    padding-left: 5px;
+}
+
+#detailTitle span {
+    color: #8e9181;
+    font-weight: normal;
+    font-size: 14px;
+}
+
+#detail h1 {
+    color: black;
+    font-weight: bolder;
+}
+
+#detail .evenRow {
+    background-color: #ebeef1;
+}
+
+#detail .oddRow {
+    background-color: #eff3f5;
+}
+
+div.pageBodyContent ol {
+    margin-left: 12px;
+}
+
+div.pageBodyContent ul {
+    list-style-position: outside;
+}
+
+div.pageBodyContent ol li {
+    list-style-type: decimal;
+}
+
+div.newsContainer {
+    clear:both;
+    margin-bottom:20px;
+    padding:10px;
+    width:100%;
+}
+div.newsContainer h2 {
+    padding:10px;
+    color:#6B628F;
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/images/WP1.png b/trunk/wise-webapp/src/main/webapp/images/WP1.png
new file mode 100644
index 00000000..d1c046ff
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/WP1.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/WP2.png b/trunk/wise-webapp/src/main/webapp/images/WP2.png
new file mode 100644
index 00000000..7422d857
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/WP2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/WP3.png b/trunk/wise-webapp/src/main/webapp/images/WP3.png
new file mode 100644
index 00000000..a2daa174
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/WP3.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/WP4.png b/trunk/wise-webapp/src/main/webapp/images/WP4.png
new file mode 100644
index 00000000..4ffe56e3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/WP4.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/aboutColors.png b/trunk/wise-webapp/src/main/webapp/images/aboutColors.png
new file mode 100755
index 00000000..326507ea
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/aboutColors.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/add.png b/trunk/wise-webapp/src/main/webapp/images/add.png
new file mode 100755
index 00000000..6332fefe
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/add.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/ajax-loader.gif b/trunk/wise-webapp/src/main/webapp/images/ajax-loader.gif
new file mode 100644
index 00000000..baa98851
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/ajax-loader.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/ajax-loader2.gif b/trunk/wise-webapp/src/main/webapp/images/ajax-loader2.gif
new file mode 100644
index 00000000..ffcb5622
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/ajax-loader2.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/animatedPresentation.gif b/trunk/wise-webapp/src/main/webapp/images/animatedPresentation.gif
new file mode 100644
index 00000000..f6ebf736
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/animatedPresentation.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/application_view_icons.png b/trunk/wise-webapp/src/main/webapp/images/application_view_icons.png
new file mode 100755
index 00000000..fa34cf70
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/application_view_icons.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/application_view_tile.png b/trunk/wise-webapp/src/main/webapp/images/application_view_tile.png
new file mode 100755
index 00000000..ae7f4dc5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/application_view_tile.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_down.gif b/trunk/wise-webapp/src/main/webapp/images/arrow_down.gif
new file mode 100644
index 00000000..552f123e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_down.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_down.png b/trunk/wise-webapp/src/main/webapp/images/arrow_down.png
new file mode 100755
index 00000000..2c4e2793
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_down.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_left.png b/trunk/wise-webapp/src/main/webapp/images/arrow_left.png
new file mode 100755
index 00000000..5dc69678
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_left.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_merge.png b/trunk/wise-webapp/src/main/webapp/images/arrow_merge.png
new file mode 100755
index 00000000..7502dbb3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_merge.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_right.png b/trunk/wise-webapp/src/main/webapp/images/arrow_right.png
new file mode 100755
index 00000000..4bfba64a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_right.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_rotate_anticlockwise.png b/trunk/wise-webapp/src/main/webapp/images/arrow_rotate_anticlockwise.png
new file mode 100755
index 00000000..46c75aa8
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_rotate_anticlockwise.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_rotate_clockwise.png b/trunk/wise-webapp/src/main/webapp/images/arrow_rotate_clockwise.png
new file mode 100755
index 00000000..aa65210e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_rotate_clockwise.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_turn_left.png b/trunk/wise-webapp/src/main/webapp/images/arrow_turn_left.png
new file mode 100755
index 00000000..a3d6c9e3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_turn_left.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_turn_right.png b/trunk/wise-webapp/src/main/webapp/images/arrow_turn_right.png
new file mode 100755
index 00000000..629f20d6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_turn_right.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/arrow_up.png b/trunk/wise-webapp/src/main/webapp/images/arrow_up.png
new file mode 100755
index 00000000..1ebb1932
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/arrow_up.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/backColor.png b/trunk/wise-webapp/src/main/webapp/images/backColor.png
new file mode 100755
index 00000000..bbd0d8ef
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/backColor.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/balloon.gif b/trunk/wise-webapp/src/main/webapp/images/balloon.gif
new file mode 100644
index 00000000..0573af01
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/balloon.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/balloon.png b/trunk/wise-webapp/src/main/webapp/images/balloon.png
new file mode 100644
index 00000000..45a7db8f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/balloon.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/beta.png b/trunk/wise-webapp/src/main/webapp/images/beta.png
new file mode 100644
index 00000000..eb3990aa
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/beta.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bg-center.gif b/trunk/wise-webapp/src/main/webapp/images/bg-center.gif
new file mode 100755
index 00000000..4d12d274
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bg-center.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bg-left.gif b/trunk/wise-webapp/src/main/webapp/images/bg-left.gif
new file mode 100755
index 00000000..9cebb780
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bg-left.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bg-right.gif b/trunk/wise-webapp/src/main/webapp/images/bg-right.gif
new file mode 100755
index 00000000..3d871f96
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bg-right.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bin.png b/trunk/wise-webapp/src/main/webapp/images/bin.png
new file mode 100755
index 00000000..ebad933c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bin.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/black-keyboard.png b/trunk/wise-webapp/src/main/webapp/images/black-keyboard.png
new file mode 100644
index 00000000..5d670cca
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/black-keyboard.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/blank.gif b/trunk/wise-webapp/src/main/webapp/images/blank.gif
new file mode 100755
index 00000000..c9c195fd
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/blank.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bodyImg.png b/trunk/wise-webapp/src/main/webapp/images/bodyImg.png
new file mode 100755
index 00000000..424dc89a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bodyImg.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/body_btn.gif b/trunk/wise-webapp/src/main/webapp/images/body_btn.gif
new file mode 100644
index 00000000..180e276d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/body_btn.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bold.png b/trunk/wise-webapp/src/main/webapp/images/bold.png
new file mode 100755
index 00000000..dbefe42d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bold.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/borderColor.png b/trunk/wise-webapp/src/main/webapp/images/borderColor.png
new file mode 100755
index 00000000..f8242e7e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/borderColor.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/btnBody.png b/trunk/wise-webapp/src/main/webapp/images/btnBody.png
new file mode 100644
index 00000000..bf1859d6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/btnBody.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/btnBody2.png b/trunk/wise-webapp/src/main/webapp/images/btnBody2.png
new file mode 100644
index 00000000..6201347c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/btnBody2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/btnEnd.png b/trunk/wise-webapp/src/main/webapp/images/btnEnd.png
new file mode 100644
index 00000000..9bffd593
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/btnEnd.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/btnEnd2.png b/trunk/wise-webapp/src/main/webapp/images/btnEnd2.png
new file mode 100644
index 00000000..348e4674
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/btnEnd2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/btnStart.png b/trunk/wise-webapp/src/main/webapp/images/btnStart.png
new file mode 100644
index 00000000..5f6b6ef9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/btnStart.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/btnStart2.png b/trunk/wise-webapp/src/main/webapp/images/btnStart2.png
new file mode 100644
index 00000000..7906d0dc
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/btnStart2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/btn_newdoc.gif b/trunk/wise-webapp/src/main/webapp/images/btn_newdoc.gif
new file mode 100644
index 00000000..78aa2482
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/btn_newdoc.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom.png
new file mode 100644
index 00000000..75d38a15
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_blue.gif
new file mode 100644
index 00000000..be8955a4
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico.png
new file mode 100644
index 00000000..0b340f20
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.gif
new file mode 100644
index 00000000..28ffd19e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.png
new file mode 100644
index 00000000..de05a47a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_bottom_pico_blue.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left.png
new file mode 100644
index 00000000..3f5d468a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left_blue.gif
new file mode 100644
index 00000000..6917b999
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_left_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right.png
new file mode 100644
index 00000000..0df43f74
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right_blue.gif
new file mode 100644
index 00000000..7b56f19c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_bottom_right_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left.png
new file mode 100644
index 00000000..32cd8583
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left_blue.gif
new file mode 100644
index 00000000..f4372cea
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_left_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right.png
new file mode 100644
index 00000000..d469fb0f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right_blue.gif
new file mode 100644
index 00000000..a0caeed1
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_corner_top_right_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_left.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_left.png
new file mode 100644
index 00000000..b4636a4b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_left.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_left_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_left_blue.gif
new file mode 100644
index 00000000..9882af64
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_left_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom.png
new file mode 100644
index 00000000..7bb0e508
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom_blue.gif
new file mode 100644
index 00000000..58f92fc9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_bottom_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left.png
new file mode 100644
index 00000000..f74c392a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left_blue.gif
new file mode 100644
index 00000000..ba1cf748
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_left_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right.png
new file mode 100644
index 00000000..eb0a0d62
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right_blue.gif
new file mode 100644
index 00000000..b2c7ae9f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_bottom_right_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left.png
new file mode 100644
index 00000000..db6ee9e8
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left_blue.gif
new file mode 100644
index 00000000..7b3b9032
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_left_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right.png
new file mode 100644
index 00000000..7ba7b4cc
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right_blue.gif
new file mode 100644
index 00000000..d427b4a5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_corner_top_right_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_top.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_top.png
new file mode 100644
index 00000000..64beb4e9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_top.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_top_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_top_blue.gif
new file mode 100644
index 00000000..ab43e59c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_pico_top_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_right.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_right.png
new file mode 100644
index 00000000..6140b359
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_right.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_right_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_right_blue.gif
new file mode 100644
index 00000000..2900ecf5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_right_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top.png
new file mode 100644
index 00000000..7a59f634
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_blue.gif
new file mode 100644
index 00000000..f95a0557
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico.png
new file mode 100644
index 00000000..51d94c2b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.gif b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.gif
new file mode 100644
index 00000000..87925f1d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.png b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.png
new file mode 100644
index 00000000..c1e6c76e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bubbleTip_top_pico_blue.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bullet_black.png b/trunk/wise-webapp/src/main/webapp/images/bullet_black.png
new file mode 100755
index 00000000..57619706
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bullet_black.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bullet_blue.png b/trunk/wise-webapp/src/main/webapp/images/bullet_blue.png
new file mode 100755
index 00000000..a7651ec8
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bullet_blue.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bullet_green.png b/trunk/wise-webapp/src/main/webapp/images/bullet_green.png
new file mode 100755
index 00000000..058ad261
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bullet_green.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bullet_orange.png b/trunk/wise-webapp/src/main/webapp/images/bullet_orange.png
new file mode 100755
index 00000000..fa63024e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bullet_orange.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bullet_pink.png b/trunk/wise-webapp/src/main/webapp/images/bullet_pink.png
new file mode 100755
index 00000000..0c9f73e3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bullet_pink.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bullet_purple.png b/trunk/wise-webapp/src/main/webapp/images/bullet_purple.png
new file mode 100755
index 00000000..52ba5036
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bullet_purple.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/bullet_red.png b/trunk/wise-webapp/src/main/webapp/images/bullet_red.png
new file mode 100755
index 00000000..0cd80311
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/bullet_red.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/buttons.gif b/trunk/wise-webapp/src/main/webapp/images/buttons.gif
new file mode 100644
index 00000000..82eecbe6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/buttons.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/buttonsaqua.gif b/trunk/wise-webapp/src/main/webapp/images/buttonsaqua.gif
new file mode 100644
index 00000000..3ddb7860
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/buttonsaqua.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/chart_bar.png b/trunk/wise-webapp/src/main/webapp/images/chart_bar.png
new file mode 100755
index 00000000..9051fbc6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/chart_bar.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/chart_curve.png b/trunk/wise-webapp/src/main/webapp/images/chart_curve.png
new file mode 100755
index 00000000..01e933a6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/chart_curve.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/chart_line.png b/trunk/wise-webapp/src/main/webapp/images/chart_line.png
new file mode 100755
index 00000000..85020f32
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/chart_line.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/chart_organisation.png b/trunk/wise-webapp/src/main/webapp/images/chart_organisation.png
new file mode 100755
index 00000000..c32d25c1
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/chart_organisation.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/chart_pie.png b/trunk/wise-webapp/src/main/webapp/images/chart_pie.png
new file mode 100755
index 00000000..fe00fa05
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/chart_pie.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/cleardot.gif b/trunk/wise-webapp/src/main/webapp/images/cleardot.gif
new file mode 100644
index 00000000..35d42e80
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/cleardot.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/clock.png b/trunk/wise-webapp/src/main/webapp/images/clock.png
new file mode 100755
index 00000000..e2672c20
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/clock.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/clock_red.png b/trunk/wise-webapp/src/main/webapp/images/clock_red.png
new file mode 100755
index 00000000..2842cc33
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/clock_red.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/close.png b/trunk/wise-webapp/src/main/webapp/images/close.png
new file mode 100644
index 00000000..4de1c381
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/close.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/close12_1.gif b/trunk/wise-webapp/src/main/webapp/images/close12_1.gif
new file mode 100644
index 00000000..e2f67d72
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/close12_1.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/closelabel.gif b/trunk/wise-webapp/src/main/webapp/images/closelabel.gif
new file mode 100644
index 00000000..7eab9ba8
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/closelabel.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/coins.png b/trunk/wise-webapp/src/main/webapp/images/coins.png
new file mode 100755
index 00000000..0ca9074d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/coins.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/collab_publish.png b/trunk/wise-webapp/src/main/webapp/images/collab_publish.png
new file mode 100644
index 00000000..fa862d61
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/collab_publish.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/collab_share.png b/trunk/wise-webapp/src/main/webapp/images/collab_share.png
new file mode 100644
index 00000000..2e1594eb
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/collab_share.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/collab_tag.png b/trunk/wise-webapp/src/main/webapp/images/collab_tag.png
new file mode 100644
index 00000000..b06c7d25
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/collab_tag.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/color_swatch.png b/trunk/wise-webapp/src/main/webapp/images/color_swatch.png
new file mode 100755
index 00000000..ecb0ac7e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/color_swatch.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/comment.png b/trunk/wise-webapp/src/main/webapp/images/comment.png
new file mode 100755
index 00000000..00352e5b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/comment.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/connect.png b/trunk/wise-webapp/src/main/webapp/images/connect.png
new file mode 100755
index 00000000..024138eb
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/connect.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/cross.png b/trunk/wise-webapp/src/main/webapp/images/cross.png
new file mode 100755
index 00000000..1514d51a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/cross.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/delNode.png b/trunk/wise-webapp/src/main/webapp/images/delNode.png
new file mode 100755
index 00000000..69baa4bc
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/delNode.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/delete.png b/trunk/wise-webapp/src/main/webapp/images/delete.png
new file mode 100755
index 00000000..08f24936
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/delete.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/disconnect.png b/trunk/wise-webapp/src/main/webapp/images/disconnect.png
new file mode 100755
index 00000000..b335cb11
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/disconnect.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/east.gif b/trunk/wise-webapp/src/main/webapp/images/east.gif
new file mode 100644
index 00000000..639dd99c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/east.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/end_btn.gif b/trunk/wise-webapp/src/main/webapp/images/end_btn.gif
new file mode 100644
index 00000000..06596f71
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/end_btn.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/error_icon.png b/trunk/wise-webapp/src/main/webapp/images/error_icon.png
new file mode 100644
index 00000000..c37bd062
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/error_icon.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-angel.png b/trunk/wise-webapp/src/main/webapp/images/face-angel.png
new file mode 100644
index 00000000..d2c5e940
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-angel.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-crying.png b/trunk/wise-webapp/src/main/webapp/images/face-crying.png
new file mode 100644
index 00000000..a7e3f49f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-crying.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-devilish.png b/trunk/wise-webapp/src/main/webapp/images/face-devilish.png
new file mode 100644
index 00000000..8e2cd458
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-devilish.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-glasses.png b/trunk/wise-webapp/src/main/webapp/images/face-glasses.png
new file mode 100644
index 00000000..d13f2c8c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-glasses.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-grin.png b/trunk/wise-webapp/src/main/webapp/images/face-grin.png
new file mode 100644
index 00000000..d15cf2d4
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-grin.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-kiss.png b/trunk/wise-webapp/src/main/webapp/images/face-kiss.png
new file mode 100644
index 00000000..809c1cf7
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-kiss.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-monkey.png b/trunk/wise-webapp/src/main/webapp/images/face-monkey.png
new file mode 100644
index 00000000..69db8fa5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-monkey.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-plain.png b/trunk/wise-webapp/src/main/webapp/images/face-plain.png
new file mode 100644
index 00000000..a6761bd1
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-plain.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-sad.png b/trunk/wise-webapp/src/main/webapp/images/face-sad.png
new file mode 100644
index 00000000..fa258956
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-sad.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-smile-big.png b/trunk/wise-webapp/src/main/webapp/images/face-smile-big.png
new file mode 100644
index 00000000..4cebcff6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-smile-big.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-smile.png b/trunk/wise-webapp/src/main/webapp/images/face-smile.png
new file mode 100644
index 00000000..01e01170
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-smile.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-surprise.png b/trunk/wise-webapp/src/main/webapp/images/face-surprise.png
new file mode 100644
index 00000000..863f3048
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-surprise.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/face-wink.png b/trunk/wise-webapp/src/main/webapp/images/face-wink.png
new file mode 100644
index 00000000..46be6855
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/face-wink.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/favicon.ico b/trunk/wise-webapp/src/main/webapp/images/favicon.ico
new file mode 100644
index 00000000..8b79d3c9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/favicon.ico differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/file_export.png b/trunk/wise-webapp/src/main/webapp/images/file_export.png
new file mode 100644
index 00000000..aec7cfb2
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/file_export.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/file_printer.png b/trunk/wise-webapp/src/main/webapp/images/file_printer.png
new file mode 100644
index 00000000..ecd1ff26
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/file_printer.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/file_redo.png b/trunk/wise-webapp/src/main/webapp/images/file_redo.png
new file mode 100644
index 00000000..3a8502c6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/file_redo.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/file_redo_dis.png b/trunk/wise-webapp/src/main/webapp/images/file_redo_dis.png
new file mode 100644
index 00000000..36cf9df3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/file_redo_dis.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/file_undo.png b/trunk/wise-webapp/src/main/webapp/images/file_undo.png
new file mode 100644
index 00000000..acd5a581
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/file_undo.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/file_undo_dis.png b/trunk/wise-webapp/src/main/webapp/images/file_undo_dis.png
new file mode 100644
index 00000000..6af29fe2
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/file_undo_dis.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/firefox.gif b/trunk/wise-webapp/src/main/webapp/images/firefox.gif
new file mode 100644
index 00000000..dbe55b48
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/firefox.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/firstSteps.png b/trunk/wise-webapp/src/main/webapp/images/firstSteps.png
new file mode 100644
index 00000000..b7cee199
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/firstSteps.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/flag_blue.png b/trunk/wise-webapp/src/main/webapp/images/flag_blue.png
new file mode 100755
index 00000000..003924f5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/flag_blue.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/flag_green.png b/trunk/wise-webapp/src/main/webapp/images/flag_green.png
new file mode 100755
index 00000000..e4bc611f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/flag_green.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/flag_orange.png b/trunk/wise-webapp/src/main/webapp/images/flag_orange.png
new file mode 100755
index 00000000..e6320242
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/flag_orange.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/flag_pink.png b/trunk/wise-webapp/src/main/webapp/images/flag_pink.png
new file mode 100755
index 00000000..5f15e526
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/flag_pink.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/flag_purple.png b/trunk/wise-webapp/src/main/webapp/images/flag_purple.png
new file mode 100755
index 00000000..d0698664
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/flag_purple.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/flag_yellow.png b/trunk/wise-webapp/src/main/webapp/images/flag_yellow.png
new file mode 100755
index 00000000..14c89a54
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/flag_yellow.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/font.png b/trunk/wise-webapp/src/main/webapp/images/font.png
new file mode 100755
index 00000000..6e06872f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/font.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/fontColor.png b/trunk/wise-webapp/src/main/webapp/images/fontColor.png
new file mode 100755
index 00000000..20bc2423
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/fontColor.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/fontSize.png b/trunk/wise-webapp/src/main/webapp/images/fontSize.png
new file mode 100644
index 00000000..2356c666
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/fontSize.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/font_bold.png b/trunk/wise-webapp/src/main/webapp/images/font_bold.png
new file mode 100644
index 00000000..e35db88c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/font_bold.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/font_color.png b/trunk/wise-webapp/src/main/webapp/images/font_color.png
new file mode 100644
index 00000000..de227993
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/font_color.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/font_italic.png b/trunk/wise-webapp/src/main/webapp/images/font_italic.png
new file mode 100644
index 00000000..8d915b04
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/font_italic.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/font_size.png b/trunk/wise-webapp/src/main/webapp/images/font_size.png
new file mode 100644
index 00000000..e3499795
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/font_size.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/font_type.png b/trunk/wise-webapp/src/main/webapp/images/font_type.png
new file mode 100644
index 00000000..eaccc509
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/font_type.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/footerBody.png b/trunk/wise-webapp/src/main/webapp/images/footerBody.png
new file mode 100644
index 00000000..da6cf551
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/footerBody.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/footerEnd.png b/trunk/wise-webapp/src/main/webapp/images/footerEnd.png
new file mode 100644
index 00000000..31504fe9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/footerEnd.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/footerStart.png b/trunk/wise-webapp/src/main/webapp/images/footerStart.png
new file mode 100644
index 00000000..93c33f9d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/footerStart.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/freeMind-import-export.png b/trunk/wise-webapp/src/main/webapp/images/freeMind-import-export.png
new file mode 100644
index 00000000..71c30122
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/freeMind-import-export.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/grid.gif b/trunk/wise-webapp/src/main/webapp/images/grid.gif
new file mode 100644
index 00000000..ab95bfb3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/grid.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/group.png b/trunk/wise-webapp/src/main/webapp/images/group.png
new file mode 100755
index 00000000..a7c3ade7
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/group.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/group2.png b/trunk/wise-webapp/src/main/webapp/images/group2.png
new file mode 100755
index 00000000..ca11887f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/group2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/group_go.png b/trunk/wise-webapp/src/main/webapp/images/group_go.png
new file mode 100755
index 00000000..1f523330
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/group_go.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/hd-sprite.gif b/trunk/wise-webapp/src/main/webapp/images/hd-sprite.gif
new file mode 100644
index 00000000..0d6d7edf
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/hd-sprite.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/help.png b/trunk/wise-webapp/src/main/webapp/images/help.png
new file mode 100755
index 00000000..5c870176
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/help.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/history.png b/trunk/wise-webapp/src/main/webapp/images/history.png
new file mode 100644
index 00000000..6e8052ff
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/history.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon-small.png b/trunk/wise-webapp/src/main/webapp/images/icon-small.png
new file mode 100755
index 00000000..0c618ca4
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon-small.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon.gif b/trunk/wise-webapp/src/main/webapp/images/icon.gif
new file mode 100644
index 00000000..cc45543c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon.png b/trunk/wise-webapp/src/main/webapp/images/icon.png
new file mode 100755
index 00000000..b6f8d24d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon_doc_big.gif b/trunk/wise-webapp/src/main/webapp/images/icon_doc_big.gif
new file mode 100644
index 00000000..e97a8bf3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon_doc_big.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon_list.png b/trunk/wise-webapp/src/main/webapp/images/icon_list.png
new file mode 100644
index 00000000..ce13eaf6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon_list.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon_menu.png b/trunk/wise-webapp/src/main/webapp/images/icon_menu.png
new file mode 100644
index 00000000..7ba11271
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon_menu.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon_triangle_green_13x19.gif b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_green_13x19.gif
new file mode 100644
index 00000000..437761a8
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_green_13x19.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_10x13.gif b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_10x13.gif
new file mode 100644
index 00000000..9ae0bcc0
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_10x13.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif
new file mode 100644
index 00000000..0bb01df5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_13x19.gif b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_13x19.gif
new file mode 100644
index 00000000..f25a10c2
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/icon_triangle_grey_13x19.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/italic.png b/trunk/wise-webapp/src/main/webapp/images/italic.png
new file mode 100755
index 00000000..006d4c59
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/italic.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/key.png b/trunk/wise-webapp/src/main/webapp/images/key.png
new file mode 100755
index 00000000..4ec1a928
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/key.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/lightbulb.png b/trunk/wise-webapp/src/main/webapp/images/lightbulb.png
new file mode 100755
index 00000000..d22fde8b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/lightbulb.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/lightbulb_off.png b/trunk/wise-webapp/src/main/webapp/images/lightbulb_off.png
new file mode 100755
index 00000000..e95b8c5b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/lightbulb_off.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/loading.gif b/trunk/wise-webapp/src/main/webapp/images/loading.gif
new file mode 100644
index 00000000..78733e4e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/loading.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/loadingIcon.gif b/trunk/wise-webapp/src/main/webapp/images/loadingIcon.gif
new file mode 100644
index 00000000..2dfb06a6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/loadingIcon.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/lock.png b/trunk/wise-webapp/src/main/webapp/images/lock.png
new file mode 100755
index 00000000..2ebc4f6f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/lock.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/lock_open.png b/trunk/wise-webapp/src/main/webapp/images/lock_open.png
new file mode 100755
index 00000000..a471765f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/lock_open.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/logo-big.png b/trunk/wise-webapp/src/main/webapp/images/logo-big.png
new file mode 100755
index 00000000..0b4befa6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/logo-big.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/logo-small.gif b/trunk/wise-webapp/src/main/webapp/images/logo-small.gif
new file mode 100644
index 00000000..80649cfb
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/logo-small.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/logo-small.png b/trunk/wise-webapp/src/main/webapp/images/logo-small.png
new file mode 100755
index 00000000..1b8e9692
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/logo-small.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/logo-vsmall.gif b/trunk/wise-webapp/src/main/webapp/images/logo-vsmall.gif
new file mode 100644
index 00000000..c205c11e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/logo-vsmall.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/logo-vsmall.png b/trunk/wise-webapp/src/main/webapp/images/logo-vsmall.png
new file mode 100755
index 00000000..4947f72e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/logo-vsmall.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/logo-vvsmall.png b/trunk/wise-webapp/src/main/webapp/images/logo-vvsmall.png
new file mode 100644
index 00000000..18551fe2
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/logo-vvsmall.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/mac-metaKey.png b/trunk/wise-webapp/src/main/webapp/images/mac-metaKey.png
new file mode 100644
index 00000000..63579a46
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/mac-metaKey.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/marca-vsmall.png b/trunk/wise-webapp/src/main/webapp/images/marca-vsmall.png
new file mode 100755
index 00000000..a07631d2
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/marca-vsmall.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/mindmap.png b/trunk/wise-webapp/src/main/webapp/images/mindmap.png
new file mode 100644
index 00000000..c5411d4e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/mindmap.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/money.png b/trunk/wise-webapp/src/main/webapp/images/money.png
new file mode 100755
index 00000000..42c52d05
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/money.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/money_dollar.png b/trunk/wise-webapp/src/main/webapp/images/money_dollar.png
new file mode 100755
index 00000000..59af1638
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/money_dollar.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/money_euro.png b/trunk/wise-webapp/src/main/webapp/images/money_euro.png
new file mode 100755
index 00000000..b322ba92
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/money_euro.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/money_pound.png b/trunk/wise-webapp/src/main/webapp/images/money_pound.png
new file mode 100755
index 00000000..b7113646
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/money_pound.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/money_yen.png b/trunk/wise-webapp/src/main/webapp/images/money_yen.png
new file mode 100755
index 00000000..228a6778
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/money_yen.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/moor_arrows.gif b/trunk/wise-webapp/src/main/webapp/images/moor_arrows.gif
new file mode 100755
index 00000000..c57addcf
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/moor_arrows.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/moor_boverlay.png b/trunk/wise-webapp/src/main/webapp/images/moor_boverlay.png
new file mode 100755
index 00000000..7ac228b0
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/moor_boverlay.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/moor_cursor.gif b/trunk/wise-webapp/src/main/webapp/images/moor_cursor.gif
new file mode 100755
index 00000000..9515a38e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/moor_cursor.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/moor_slider.png b/trunk/wise-webapp/src/main/webapp/images/moor_slider.png
new file mode 100755
index 00000000..9f4c47bf
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/moor_slider.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/moor_woverlay.png b/trunk/wise-webapp/src/main/webapp/images/moor_woverlay.png
new file mode 100755
index 00000000..c3f3e96e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/moor_woverlay.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/mymaps.png b/trunk/wise-webapp/src/main/webapp/images/mymaps.png
new file mode 100644
index 00000000..8aabdd2d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/mymaps.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newMap1.png b/trunk/wise-webapp/src/main/webapp/images/newMap1.png
new file mode 100644
index 00000000..d3f59fce
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newMap1.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newMap2.png b/trunk/wise-webapp/src/main/webapp/images/newMap2.png
new file mode 100644
index 00000000..3ab7a074
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newMap2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newNode.png b/trunk/wise-webapp/src/main/webapp/images/newNode.png
new file mode 100755
index 00000000..b1c2d4f5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newNode.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newmap.png b/trunk/wise-webapp/src/main/webapp/images/newmap.png
new file mode 100644
index 00000000..84dee22f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newmap.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newmap3.png b/trunk/wise-webapp/src/main/webapp/images/newmap3.png
new file mode 100644
index 00000000..07cb0934
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newmap3.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newmap4.png b/trunk/wise-webapp/src/main/webapp/images/newmap4.png
new file mode 100644
index 00000000..29ecf107
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newmap4.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newmap5.png b/trunk/wise-webapp/src/main/webapp/images/newmap5.png
new file mode 100644
index 00000000..d8bf081b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newmap5.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/newsLinks.png b/trunk/wise-webapp/src/main/webapp/images/newsLinks.png
new file mode 100644
index 00000000..d14a6bed
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/newsLinks.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/node_add.png b/trunk/wise-webapp/src/main/webapp/images/node_add.png
new file mode 100755
index 00000000..a7c3ade7
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/node_add.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/node_border.png b/trunk/wise-webapp/src/main/webapp/images/node_border.png
new file mode 100755
index 00000000..b72cf7bb
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/node_border.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/node_border2.png b/trunk/wise-webapp/src/main/webapp/images/node_border2.png
new file mode 100755
index 00000000..f4599c59
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/node_border2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/node_elipse.png b/trunk/wise-webapp/src/main/webapp/images/node_elipse.png
new file mode 100755
index 00000000..53922749
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/node_elipse.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/north.gif b/trunk/wise-webapp/src/main/webapp/images/north.gif
new file mode 100644
index 00000000..7200b4e0
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/north.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/note.png b/trunk/wise-webapp/src/main/webapp/images/note.png
new file mode 100644
index 00000000..ffea2b8b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/note.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/note1.png b/trunk/wise-webapp/src/main/webapp/images/note1.png
new file mode 100644
index 00000000..667a85fc
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/note1.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/page_delete.png b/trunk/wise-webapp/src/main/webapp/images/page_delete.png
new file mode 100644
index 00000000..73e86384
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/page_delete.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/page_go.png b/trunk/wise-webapp/src/main/webapp/images/page_go.png
new file mode 100644
index 00000000..20c6ec0e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/page_go.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/paypal-donate.gif b/trunk/wise-webapp/src/main/webapp/images/paypal-donate.gif
new file mode 100644
index 00000000..39f40a85
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/paypal-donate.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/printNews.png b/trunk/wise-webapp/src/main/webapp/images/printNews.png
new file mode 100644
index 00000000..7dd56f78
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/printNews.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/printer.png b/trunk/wise-webapp/src/main/webapp/images/printer.png
new file mode 100644
index 00000000..888f9edd
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/printer.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/removeUser.jpeg b/trunk/wise-webapp/src/main/webapp/images/removeUser.jpeg
new file mode 100644
index 00000000..d6a197e7
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/removeUser.jpeg differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/ruby.png b/trunk/wise-webapp/src/main/webapp/images/ruby.png
new file mode 100755
index 00000000..f763a168
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/ruby.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/s.gif b/trunk/wise-webapp/src/main/webapp/images/s.gif
new file mode 100644
index 00000000..1d11fa9a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/s.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/save.png b/trunk/wise-webapp/src/main/webapp/images/save.png
new file mode 100644
index 00000000..a98b0c3b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/save.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/se-handle.gif b/trunk/wise-webapp/src/main/webapp/images/se-handle.gif
new file mode 100644
index 00000000..743ab0af
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/se-handle.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/search.png b/trunk/wise-webapp/src/main/webapp/images/search.png
new file mode 100644
index 00000000..076708b4
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/search.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/search2.png b/trunk/wise-webapp/src/main/webapp/images/search2.png
new file mode 100644
index 00000000..d6b3cb06
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/search2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/search3.png b/trunk/wise-webapp/src/main/webapp/images/search3.png
new file mode 100644
index 00000000..26bb1140
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/search3.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/seast.png b/trunk/wise-webapp/src/main/webapp/images/seast.png
new file mode 100644
index 00000000..45118540
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/seast.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape-elipse.png b/trunk/wise-webapp/src/main/webapp/images/shape-elipse.png
new file mode 100644
index 00000000..2e3ea734
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape-elipse.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape-line.png b/trunk/wise-webapp/src/main/webapp/images/shape-line.png
new file mode 100644
index 00000000..de12b941
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape-line.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape-rectangle-rounded.png b/trunk/wise-webapp/src/main/webapp/images/shape-rectangle-rounded.png
new file mode 100644
index 00000000..eaed09fb
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape-rectangle-rounded.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape-rectangle.png b/trunk/wise-webapp/src/main/webapp/images/shape-rectangle.png
new file mode 100644
index 00000000..ff399b22
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape-rectangle.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape.png b/trunk/wise-webapp/src/main/webapp/images/shape.png
new file mode 100755
index 00000000..7bfb84ea
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape_handles.png b/trunk/wise-webapp/src/main/webapp/images/shape_handles.png
new file mode 100755
index 00000000..5a88b2f3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape_handles.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape_square_add.png b/trunk/wise-webapp/src/main/webapp/images/shape_square_add.png
new file mode 100755
index 00000000..31edfce5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape_square_add.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape_square_delete.png b/trunk/wise-webapp/src/main/webapp/images/shape_square_delete.png
new file mode 100755
index 00000000..ede912de
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape_square_delete.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shape_square_edit.png b/trunk/wise-webapp/src/main/webapp/images/shape_square_edit.png
new file mode 100755
index 00000000..d28dc6b1
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shape_square_edit.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/shrink_animation.gif b/trunk/wise-webapp/src/main/webapp/images/shrink_animation.gif
new file mode 100644
index 00000000..4a33551f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/shrink_animation.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/signUpBodyBtn.png b/trunk/wise-webapp/src/main/webapp/images/signUpBodyBtn.png
new file mode 100644
index 00000000..dcd5c9b5
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/signUpBodyBtn.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/signUpEndBtn.png b/trunk/wise-webapp/src/main/webapp/images/signUpEndBtn.png
new file mode 100644
index 00000000..18e7dd2a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/signUpEndBtn.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/signUpStartBtn.png b/trunk/wise-webapp/src/main/webapp/images/signUpStartBtn.png
new file mode 100644
index 00000000..d125cfbf
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/signUpStartBtn.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/sne.png b/trunk/wise-webapp/src/main/webapp/images/sne.png
new file mode 100644
index 00000000..f844cd08
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/sne.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/snorth.png b/trunk/wise-webapp/src/main/webapp/images/snorth.png
new file mode 100644
index 00000000..ae9c04d9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/snorth.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/snw.png b/trunk/wise-webapp/src/main/webapp/images/snw.png
new file mode 100644
index 00000000..44401ef6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/snw.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/south.gif b/trunk/wise-webapp/src/main/webapp/images/south.gif
new file mode 100644
index 00000000..3c36b220
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/south.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/sse.png b/trunk/wise-webapp/src/main/webapp/images/sse.png
new file mode 100644
index 00000000..be76255f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/sse.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/ssouth.png b/trunk/wise-webapp/src/main/webapp/images/ssouth.png
new file mode 100644
index 00000000..7b26b268
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/ssouth.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/ssw.png b/trunk/wise-webapp/src/main/webapp/images/ssw.png
new file mode 100644
index 00000000..02ace46f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/ssw.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/start_btn.gif b/trunk/wise-webapp/src/main/webapp/images/start_btn.gif
new file mode 100644
index 00000000..163bb7cd
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/start_btn.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/swest.png b/trunk/wise-webapp/src/main/webapp/images/swest.png
new file mode 100644
index 00000000..54c06214
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/swest.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tab.png b/trunk/wise-webapp/src/main/webapp/images/tab.png
new file mode 100644
index 00000000..19779cb9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tab.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tab2.png b/trunk/wise-webapp/src/main/webapp/images/tab2.png
new file mode 100644
index 00000000..bcd1f891
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tab2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tab3.png b/trunk/wise-webapp/src/main/webapp/images/tab3.png
new file mode 100644
index 00000000..17cbe2d6
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tab3.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tab4.png b/trunk/wise-webapp/src/main/webapp/images/tab4.png
new file mode 100644
index 00000000..fe358f69
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tab4.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tab5.png b/trunk/wise-webapp/src/main/webapp/images/tab5.png
new file mode 100644
index 00000000..27bdae87
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tab5.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_blue.png b/trunk/wise-webapp/src/main/webapp/images/tag_blue.png
new file mode 100755
index 00000000..9757fc6e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_blue.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_blue_add.png b/trunk/wise-webapp/src/main/webapp/images/tag_blue_add.png
new file mode 100755
index 00000000..887972eb
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_blue_add.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_blue_add2.png b/trunk/wise-webapp/src/main/webapp/images/tag_blue_add2.png
new file mode 100755
index 00000000..997c191a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_blue_add2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_green.png b/trunk/wise-webapp/src/main/webapp/images/tag_green.png
new file mode 100755
index 00000000..83ec984b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_green.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_orange.png b/trunk/wise-webapp/src/main/webapp/images/tag_orange.png
new file mode 100755
index 00000000..454a59f3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_orange.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_pink.png b/trunk/wise-webapp/src/main/webapp/images/tag_pink.png
new file mode 100755
index 00000000..76e2296c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_pink.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_purple.png b/trunk/wise-webapp/src/main/webapp/images/tag_purple.png
new file mode 100755
index 00000000..ebaf0e87
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_purple.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_red.png b/trunk/wise-webapp/src/main/webapp/images/tag_red.png
new file mode 100755
index 00000000..6ebb37d2
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_red.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tag_yellow.png b/trunk/wise-webapp/src/main/webapp/images/tag_yellow.png
new file mode 100755
index 00000000..83d12924
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tag_yellow.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/text_bold.png b/trunk/wise-webapp/src/main/webapp/images/text_bold.png
new file mode 100755
index 00000000..889ae80e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/text_bold.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/text_italic.png b/trunk/wise-webapp/src/main/webapp/images/text_italic.png
new file mode 100755
index 00000000..8482ac8c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/text_italic.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/thumb_down.png b/trunk/wise-webapp/src/main/webapp/images/thumb_down.png
new file mode 100755
index 00000000..3c832d4c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/thumb_down.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/thumb_up.png b/trunk/wise-webapp/src/main/webapp/images/thumb_up.png
new file mode 100755
index 00000000..2bd16ccf
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/thumb_up.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tick.png b/trunk/wise-webapp/src/main/webapp/images/tick.png
new file mode 100755
index 00000000..a9925a06
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tick.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/toolbar2.png b/trunk/wise-webapp/src/main/webapp/images/toolbar2.png
new file mode 100644
index 00000000..80e5f92f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/toolbar2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/toolbarNews.png b/trunk/wise-webapp/src/main/webapp/images/toolbarNews.png
new file mode 100644
index 00000000..3fb0874e
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/toolbarNews.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/topic_add.png b/trunk/wise-webapp/src/main/webapp/images/topic_add.png
new file mode 100644
index 00000000..833f77c0
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/topic_add.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/topic_bgcolor.png b/trunk/wise-webapp/src/main/webapp/images/topic_bgcolor.png
new file mode 100644
index 00000000..70699e6b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/topic_bgcolor.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/topic_border.png b/trunk/wise-webapp/src/main/webapp/images/topic_border.png
new file mode 100644
index 00000000..ce42be54
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/topic_border.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/topic_delete.png b/trunk/wise-webapp/src/main/webapp/images/topic_delete.png
new file mode 100644
index 00000000..00552b36
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/topic_delete.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/topic_icon.png b/trunk/wise-webapp/src/main/webapp/images/topic_icon.png
new file mode 100644
index 00000000..d9e245a1
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/topic_icon.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/topic_link.png b/trunk/wise-webapp/src/main/webapp/images/topic_link.png
new file mode 100644
index 00000000..247ce29c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/topic_link.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/topic_shape.png b/trunk/wise-webapp/src/main/webapp/images/topic_shape.png
new file mode 100644
index 00000000..6f004cae
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/topic_shape.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/transparent.gif b/trunk/wise-webapp/src/main/webapp/images/transparent.gif
new file mode 100644
index 00000000..b29d3406
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/transparent.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tryItBodyBtn.png b/trunk/wise-webapp/src/main/webapp/images/tryItBodyBtn.png
new file mode 100644
index 00000000..cda7214c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tryItBodyBtn.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tryItBodyBtn2.png b/trunk/wise-webapp/src/main/webapp/images/tryItBodyBtn2.png
new file mode 100644
index 00000000..b80dcc68
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tryItBodyBtn2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tryItEndBtn.png b/trunk/wise-webapp/src/main/webapp/images/tryItEndBtn.png
new file mode 100644
index 00000000..1d1bb39c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tryItEndBtn.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tryItEndBtn2.png b/trunk/wise-webapp/src/main/webapp/images/tryItEndBtn2.png
new file mode 100644
index 00000000..f0ec3792
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tryItEndBtn2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tryItStartBtn.png b/trunk/wise-webapp/src/main/webapp/images/tryItStartBtn.png
new file mode 100644
index 00000000..ac9bf87b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tryItStartBtn.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/tryItStartBtn2.png b/trunk/wise-webapp/src/main/webapp/images/tryItStartBtn2.png
new file mode 100644
index 00000000..c4011ba8
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/tryItStartBtn2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/usability_editing_text.png b/trunk/wise-webapp/src/main/webapp/images/usability_editing_text.png
new file mode 100644
index 00000000..a63b0167
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/usability_editing_text.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/user.gif b/trunk/wise-webapp/src/main/webapp/images/user.gif
new file mode 100644
index 00000000..bc934396
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/user.gif differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/user_delete.png b/trunk/wise-webapp/src/main/webapp/images/user_delete.png
new file mode 100755
index 00000000..acbb5630
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/user_delete.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/video-icon.png b/trunk/wise-webapp/src/main/webapp/images/video-icon.png
new file mode 100644
index 00000000..4d1c9b53
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/video-icon.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/videoBody.png b/trunk/wise-webapp/src/main/webapp/images/videoBody.png
new file mode 100644
index 00000000..171f6a72
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/videoBody.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/videoEnd.png b/trunk/wise-webapp/src/main/webapp/images/videoEnd.png
new file mode 100644
index 00000000..1f9eec5a
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/videoEnd.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/videoStart.png b/trunk/wise-webapp/src/main/webapp/images/videoStart.png
new file mode 100644
index 00000000..51b7188c
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/videoStart.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/waring_icon.png b/trunk/wise-webapp/src/main/webapp/images/waring_icon.png
new file mode 100644
index 00000000..628cf2da
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/waring_icon.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-clear-night.png b/trunk/wise-webapp/src/main/webapp/images/weather-clear-night.png
new file mode 100644
index 00000000..43457526
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-clear-night.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-clear.png b/trunk/wise-webapp/src/main/webapp/images/weather-clear.png
new file mode 100644
index 00000000..7dc15ea9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-clear.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-few-clouds-night.png b/trunk/wise-webapp/src/main/webapp/images/weather-few-clouds-night.png
new file mode 100644
index 00000000..d69efec9
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-few-clouds-night.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-few-clouds.png b/trunk/wise-webapp/src/main/webapp/images/weather-few-clouds.png
new file mode 100644
index 00000000..0e633a38
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-few-clouds.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-overcast.png b/trunk/wise-webapp/src/main/webapp/images/weather-overcast.png
new file mode 100644
index 00000000..0045129b
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-overcast.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-severe-alert.png b/trunk/wise-webapp/src/main/webapp/images/weather-severe-alert.png
new file mode 100644
index 00000000..98e9f6c1
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-severe-alert.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-showers-scattered.png b/trunk/wise-webapp/src/main/webapp/images/weather-showers-scattered.png
new file mode 100644
index 00000000..8d10d844
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-showers-scattered.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-showers.png b/trunk/wise-webapp/src/main/webapp/images/weather-showers.png
new file mode 100644
index 00000000..d9685d24
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-showers.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-snow.png b/trunk/wise-webapp/src/main/webapp/images/weather-snow.png
new file mode 100644
index 00000000..a83d8559
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-snow.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/weather-storm.png b/trunk/wise-webapp/src/main/webapp/images/weather-storm.png
new file mode 100644
index 00000000..feebe1d4
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/weather-storm.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/wisemapping.swf b/trunk/wise-webapp/src/main/webapp/images/wisemapping.swf
new file mode 100644
index 00000000..f7107bf3
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/wisemapping.swf differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/world.png b/trunk/wise-webapp/src/main/webapp/images/world.png
new file mode 100755
index 00000000..a7c3ade7
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/world.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/world2.png b/trunk/wise-webapp/src/main/webapp/images/world2.png
new file mode 100755
index 00000000..448196b1
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/world2.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/world_go.png b/trunk/wise-webapp/src/main/webapp/images/world_go.png
new file mode 100755
index 00000000..aee9c97f
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/world_go.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/world_link.png b/trunk/wise-webapp/src/main/webapp/images/world_link.png
new file mode 100755
index 00000000..b8edc126
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/world_link.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/zoom_in.png b/trunk/wise-webapp/src/main/webapp/images/zoom_in.png
new file mode 100755
index 00000000..1984e62d
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/zoom_in.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/images/zoom_out.png b/trunk/wise-webapp/src/main/webapp/images/zoom_out.png
new file mode 100755
index 00000000..da2b3de4
Binary files /dev/null and b/trunk/wise-webapp/src/main/webapp/images/zoom_out.png differ
diff --git a/trunk/wise-webapp/src/main/webapp/index.html b/trunk/wise-webapp/src/main/webapp/index.html
new file mode 100644
index 00000000..8867024f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/index.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+    <meta HTTP-EQUIV="REFRESH" content="0; url=/c/home.htm">    
+</head>
+</html>
diff --git a/trunk/wise-webapp/src/main/webapp/index.jsp b/trunk/wise-webapp/src/main/webapp/index.jsp
new file mode 100644
index 00000000..5e6bb412
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/index.jsp
@@ -0,0 +1,3 @@
+<%
+    response.sendRedirect("c/home.htm");
+%>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/IconPanel.js b/trunk/wise-webapp/src/main/webapp/js/IconPanel.js
new file mode 100644
index 00000000..b63fe675
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/IconPanel.js
@@ -0,0 +1,101 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+var IconPanel = new Class({
+    options:{
+        width:190,
+        initialWidth:0,
+        height:145,
+        content:null,
+        panel:null,
+        button:null,
+        onStart:Class.empty,
+        state:'close'
+    },
+    initialize:function(options){
+        this.setOptions(options);
+        if($chk(this.options.button))
+        {
+            this.init();
+        }
+    },
+    setButton:function(button){
+        this.options.button=button;
+    },
+    init:function(){
+        var panel = new Element('div');
+        var coord = this.options.button.getCoordinates();
+        var top = this.options.button.getTop() + coord.height+2;
+        var left = this.options.button.getLeft();
+        panel.setStyles({width:this.options.initialWidth, height:0,position:'absolute', top:top, left:left, background:'#e5e5e5', border:'1px solid #BBB4D6', zIndex:20, overflow:'hidden'});
+        this.options.panel=panel;
+        this.options.content.inject(panel);
+
+        this.options.content.addEvent('click', function(event) {
+            this.close();
+        }.bind(this));
+        panel.setStyle('opacity',0);
+        panel.inject($(document.body));
+        this.registerOpenPanel();
+    },
+    open:function(){
+        if(this.options.state=='close')
+        {
+            if(!$chk(this.options.panel))
+            {
+                this.init();
+            }
+            var panel = this.options.panel;
+            var options = this.options;
+            panel.setStyles({border: '1px solid #636163', opacity:100});
+            this.fireEvent('onStart');
+            var fx = panel.effects({duration:500, onComplete:function(){
+                this.registerClosePanel();
+            }.bind(this)});
+            fx.start({'height':[0,this.options.height], 'width':[this.options.initialWidth, this.options.width]});
+            this.options.state='open';
+
+        }
+    },
+    close:function(){
+        if(this.options.state=='open')
+        {
+            var fx = this.options.panel.effects({duration:500, onComplete:function(){
+                this.options.panel.setStyles({border: '1px solid transparent', opacity:0});
+                this.registerOpenPanel();
+            }.bind(this)});
+            fx.start({'height':[this.options.height,0], 'width':[this.options.width, this.options.initialWidth]});
+            this.options.state = 'close';
+        }
+    },
+    registerOpenPanel:function(){
+        this.options.button.removeEvents('click');
+        this.options.button.addEvent('click',function(event){
+            this.open();
+        }.bindWithEvent(this));
+    },
+    registerClosePanel:function(){
+        this.options.button.removeEvents('click');
+        this.options.button.addEvent('click', function(event){
+            this.close();
+        }.bindWithEvent(this));
+    }
+});
+
+IconPanel.implement(new Events, new Options);
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/common.js b/trunk/wise-webapp/src/main/webapp/js/common.js
new file mode 100644
index 00000000..45fa206a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/common.js
@@ -0,0 +1,413 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/******************************************************************/
+/*                        MOOdalBox 1.3.b4                        */
+/* A modal box (inline popup), used to display remote content     */
+/* loaded using AJAX, written for the mootools framework          */
+/*         by Razvan Brates, razvan [at] e-magine.ro              */
+/******************************************************************/
+/*               http://www.e-magine.ro/moodalbox                 */
+/******************************************************************/
+/*                                                                */
+/* MIT style license:                                             */
+/* http://en.wikipedia.org/wiki/MIT_License                       */
+/*                                                                */
+/* mootools found at:                                             */
+/* http://mootools.net/                                           */
+/*                                                                */
+/* Original code based on "Slimbox", by Christophe Beyls:         */
+/* http://www.digitalia.be/software/slimbox                       */
+/******************************************************************/
+
+// Constants defined here can be changed for easy config / translation
+// (defined as vars, because of MSIE's lack of support for const)
+
+var _ERROR_MESSAGE = "Oops.. there was a problem with your request.<br /><br />" +
+                     "Please try again.<br /><br />" +
+                     "<em>Click anywhere to close.</em>";
+// the error message displayed when the request has a problem
+var _RESIZE_DURATION = 400;
+// Duration of height and width resizing (ms)
+var _INITIAL_WIDTH = 250;
+// Initial width of the box (px)
+var _INITIAL_HEIGHT = 250;
+// Initial height of the box (px)
+var _CONTENTS_WIDTH = 500;
+// Actual width of the box (px)
+var _CONTENTS_HEIGHT = 400;
+// Actual height of the box (px)
+var _DEF_CONTENTS_WIDTH = 500;
+// Default width of the box (px) - used for resetting when a different setting was used
+var _DEF_CONTENTS_HEIGHT = 400;
+// Default height of the box (px) - used for resetting when a different setting was used
+var _DEF_FULLSCREEN_WIDTH = 0.95;
+// Default fullscreen width (%)
+var _DEF_FULLSCREEN_HEIGHT = 0.8;
+// Default fullscreen height (%)
+var _ANIMATE_CAPTION = true;
+// Enable/Disable caption animation
+var _EVAL_SCRIPTS = true;
+// Option to evaluate scripts in the response text
+var _EVAL_RESPONSE = false;
+// Option to evaluate the whole response text
+
+// The MOOdalBox object in its beauty
+var MOOdalBox = {
+
+// init the MOOdalBox
+    init: function (options) {
+
+        // init default options
+        this.options = Object.extend({
+            resizeDuration:     _RESIZE_DURATION,
+            initialWidth:         _INITIAL_WIDTH,
+            initialHeight:         _INITIAL_HEIGHT,
+            contentsWidth:         _CONTENTS_WIDTH,
+            contentsHeight:     _CONTENTS_HEIGHT,
+            defContentsWidth:     _DEF_CONTENTS_WIDTH,
+            defContentsHeight:     _DEF_CONTENTS_HEIGHT,
+            defFullscreenWidth:    _DEF_FULLSCREEN_WIDTH,
+            defFullscreenHeight:_DEF_FULLSCREEN_HEIGHT,
+            animateCaption:     _ANIMATE_CAPTION,
+            evalScripts:         _EVAL_SCRIPTS,
+            evalResponse:         _EVAL_RESPONSE
+        }, options || {});
+
+        // scan anchors for those opening a MOOdalBox
+        this.anchors = [];
+        this.scanAnchors(document.body, false);
+        // scan forms for those opening a MOOdalBox
+        this.forms = [];
+        this.scanForms(document.body, false);
+        // add event listeners
+        this.eventKeyDown = this.keyboardListener.bindWithEvent(this);
+        this.eventPosition = this.position.bind(this);
+
+        // init the HTML elements
+        // the overlay (clickable to close)
+        this.overlay = new Element('div').setProperty('id', 'mb_overlay').injectInside(document.body);
+
+        this.overlayDiv = new Element('div').setOpacity(0).setStyles({position: 'absolute', border: 0, width: '100%', backgroundColor: "black", zIndex: 98}).injectInside(document.body);
+        // the center element
+        this.center = new Element('div').setProperty('id', 'mb_center').setStyles({width: this.options.initialWidth + 'px', height: this.options.initialHeight + 'px', marginLeft: '-' + (this.options.initialWidth / 2) + 'px', display: 'none'}).injectInside(document.body);
+        // the actual page contents
+        this.contents = new Element('div').setProperty('id', 'mb_contents').injectInside(this.center);
+
+        // the bottom part (caption / close)
+        this.bottom = new Element('div').setProperty('id', 'mb_bottom').setStyle('display', 'none').injectInside(document.body);
+        this.closelink = new Element('a').setProperties({id: 'mb_close_link', href: '#'}).injectInside(this.bottom);
+        this.caption = new Element('div').setProperty('id', 'mb_caption').injectInside(this.bottom);
+        new Element('div').setStyle('clear', 'both').injectInside(this.bottom);
+
+        this.error = new Element('div').setProperty('id', 'mb_error').setHTML(_ERROR_MESSAGE);
+
+        // attach the close event to the close button / the overlay
+        this.closelink.onclick = this.overlay.onclick = this.close.bind(this);
+
+        // init the effects
+        var nextEffect = this.nextEffect.bind(this);
+        this.fx = {
+            overlay:     this.overlay.effect('opacity', { duration: 500 }).hide(),
+            resize:     this.center.effects({ onComplete: nextEffect }),
+            contents:     this.contents.effect('opacity', { duration: 500, onComplete: nextEffect }),
+            bottom:     this.bottom.effects({ duration: 400, onComplete: nextEffect })
+        };
+
+        // AJAX related options
+        var ajaxFailure = this.ajaxFailure.bind(this);
+        this.ajaxOptions = {
+            update:         this.contents,
+            evalScripts:     this.options.evalScripts,
+            evalResponse:     this.options.evalResponse,
+            onComplete:     nextEffect,
+            onFailure:         ajaxFailure,
+            encoding: 'utf-8'
+        };
+
+        this.ajaxRequest = Class.empty;
+
+    },
+
+    click: function(link) {
+        return this.open(link.href, link.title, link.rel, false);
+    },
+
+    open: function(sLinkHref, sLinkTitle, sLinkRel, oForm) {
+        //Remove window key event listeners.
+        this.eventContainer = new Element('div');
+        this.eventContainer.cloneEvents($(document), 'keydown');
+        $(document).removeEvents('keydown');
+
+        this.href = sLinkHref;
+        this.title = sLinkTitle;
+        this.rel = sLinkRel;
+
+        if (oForm) {
+            if (oForm.method == 'get') {
+                this.href += "?" + oForm.toQueryString();
+                this.ajaxOptions = Object.extend(this.ajaxOptions, {method: 'get', postBody: ''});
+            } else {
+                this.ajaxOptions = Object.extend(this.ajaxOptions, {method: 'post', postBody: oForm});
+            }
+        } else {
+            this.ajaxOptions = Object.extend(this.ajaxOptions, {method: 'get', postBody: ''});
+        }
+        this.ajaxOptions.encoding = 'utf-8';
+
+        this.position();
+        this.setup(true);
+        this.top = Window.getScrollTop() + (Window.getHeight() / 15);
+        this.center.setStyles({top: this.top + 'px', display: ''});
+        this.fx.overlay.custom(0.8);
+        return this.loadContents(sLinkHref);
+    },
+
+    position: function() {
+        this.overlay.setStyles({top: Window.getScrollTop() + 'px', height: Window.getHeight() + 'px'});
+        this.overlayDiv.setStyles({top: Window.getScrollTop() + 'px', height: Window.getHeight() + 'px'});
+    },
+
+    scanAnchors: function(oWhere, bForce) {
+
+        // scan anchors for those opening a MOOdalBox
+        $$($(oWhere).getElements('a')).each(function(el) {
+            // we use a regexp to check for links that
+            // have a rel attribute starting with "moodalbox"
+            if (el.href && ((el.rel && el.rel.test('^moodalbox', 'i')) || (bForce && !el.onclick))) {
+                if (bForce && !el.rel) {
+                    // if we're forcing links to open in a moodalbox, we're keeping the current size
+                    el.rel = "moodalbox " + this.options.contentsWidth + "px " + this.options.contentsHeight + "px";
+                    if (this.wizardMode) el.rel += " wizard";
+                }
+                el.onclick = this.click.pass(el, this);
+                this.anchors.push(el);
+            }
+        }, this);
+    },
+
+    scanForms: function (oWhere, bForce) {
+        // scan forms for those opening a MOOdalBox
+        $$($(oWhere).getElements('form')).each(function(el) {
+            // we use a regexp to check for links that
+            // have a rel attribute starting with "moodalbox"
+            el.rel = el.getProperty('rel');
+            if ((el.rel && el.rel.test('^moodalbox', 'i')) || bForce) {
+                if (bForce && !el.rel) {
+                    // if we're forcing links to open in a moodalbox, we're keeping the current size
+                    el.rel = "moodalbox " + this.options.contentsWidth + "px " + this.options.contentsHeight + "px";
+                    if (this.wizardMode) el.rel += " wizard";
+                }
+                el.onsubmit = this.open.pass([el.action, el.title, el.rel, el], this);
+                this.forms.push(el);
+            }
+        }, this);
+    },
+
+    setup: function(open) {
+        //var elements = $A($$('object'));
+        //elements.extend($$(window.ActiveXObject ? 'select' : 'embed'));
+        //elements.each(function(el){ el.style.visibility = open ? 'hidden' : ''; });
+
+        // use an iframe to show under everything
+
+        var fn = open ? 'addEvent' : 'removeEvent';
+        window[fn]('scroll', this.eventPosition)[fn]('resize', this.eventPosition);
+        document[fn]('keydown', this.eventKeyDown);
+        this.step = 0;
+    },
+
+    loadContents: function() {
+
+        if (this.step) return false;
+        this.step = 1;
+
+        // check to see if there are specified dimensions
+        // if not, fall back to default values
+
+        // fullscreen switch concept originally by Lennart Pilon (http://ljpilon.nl/)
+
+        // we check for a "fullscreen" switch
+        if (this.rel.test("fullscreen")) {
+
+            this.options.contentsWidth = this.options.defFullscreenWidth * window.getWidth();
+            this.options.contentsHeight = this.options.defFullscreenHeight * window.getHeight();
+
+        } else { // we check for other specified dimensions (px or %)
+
+            var aDim = this.rel.match(/[0-9.]+(px|%)/g);
+
+            if (aDim && aDim[0]) { //first dimension is interpreted as width
+
+                var w = aDim[0].toInt();
+
+                if (aDim[0].test("%")) {
+                    this.options.contentsWidth = (w > 0) ? 0.01 * w * window.getWidth() : this.options.defFullscreenWidth * window.getWidth();
+                } else {
+                    this.options.contentsWidth = (w > 0) ? w : this.options.defContentsWidth;
+                }
+            } else { // we switch to defaults if there aren't any dimensions specified
+                this.options.contentsWidth = this.options.defContentsWidth;
+                this.options.contentsHeight = this.options.defContentsHeight;
+            }
+
+            if (aDim && aDim[1]) { // we have a second dimension specified, which we'll interpret as height
+
+                var h = aDim[1].toInt();
+
+                if (aDim[1].test("%")) {
+                    this.options.contentsHeight = (h > 0) ? 0.01 * h * window.getHeight() : this.options.defFullscreenHeight * window.getHeight();
+                } else {
+                    this.options.contentsHeight = (h > 0) ? h : this.options.defContentsHeight;
+                }
+            } else if (aDim && aDim[0]) {
+                // we have the first dimension specified, but not the second
+                // so we interpret as width = height = the given value
+                if (aDim[0].test("%")) {
+                    this.options.contentsHeight = (w > 0) ? 0.01 * w * window.getHeight() : this.options.defFullscreenHeight * window.getHeight();
+                } else {
+                    this.options.contentsHeight = (w > 0) ? w : this.options.defContentsHeight;
+                }
+            }
+            // correct a little approximation bug (size flickers)
+            this.options.contentsWidth = Math.floor(this.options.contentsWidth);
+            this.options.contentsHeight = Math.floor(this.options.contentsHeight);
+
+        }
+
+        this.wizardMode = this.rel.test("wizard");
+
+        // this is where we'll check for other options passed via the rel attribute
+
+        this.bottom.setStyles({opacity: '0', height: '0px', display: 'none'});
+        this.center.className = 'mb_loading';
+
+        this.fx.contents.hide();
+
+        // AJAX call here
+        this.ajaxRequest = new Ajax(this.href, this.ajaxOptions).request();
+
+        // make the local timeout call here
+
+        return false;
+    },
+
+    ajaxFailure: function () {
+        this.contents.setHTML('');
+        this.error.clone().injectInside(this.contents);
+        this.nextEffect();
+        this.center.setStyle('cursor', 'pointer');
+        this.bottom.setStyle('cursor', 'pointer');
+        this.center.onclick = this.bottom.onclick = this.close.bind(this);
+    },
+
+
+// make the local timeout function here
+
+
+    nextEffect: function() {
+        switch (this.step++) {
+            case 1:
+            // remove previous styling from the elements
+            // (e.g. styling applied in case of an error)
+                this.center.className = '';
+                this.center.setStyle('cursor', 'default');
+                this.bottom.setStyle('cursor', 'default');
+                this.center.onclick = this.bottom.onclick = '';
+                this.caption.setHTML(this.title);
+
+                this.contents.setStyles({width: this.options.contentsWidth + "px", height: this.options.contentsHeight + "px"});
+
+                if (this.center.clientHeight != this.contents.offsetHeight) {
+                    this.fx.resize.options.duration = this.options.resizeDuration;
+                    this.fx.resize.custom({height: [this.center.clientHeight, this.contents.offsetHeight]});
+                    break;
+                }
+                this.step++;
+
+
+
+            case 2:
+                if (this.center.clientWidth != this.contents.offsetWidth) {
+                    this.fx.resize.custom({width: [this.center.clientWidth, this.contents.offsetWidth], marginLeft: [-this.center.clientWidth / 2, -this.contents.offsetWidth / 2]});
+                    break;
+                }
+                this.step++;
+
+            case 3:
+                this.bottom.setStyles({top: (this.top + this.center.clientHeight) + 'px', width: this.contents.style.width, marginLeft: this.center.style.marginLeft, display: ''});
+
+            // check to see if in wizard mode and parse links
+                if (this.wizardMode) this.scanAnchors(this.contents, true);
+                if (this.wizardMode) this.scanForms(this.contents, true);
+
+                this.fx.contents.custom(0, 1);
+                break;
+
+            case 4:
+                if (this.options.animateCaption) {
+                    this.fx.bottom.custom({opacity: [0, 1], height: [0, this.bottom.scrollHeight]});
+                    break;
+                }
+                this.bottom.setStyles({opacity: '1', height: this.bottom.scrollHeight + 'px'});
+
+            case 5:
+                this.step = 0;
+        }
+    },
+
+
+    keyboardListener: function(event) {
+        // close the MOOdalBox when the user presses CTRL + W, CTRL + X, ESC
+        if ((event.control && event.key == 'w') || (event.control && event.key == 'x') || (event.key == 'esc')) {
+            this.close();
+            event.stop();
+        }
+    },
+
+    close: function() {
+        //restore key event listeners
+        $(document).cloneEvents(this.eventContainer, 'keydown');
+        this.eventContainer.removeEvents('keydown');
+        if (this.step < 0) return;
+        this.step = -1;
+        for (var f in this.fx) this.fx[f].clearTimer();
+        this.center.style.display = this.bottom.style.display = 'none';
+        this.center.className = 'mb_loading';
+        this.fx.overlay.chain(this.setup.pass(false, this)).custom(0);
+        this.overlayDiv.style.display = "none";
+        return false;
+    },
+
+    config: function(options) {
+        this.options = Object.extend(this.options, options || {});
+        return false;
+        // to be used on links
+    }
+
+};
+
+// Moodal Dialog startup
+Window.onDomReady(MOOdalBox.init.bind(MOOdalBox));
+
+
+function displayLoading()
+{
+    $('headerLoading').style.visibility = 'visible';
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/editor.js b/trunk/wise-webapp/src/main/webapp/js/editor.js
new file mode 100644
index 00000000..a267f11d
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/editor.js
@@ -0,0 +1,710 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/*Extend mootools known keys*/
+ExtendedKeys = {
+    'insert': 45,
+    'f2':113,
+    'ctrl-enter':17
+};
+
+$extend(Event.keys, ExtendedKeys);
+
+var designer = null;
+/* JavaScript tabs changer */
+
+// CSS helper functions
+CSS = {
+    // Adds a class to an element.
+    AddClass: function (e, c) {
+        if (!e.className.match(new RegExp("\\b" + c + "\\b", "i")))
+            e.className += (e.className ? " " : "") + c;
+    },
+
+    // Removes a class from an element.
+    RemoveClass: function (e, c) {
+        e.className = e.className.replace(new RegExp(" \\b" + c + "\\b|\\b" + c + "\\b ?", "gi"), "");
+    }
+};
+
+// Functions for handling tabs.
+Tabs = {
+    // Changes to the tab with the specified ID.
+    GoTo: function (contentId, skipReplace) {
+        // This variable will be true if a tab for the specified
+        // content ID was found.
+        var foundTab = false;
+
+        // Get the TOC element.
+        var toc = $("toc");
+        if (toc) {
+            var lis = toc.getElementsByTagName("li");
+            for (var j = 0; j < lis.length; j++) {
+                var li = lis[j];
+
+                // Give the current tab link the class "current" and
+                // remove the class from any other TOC links.
+                var anchors = li.getElementsByTagName("a");
+                var anchors = li.getElementsByTagName("a");
+                for (var k = 0; k < anchors.length; k++) {
+                    if (anchors[k].hash == "#" + contentId) {
+                        CSS.AddClass(li, "current");
+                        foundTab = true;
+                        break;
+                    } else {
+                        CSS.RemoveClass(li, "current");
+                    }
+                }
+            }
+        }
+
+        // Show the content with the specified ID.
+        var divsToHide = [];
+        var divs = document.getElementsByTagName("div");
+        for (var i = 0; i < divs.length; i++) {
+            var div = divs[i];
+
+            if (div.className.match(/\btabContent\b/i)) {
+                if (div.id == "_" + contentId)
+                    div.style.display = "block";
+                else
+                {
+                    divsToHide.push(div);
+                }
+            }
+        }
+
+        // Hide the other content boxes.
+        for (var i = 0; i < divsToHide.length; i++)
+            divsToHide[i].style.display = "none";
+
+        // Change the address bar.
+        if (!skipReplace) window.location.replace("#" + contentId);
+    },
+
+    OnClickHandler: function (e) {
+        // Stop the event (to stop it from scrolling or
+        // making an entry in the history).
+        if (!e) e = window.event;
+        if (e.preventDefault) e.preventDefault(); else e.returnValue = false;
+
+        // Get the name of the anchor of the link that was clicked.
+        Tabs.GoTo(this.hash.substring(1));
+    },
+
+    Init: function () {
+        if (!document.getElementsByTagName)
+        {
+            return;
+        }
+
+        // Attach an onclick event to all the anchor links on the page.
+        var anchors = document.getElementsByTagName("a");
+        for (var i = 0; i < anchors.length; i++) {
+            var a = anchors[i];
+            if (a.hash) {
+                a.onclick = Tabs.OnClickHandler;
+            }
+        }
+
+        var contentId;
+        if (window.location.hash)
+            contentId = window.location.hash.substring(1);
+
+        var divs = document.getElementsByTagName("div");
+        for (var i = 0; i < divs.length; i++) {
+            var div = divs[i];
+
+            if (div.className.match(/\btabContent\b/i)) {
+                if (!contentId) contentId = div.id;
+                div.id = "_" + div.id;
+            }
+        }
+
+        if (contentId)
+            Tabs.GoTo(contentId, true);
+    }
+};
+
+if (document.createStyleSheet) {
+    var style = document.createStyleSheet();
+    style.addRule("div.tabContent", "display: none;");
+    style.addRule("div" + contentId, "display: block;");
+} else {
+    var head = document.getElementsByTagName("head")[0];
+    if (head) {
+        var style = document.createElement("style");
+        style.setAttribute("type", "text/css");
+        style.appendChild(document.createTextNode("div.tabContent { display: none; }"));
+        style.appendChild(document.createTextNode("div" + contentId + " { display: block; }"));
+        head.appendChild(style);
+    }
+}
+
+// Hook up the OnLoad event to the tab initialization function.
+Tabs.Init();
+
+// Hide the content while waiting for the onload event to trigger.
+var contentId = window.location.hash || "#Introduction";
+
+function afterCoreLoading()
+{
+
+    if (core.UserAgent.isVMLSupported())
+    {
+        $import("../js/mindplot.vml.js");
+    } else
+    {
+        $import("../js/mindplot.svg.js");
+
+    }
+}
+;
+
+var iconPanel = null;
+
+function afterWisemapLoading()
+{
+    buildMindmapDesigner();
+
+    if ($('helpButton') != null)
+    {
+        var helpPanel = new Panel({panelButton:$('helpButton'), backgroundColor:'black'});
+        helpPanel.setContent(Help.buildHelp(helpPanel));
+    }
+
+    if ($('helpButtonFirstSteps') != null)
+    {
+        var firstStepsPanel = $('helpButtonFirstSteps')
+        firstStepsPanel.addEvent('click', function(event) {
+            var firstStepWindow = window.open("firststeps.htm", "WiseMapping", "width=100px, height=100px");
+            firstStepWindow.focus();
+            firstStepWindow.moveTo(0, 0);
+            firstStepWindow.resizeTo(screen.availWidth, screen.availHeight);
+        });
+
+        var keyboardPanel = $('helpButtonKeyboard')
+        keyboardPanel.addEvent('click', function(event) {
+            MOOdalBox.open('keyboard.htm', 'KeyBoard Shortcuts', '500px 400px', false)
+        });
+
+    }
+
+
+    var iconChooser = buildIconChooser();
+    iconPanel = new IconPanel({button:$('topicIcon'), onStart:cleanScreenEvent, content:iconChooser});
+    // Register Events ...
+    $(document).addEvent('keydown', designer.keyEventHandler.bindWithEvent(designer));
+    $("ffoxWorkarroundInput").addEvent('keydown', designer.keyEventHandler.bindWithEvent(designer));
+    //
+    $('zoomIn').addEvent('click', function(event) {
+        designer.zoomIn();
+    });
+
+    $('zoomOut').addEvent('click', function(event) {
+        designer.zoomOut();
+    });
+
+    $('undoEdition').addEvent('click', function(event) {
+        designer.undo();
+    });
+
+    $('redoEdition').addEvent('click', function(event) {
+        designer.redo();
+    });
+    designer.addEventListener("change", function(event) {
+        if (event.undoSteps > 0)
+        {
+            $("undoEdition").setStyle("background-image", "url(../images/file_undo.png)");
+        } else
+        {
+            $("undoEdition").setStyle("background-image", "url(../images/file_undo_dis.png)");
+        }
+
+        if (event.redoSteps > 0)
+        {
+            $("redoEdition").setStyle("background-image", "url(../images/file_redo.png)");
+        } else
+        {
+            $("redoEdition").setStyle("background-image", "url(../images/file_redo_dis.png)");
+        }
+
+    });
+
+    $('addTopic').addEvent('click', function(event) {
+        designer.createSiblingForSelectedNode();
+    });
+    $('deleteTopic').addEvent('click', function(event) {
+        var topics = designer.getSelectedNodes();
+        designer.deleteCurrentNode();
+    });
+    var context = this;
+    var colorPicker1 = new MooRainbow('topicColor', {
+        id: 'topicColor',
+        imgPath: '../images/',
+        startColor: [255, 255, 255],
+        onInit: function(color) {
+            cleanScreenEvent.bind(context).attempt();
+            setCurrentColorPicker.attempt(colorPicker1, context);
+        },
+        onChange: function(color) {
+            designer.setBackColor2SelectedNode(color.hex);
+        },
+        onComplete: function(color) {
+            removeCurrentColorPicker.attempt(colorPicker1, context);
+        }
+    });
+    var colorPicker2 = new MooRainbow('topicBorder', {
+        id: 'topicBorder',
+        imgPath: '../images/',
+        startColor: [255, 255, 255],
+        onInit: function(color) {
+            cleanScreenEvent.bind(context).attempt();
+            setCurrentColorPicker.attempt(colorPicker2, context);
+        },
+        onChange: function(color) {
+            designer.setBorderColor2SelectedNode(color.hex);
+        },
+        onComplete: function(color) {
+            removeCurrentColorPicker.attempt(colorPicker2, context);
+        }
+    });
+    $('topicLink').addEvent('click', function(event) {
+        designer.addLink2SelectedNode();
+
+    });
+
+    $('topicNote').addEvent('click', function(event) {
+        designer.addNote2SelectedNode();
+
+    });
+
+
+    $('fontBold').addEvent('click', function(event) {
+        designer.setWeight2SelectedNode();
+    });
+
+    $('fontItalic').addEvent('click', function(event) {
+        designer.setStyle2SelectedNode();
+    });
+
+    var colorPicker3 = new MooRainbow('fontColor', {
+        id: 'fontColor',
+        imgPath: '../images/',
+        startColor: [255, 255, 255],
+        onInit: function(color) {
+            cleanScreenEvent.bind(context).attempt();
+            setCurrentColorPicker.attempt(colorPicker3, context);
+        },
+        onChange: function(color) {
+            designer.setFontColor2SelectedNode(color.hex);
+        },
+        onComplete: function(color) {
+            removeCurrentColorPicker.attempt(colorPicker3, context);
+        }
+    });
+
+    // Save event handler ....
+    var saveButton = $('saveButton');
+    saveButton.addEvent('click', function(event) {
+
+        if (!isTryMode)
+        {
+            saveButton.setStyle('cursor', 'wait');
+            var saveFunc = function()
+            {
+                designer.save(function()
+                {
+                    var monitor = core.Monitor.getInstance();
+                    monitor.logMessage('Save completed successfully');
+                    saveButton.setStyle('cursor', 'pointer');
+                }, true);
+            }
+            saveFunc.delay(1);
+        } else
+        {
+            new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
+            {
+                'window': {theme:Windoo.Themes.wise,
+                    title:''
+                }
+            });
+        }
+    });
+
+    var discardButton = $('discardButton');
+    discardButton.addEvent('click', function(event) {
+
+        if (!isTryMode)
+        {
+            displayLoading();
+            window.document.location = "mymaps.htm";
+        } else
+        {
+            new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
+            {
+                'window': {theme:Windoo.Themes.wise,
+                    title:''
+                }
+            });
+        }
+    });
+
+    if (isTryMode)
+    {
+        $('tagIt').addEvent('click', function(event)
+        {
+            new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
+            {
+                'window': {theme:Windoo.Themes.wise,
+                    title:''
+                }
+            });
+
+        });
+
+        $('shareIt').addEvent('click', function(event)
+        {
+            new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
+            {
+                'window': {theme:Windoo.Themes.wise,
+                    title:''
+                }
+            });
+
+        });
+
+        $('publishIt').addEvent('click', function(event)
+        {
+            new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
+            {
+                'window': {theme:Windoo.Themes.wise,
+                    title:''
+                }
+            });
+
+        });
+
+        $('history').addEvent('click', function(event)
+        {
+            new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.',
+            {
+                'window': {theme:Windoo.Themes.wise,
+                    title:''
+                }
+            });
+
+        });
+
+    }
+
+    // Autosave ...
+    if (!isTryMode)
+    {
+        var autosave = function() {
+
+            if (designer.needsSave())
+            {
+                designer.save(function()
+                {
+                    var monitor = core.Monitor.getInstance();
+                }, false);
+            }
+        };
+        autosave.periodical(30000);
+
+        // To prevent the user from leaving the page with changes ...
+        window.onbeforeunload = function confirmExit()
+        {
+            if (designer.needsSave())
+            {
+                designer.save(null, false)
+            }
+        }
+    }
+    // Build panels ...
+    fontFamilyPanel();
+    shapeTypePanel();
+    fontSizePanel();
+
+    // Disable loading dialog ...
+    setTimeout("loadingDialog.deactivate();", 500);
+}
+
+function buildIconChooser() {
+    var content = new Element('div').setStyles({width:230,height:240,padding:5});
+    var count = 0;
+    for (var i = 0; i < mindplot.ImageIcon.prototype.ICON_FAMILIES.length; i = i + 1)
+    {
+        var familyIcons = mindplot.ImageIcon.prototype.ICON_FAMILIES[i];
+        for (var j = 0; j < familyIcons.length; j = j + 1)
+        {
+            // Separate icons by line ...
+            var familyContent;
+            if ((count % 9) == 0)
+            {
+                familyContent = new Element('div').inject(content);
+            }
+
+
+            var iconId = familyIcons[j];
+            var img = new Element('img').setStyles({width:16,height:16,padding:"0px 2px"}).inject(familyContent);
+            img.id = iconId;
+            img.src = mindplot.ImageIcon.prototype._getImageUrl(iconId);
+            img.addEvent('click', function(event, id) {
+                designer.addImage2SelectedNode(this.id);
+            }.bindWithEvent(img));
+            count = count + 1;
+        }
+
+    }
+
+    return content;
+}
+;
+
+
+function setCurrentColorPicker(colorPicker)
+{
+    this.currentColorPicker = colorPicker;
+}
+
+function removeCurrentColorPicker(colorPicker)
+{
+    $clear(this.currentColorPicker);
+}
+
+function buildMindmapDesigner()
+{
+
+    // Initialize message logger ...
+    var monitor = new core.Monitor($('msgLoggerContainer'), $('msgLogger'));
+    core.Monitor.setInstance(monitor);
+
+    // Initialize logger...
+    core.Logger.init(window.LoggerService);
+
+    var container = $('mindplot');
+    var footer = $('footerEditor');
+    if (core.UserAgent.isIframeWorkaroundRequired())
+    {
+        var iframe = document.createElement('iframe');
+        iframe.id = "mindplotIFrame";
+        var top = container.offsetTop;
+        var bottom = footer.offsetTop;
+        iframe.setStyle('width', "100%");
+        iframe.setStyle('height', bottom - top + "px");
+        iframe.setStyle('overflow', "hidden");
+        iframe.setStyle('border', "none");
+        container.appendChild(iframe);
+        var mapContainer = "<div id='mindplot' style='background: url( ../images/grid.gif ) bottom left repeat !important;'></div><script>function styleMe() {" +
+                           "var small_head = document.getElementsByTagName('head').item(0);" +
+                           "var thestyle = document.createElement('link');" +
+                           "thestyle.setAttribute('rel', 'stylesheet');thestyle.setAttribute('type', 'text/css');thestyle.setAttribute('href', '../css/bubble.css');small_head.appendChild(thestyle);}; styleMe();</script>";
+        var doc = iframe.contentDocument;
+        if (doc == undefined || doc == null)
+            doc = iframe.contentWindow.document;
+        doc.open();
+        doc.write(mapContainer);
+        doc.close();
+        $(doc.body).setStyle('margin', '0px');
+        container = doc.getElementById('mindplot');
+
+    }
+
+    // Initialize Editor ...
+    var persistantManager = new mindplot.PersistanceManager(window.MapEditorService);
+
+    var screenWidth = window.getWidth();
+    var screenHeight = window.getHeight();
+
+    // Positionate node ...              h
+    // header - footer
+    screenHeight = screenHeight - 90 - 61;
+
+    // body margin ...
+    editorProperties.width = screenWidth;
+    editorProperties.height = screenHeight;
+
+    designer = new mindplot.MindmapDesigner(editorProperties, container, persistantManager);
+    designer.loadFromXML(mapId, mapXml);
+
+    // If a node has focus, focus can be move to another node using the keys.
+    designer._cleanScreen = cleanScreenEvent.bind(this);
+
+
+    // Save map on load ....
+    if (editorProperties.saveOnLoad)
+    {
+        var saveOnLoad = function() {
+            designer.save(function() {
+            }, false);
+        }.delay(1000)
+    }
+
+}
+;
+
+function createColorPalette(container, onSelectFunction, event)
+{
+    cleanScreenEvent();
+    _colorPalette = new core.ColorPicker();
+    _colorPalette.onSelect = function(color) {
+        onSelectFunction.call(this, color);
+        cleanScreenEvent();
+    };
+
+    //    dojo.event.kwConnect({srcObj: this._colorPalette,srcFunc:"onColorSelect",targetObj:this._colorPalette, targetFunc:"onSelect", once:true});
+    var mouseCoords = core.Utils.getMousePosition(event);
+    var colorPaletteElement = $("colorPalette");
+    colorPaletteElement.setStyle('left', (mouseCoords.x - 80) + "px");
+    colorPaletteElement.setStyle('display', "block");
+}
+;
+
+function cleanScreenEvent()
+{
+    if (this.currentColorPicker)
+    {
+        this.currentColorPicker.hide();
+    }
+    $("fontFamilyPanel").setStyle('display', "none");
+    $("fontSizePanel").setStyle('display', "none");
+    $("topicShapePanel").setStyle('display', "none");
+    iconPanel.close();
+}
+
+function fontFamilyPanel()
+{
+    var supportedFonts = ['times','arial','tahoma','verdana'];
+    var updateFunction = function(value)
+    {
+        value = value.charAt(0).toUpperCase() + value.substring(1, value.length);
+        designer.setFont2SelectedNode(value);
+    };
+
+    var onFocusValue = function(selectedNode)
+    {
+        return selectedNode.getFontFamily();
+    };
+
+    buildPanel('fontFamily', 'fontFamilyPanel', supportedFonts, updateFunction, onFocusValue);
+}
+
+function shapeTypePanel()
+{
+    var shapeTypePanel = ['rectagle','rounded rectagle','line','elipse'];
+    var updateFunction = function(value)
+    {
+        designer.setShape2SelectedNode(value);
+    };
+
+    var onFocusValue = function(selectedNode)
+    {
+        return selectedNode.getShapeType();
+    };
+
+    buildPanel('topicShape', 'topicShapePanel', shapeTypePanel, updateFunction, onFocusValue);
+}
+
+function fontSizePanel()
+{
+    var shapeTypePanel = ['small','normal','large','huge'];
+    var map = {small:'6',normal:'8',large:'10',huge:'15'};
+    var updateFunction = function(value)
+    {
+        var nodes = designer.getSelectedNodes();
+        var value = map[value];
+        designer.setFontSize2SelectedNode(value);
+    };
+
+    var onFocusValue = function(selectedNode)
+    {
+        var fontSize = selectedNode.getFontSize();
+        var result = "";
+        if (fontSize <= 6)
+        {
+            result = 'small';
+        } else if (fontSize <= 8)
+        {
+            result = 'normal';
+        } else if (fontSize <= 10)
+        {
+            result = 'large';
+        } else if (fontSize >= 15)
+        {
+            result = 'huge';
+        }
+        return result;
+    };
+    buildPanel('fontSize', 'fontSizePanel', shapeTypePanel, updateFunction, onFocusValue);
+}
+
+function buildPanel(buttonElemId, elemLinksContainer, elemLinkIds, updateFunction, onFocusValue)
+{
+    // Font family event handling ....
+    $(buttonElemId).addEvent('click', function(event)
+    {
+        var container = $(elemLinksContainer);
+        var isRendered = container.getStyle('display') == 'block';
+        cleanScreenEvent();
+
+        // Restore default css.
+        for (var i = 0; i < elemLinkIds.length; i++)
+        {
+            var elementId = elemLinkIds[i];
+            $(elementId).className = 'toolbarPanelLink';
+        }
+
+        // Select current element ...
+        var nodes = designer.getSelectedNodes();
+        var lenght = nodes.length;
+        if (lenght == 1)
+        {
+            var selectedNode = nodes[0];
+            var selectedElementId = onFocusValue(selectedNode);
+            selectedElementId = selectedElementId.toLowerCase();
+            var selectedElement = $(selectedElementId);
+            selectedElement.className = 'toolbarPanelLinkSelectedLink';
+        }
+
+        container.setStyle('display', 'block');
+
+        var mouseCoords = core.Utils.getMousePosition(event);
+        if (!isRendered)
+        {
+            container.setStyle('left', (mouseCoords.x - 10) + "px");
+        }
+
+    });
+
+    var fontOnClick = function(event)
+    {
+        var value = this.getAttribute('id');
+        updateFunction(value);
+        cleanScreenEvent();
+    };
+
+    // Register event listeners on elements ...
+    for (var i = 0; i < elemLinkIds.length; i++)
+    {
+        var elementId = elemLinkIds[i];
+        $(elementId).addEvent('click', fontOnClick.bind($(elementId)));
+    }
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/embedded.js b/trunk/wise-webapp/src/main/webapp/js/embedded.js
new file mode 100644
index 00000000..1a517c6a
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/embedded.js
@@ -0,0 +1,111 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+function afterCoreLoading()
+{
+    if (core.UserAgent.isVMLSupported())
+    {
+        $import("../js/mindplot.vml.js");
+    } else
+    {
+        $import("../js/mindplot.svg.js");
+
+    }
+}
+;
+
+function afterWisemapLoading()
+{
+    buildMindmapDesigner();
+
+
+    $('zoomIn').addEvent('click', function(event) {
+        designer.zoomIn();
+    });
+
+    $('zoomOut').addEvent('click', function(event) {
+        designer.zoomOut();
+    });
+
+    // Disable loading dialog ...
+    setTimeout("loadingDialog.deactivate();", 500);
+}
+
+function setCurrentColorPicker(colorPicker)
+{
+    this.currentColorPicker = colorPicker;
+}
+
+
+function buildMindmapDesigner()
+{
+
+    // Initialize logger...
+    core.Logger.init(window.LoggerService);
+
+    var container = $('mindplot');
+    var footer = $('embFooter');
+    if (core.UserAgent.isIframeWorkaroundRequired())
+    {
+        var iframe = document.createElement('iframe');
+        iframe.id = "mindplotIFrame";
+        var top = container.offsetTop;
+        var bottom = footer.offsetTop;
+        iframe.setStyle('width', "100%");
+        iframe.setStyle('height', bottom - top + "px");
+        iframe.setStyle('overflow', "hidden");
+        iframe.setStyle('border', "none");
+        container.appendChild(iframe);
+        var mapContainer = "<div id='mindplot' style='background: url( ../images/grid.gif ) bottom left repeat !important;'></div><script>function styleMe() {" +
+                           "var small_head = document.getElementsByTagName('head').item(0);" +
+                           "var thestyle = document.createElement('link');" +
+                           "thestyle.setAttribute('rel', 'stylesheet');thestyle.setAttribute('type', 'text/css');thestyle.setAttribute('href', '../css/bubble.css');small_head.appendChild(thestyle);}; styleMe();</script>";
+        var doc = iframe.contentDocument;
+        if (doc == undefined || doc == null)
+            doc = iframe.contentWindow.document;
+        doc.open();
+        doc.write(mapContainer);
+        doc.close();
+        $(doc.body).setStyle('margin', '0px');
+        container = doc.getElementById('mindplot');
+
+    }
+
+    // Initialize Editor ...
+    var persistantManager = new mindplot.PersistanceManager(window.MapEditorService);
+
+    var screenWidth = window.getWidth();
+    var screenHeight = window.getHeight();
+
+    // Positionate node ...
+    // header - footer
+    screenHeight = screenHeight;
+
+    // body margin ...
+    editorProperties.width = screenWidth;
+    editorProperties.height = screenHeight;
+    editorProperties.viewMode = true;
+
+    designer = new mindplot.MindmapDesigner(editorProperties, container, persistantManager);
+    designer.loadFromXML(mapId, mapXml);
+
+    // If a node has focus, focus can be move to another node using the keys.
+    designer._cleanScreen = function() {
+    };
+}
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/help.js b/trunk/wise-webapp/src/main/webapp/js/help.js
new file mode 100644
index 00000000..4029f483
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/help.js
@@ -0,0 +1,79 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+var Help = {
+    buildHelp:function(panel){
+        var container = new Element('div');
+        container.setStyles({width:'100%', textAlign:'center'});
+        var content1 = Help.buildContentIcon('../images/black-keyboard.png', 'Keyboard Shortcuts', function(){MOOdalBox.open('keyboard.htm','KeyBoard Shortcuts', '500px 400px', false);panel.hidePanel();});
+        var content2 = Help.buildContentIcon('../images/firstSteps.png', 'Editor First Steps', function(){
+           var wOpen;
+           var sOptions;
+
+           sOptions = 'status=yes,menubar=yes,scrollbars=yes,resizable=yes,toolbar=yes';
+           sOptions = sOptions + ',width=' + (screen.availWidth - 10).toString();
+           sOptions = sOptions + ',height=' + (screen.availHeight - 122).toString();
+           sOptions = sOptions + ',screenX=0,screenY=0,left=0,top=0';
+
+           wOpen = window.open("firststeps.htm", "WiseMapping", "width=100px, height=100px");
+           wOpen.focus();
+           wOpen.moveTo( 0, 0 );
+           wOpen.resizeTo( screen.availWidth, screen.availHeight );
+           panel.hidePanel();
+        });
+
+        container.addEvent('show', function(){
+            content1.effect('opacity',{duration:800}).start(0,100);
+            var eff = function(){content2.effect('opacity',{duration:800}).start(0,100);};
+            eff.delay(150);
+        });
+        container.addEvent('hide', function(){
+            content1.effect('opacity').set(0);
+            content2.effect('opacity').set(0)
+        });
+        content1.inject(container);
+        content2.inject(container);
+        return container;
+    },
+    buildContentIcon:function(image, text, onClickFn){
+        var container = new Element('div').setStyles({margin:'15px 0px 0px 0px', opacity:0, padding:'5px 0px', border: '1px solid transparent', cursor:'pointer'});
+
+        var icon = new Element('div');
+        icon.addEvent('click',onClickFn);
+        var img = new Element('img');
+        img.setProperty('src',image);
+        img.inject(icon);
+        icon.inject(container);
+
+        var textContainer = new Element('div').setStyles({width:'100%', color:'white'});
+        textContainer.innerHTML=text;
+        textContainer.inject(container);
+
+        container.addEvent('mouseover', function(event){
+            $(this).setStyle('border-top', '1px solid #BBB4D6');
+            $(this).setStyle('border-bottom', '1px solid #BBB4D6');
+        }.bindWithEvent(container));
+        container.addEvent('mouseout', function(event){
+            $(this).setStyle('border-top', '1px solid transparent');
+            $(this).setStyle('border-bottom', '1px solid transparent');
+
+        }.bindWithEvent(container));
+        return container;
+    }
+};
diff --git a/trunk/wise-webapp/src/main/webapp/js/helpPanel.js b/trunk/wise-webapp/src/main/webapp/js/helpPanel.js
new file mode 100644
index 00000000..4da62bb2
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/helpPanel.js
@@ -0,0 +1,103 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+var Panel = new Class({
+    options:{
+        width:'140px',
+        height:250,
+        opacity:0.9,
+        panelButton:null,
+        content:null,
+        frame:null,
+        onStart:Class.empty,
+        onComplete:Class.empty
+    },
+    initialize:function(options){
+        this.setOptions(options);
+
+        this.buildBody();
+
+        //atach listener to button
+        this.options.panelButton.addEvent('click',this.openPanel.bindWithEvent(this));
+    },
+    buildBody:function(){
+        var opts = this.options;
+        opts.frame = new Element('div');
+        if($chk(opts.content))
+        {
+            this.setContent(opts.content);
+        }
+
+    },
+    setContent:function(content){
+        this.options.content=content;
+        this.options.content.inject(this.options.frame);
+        this.setInitialStyles();
+        this.options.frame.injectBefore(this.options.panelButton);
+    },
+    setInitialStyles:function(){
+        var opts = this.options;
+        var buttonTop = opts.panelButton.getTop();
+        var buttonLeft = opts.panelButton.getLeft();
+        var bodyHeight = parseInt(opts.panelButton.getParent().getStyle('height'));
+        var coordinates = opts.panelButton.getCoordinates();
+        var width = opts.width || coordinates.width;
+        var elemCoords = {
+                            top:'0px',
+                            left:coordinates.left,
+                            width:width,
+                            height:'0px',
+                            zIndex:'10',
+                            overflow:'hidden'
+                         };
+        var elemStyles = {
+                            backgroundColor: opts.backgroundColor||'blue',
+                            opacity: opts.opacity,
+                            position:'absolute'
+                         }
+        opts.frame.setStyles(elemCoords).setStyles(elemStyles);
+    },
+    openPanel:function(){
+        this.fireEvent('onStart');
+
+        var button = this.options.panelButton;
+        button.removeEvents('click');
+        button.addEvent('click',this.hidePanel.bindWithEvent(this));
+        var top = parseInt(this.options.frame.getStyle('top'));
+        var fx = this.options.frame.effects({duration:500, onComplete:function(){this.options.content.fireEvent('show');}.bind(this)});
+        fx.start({'height':[0,this.options.height],'top':[top, top-this.options.height]});
+
+        this.fireEvent('onComplete');
+    },
+    hidePanel:function(){
+        this.fireEvent('onStart');
+
+        var button = this.options.panelButton;
+        button.removeEvents('click');
+        button.addEvent('click',this.openPanel.bindWithEvent(this));
+        var top = parseInt(this.options.frame.getStyle('top'));
+        this.options.content.fireEvent('hide');
+        var fx = this.options.frame.effects({duration:500});
+        fx.start({'height':[this.options.height,0],'top':[top, top+this.options.height]});
+
+        this.fireEvent('onComplete');
+    }
+});
+
+Panel.implement(new Events, new Options);
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/menu.js b/trunk/wise-webapp/src/main/webapp/js/menu.js
new file mode 100644
index 00000000..4609f3a2
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/menu.js
@@ -0,0 +1,74 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+var Menu = {
+    init: function ()
+    {
+        $ES('.subMenu2', $('mydocs')).each(function(el) {
+            var parent = el.getParent();
+            var button = $E('.button', parent);
+            if (button.getTag() == 'div')
+            {
+                el.setStyle('top', '25px');
+                el.setStyle('left', '7px');
+            }
+            button.addEvent('click', this.updateSubMenu.bindWithEvent(this, [button, el]));
+            button.state = "closed";
+        }, this);
+
+        this.currentElement = null;
+        this.currentItem = null;
+        $(document).addEvent('click', this.hide.bindWithEvent(this));
+    },
+    updateSubMenu: function(event, src, el)
+    {
+        if (src.state == "open")
+        {
+            el.setStyle("visibility", "hidden");
+            src.state = "closed";
+            this.currentElement = null;
+            this.currentItem = null;
+        }
+        else
+        {
+            if (this.currentElement != null)
+            {
+                this.hide.attempt(null, this);
+            }
+            this.currentElement = el;
+            this.currentItem = src;
+            el.setStyle("visibility", "visible");
+            src.state = "open";
+        }
+        if (event != null)
+        {
+            var evt = new Event(event);
+            evt.stopPropagation();
+        }
+    },
+    hide: function(event)
+    {
+        if (this.currentElement != null)
+        {
+            this.updateSubMenu.attempt([event, this.currentItem, this.currentElement], this);
+        }
+    }
+};
+
+Window.onDomReady(Menu.init.bind(Menu));
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/menu2.js b/trunk/wise-webapp/src/main/webapp/js/menu2.js
new file mode 100644
index 00000000..a2b9fa42
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/menu2.js
@@ -0,0 +1,114 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+Window.onDomReady(function() {
+    // variable for the list status
+    var listStatus = 'closed';
+    // setup var that holds our opened list's id
+    var listOpen;
+    // show list function
+    var showList = function(lid) {
+        var listId = lid.replace(/For/g, '');
+        // need to check if there is an open list
+        if (listStatus == "open") {
+            // check if the open list is the same
+            // as toggled list. If not, then we hide it
+            if (listId != listOpen) {
+                hideList();
+            }
+        }
+        if (listStatus == "closed") {
+            // set our list status
+            listStatus = 'open';
+            // set the curent open list id
+            listOpen = listId;
+            // show our list with a little effects
+            new fx.Opacity($(listOpen), {duration: 500}).custom(0, 1);
+            new fx.Height($(listOpen), {duration: 300}).custom(20, 40);
+            new fx.Width($(listOpen), {duration: 300}).custom(20, 131);
+            // we add a timeout so the sublist goes away
+            // if the user doesn't click/mouseover another
+            // menu item
+            (hideList).delay(15000);
+        }
+    };
+    // hide list function
+    var hideList = function() {
+        if (listOpen) {
+            // check if our list is shown already - if so run the effects to hide list
+            if ($(listOpen).getStyle('visibility') == "visible") {
+                new fx.Opacity($(listOpen), {duration: 500}).custom(1, 0);
+                new fx.Height($(listOpen), {duration: 300}).custom(40, 20);
+                new fx.Width($(listOpen), {duration: 300}).custom(131, 20);
+            }
+            // set our list status
+            listStatus = 'closed';
+            // reset open list id
+            listOpen = '';
+        }
+    };
+    $ES('a.navbutton').action({
+    // initialize the submenu - gets general data in order to attempt to position
+    // the submenu in relation to the image/anchor tag that opens it
+        initialize: function() {
+            // check if element has our flag for having a drop menu
+            if (this.hasClass('hasSubNav')) {
+                var listId = this.name.replace(/For/g, '');
+                // have to do it this way.
+                // for some reason this.firstChild.getTag() won't work
+                if ($(this.firstChild).getTag() == 'img') {
+                    // attempt to set offset to be a little taller
+                    // than your image
+                    var yOffset = this.firstChild.height + 1;
+                } else {
+                    // set your default offset here
+                    var yOffset = 20;
+                }
+                // set the styles of your list
+                // to position it (relatively) correctly
+                $(listId).setStyles({ top: yOffset + 'px', left: this.getLeft() + 'px' });
+            }
+        },
+        onmouseover: function() {
+            // add mouseover action to change image
+            this.firstChild.src = this.firstChild.src.replace(/off/g, 'on');
+            // optional effect for mouseover
+            this.effect('opacity').custom(.3, 1);
+            // check if element has our flag for having a drop menu
+            if (this.hasClass('hasSubNav')) {
+                // pass the id of the mouseover, so we can determine
+                // which list to show
+                showList(this.id);
+            } else {
+                // if the button moused over does not have a list
+                // then we close the list since we are obviously
+                // on another button now
+                if (listStatus == 'open') {
+                    hideList();
+                }
+            }
+        },
+        onmouseout: function() {
+            // switch mouseout button
+            this.firstChild.src = this.firstChild.src.replace(/on/g, 'off');
+            // optional effect for mouseout
+            this.effect('opacity').custom(.3, 1);
+        }
+    });
+});
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/mooRainbow.js b/trunk/wise-webapp/src/main/webapp/js/mooRainbow.js
new file mode 100755
index 00000000..6ba1093c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/mooRainbow.js
@@ -0,0 +1,626 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/***
+ * MooRainbow
+ *
+ * @version		1.0
+ * @license		MIT-style license
+ * @author		w00fz - < w00fzIT [at] gmail.com >
+ * @infos			http://w00fz.altervista.org/mooRainbow
+ * @copyright		Author
+ * 
+ * 	Lot of thanks also to kamicane, tomocchino, ibolmo, Inviz.
+ */
+
+var MooRainbow = new Class({
+    options: {
+        id: 'mooRainbow',
+        prefix: 'moor-',
+        imgPath: 'images/',
+        startColor: [255, 0, 0],
+        wheel: false,
+        onComplete: Class.empty,
+        onChange: Class.empty
+    },
+
+    initialize: function(el, options) {
+        this.element = $(el);
+        if (!this.element) return;
+        this.setOptions(options);
+
+        this.sliderPos = 0;
+        this.pickerPos = {x: 0, y: 0};
+        this.backupColor = this.options.startColor;
+        this.currentColor = this.options.startColor;
+        this.sets = {
+            rgb: [],
+            hsb: [],
+            hex: []
+        };
+        this.pickerClick = this.sliderClick = false;
+        if (!this.layout) this.doLayout();
+        this.OverlayEvents();
+        this.sliderEvents();
+        this.backupEvent();
+        if (this.options.wheel) this.wheelEvents();
+        this.element.addEvent('click', function(e) {
+            this.toggle(e);
+        }.bind(this));
+
+        this.layout.overlay.setStyle('background-color', this.options.startColor.rgbToHex());
+        this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex());
+
+        this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w;
+        this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h;
+
+        this.manualSet(this.options.startColor);
+
+        this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w;
+        this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h;
+        this.sliderPos = this.snippet('arrPos') - this.snippet('arrSize', 'int');
+
+        if (window.khtml) this.hide();
+    },
+
+    toggle: function() {
+        this[this.visible ? 'hide' : 'show']()
+    },
+
+    show: function() {
+        this.fireEvent('onInit', [this.sets, this]);
+        this.rePosition();
+        this.layout.setStyle('display', 'block');
+        this.visible = true;
+    },
+
+    hide: function() {
+        this.layout.setStyles({'display': 'none'});
+        this.visible = false;
+    },
+
+    manualSet: function(color, type) {
+        if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb';
+        var rgb, hsb, hex;
+
+        if (type == 'rgb') {
+            rgb = color;
+            hsb = color.rgbToHsb();
+            hex = color.rgbToHex();
+        }
+        else if (type == 'hsb') {
+            hsb = color;
+            rgb = color.hsbToRgb();
+            hex = rgb.rgbToHex();
+        }
+        else {
+            hex = color;
+            rgb = color.hexToRgb();
+            hsb = rgb.rgbToHsb();
+        }
+
+        this.setMooRainbow(rgb);
+        this.autoSet(hsb);
+    },
+
+    autoSet: function(hsb) {
+        var curH = this.snippet('curSize', 'int').h;
+        var curW = this.snippet('curSize', 'int').w;
+        var oveH = this.layout.overlay.height;
+        var oveW = this.layout.overlay.width;
+        var sliH = this.layout.slider.height;
+        var arwH = this.snippet('arrSize', 'int');
+        var hue;
+
+        var posx = Math.round(((oveW * hsb[1]) / 100) - curW);
+        var posy = Math.round(- ((oveH * hsb[2]) / 100) + oveH - curH);
+
+        var c = Math.round(((sliH * hsb[0]) / 360));
+        c = (c == 360) ? 0 : c;
+        var position = sliH - c + this.snippet('slider') - arwH;
+        hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex();
+
+        this.layout.cursor.setStyles({'top': posy, 'left': posx});
+        this.layout.arrows.setStyle('top', position);
+        this.layout.overlay.setStyle('background-color', hue);
+        this.sliderPos = this.snippet('arrPos') - arwH;
+        this.pickerPos.x = this.snippet('curPos').l + curW;
+        this.pickerPos.y = this.snippet('curPos').t + curH;
+    },
+
+    setMooRainbow: function(color, type) {
+        if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb';
+        var rgb, hsb, hex;
+
+        if (type == 'rgb') {
+            rgb = color;
+            hsb = color.rgbToHsb();
+            hex = color.rgbToHex();
+        }
+        else if (type == 'hsb') {
+            hsb = color;
+            rgb = color.hsbToRgb();
+            hex = rgb.rgbToHex();
+        }
+        else {
+            hex = color;
+            rgb = color.hexToRgb();
+            hsb = rgb.rgbToHsb();
+        }
+
+        this.sets = {
+            rgb: rgb,
+            hsb: hsb,
+            hex: hex
+        };
+
+        if (!$chk(this.pickerPos.x))
+            this.autoSet(hsb);
+
+        this.RedInput.value = rgb[0];
+        this.GreenInput.value = rgb[1];
+        this.BlueInput.value = rgb[2];
+        this.HueInput.value = hsb[0];
+        this.SatuInput.value = hsb[1];
+        this.BrighInput.value = hsb[2];
+        this.hexInput.value = hex;
+
+        this.currentColor = rgb;
+
+        this.chooseColor.setStyle('background-color', rgb.rgbToHex());
+    },
+
+    parseColors: function(x, y, z) {
+        var s = Math.round((x * 100) / this.layout.overlay.width);
+        var b = 100 - Math.round((y * 100) / this.layout.overlay.height);
+        var h = 360 - Math.round((z * 360) / this.layout.slider.height) + this.snippet('slider') - this.snippet('arrSize', 'int');
+        h -= this.snippet('arrSize', 'int');
+        h = (h >= 360) ? 0 : (h < 0) ? 0 : h;
+        s = (s > 100) ? 100 : (s < 0) ? 0 : s;
+        b = (b > 100) ? 100 : (b < 0) ? 0 : b;
+
+        return [h, s, b];
+    },
+
+    OverlayEvents: function() {
+        var lim, curH, curW, inputs;
+        curH = this.snippet('curSize', 'int').h;
+        curW = this.snippet('curSize', 'int').w;
+        inputs = this.arrRGB.copy().concat(this.arrHSB, this.hexInput);
+
+        document.addEvent('click', function() {
+            if (this.visible) this.hide(this.layout);
+        }.bind(this));
+
+        inputs.each(function(el) {
+            el.addEvent('keydown', this.eventKeydown.bindWithEvent(this, el));
+            el.addEvent('keyup', this.eventKeyup.bindWithEvent(this, el));
+        }, this);
+        [this.element, this.layout].each(function(el) {
+            el.addEvents({
+                'click': function(e) {
+                    new Event(e).stop();
+                },
+                'keyup': function(e) {
+                    e = new Event(e);
+                    if (e.key == 'esc' && this.visible) this.hide(this.layout);
+                }.bind(this)
+            }, this);
+        }, this);
+
+        lim = {
+            x: [0 - curW, (this.layout.overlay.width - curW)],
+            y: [0 - curH, (this.layout.overlay.height - curH)]
+        };
+
+        this.layout.drag = new Drag.Base(this.layout.cursor, {
+            limit: lim,
+            onStart: this.overlayDrag.bind(this),
+            onDrag: this.overlayDrag.bind(this),
+            snap: 0
+        });
+
+        this.layout.overlay2.addEvent('mousedown', function(e) {
+            e = new Event(e);
+            this.layout.cursor.setStyles({
+                'top': e.page.y - this.layout.overlay.getTop() - curH,
+                'left': e.page.x - this.layout.overlay.getLeft() - curW
+            });
+            this.layout.drag.start(e);
+        }.bind(this));
+
+        this.okButton.addEvent('click', function() {
+            if (this.currentColor == this.options.startColor) {
+                this.hide();
+                this.fireEvent('onComplete', [this.sets, this]);
+            }
+            else {
+                this.backupColor = this.currentColor;
+                this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex());
+                this.hide();
+                this.fireEvent('onComplete', [this.sets, this]);
+            }
+        }.bind(this));
+    },
+
+    overlayDrag: function() {
+        var curH = this.snippet('curSize', 'int').h;
+        var curW = this.snippet('curSize', 'int').w;
+        this.pickerPos.x = this.snippet('curPos').l + curW;
+        this.pickerPos.y = this.snippet('curPos').t + curH;
+
+        this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb');
+        this.fireEvent('onChange', [this.sets, this]);
+    },
+
+    sliderEvents: function() {
+        var arwH = this.snippet('arrSize', 'int'), lim;
+
+        lim = [0 + this.snippet('slider') - arwH, this.layout.slider.height - arwH + this.snippet('slider')];
+        this.layout.sliderDrag = new Drag.Base(this.layout.arrows, {
+            limit: {y: lim},
+            modifiers: {x: false},
+            onStart: this.sliderDrag.bind(this),
+            onDrag: this.sliderDrag.bind(this),
+            snap: 0
+        });
+
+        this.layout.slider.addEvent('mousedown', function(e) {
+            e = new Event(e);
+
+            this.layout.arrows.setStyle(
+                    'top', e.page.y - this.layout.slider.getTop() + this.snippet('slider') - arwH
+                    );
+            this.layout.sliderDrag.start(e);
+        }.bind(this));
+    },
+
+    sliderDrag: function() {
+        var arwH = this.snippet('arrSize', 'int'), hue;
+
+        this.sliderPos = this.snippet('arrPos') - arwH;
+        this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb');
+        hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex();
+        this.layout.overlay.setStyle('background-color', hue);
+        this.fireEvent('onChange', [this.sets, this]);
+    },
+
+    backupEvent: function() {
+        this.layout.backup.addEvent('click', function() {
+            this.manualSet(this.backupColor);
+            this.fireEvent('onChange', [this.sets, this]);
+        }.bind(this));
+    },
+
+    wheelEvents: function() {
+        var arrColors = this.arrRGB.copy().extend(this.arrHSB);
+
+        arrColors.each(function(el) {
+            el.addEvents({
+                'mousewheel': this.eventKeys.bindWithEvent(this, el),
+                'keydown': this.eventKeys.bindWithEvent(this, el)
+            });
+        }, this);
+
+        [this.layout.arrows, this.layout.slider].each(function(el) {
+            el.addEvents({
+                'mousewheel': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider']),
+                'keydown': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider'])
+            });
+        }, this);
+    },
+
+    eventKeys: function(e, el, id) {
+        var wheel, type;
+        id = (!id) ? el.id : this.arrHSB[0];
+
+        if (e.type == 'keydown') {
+            if (e.key == 'up') wheel = 1;
+            else if (e.key == 'down') wheel = -1;
+            else return;
+        } else if (e.type == Element.Events.mousewheel.type) wheel = (e.wheel > 0) ? 1 : -1;
+
+        if (this.arrRGB.test(el)) type = 'rgb';
+        else if (this.arrHSB.test(el)) type = 'hsb';
+        else type = 'hsb';
+
+        if (type == 'rgb') {
+            var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass;
+            var value = el.value.toInt() + wheel;
+            value = (value > 255) ? 255 : (value < 0) ? 0 : value;
+
+            switch (el.className) {
+                case prefix + 'rInput': pass = [value, rgb[1], rgb[2]];    break;
+                case prefix + 'gInput': pass = [rgb[0], value, rgb[2]];    break;
+                case prefix + 'bInput':    pass = [rgb[0], rgb[1], value];    break;
+                default : pass = rgb;
+            }
+            this.manualSet(pass);
+            this.fireEvent('onChange', [this.sets, this]);
+        } else {
+            var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass;
+            var value = el.value.toInt() + wheel;
+
+            if (el.className.test(/(HueInput)/)) value = (value > 359) ? 0 : (value < 0) ? 0 : value;
+            else value = (value > 100) ? 100 : (value < 0) ? 0 : value;
+
+            switch (el.className) {
+                case prefix + 'HueInput': pass = [value, hsb[1], hsb[2]]; break;
+                case prefix + 'SatuInput': pass = [hsb[0], value, hsb[2]]; break;
+                case prefix + 'BrighInput':    pass = [hsb[0], hsb[1], value]; break;
+                default : pass = hsb;
+            }
+            this.manualSet(pass, 'hsb');
+            this.fireEvent('onChange', [this.sets, this]);
+        }
+        e.stop();
+    },
+
+    eventKeydown: function(e, el) {
+        var n = e.code, k = e.key;
+
+        if ((!el.className.test(/hexInput/) && !(n >= 48 && n <= 57)) &&
+            (k != 'backspace' && k != 'tab' && k != 'delete' && k != 'left' && k != 'right'))
+            e.stop();
+    },
+
+    eventKeyup: function(e, el) {
+        var n = e.code, k = e.key, pass, prefix, chr = el.value.charAt(0);
+
+        if (!$chk(el.value)) return;
+        if (el.className.test(/hexInput/)) {
+            if (chr != "#" && el.value.length != 6) return;
+            if (chr == '#' && el.value.length != 7) return;
+        } else {
+            if (!(n >= 48 && n <= 57) && (!['backspace', 'tab', 'delete', 'left', 'right'].test(k)) && el.value.length > 3) return;
+        }
+
+        prefix = this.options.prefix;
+
+        if (el.className.test(/(rInput|gInput|bInput)/)) {
+            if (el.value < 0 || el.value > 255) return;
+            switch (el.className) {
+                case prefix + 'rInput': pass = [el.value, this.sets.rgb[1], this.sets.rgb[2]]; break;
+                case prefix + 'gInput': pass = [this.sets.rgb[0], el.value, this.sets.rgb[2]]; break;
+                case prefix + 'bInput': pass = [this.sets.rgb[0], this.sets.rgb[1], el.value]; break;
+                default : pass = this.sets.rgb;
+            }
+            this.manualSet(pass);
+            this.fireEvent('onChange', [this.sets, this]);
+        }
+        else if (!el.className.test(/hexInput/)) {
+            if (el.className.test(/HueInput/) && el.value < 0 || el.value > 360) return;
+            else if (el.className.test(/HueInput/) && el.value == 360) el.value = 0;
+            else if (el.className.test(/(SatuInput|BrighInput)/) && el.value < 0 || el.value > 100) return;
+            switch (el.className) {
+                case prefix + 'HueInput': pass = [el.value, this.sets.hsb[1], this.sets.hsb[2]]; break;
+                case prefix + 'SatuInput': pass = [this.sets.hsb[0], el.value, this.sets.hsb[2]]; break;
+                case prefix + 'BrighInput': pass = [this.sets.hsb[0], this.sets.hsb[1], el.value]; break;
+                default : pass = this.sets.hsb;
+            }
+            this.manualSet(pass, 'hsb');
+            this.fireEvent('onChange', [this.sets, this]);
+        } else {
+            pass = el.value.hexToRgb(true);
+            if (isNaN(pass[0]) || isNaN(pass[1]) || isNaN(pass[2])) return;
+
+            if ($chk(pass)) {
+                this.manualSet(pass);
+                this.fireEvent('onChange', [this.sets, this]);
+            }
+        }
+
+    },
+
+    doLayout: function() {
+        var id = this.options.id, prefix = this.options.prefix;
+        var idPrefix = id + ' .' + prefix;
+
+        this.layout = new Element('div', {
+            'styles': {'display': 'block', 'position': 'absolute'},
+            'id': id
+        }).inject(document.body);
+
+        var box = new Element('div', {
+            'styles':  {'position': 'relative'},
+            'class': prefix + 'box'
+        }).inject(this.layout);
+
+        var div = new Element('div', {
+            'styles': {'position': 'absolute', 'overflow': 'hidden'},
+            'class': prefix + 'overlayBox'
+        }).inject(box);
+
+        var ar = new Element('div', {
+            'styles': {'position': 'absolute', 'zIndex': 1},
+            'class': prefix + 'arrows'
+        }).inject(box);
+        ar.width = ar.getStyle('width').toInt();
+        ar.height = ar.getStyle('height').toInt();
+
+        var ov = new Element('img', {
+            'styles': {'background-color': '#fff', 'position': 'relative', 'zIndex': 2},
+            'src': this.options.imgPath + 'moor_woverlay.png',
+            'class': prefix + 'overlay'
+        }).inject(div);
+
+        var ov2 = new Element('img', {
+            'styles': {'position': 'absolute', 'top': 0, 'left': 0, 'zIndex': 2},
+            'src': this.options.imgPath + 'moor_boverlay.png',
+            'class': prefix + 'overlay'
+        }).inject(div);
+
+        if (window.ie6) {
+            div.setStyle('overflow', '');
+            var src = ov.src;
+            ov.src = this.options.imgPath + 'blank.gif';
+            ov.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')";
+            src = ov2.src;
+            ov2.src = this.options.imgPath + 'blank.gif';
+            ov2.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')";
+        }
+        ov.width = ov2.width = div.getStyle('width').toInt();
+        ov.height = ov2.height = div.getStyle('height').toInt();
+
+        var cr = new Element('div', {
+            'styles': {'overflow': 'hidden', 'position': 'absolute', 'zIndex': 2},
+            'class': prefix + 'cursor'
+        }).inject(div);
+        cr.width = cr.getStyle('width').toInt();
+        cr.height = cr.getStyle('height').toInt();
+
+        var sl = new Element('img', {
+            'styles': {'position': 'absolute', 'z-index': 2},
+            'src': this.options.imgPath + 'moor_slider.png',
+            'class': prefix + 'slider'
+        }).inject(box);
+        this.layout.slider = sl;
+        //$E('#' + idPrefix + 'slider');
+        sl.width = sl.getStyle('width').toInt();
+        sl.height = sl.getStyle('height').toInt();
+
+        new Element('div', {
+            'styles': {'position': 'absolute'},
+            'class': prefix + 'colorBox'
+        }).inject(box);
+
+        var chooseColor = new Element('div', {
+            'styles': {'zIndex': 2, 'position': 'absolute'},
+            'class': prefix + 'chooseColor'
+        }).inject(box);
+
+        this.layout.backup = new Element('div', {
+            'styles': {'zIndex': 2, 'position': 'absolute', 'cursor': 'pointer'},
+            'class': prefix + 'currentColor'
+        }).inject(box);
+
+        var R = new Element('label').inject(box).setStyle('position', 'absolute');
+        var G = R.clone().inject(box).addClass(prefix + 'gLabel').appendText('G: ');
+        var B = R.clone().inject(box).addClass(prefix + 'bLabel').appendText('B: ');
+        R.appendText('R: ').addClass(prefix + 'rLabel');
+
+        var inputR = new Element('input');
+        var inputG = inputR.clone().inject(G).addClass(prefix + 'gInput');
+        var inputB = inputR.clone().inject(B).addClass(prefix + 'bInput');
+        inputR.inject(R).addClass(prefix + 'rInput');
+
+        var HU = new Element('label').inject(box).setStyle('position', 'absolute');
+        var SA = HU.clone().inject(box).addClass(prefix + 'SatuLabel').appendText('S: ');
+        var BR = HU.clone().inject(box).addClass(prefix + 'BrighLabel').appendText('B: ');
+        HU.appendText('H: ').addClass(prefix + 'HueLabel');
+
+        var inputHU = new Element('input');
+        var inputSA = inputHU.clone().inject(SA).addClass(prefix + 'SatuInput');
+        var inputBR = inputHU.clone().inject(BR).addClass(prefix + 'BrighInput');
+        inputHU.inject(HU).addClass(prefix + 'HueInput');
+        SA.appendText(' %');
+        BR.appendText(' %');
+        new Element('span', {'styles': {'position': 'absolute'}, 'class': prefix + 'ballino'}).setHTML(" &deg;").injectAfter(HU);
+
+        var inputHex = new Element('input').addClass(prefix + 'hexInput');
+        var hex = new Element('label').inject(box).setStyle('position', 'absolute').addClass(prefix + 'hexLabel').appendText('#hex: ').adopt(inputHex);
+
+        var ok = new Element('input', {
+            'styles': {'position': 'absolute'},
+            'type': 'button',
+            'value': 'Select',
+            'class': prefix + 'okButton'
+        }).inject(box);
+
+        this.rePosition();
+
+        var overlays = $$('#' + idPrefix + 'overlay');
+        this.layout.overlay = ov;
+        //overlays[0];
+        this.layout.overlay2 = ov2;
+        //overlays[1];
+        this.layout.cursor = cr;
+        //$E('#' + idPrefix + 'cursor');
+        this.layout.arrows = ar;
+        //$E('#' + idPrefix + 'arrows');
+        this.chooseColor = chooseColor;
+        //$E('#' + idPrefix + 'chooseColor');
+        //this.layout.backup = $E('#' + idPrefix + 'currentColor');
+        this.RedInput = inputR;
+        //$E('#' + idPrefix + 'rInput');
+        this.GreenInput = inputG;
+        //$E('#' + idPrefix + 'gInput');
+        this.BlueInput = inputB;
+        //$E('#' + idPrefix + 'bInput');
+        this.HueInput = inputHU;
+        //$E('#' + idPrefix + 'HueInput');
+        this.SatuInput = inputSA;
+        //$E('#' + idPrefix + 'SatuInput');
+        this.BrighInput = inputBR;
+        //$E('#' + idPrefix + 'BrighInput');
+        this.hexInput = inputHex;
+        //$E('#' + idPrefix + 'hexInput');
+
+        this.arrRGB = [this.RedInput, this.GreenInput, this.BlueInput];
+        this.arrHSB = [this.HueInput, this.SatuInput, this.BrighInput];
+        this.okButton = ok;
+        //$E('#' + idPrefix + 'okButton');
+
+        if (!window.khtml) this.hide();
+    },
+    rePosition: function() {
+        var coords = this.element.getCoordinates();
+        this.layout.setStyles({
+            'left': coords.left,
+            'top': coords.top + coords.height + 1
+        });
+    },
+
+    snippet: function(mode, type) {
+        var size;
+        type = (type) ? type : 'none';
+
+        switch (mode) {
+            case 'arrPos':
+                var t = this.layout.arrows.getStyle('top').toInt();
+                size = t;
+                break;
+            case 'arrSize':
+                var h = this.layout.arrows.height;
+                h = (type == 'int') ? (h / 2).toInt() : h;
+                size = h;
+                break;
+            case 'curPos':
+                var l = this.layout.cursor.getStyle('left').toInt();
+                var t = this.layout.cursor.getStyle('top').toInt();
+                size = {'l': l, 't': t};
+                break;
+            case 'slider':
+                var t = this.layout.slider.getStyle('marginTop').toInt();
+                size = t;
+                break;
+            default :
+                var h = this.layout.cursor.height;
+                var w = this.layout.cursor.width;
+                h = (type == 'int') ? (h / 2).toInt() : h;
+                w = (type == 'int') ? (w / 2).toInt() : w;
+                size = {w: w, h: h};
+        }
+        ;
+        return size;
+    }
+});
+
+MooRainbow.implement(new Options);
+MooRainbow.implement(new Events);
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/mootools.js b/trunk/wise-webapp/src/main/webapp/js/mootools.js
new file mode 100644
index 00000000..f8bfa0be
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/mootools.js
@@ -0,0 +1,7173 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/*
+Script: Core.js
+	Mootools - My Object Oriented javascript.
+
+License:
+	MIT-style license.
+
+MooTools Copyright:
+	copyright (c) 2007 Valerio Proietti, <http://mad4milk.net>
+
+MooTools Credits:
+	- Class is slightly based on Base.js <http://dean.edwards.name/weblog/2006/03/base/> (c) 2006 Dean Edwards, License <http://creativecommons.org/licenses/LGPL/2.1/>
+	- Some functions are inspired by those found in prototype.js <http://prototype.conio.net/> (c) 2005 Sam Stephenson sam [at] conio [dot] net, MIT-style license
+	- Documentation by Aaron Newton (aaron.newton [at] cnet [dot] com) and Valerio Proietti.
+*/
+
+var MooTools = {
+    version: '1.11'
+};
+
+/* Section: Core Functions */
+
+/*
+Function: $defined
+	Returns true if the passed in value/object is defined, that means is not null or undefined.
+
+Arguments:
+	obj - object to inspect
+*/
+
+function $defined(obj) {
+    return (obj != undefined);
+}
+;
+
+/*
+Function: $type
+	Returns the type of object that matches the element passed in.
+
+Arguments:
+	obj - the object to inspect.
+
+Example:
+	>var myString = 'hello';
+	>$type(myString); //returns "string"
+
+Returns:
+	'element' - if obj is a DOM element node
+	'textnode' - if obj is a DOM text node
+	'whitespace' - if obj is a DOM whitespace node
+	'arguments' - if obj is an arguments object
+	'object' - if obj is an object
+	'string' - if obj is a string
+	'number' - if obj is a number
+	'boolean' - if obj is a boolean
+	'function' - if obj is a function
+	'regexp' - if obj is a regular expression
+	'class' - if obj is a Class. (created with new Class, or the extend of another class).
+	'collection' - if obj is a native htmlelements collection, such as childNodes, getElementsByTagName .. etc.
+	false - (boolean) if the object is not defined or none of the above.
+*/
+
+function $type(obj) {
+    if (!$defined(obj)) return false;
+    if (obj.htmlElement) return 'element';
+    var type = typeof obj;
+    if (type == 'object' && obj.nodeName) {
+        switch (obj.nodeType) {
+            case 1: return 'element';
+            case 3: return (/\S/).test(obj.nodeValue) ? 'textnode' : 'whitespace';
+        }
+    }
+    if (type == 'object' || type == 'function') {
+        switch (obj.constructor) {
+            case Array: return 'array';
+            case RegExp: return 'regexp';
+            case Class: return 'class';
+        }
+        if (typeof obj.length == 'number') {
+            if (obj.item) return 'collection';
+            if (obj.callee) return 'arguments';
+        }
+    }
+    return type;
+}
+;
+
+/*
+Function: $merge
+	merges a number of objects recursively without referencing them or their sub-objects.
+
+Arguments:
+	any number of objects.
+
+Example:
+	>var mergedObj = $merge(obj1, obj2, obj3);
+	>//obj1, obj2, and obj3 are unaltered
+*/
+
+function $merge() {
+    var mix = {};
+    for (var i = 0; i < arguments.length; i++) {
+        for (var property in arguments[i]) {
+            var ap = arguments[i][property];
+            var mp = mix[property];
+            if (mp && $type(ap) == 'object' && $type(mp) == 'object') mix[property] = $merge(mp, ap);
+            else mix[property] = ap;
+        }
+    }
+    return mix;
+}
+;
+
+/*
+Function: $extend
+	Copies all the properties from the second passed object to the first passed Object.
+	If you do myWhatever.extend = $extend the first parameter will become myWhatever, and your extend function will only need one parameter.
+
+Example:
+	(start code)
+	var firstOb = {
+		'name': 'John',
+		'lastName': 'Doe'
+	};
+	var secondOb = {
+		'age': '20',
+		'sex': 'male',
+		'lastName': 'Dorian'
+	};
+	$extend(firstOb, secondOb);
+	//firstOb will become:
+	{
+		'name': 'John',
+		'lastName': 'Dorian',
+		'age': '20',
+		'sex': 'male'
+	};
+	(end)
+
+Returns:
+	The first object, extended.
+*/
+
+var $extend = function() {
+    var args = arguments;
+    if (!args[1]) args = [this, args[0]];
+    for (var property in args[1]) args[0][property] = args[1][property];
+    return args[0];
+};
+
+/*
+Function: $native
+	Will add a .extend method to the objects passed as a parameter, but the property passed in will be copied to the object's prototype only if non previously existent.
+	Its handy if you dont want the .extend method of an object to overwrite existing methods.
+	Used automatically in MooTools to implement Array/String/Function/Number methods to browser that dont support them whitout manual checking.
+
+Arguments:
+	a number of classes/native javascript objects
+
+*/
+
+var $native = function() {
+    for (var i = 0, l = arguments.length; i < l; i++) {
+        arguments[i].extend = function(props) {
+            for (var prop in props) {
+                if (!this.prototype[prop]) this.prototype[prop] = props[prop];
+                if (!this[prop]) this[prop] = $native.generic(prop);
+            }
+        };
+    }
+};
+
+$native.generic = function(prop) {
+    return function(bind) {
+        return this.prototype[prop].apply(bind, Array.prototype.slice.call(arguments, 1));
+    };
+};
+
+$native(Function, Array, String, Number);
+
+/*
+Function: $chk
+	Returns true if the passed in value/object exists or is 0, otherwise returns false.
+	Useful to accept zeroes.
+
+Arguments:
+	obj - object to inspect
+*/
+
+function $chk(obj) {
+    return !!(obj || obj === 0);
+}
+;
+
+/*
+Function: $pick
+	Returns the first object if defined, otherwise returns the second.
+
+Arguments:
+	obj - object to test
+	picked - the default to return
+
+Example:
+	(start code)
+		function say(msg){
+			alert($pick(msg, 'no meessage supplied'));
+		}
+	(end)
+*/
+
+function $pick(obj, picked) {
+    return $defined(obj) ? obj : picked;
+}
+;
+
+/*
+Function: $random
+	Returns a random integer number between the two passed in values.
+
+Arguments:
+	min - integer, the minimum value (inclusive).
+	max - integer, the maximum value (inclusive).
+
+Returns:
+	a random integer between min and max.
+*/
+
+function $random(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+;
+
+/*
+Function: $time
+	Returns the current timestamp
+
+Returns:
+	a timestamp integer.
+*/
+
+function $time() {
+    return new Date().getTime();
+}
+;
+
+/*
+Function: $clear
+	clears a timeout or an Interval.
+
+Returns:
+	null
+
+Arguments:
+	timer - the setInterval or setTimeout to clear.
+
+Example:
+	>var myTimer = myFunction.delay(5000); //wait 5 seconds and execute my function.
+	>myTimer = $clear(myTimer); //nevermind
+
+See also:
+	<Function.delay>, <Function.periodical>
+*/
+
+function $clear(timer) {
+    clearTimeout(timer);
+    clearInterval(timer);
+    return null;
+}
+;
+
+/*
+Class: Abstract
+	Abstract class, to be used as singleton. Will add .extend to any object
+
+Arguments:
+	an object
+
+Returns:
+	the object with an .extend property, equivalent to <$extend>.
+*/
+
+var Abstract = function(obj) {
+    obj = obj || {};
+    obj.extend = $extend;
+    return obj;
+};
+
+//window, document
+
+var Window = new Abstract(window);
+var Document = new Abstract(document);
+document.head = document.getElementsByTagName('head')[0];
+
+/*
+Class: window
+	Some properties are attached to the window object by the browser detection.
+
+Note:
+	browser detection is entirely object-based. We dont sniff.
+
+Properties:
+	window.ie - will be set to true if the current browser is internet explorer (any).
+	window.ie6 - will be set to true if the current browser is internet explorer 6.
+	window.ie7 - will be set to true if the current browser is internet explorer 7.
+	window.gecko - will be set to true if the current browser is Mozilla/Gecko.
+	window.webkit - will be set to true if the current browser is Safari/Konqueror.
+	window.webkit419 - will be set to true if the current browser is Safari2 / webkit till version 419.
+	window.webkit420 - will be set to true if the current browser is Safari3 (Webkit SVN Build) / webkit over version 419.
+	window.opera - is set to true by opera itself.
+*/
+
+window.xpath = !!(document.evaluate);
+if (window.ActiveXObject) window.ie = window[window.XMLHttpRequest ? 'ie7' : 'ie6'] = true;
+else if (document.childNodes && !document.all && !navigator.taintEnabled) window.webkit = window[window.xpath ? 'webkit420' : 'webkit419'] = true;
+else if (document.getBoxObjectFor != null) window.gecko = true;
+
+/*compatibility*/
+
+window.khtml = window.webkit;
+
+Object.extend = $extend;
+
+/*end compatibility*/
+
+//htmlelement
+
+if (typeof HTMLElement == 'undefined') {
+    var HTMLElement = function() {
+    };
+    if (window.webkit) document.createElement("iframe"); //fixes safari
+    HTMLElement.prototype = (window.webkit) ? window["[[DOMElement.prototype]]"] : {};
+}
+HTMLElement.prototype.htmlElement = function() {
+};
+
+//enables background image cache for internet explorer 6
+
+if (window.ie6) try {
+    document.execCommand("BackgroundImageCache", false, true);
+} catch(e) {
+}
+;
+
+/*
+Script: Class.js
+	Contains the Class Function, aims to ease the creation of reusable Classes.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Class
+	The base class object of the <http://mootools.net> framework.
+	Creates a new class, its initialize method will fire upon class instantiation.
+	Initialize wont fire on instantiation when you pass *null*.
+
+Arguments:
+	properties - the collection of properties that apply to the class.
+
+Example:
+	(start code)
+	var Cat = new Class({
+		initialize: function(name){
+			this.name = name;
+		}
+	});
+	var myCat = new Cat('Micia');
+	alert(myCat.name); //alerts 'Micia'
+	(end)
+*/
+
+var Class = function(properties) {
+    var klass = function() {
+        return (arguments[0] !== null && this.initialize && $type(this.initialize) == 'function') ? this.initialize.apply(this, arguments) : this;
+    };
+    $extend(klass, this);
+    klass.prototype = properties;
+    klass.constructor = Class;
+    return klass;
+};
+
+/*
+Property: empty
+	Returns an empty function
+*/
+
+Class.empty = function() {
+};
+
+Class.prototype = {
+
+/*
+    Property: extend
+        Returns the copy of the Class extended with the passed in properties.
+
+    Arguments:
+        properties - the properties to add to the base class in this new Class.
+
+    Example:
+        (start code)
+        var Animal = new Class({
+            initialize: function(age){
+                this.age = age;
+            }
+        });
+        var Cat = Animal.extend({
+            initialize: function(name, age){
+                this.parent(age); //will call the previous initialize;
+                this.name = name;
+            }
+        });
+        var myCat = new Cat('Micia', 20);
+        alert(myCat.name); //alerts 'Micia'
+        alert(myCat.age); //alerts 20
+        (end)
+    */
+
+    extend: function(properties) {
+        var proto = new this(null);
+        for (var property in properties) {
+            var pp = proto[property];
+            proto[property] = Class.Merge(pp, properties[property]);
+        }
+        return new Class(proto);
+    },
+
+/*
+    Property: implement
+        Implements the passed in properties to the base Class prototypes, altering the base class, unlike <Class.extend>.
+
+    Arguments:
+        properties - the properties to add to the base class.
+
+    Example:
+        (start code)
+        var Animal = new Class({
+            initialize: function(age){
+                this.age = age;
+            }
+        });
+        Animal.implement({
+            setName: function(name){
+                this.name = name
+            }
+        });
+        var myAnimal = new Animal(20);
+        myAnimal.setName('Micia');
+        alert(myAnimal.name); //alerts 'Micia'
+        (end)
+    */
+
+    implement: function() {
+        for (var i = 0, l = arguments.length; i < l; i++) $extend(this.prototype, arguments[i]);
+    }
+
+};
+
+//internal
+
+Class.Merge = function(previous, current) {
+    if (previous && previous != current) {
+        var type = $type(current);
+        if (type != $type(previous)) return current;
+        switch (type) {
+            case 'function':
+                var merged = function() {
+                    this.parent = arguments.callee.parent;
+                    return current.apply(this, arguments);
+                };
+                merged.parent = previous;
+                return merged;
+            case 'object': return $merge(previous, current);
+        }
+    }
+    return current;
+};
+
+/*
+Script: Class.Extras.js
+	Contains common implementations for custom classes. In Mootools is implemented in <Ajax>, <XHR> and <Fx.Base> and many more.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Chain
+	An "Utility" Class. Its methods can be implemented with <Class.implement> into any <Class>.
+	Currently implemented in <Fx.Base>, <XHR> and <Ajax>. In <Fx.Base> for example, is used to execute a list of function, one after another, once the effect is completed.
+	The functions will not be fired all togheter, but one every completion, to create custom complex animations.
+
+Example:
+	(start code)
+	var myFx = new Fx.Style('element', 'opacity');
+
+	myFx.start(1,0).chain(function(){
+		myFx.start(0,1);
+	}).chain(function(){
+		myFx.start(1,0);
+	}).chain(function(){
+		myFx.start(0,1);
+	});
+	//the element will appear and disappear three times
+	(end)
+*/
+
+var Chain = new Class({
+
+/*
+    Property: chain
+        adds a function to the Chain instance stack.
+
+    Arguments:
+        fn - the function to append.
+    */
+
+    chain: function(fn) {
+        this.chains = this.chains || [];
+        this.chains.push(fn);
+        return this;
+    },
+
+/*
+    Property: callChain
+        Executes the first function of the Chain instance stack, then removes it. The first function will then become the second.
+    */
+
+    callChain: function() {
+        if (this.chains && this.chains.length) this.chains.shift().delay(10, this);
+    },
+
+/*
+    Property: clearChain
+        Clears the stack of a Chain instance.
+    */
+
+    clearChain: function() {
+        this.chains = [];
+    }
+
+});
+
+/*
+Class: Events
+	An "Utility" Class. Its methods can be implemented with <Class.implement> into any <Class>.
+	In <Fx.Base> Class, for example, is used to give the possibility add any number of functions to the Effects events, like onComplete, onStart, onCancel.
+	Events in a Class that implements <Events> can be either added as an option, or with addEvent. Never with .options.onEventName.
+
+Example:
+	(start code)
+	var myFx = new Fx.Style('element', 'opacity').addEvent('onComplete', function(){
+		alert('the effect is completed');
+	}).addEvent('onComplete', function(){
+		alert('I told you the effect is completed');
+	});
+
+	myFx.start(0,1);
+	//upon completion it will display the 2 alerts, in order.
+	(end)
+
+Implementing:
+	This class can be implemented into other classes to add the functionality to them.
+	Goes well with the <Options> class.
+
+Example:
+	(start code)
+	var Widget = new Class({
+		initialize: function(){},
+		finish: function(){
+			this.fireEvent('onComplete');
+		}
+	});
+	Widget.implement(new Events);
+	//later...
+	var myWidget = new Widget();
+	myWidget.addEvent('onComplete', myfunction);
+	(end)
+*/
+
+var Events = new Class({
+
+/*
+    Property: addEvent
+        adds an event to the stack of events of the Class instance.
+
+    Arguments:
+        type - string; the event name (e.g. 'onComplete')
+        fn - function to execute
+    */
+
+    addEvent: function(type, fn) {
+        if (fn != Class.empty) {
+            this.$events = this.$events || {};
+            this.$events[type] = this.$events[type] || [];
+            this.$events[type].include(fn);
+        }
+        return this;
+    },
+
+/*
+    Property: fireEvent
+        fires all events of the specified type in the Class instance.
+
+    Arguments:
+        type - string; the event name (e.g. 'onComplete')
+        args - array or single object; arguments to pass to the function; if more than one argument, must be an array
+        delay - (integer) delay (in ms) to wait to execute the event
+
+    Example:
+    (start code)
+    var Widget = new Class({
+        initialize: function(arg1, arg2){
+            ...
+            this.fireEvent("onInitialize", [arg1, arg2], 50);
+        }
+    });
+    Widget.implement(new Events);
+    (end)
+    */
+
+    fireEvent: function(type, args, delay) {
+        if (this.$events && this.$events[type]) {
+            this.$events[type].each(function(fn) {
+                fn.create({'bind': this, 'delay': delay, 'arguments': args})();
+            }, this);
+        }
+        return this;
+    },
+
+/*
+    Property: removeEvent
+        removes an event from the stack of events of the Class instance.
+
+    Arguments:
+        type - string; the event name (e.g. 'onComplete')
+        fn - function that was added
+    */
+
+    removeEvent: function(type, fn) {
+        if (this.$events && this.$events[type]) this.$events[type].remove(fn);
+        return this;
+    }
+
+});
+
+/*
+Class: Options
+	An "Utility" Class. Its methods can be implemented with <Class.implement> into any <Class>.
+	Used to automate the options settings, also adding Class <Events> when the option begins with on.
+
+	Example:
+		(start code)
+		var Widget = new Class({
+			options: {
+				color: '#fff',
+				size: {
+					width: 100
+					height: 100
+				}
+			},
+			initialize: function(options){
+				this.setOptions(options);
+			}
+		});
+		Widget.implement(new Options);
+		//later...
+		var myWidget = new Widget({
+			color: '#f00',
+			size: {
+				width: 200
+			}
+		});
+		//myWidget.options = {color: #f00, size: {width: 200, height: 100}}
+		(end)
+*/
+
+var Options = new Class({
+
+/*
+    Property: setOptions
+        sets this.options
+
+    Arguments:
+        defaults - object; the default set of options
+        options - object; the user entered options. can be empty too.
+
+    Note:
+        if your Class has <Events> implemented, every option beginning with on, followed by a capital letter (onComplete) becomes an Class instance event.
+    */
+
+    setOptions: function() {
+        this.options = $merge.apply(null, [this.options].extend(arguments));
+        if (this.addEvent) {
+            for (var option in this.options) {
+                if ($type(this.options[option] == 'function') && (/^on[A-Z]/).test(option)) this.addEvent(option, this.options[option]);
+            }
+        }
+        return this;
+    }
+
+});
+
+/*
+Script: Array.js
+	Contains Array prototypes, <$A>, <$each>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Array
+	A collection of The Array Object prototype methods.
+*/
+
+//custom methods
+
+Array.extend({
+
+/*
+    Property: forEach
+        Iterates through an array; This method is only available for browsers without native *forEach* support.
+        For more info see <http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:forEach>
+
+        *forEach* executes the provided function (callback) once for each element present in the array. callback is invoked only for indexes of the array which have assigned values; it is not invoked for indexes which have been deleted or which have never been assigned values.
+
+    Arguments:
+        fn - function to execute with each item in the array; passed the item and the index of that item in the array
+        bind - the object to bind "this" to (see <Function.bind>)
+
+    Example:
+        >['apple','banana','lemon'].each(function(item, index){
+        >	alert(index + " = " + item); //alerts "0 = apple" etc.
+        >}, bindObj); //optional second arg for binding, not used here
+    */
+
+    forEach: function(fn, bind) {
+        for (var i = 0, j = this.length; i < j; i++) fn.call(bind, this[i], i, this);
+    },
+
+/*
+    Property: filter
+        This method is provided only for browsers without native *filter* support.
+        For more info see <http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:filter>
+
+        *filter* calls a provided callback function once for each element in an array, and constructs a new array of all the values for which callback returns a true value. callback is invoked only for indexes of the array which have assigned values; it is not invoked for indexes which have been deleted or which have never been assigned values. Array elements which do not pass the callback test are simply skipped, and are not included in the new array.
+
+    Arguments:
+        fn - function to execute with each item in the array; passed the item and the index of that item in the array
+        bind - the object to bind "this" to (see <Function.bind>)
+
+    Example:
+        >var biggerThanTwenty = [10,3,25,100].filter(function(item, index){
+        > return item > 20;
+        >});
+        >//biggerThanTwenty = [25,100]
+    */
+
+    filter: function(fn, bind) {
+        var results = [];
+        for (var i = 0, j = this.length; i < j; i++) {
+            if (fn.call(bind, this[i], i, this)) results.push(this[i]);
+        }
+        return results;
+    },
+
+/*
+    Property: map
+        This method is provided only for browsers without native *map* support.
+        For more info see <http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:map>
+
+        *map* calls a provided callback function once for each element in an array, in order, and constructs a new array from the results. callback is invoked only for indexes of the array which have assigned values; it is not invoked for indexes which have been deleted or which have never been assigned values.
+
+    Arguments:
+        fn - function to execute with each item in the array; passed the item and the index of that item in the array
+        bind - the object to bind "this" to (see <Function.bind>)
+
+    Example:
+        >var timesTwo = [1,2,3].map(function(item, index){
+        > return item*2;
+        >});
+        >//timesTwo = [2,4,6];
+    */
+
+    map: function(fn, bind) {
+        var results = [];
+        for (var i = 0, j = this.length; i < j; i++) results[i] = fn.call(bind, this[i], i, this);
+        return results;
+    },
+
+/*
+    Property: every
+        This method is provided only for browsers without native *every* support.
+        For more info see <http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:every>
+
+        *every* executes the provided callback function once for each element present in the array until it finds one where callback returns a false value. If such an element is found, the every method immediately returns false. Otherwise, if callback returned a true value for all elements, every will return true. callback is invoked only for indexes of the array which have assigned values; it is not invoked for indexes which have been deleted or which have never been assigned values.
+
+    Arguments:
+        fn - function to execute with each item in the array; passed the item and the index of that item in the array
+        bind - the object to bind "this" to (see <Function.bind>)
+
+    Example:
+        >var areAllBigEnough = [10,4,25,100].every(function(item, index){
+        > return item > 20;
+        >});
+        >//areAllBigEnough = false
+    */
+
+    every: function(fn, bind) {
+        for (var i = 0, j = this.length; i < j; i++) {
+            if (!fn.call(bind, this[i], i, this)) return false;
+        }
+        return true;
+    },
+
+/*
+    Property: some
+        This method is provided only for browsers without native *some* support.
+        For more info see <http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:some>
+
+        *some* executes the callback function once for each element present in the array until it finds one where callback returns a true value. If such an element is found, some immediately returns true. Otherwise, some returns false. callback is invoked only for indexes of the array which have assigned values; it is not invoked for indexes which have been deleted or which have never been assigned values.
+
+    Arguments:
+        fn - function to execute with each item in the array; passed the item and the index of that item in the array
+        bind - the object to bind "this" to (see <Function.bind>)
+
+    Example:
+        >var isAnyBigEnough = [10,4,25,100].some(function(item, index){
+        > return item > 20;
+        >});
+        >//isAnyBigEnough = true
+    */
+
+    some: function(fn, bind) {
+        for (var i = 0, j = this.length; i < j; i++) {
+            if (fn.call(bind, this[i], i, this)) return true;
+        }
+        return false;
+    },
+
+/*
+    Property: indexOf
+        This method is provided only for browsers without native *indexOf* support.
+        For more info see <http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:indexOf>
+
+        *indexOf* compares a search element to elements of the Array using strict equality (the same method used by the ===, or triple-equals, operator).
+
+    Arguments:
+        item - any type of object; element to locate in the array
+        from - integer; optional; the index of the array at which to begin the search (defaults to 0)
+
+    Example:
+        >['apple','lemon','banana'].indexOf('lemon'); //returns 1
+        >['apple','lemon'].indexOf('banana'); //returns -1
+    */
+
+    indexOf: function(item, from) {
+        var len = this.length;
+        for (var i = (from < 0) ? Math.max(0, len + from) : from || 0; i < len; i++) {
+            if (this[i] === item) return i;
+        }
+        return -1;
+    },
+
+/*
+    Property: each
+        Same as <Array.forEach>.
+
+    Arguments:
+        fn - function to execute with each item in the array; passed the item and the index of that item in the array
+        bind - optional, the object that the "this" of the function will refer to.
+
+    Example:
+        >var Animals = ['Cat', 'Dog', 'Coala'];
+        >Animals.each(function(animal){
+        >	document.write(animal)
+        >});
+    */
+
+/*
+    Property: copy
+        returns a copy of the array.
+
+    Returns:
+        a new array which is a copy of the current one.
+
+    Arguments:
+        start - integer; optional; the index where to start the copy, default is 0. If negative, it is taken as the offset from the end of the array.
+        length - integer; optional; the number of elements to copy. By default, copies all elements from start to the end of the array.
+
+    Example:
+        >var letters = ["a","b","c"];
+        >var copy = letters.copy();		// ["a","b","c"] (new instance)
+    */
+
+    copy: function(start, length) {
+        start = start || 0;
+        if (start < 0) start = this.length + start;
+        length = length || (this.length - start);
+        var newArray = [];
+        for (var i = 0; i < length; i++) newArray[i] = this[start++];
+        return newArray;
+    },
+
+/*
+    Property: remove
+        Removes all occurrences of an item from the array.
+
+    Arguments:
+        item - the item to remove
+
+    Returns:
+        the Array with all occurrences of the item removed.
+
+    Example:
+        >["1","2","3","2"].remove("2") // ["1","3"];
+    */
+
+    remove: function(item) {
+        var i = 0;
+        var len = this.length;
+        while (i < len) {
+            if (this[i] === item) {
+                this.splice(i, 1);
+                len--;
+            } else {
+                i++;
+            }
+        }
+        return this;
+    },
+
+/*
+    Property: contains
+        Tests an array for the presence of an item.
+
+    Arguments:
+        item - the item to search for in the array.
+        from - integer; optional; the index at which to begin the search, default is 0. If negative, it is taken as the offset from the end of the array.
+
+    Returns:
+        true - the item was found
+        false - it wasn't
+
+    Example:
+        >["a","b","c"].contains("a"); // true
+        >["a","b","c"].contains("d"); // false
+    */
+
+    contains: function(item, from) {
+        return this.indexOf(item, from) != -1;
+    },
+
+/*
+    Property: associate
+        Creates an object with key-value pairs based on the array of keywords passed in
+        and the current content of the array.
+
+    Arguments:
+        keys - the array of keywords.
+
+    Example:
+        (start code)
+        var Animals = ['Cat', 'Dog', 'Coala', 'Lizard'];
+        var Speech = ['Miao', 'Bau', 'Fruuu', 'Mute'];
+        var Speeches = Animals.associate(Speech);
+        //Speeches['Miao'] is now Cat.
+        //Speeches['Bau'] is now Dog.
+        //...
+        (end)
+    */
+
+    associate: function(keys) {
+        var obj = {}, length = Math.min(this.length, keys.length);
+        for (var i = 0; i < length; i++) obj[keys[i]] = this[i];
+        return obj;
+    },
+
+/*
+    Property: extend
+        Extends an array with another one.
+
+    Arguments:
+        array - the array to extend ours with
+
+    Example:
+        >var Animals = ['Cat', 'Dog', 'Coala'];
+        >Animals.extend(['Lizard']);
+        >//Animals is now: ['Cat', 'Dog', 'Coala', 'Lizard'];
+    */
+
+    extend: function(array) {
+        for (var i = 0, j = array.length; i < j; i++) this.push(array[i]);
+        return this;
+    },
+
+/*
+    Property: merge
+        merges an array in another array, without duplicates. (case- and type-sensitive)
+
+    Arguments:
+        array - the array to merge from.
+
+    Example:
+        >['Cat','Dog'].merge(['Dog','Coala']); //returns ['Cat','Dog','Coala']
+    */
+
+    merge: function(array) {
+        for (var i = 0, l = array.length; i < l; i++) this.include(array[i]);
+        return this;
+    },
+
+/*
+    Property: include
+        includes the passed in element in the array, only if its not already present. (case- and type-sensitive)
+
+    Arguments:
+        item - item to add to the array (if not present)
+
+    Example:
+        >['Cat','Dog'].include('Dog'); //returns ['Cat','Dog']
+        >['Cat','Dog'].include('Coala'); //returns ['Cat','Dog','Coala']
+    */
+
+    include: function(item) {
+        if (!this.contains(item)) this.push(item);
+        return this;
+    },
+
+/*
+    Property: getRandom
+        returns a random item in the Array
+    */
+
+    getRandom: function() {
+        return this[$random(0, this.length - 1)] || null;
+    },
+
+/*
+    Property: getLast
+        returns the last item in the Array
+    */
+
+    getLast: function() {
+        return this[this.length - 1] || null;
+    }
+
+});
+
+//copies
+
+Array.prototype.each = Array.prototype.forEach;
+Array.each = Array.forEach;
+
+/* Section: Utility Functions */
+
+/*
+Function: $A()
+	Same as <Array.copy>, but as function.
+	Useful to apply Array prototypes to iterable objects, as a collection of DOM elements or the arguments object.
+
+Example:
+	(start code)
+	function myFunction(){
+		$A(arguments).each(argument, function(){
+			alert(argument);
+		});
+	};
+	//the above will alert all the arguments passed to the function myFunction.
+	(end)
+*/
+
+function $A(array) {
+    return Array.copy(array);
+}
+;
+
+/*
+Function: $each
+	Use to iterate through iterables that are not regular arrays, such as builtin getElementsByTagName calls, arguments of a function, or an object.
+
+Arguments:
+	iterable - an iterable element or an objct.
+	function - function to apply to the iterable.
+	bind - optional, the 'this' of the function will refer to this object.
+
+Function argument:
+	The function argument will be passed the following arguments.
+
+	item - the current item in the iterator being procesed
+	index - integer; the index of the item, or key in case of an object.
+
+Examples:
+	(start code)
+	$each(['Sun','Mon','Tue'], function(day, index){
+		alert('name:' + day + ', index: ' + index);
+	});
+	//alerts "name: Sun, index: 0", "name: Mon, index: 1", etc.
+	//over an object
+	$each({first: "Sunday", second: "Monday", third: "Tuesday"}, function(value, key){
+		alert("the " + key + " day of the week is " + value);
+	});
+	//alerts "the first day of the week is Sunday",
+	//"the second day of the week is Monday", etc.
+	(end)
+*/
+
+function $each(iterable, fn, bind) {
+    if (iterable && typeof iterable.length == 'number' && $type(iterable) != 'object') {
+        Array.forEach(iterable, fn, bind);
+    } else {
+        for (var name in iterable) fn.call(bind || iterable, iterable[name], name);
+    }
+}
+;
+
+/*compatibility*/
+
+Array.prototype.test = Array.prototype.contains;
+
+/*end compatibility*/
+
+/*
+Script: String.js
+	Contains String prototypes.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: String
+	A collection of The String Object prototype methods.
+*/
+
+String.extend({
+
+/*
+    Property: test
+        Tests a string with a regular expression.
+
+    Arguments:
+        regex - a string or regular expression object, the regular expression you want to match the string with
+        params - optional, if first parameter is a string, any parameters you want to pass to the regex ('g' has no effect)
+
+    Returns:
+        true if a match for the regular expression is found in the string, false if not.
+        See <http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:RegExp:test>
+
+    Example:
+        >"I like cookies".test("cookie"); // returns true
+        >"I like cookies".test("COOKIE", "i") // ignore case, returns true
+        >"I like cookies".test("cake"); // returns false
+    */
+
+    test: function(regex, params) {
+        return (($type(regex) == 'string') ? new RegExp(regex, params) : regex).test(this);
+    },
+
+/*
+    Property: toInt
+        parses a string to an integer.
+
+    Returns:
+        either an int or "NaN" if the string is not a number.
+
+    Example:
+        >var value = "10px".toInt(); // value is 10
+    */
+
+    toInt: function() {
+        return parseInt(this, 10);
+    },
+
+/*
+    Property: toFloat
+        parses a string to an float.
+
+    Returns:
+        either a float or "NaN" if the string is not a number.
+
+    Example:
+        >var value = "10.848".toFloat(); // value is 10.848
+    */
+
+    toFloat: function() {
+        return parseFloat(this);
+    },
+
+/*
+    Property: camelCase
+        Converts a hiphenated string to a camelcase string.
+
+    Example:
+        >"I-like-cookies".camelCase(); //"ILikeCookies"
+
+    Returns:
+        the camel cased string
+    */
+
+    camelCase: function() {
+        return this.replace(/-\D/g, function(match) {
+            return match.charAt(1).toUpperCase();
+        });
+    },
+
+/*
+    Property: hyphenate
+        Converts a camelCased string to a hyphen-ated string.
+
+    Example:
+        >"ILikeCookies".hyphenate(); //"I-like-cookies"
+    */
+
+    hyphenate: function() {
+        return this.replace(/\w[A-Z]/g, function(match) {
+            return (match.charAt(0) + '-' + match.charAt(1).toLowerCase());
+        });
+    },
+
+/*
+    Property: capitalize
+        Converts the first letter in each word of a string to Uppercase.
+
+    Example:
+        >"i like cookies".capitalize(); //"I Like Cookies"
+
+    Returns:
+        the capitalized string
+    */
+
+    capitalize: function() {
+        return this.replace(/\b[a-z]/g, function(match) {
+            return match.toUpperCase();
+        });
+    },
+
+/*
+    Property: trim
+        Trims the leading and trailing spaces off a string.
+
+    Example:
+        >"    i like cookies     ".trim() //"i like cookies"
+
+    Returns:
+        the trimmed string
+    */
+
+    trim: function() {
+        return this.replace(/^\s+|\s+$/g, '');
+    },
+
+/*
+    Property: clean
+        trims (<String.trim>) a string AND removes all the double spaces in a string.
+
+    Returns:
+        the cleaned string
+
+    Example:
+        >" i      like     cookies      \n\n".clean() //"i like cookies"
+    */
+
+    clean: function() {
+        return this.replace(/\s{2,}/g, ' ').trim();
+    },
+
+/*
+    Property: rgbToHex
+        Converts an RGB value to hexidecimal. The string must be in the format of "rgb(255,255,255)" or "rgba(255,255,255,1)";
+
+    Arguments:
+        array - boolean value, defaults to false. Use true if you want the array ['FF','33','00'] as output instead of "#FF3300"
+
+    Returns:
+        hex string or array. returns "transparent" if the output is set as string and the fourth value of rgba in input string is 0.
+
+    Example:
+        >"rgb(17,34,51)".rgbToHex(); //"#112233"
+        >"rgba(17,34,51,0)".rgbToHex(); //"transparent"
+        >"rgb(17,34,51)".rgbToHex(true); //['11','22','33']
+    */
+
+    rgbToHex: function(array) {
+        var rgb = this.match(/\d{1,3}/g);
+        return (rgb) ? rgb.rgbToHex(array) : false;
+    },
+
+/*
+    Property: hexToRgb
+        Converts a hexidecimal color value to RGB. Input string must be the hex color value (with or without the hash). Also accepts triplets ('333');
+
+    Arguments:
+        array - boolean value, defaults to false. Use true if you want the array [255,255,255] as output instead of "rgb(255,255,255)";
+
+    Returns:
+        rgb string or array.
+
+    Example:
+        >"#112233".hexToRgb(); //"rgb(17,34,51)"
+        >"#112233".hexToRgb(true); //[17,34,51]
+    */
+
+    hexToRgb: function(array) {
+        var hex = this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
+        return (hex) ? hex.slice(1).hexToRgb(array) : false;
+    },
+
+/*
+    Property: contains
+        checks if the passed in string is contained in the String. also accepts an optional second parameter, to check if the string is contained in a list of separated values.
+
+    Example:
+        >'a b c'.contains('c', ' '); //true
+        >'a bc'.contains('bc'); //true
+        >'a bc'.contains('b', ' '); //false
+    */
+
+    contains: function(string, s) {
+        return (s) ? (s + this + s).indexOf(s + string + s) > -1 : this.indexOf(string) > -1;
+    },
+
+/*
+    Property: escapeRegExp
+        Returns string with escaped regular expression characters
+
+    Example:
+        >var search = 'animals.sheeps[1]'.escapeRegExp(); // search is now 'animals\.sheeps\[1\]'
+
+    Returns:
+        Escaped string
+    */
+
+    escapeRegExp: function() {
+        return this.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+    }
+
+});
+
+Array.extend({
+
+/*
+    Property: rgbToHex
+        see <String.rgbToHex>, but as an array method.
+    */
+
+    rgbToHex: function(array) {
+        if (this.length < 3) return false;
+        if (this.length == 4 && this[3] == 0 && !array) return 'transparent';
+        var hex = [];
+        for (var i = 0; i < 3; i++) {
+            var bit = (this[i] - 0).toString(16);
+            hex.push((bit.length == 1) ? '0' + bit : bit);
+        }
+        return array ? hex : '#' + hex.join('');
+    },
+
+/*
+    Property: hexToRgb
+        same as <String.hexToRgb>, but as an array method.
+    */
+
+    hexToRgb: function(array) {
+        if (this.length != 3) return false;
+        var rgb = [];
+        for (var i = 0; i < 3; i++) {
+            rgb.push(parseInt((this[i].length == 1) ? this[i] + this[i] : this[i], 16));
+        }
+        return array ? rgb : 'rgb(' + rgb.join(',') + ')';
+    }
+
+});
+
+/*
+Script: Function.js
+	Contains Function prototypes and utility functions .
+
+License:
+	MIT-style license.
+
+Credits:
+	- Some functions are inspired by those found in prototype.js <http://prototype.conio.net/> (c) 2005 Sam Stephenson sam [at] conio [dot] net, MIT-style license
+*/
+
+/*
+Class: Function
+	A collection of The Function Object prototype methods.
+*/
+
+Function.extend({
+
+/*
+    Property: create
+        Main function to create closures.
+
+    Returns:
+        a function.
+
+    Arguments:
+        options - An Options object.
+
+    Options:
+        bind - The object that the "this" of the function will refer to. Default is the current function.
+        event - If set to true, the function will act as an event listener and receive an event as first argument.
+                If set to a class name, the function will receive a new instance of this class (with the event passed as argument's constructor) as first argument.
+                Default is false.
+        arguments - A single argument or array of arguments that will be passed to the function when called.
+
+                    If both the event and arguments options are set, the event is passed as first argument and the arguments array will follow.
+
+                    Default is no custom arguments, the function will receive the standard arguments when called.
+
+        delay - Numeric value: if set, the returned function will delay the actual execution by this amount of milliseconds and return a timer handle when called.
+                Default is no delay.
+        periodical - Numeric value: if set, the returned function will periodically perform the actual execution with this specified interval and return a timer handle when called.
+                Default is no periodical execution.
+        attempt - If set to true, the returned function will try to execute and return either the results or false on error. Default is false.
+    */
+
+    create: function(options) {
+        var fn = this;
+        options = $merge({
+            'bind': fn,
+            'event': false,
+            'arguments': null,
+            'delay': false,
+            'periodical': false,
+            'attempt': false
+        }, options);
+        if ($chk(options.arguments) && $type(options.arguments) != 'array') options.arguments = [options.arguments];
+        return function(event) {
+            var args;
+            if (options.event) {
+                event = event || window.event;
+                args = [(options.event === true) ? event : new options.event(event)];
+                if (options.arguments) args.extend(options.arguments);
+            }
+            else args = options.arguments || arguments;
+            var returns = function() {
+                return fn.apply($pick(options.bind, fn), args);
+            };
+            if (options.delay) return setTimeout(returns, options.delay);
+            if (options.periodical) return setInterval(returns, options.periodical);
+            if (options.attempt) try {
+                return returns();
+            } catch(err) {
+                return false;
+            }
+            ;
+            return returns();
+        };
+    },
+
+/*
+    Property: pass
+        Shortcut to create closures with arguments and bind.
+
+    Returns:
+        a function.
+
+    Arguments:
+        args - the arguments passed. must be an array if arguments > 1
+        bind - optional, the object that the "this" of the function will refer to.
+
+    Example:
+        >myFunction.pass([arg1, arg2], myElement);
+    */
+
+    pass: function(args, bind) {
+        return this.create({'arguments': args, 'bind': bind});
+    },
+
+/*
+    Property: attempt
+        Tries to execute the function, returns either the result of the function or false on error.
+
+    Arguments:
+        args - the arguments passed. must be an array if arguments > 1
+        bind - optional, the object that the "this" of the function will refer to.
+
+    Example:
+        >myFunction.attempt([arg1, arg2], myElement);
+    */
+
+    attempt: function(args, bind) {
+        return this.create({'arguments': args, 'bind': bind, 'attempt': true})();
+    },
+
+/*
+    Property: bind
+        method to easily create closures with "this" altered.
+
+    Arguments:
+        bind - optional, the object that the "this" of the function will refer to.
+        args - optional, the arguments passed. must be an array if arguments > 1
+
+    Returns:
+        a function.
+
+    Example:
+        >function myFunction(){
+        >	this.setStyle('color', 'red');
+        >	// note that 'this' here refers to myFunction, not an element
+        >	// we'll need to bind this function to the element we want to alter
+        >};
+        >var myBoundFunction = myFunction.bind(myElement);
+        >myBoundFunction(); // this will make the element myElement red.
+    */
+
+    bind: function(bind, args) {
+        return this.create({'bind': bind, 'arguments': args});
+    },
+
+/*
+    Property: bindAsEventListener
+        cross browser method to pass event firer
+
+    Arguments:
+        bind - optional, the object that the "this" of the function will refer to.
+        args - optional, the arguments passed. must be an array if arguments > 1
+
+    Returns:
+        a function with the parameter bind as its "this" and as a pre-passed argument event or window.event, depending on the browser.
+
+    Example:
+        >function myFunction(event){
+        >	alert(event.clientx) //returns the coordinates of the mouse..
+        >};
+        >myElement.onclick = myFunction.bindAsEventListener(myElement);
+    */
+
+    bindAsEventListener: function(bind, args) {
+        return this.create({'bind': bind, 'event': true, 'arguments': args});
+    },
+
+/*
+    Property: delay
+        Delays the execution of a function by a specified duration.
+
+    Arguments:
+        delay - the duration to wait in milliseconds.
+        bind - optional, the object that the "this" of the function will refer to.
+        args - optional, the arguments passed. must be an array if arguments > 1
+
+    Example:
+        >myFunction.delay(50, myElement) //wait 50 milliseconds, then call myFunction and bind myElement to it
+        >(function(){alert('one second later...')}).delay(1000); //wait a second and alert
+    */
+
+    delay: function(delay, bind, args) {
+        return this.create({'delay': delay, 'bind': bind, 'arguments': args})();
+    },
+
+/*
+    Property: periodical
+        Executes a function in the specified intervals of time
+
+    Arguments:
+        interval - the duration of the intervals between executions.
+        bind - optional, the object that the "this" of the function will refer to.
+        args - optional, the arguments passed. must be an array if arguments > 1
+    */
+
+    periodical: function(interval, bind, args) {
+        return this.create({'periodical': interval, 'bind': bind, 'arguments': args})();
+    }
+
+});
+
+/*
+Script: Number.js
+	Contains the Number prototypes.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Number
+	A collection of The Number Object prototype methods.
+*/
+
+Number.extend({
+
+/*
+    Property: toInt
+        Returns this number; useful because toInt must work on both Strings and Numbers.
+    */
+
+    toInt: function() {
+        return parseInt(this);
+    },
+
+/*
+    Property: toFloat
+        Returns this number as a float; useful because toFloat must work on both Strings and Numbers.
+    */
+
+    toFloat: function() {
+        return parseFloat(this);
+    },
+
+/*
+    Property: limit
+        Limits the number.
+
+    Arguments:
+        min - number, minimum value
+        max - number, maximum value
+
+    Returns:
+        the number in the given limits.
+
+    Example:
+        >(12).limit(2, 6.5)  // returns 6.5
+        >(-4).limit(2, 6.5)  // returns 2
+        >(4.3).limit(2, 6.5) // returns 4.3
+    */
+
+    limit: function(min, max) {
+        return Math.min(max, Math.max(min, this));
+    },
+
+/*
+    Property: round
+        Returns the number rounded to specified precision.
+
+    Arguments:
+        precision - integer, number of digits after the decimal point. Can also be negative or zero (default).
+
+    Example:
+        >12.45.round() // returns 12
+        >12.45.round(1) // returns 12.5
+        >12.45.round(-1) // returns 10
+
+    Returns:
+        The rounded number.
+    */
+
+    round: function(precision) {
+        precision = Math.pow(10, precision || 0);
+        return Math.round(this * precision) / precision;
+    },
+
+/*
+    Property: times
+        Executes a passed in function the specified number of times
+
+    Arguments:
+        function - the function to be executed on each iteration of the loop
+
+    Example:
+        >(4).times(alert);
+    */
+
+    times: function(fn) {
+        for (var i = 0; i < this; i++) fn(i);
+    }
+
+});
+
+/*
+Script: Element.js
+	Contains useful Element prototypes, to be used with the dollar function <$>.
+
+License:
+	MIT-style license.
+
+Credits:
+	- Some functions are inspired by those found in prototype.js <http://prototype.conio.net/> (c) 2005 Sam Stephenson sam [at] conio [dot] net, MIT-style license
+*/
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+var Element = new Class({
+
+/*
+    Property: initialize
+        Creates a new element of the type passed in.
+
+    Arguments:
+        el - string; the tag name for the element you wish to create. you can also pass in an element reference, in which case it will be extended.
+        props - object; the properties you want to add to your element.
+        Accepts the same keys as <Element.setProperties>, but also allows events and styles
+
+    Props:
+        the key styles will be used as setStyles, the key events will be used as addEvents. any other key is used as setProperty.
+
+    Example:
+        (start code)
+        new Element('a', {
+            'styles': {
+                'display': 'block',
+                'border': '1px solid black'
+            },
+            'events': {
+                'click': function(){
+                    //aaa
+                },
+                'mousedown': function(){
+                    //aaa
+                }
+            },
+            'class': 'myClassSuperClass',
+            'href': 'http://mad4milk.net'
+        });
+
+        (end)
+    */
+
+    initialize: function(el, props) {
+        if ($type(el) == 'string') {
+            if (window.ie && props && (props.name || props.type)) {
+                var name = (props.name) ? ' name="' + props.name + '"' : '';
+                var type = (props.type) ? ' type="' + props.type + '"' : '';
+                delete props.name;
+                delete props.type;
+                el = '<' + el + name + type + '>';
+            }
+            el = document.createElement(el);
+        }
+        el = $(el);
+        return (!props || !el) ? el : el.set(props);
+    }
+
+});
+
+/*
+Class: Elements
+	- Every dom function such as <$$>, or in general every function that returns a collection of nodes in mootools, returns them as an Elements class.
+	- The purpose of the Elements class is to allow <Element> methods to work also on <Elements> array.
+	- Elements is also an Array, so it accepts all the <Array> methods.
+	- Every node of the Elements instance is already extended with <$>.
+
+Example:
+	>$$('myselector').each(function(el){
+	> //...
+	>});
+
+	some iterations here, $$('myselector') is also an array.
+
+	>$$('myselector').setStyle('color', 'red');
+	every element returned by $$('myselector') also accepts <Element> methods, in this example every element will be made red.
+*/
+
+var Elements = new Class({
+
+    initialize: function(elements) {
+        return (elements) ? $extend(elements, this) : this;
+    }
+
+});
+
+Elements.extend = function(props) {
+    for (var prop in props) {
+        this.prototype[prop] = props[prop];
+        this[prop] = $native.generic(prop);
+    }
+};
+
+/*
+Section: Utility Functions
+
+Function: $
+	returns the element passed in with all the Element prototypes applied.
+
+Arguments:
+	el - a reference to an actual element or a string representing the id of an element
+
+Example:
+	>$('myElement') // gets a DOM element by id with all the Element prototypes applied.
+	>var div = document.getElementById('myElement');
+	>$(div) //returns an Element also with all the mootools extentions applied.
+
+	You'll use this when you aren't sure if a variable is an actual element or an id, as
+	well as just shorthand for document.getElementById().
+
+Returns:
+	a DOM element or false (if no id was found).
+
+Note:
+	you need to call $ on an element only once to get all the prototypes.
+	But its no harm to call it multiple times, as it will detect if it has been already extended.
+*/
+
+function $(el) {
+    if (!el) return null;
+    if (el.htmlElement) return Garbage.collect(el);
+    if ([window, document].contains(el)) return el;
+    var type = $type(el);
+    if (type == 'string') {
+        el = document.getElementById(el);
+        type = (el) ? 'element' : false;
+    }
+    if (type != 'element') return null;
+    if (el.htmlElement) return Garbage.collect(el);
+    if (['object', 'embed'].contains(el.tagName.toLowerCase())) return el;
+    $extend(el, Element.prototype);
+    el.htmlElement = function() {
+    };
+    return Garbage.collect(el);
+}
+;
+
+/*
+Function: $$
+	Selects, and extends DOM elements. Elements arrays returned with $$ will also accept all the <Element> methods.
+	The return type of element methods run through $$ is always an array. If the return array is only made by elements,
+	$$ will be applied automatically.
+
+Arguments:
+	HTML Collections, arrays of elements, arrays of strings as element ids, elements, strings as selectors.
+	Any number of the above as arguments are accepted.
+
+Note:
+	if you load <Element.Selectors.js>, $$ will also accept CSS Selectors, otherwise the only selectors supported are tag names.
+
+Example:
+	>$$('a') //an array of all anchor tags on the page
+	>$$('a', 'b') //an array of all anchor and bold tags on the page
+	>$$('#myElement') //array containing only the element with id = myElement. (only with <Element.Selectors.js>)
+	>$$('#myElement a.myClass') //an array of all anchor tags with the class "myClass"
+	>//within the DOM element with id "myElement" (only with <Element.Selectors.js>)
+	>$$(myelement, myelement2, 'a', ['myid', myid2, 'myid3'], document.getElementsByTagName('div')) //an array containing:
+	>// the element referenced as myelement if existing,
+	>// the element referenced as myelement2 if existing,
+	>// all the elements with a as tag in the page,
+	>// the element with id = myid if existing
+	>// the element with id = myid2 if existing
+	>// the element with id = myid3 if existing
+	>// all the elements with div as tag in the page
+
+Returns:
+	array - array of all the dom elements matched, extended with <$>.  Returns as <Elements>.
+*/
+
+document.getElementsBySelector = document.getElementsByTagName;
+
+function $$() {
+    var elements = [];
+    for (var i = 0, j = arguments.length; i < j; i++) {
+        var selector = arguments[i];
+        switch ($type(selector)) {
+            case 'element': elements.push(selector);
+            case 'boolean': break;
+            case false: break;
+            case 'string': selector = document.getElementsBySelector(selector, true);
+            default: elements.extend(selector);
+        }
+    }
+    return $$.unique(elements);
+}
+;
+
+$$.unique = function(array) {
+    var elements = [];
+    for (var i = 0, l = array.length; i < l; i++) {
+        if (array[i].$included) continue;
+        var element = $(array[i]);
+        if (element && !element.$included) {
+            element.$included = true;
+            elements.push(element);
+        }
+    }
+    for (var n = 0, d = elements.length; n < d; n++) elements[n].$included = null;
+    return new Elements(elements);
+};
+
+Elements.Multi = function(property) {
+    return function() {
+        var args = arguments;
+        var items = [];
+        var elements = true;
+        for (var i = 0, j = this.length, returns; i < j; i++) {
+            returns = this[i][property].apply(this[i], args);
+            if ($type(returns) != 'element') elements = false;
+            items.push(returns);
+        }
+        ;
+        return (elements) ? $$.unique(items) : items;
+    };
+};
+
+Element.extend = function(properties) {
+    for (var property in properties) {
+        HTMLElement.prototype[property] = properties[property];
+        Element.prototype[property] = properties[property];
+        Element[property] = $native.generic(property);
+        var elementsProperty = (Array.prototype[property]) ? property + 'Elements' : property;
+        Elements.prototype[elementsProperty] = Elements.Multi(property);
+    }
+};
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: set
+        you can set events, styles and properties with this shortcut. same as calling new Element.
+    */
+
+    set: function(props) {
+        for (var prop in props) {
+            var val = props[prop];
+            switch (prop) {
+                case 'styles': this.setStyles(val); break;
+                case 'events': if (this.addEvents) this.addEvents(val); break;
+                case 'properties': this.setProperties(val); break;
+                default: this.setProperty(prop, val);
+            }
+        }
+        return this;
+    },
+
+    inject: function(el, where) {
+        el = $(el);
+        switch (where) {
+            case 'before': el.parentNode.insertBefore(this, el); break;
+            case 'after':
+                var next = el.getNext();
+                if (!next) el.parentNode.appendChild(this);
+                else el.parentNode.insertBefore(this, next);
+                break;
+            case 'top':
+                var first = el.firstChild;
+                if (first) {
+                    el.insertBefore(this, first);
+                    break;
+                }
+            default: el.appendChild(this);
+        }
+        return this;
+    },
+
+/*
+    Property: injectBefore
+        Inserts the Element before the passed element.
+
+    Arguments:
+        el - an element reference or the id of the element to be injected in.
+
+    Example:
+        >html:
+        ><div id="myElement"></div>
+        ><div id="mySecondElement"></div>
+        >js:
+        >$('mySecondElement').injectBefore('myElement');
+        >resulting html:
+        ><div id="mySecondElement"></div>
+        ><div id="myElement"></div>
+    */
+
+    injectBefore: function(el) {
+        return this.inject(el, 'before');
+    },
+
+/*
+    Property: injectAfter
+        Same as <Element.injectBefore>, but inserts the element after.
+    */
+
+    injectAfter: function(el) {
+        return this.inject(el, 'after');
+    },
+
+/*
+    Property: injectInside
+        Same as <Element.injectBefore>, but inserts the element inside.
+    */
+
+    injectInside: function(el) {
+        return this.inject(el, 'bottom');
+    },
+
+/*
+    Property: injectTop
+        Same as <Element.injectInside>, but inserts the element inside, at the top.
+    */
+
+    injectTop: function(el) {
+        return this.inject(el, 'top');
+    },
+
+/*
+    Property: adopt
+        Inserts the passed elements inside the Element.
+
+    Arguments:
+        accepts elements references, element ids as string, selectors ($$('stuff')) / array of elements, array of ids as strings and collections.
+    */
+
+    adopt: function() {
+        var elements = [];
+        $each(arguments, function(argument) {
+            elements = elements.concat(argument);
+        });
+        $$(elements).inject(this);
+        return this;
+    },
+
+/*
+    Property: remove
+        Removes the Element from the DOM.
+
+    Example:
+        >$('myElement').remove() //bye bye
+    */
+
+    remove: function() {
+        return this.parentNode.removeChild(this);
+    },
+
+/*
+    Property: clone
+        Clones the Element and returns the cloned one.
+
+    Arguments:
+        contents - boolean, when true the Element is cloned with childNodes, default true
+
+    Returns:
+        the cloned element
+
+    Example:
+        >var clone = $('myElement').clone().injectAfter('myElement');
+        >//clones the Element and append the clone after the Element.
+    */
+
+    clone: function(contents) {
+        var el = $(this.cloneNode(contents !== false));
+        if (!el.$events) return el;
+        el.$events = {};
+        for (var type in this.$events) el.$events[type] = {
+            'keys': $A(this.$events[type].keys),
+            'values': $A(this.$events[type].values)
+        };
+        return el.removeEvents();
+    },
+
+/*
+    Property: replaceWith
+        Replaces the Element with an element passed.
+
+    Arguments:
+        el - a string representing the element to be injected in (myElementId, or div), or an element reference.
+        If you pass div or another tag, the element will be created.
+
+    Returns:
+        the passed in element
+
+    Example:
+        >$('myOldElement').replaceWith($('myNewElement')); //$('myOldElement') is gone, and $('myNewElement') is in its place.
+    */
+
+    replaceWith: function(el) {
+        el = $(el);
+        this.parentNode.replaceChild(el, this);
+        return el;
+    },
+
+/*
+    Property: appendText
+        Appends text node to a DOM element.
+
+    Arguments:
+        text - the text to append.
+
+    Example:
+        ><div id="myElement">hey</div>
+        >$('myElement').appendText(' howdy'); //myElement innerHTML is now "hey howdy"
+    */
+
+    appendText: function(text) {
+        this.appendChild(document.createTextNode(text));
+        return this;
+    },
+
+/*
+    Property: hasClass
+        Tests the Element to see if it has the passed in className.
+
+    Returns:
+        true - the Element has the class
+        false - it doesn't
+
+    Arguments:
+        className - string; the class name to test.
+
+    Example:
+        ><div id="myElement" class="testClass"></div>
+        >$('myElement').hasClass('testClass'); //returns true
+    */
+
+    hasClass: function(className) {
+        return this.className.contains(className, ' ');
+    },
+
+/*
+    Property: addClass
+        Adds the passed in class to the Element, if the element doesnt already have it.
+
+    Arguments:
+        className - string; the class name to add
+
+    Example:
+        ><div id="myElement" class="testClass"></div>
+        >$('myElement').addClass('newClass'); //<div id="myElement" class="testClass newClass"></div>
+    */
+
+    addClass: function(className) {
+        if (!this.hasClass(className)) this.className = (this.className + ' ' + className).clean();
+        return this;
+    },
+
+/*
+    Property: removeClass
+        Works like <Element.addClass>, but removes the class from the element.
+    */
+
+    removeClass: function(className) {
+        this.className = this.className.replace(new RegExp('(^|\\s)' + className + '(?:\\s|$)'), '$1').clean();
+        return this;
+    },
+
+/*
+    Property: toggleClass
+        Adds or removes the passed in class name to the element, depending on if it's present or not.
+
+    Arguments:
+        className - the class to add or remove
+
+    Example:
+        ><div id="myElement" class="myClass"></div>
+        >$('myElement').toggleClass('myClass');
+        ><div id="myElement" class=""></div>
+        >$('myElement').toggleClass('myClass');
+        ><div id="myElement" class="myClass"></div>
+    */
+
+    toggleClass: function(className) {
+        return this.hasClass(className) ? this.removeClass(className) : this.addClass(className);
+    },
+
+/*
+    Property: setStyle
+        Sets a css property to the Element.
+
+        Arguments:
+            property - the property to set
+            value - the value to which to set it; for numeric values that require "px" you can pass an integer
+
+        Example:
+            >$('myElement').setStyle('width', '300px'); //the width is now 300px
+            >$('myElement').setStyle('width', 300); //the width is now 300px
+    */
+
+    setStyle: function(property, value) {
+        switch (property) {
+            case 'opacity': return this.setOpacity(parseFloat(value));
+            case 'float': property = (window.ie) ? 'styleFloat' : 'cssFloat';
+        }
+        property = property.camelCase();
+        switch ($type(value)) {
+            case 'number': if (!['zIndex', 'zoom'].contains(property)) value += 'px'; break;
+            case 'array': value = 'rgb(' + value.join(',') + ')';
+        }
+        this.style[property] = value;
+        return this;
+    },
+
+/*
+    Property: setStyles
+        Applies a collection of styles to the Element.
+
+    Arguments:
+        source - an object or string containing all the styles to apply. When its a string it overrides old style.
+
+    Examples:
+        >$('myElement').setStyles({
+        >	border: '1px solid #000',
+        >	width: 300,
+        >	height: 400
+        >});
+
+        OR
+
+        >$('myElement').setStyles('border: 1px solid #000; width: 300px; height: 400px;');
+    */
+
+    setStyles: function(source) {
+        switch ($type(source)) {
+            case 'object': Element.setMany(this, 'setStyle', source); break;
+            case 'string': this.style.cssText = source;
+        }
+        return this;
+    },
+
+/*
+    Property: setOpacity
+        Sets the opacity of the Element, and sets also visibility == "hidden" if opacity == 0, and visibility = "visible" if opacity > 0.
+
+    Arguments:
+        opacity - float; Accepts values from 0 to 1.
+
+    Example:
+        >$('myElement').setOpacity(0.5) //make it 50% transparent
+    */
+
+    setOpacity: function(opacity) {
+        if (opacity == 0) {
+            if (this.style.visibility != "hidden") this.style.visibility = "hidden";
+        } else {
+            if (this.style.visibility != "visible") this.style.visibility = "visible";
+        }
+        if (!this.currentStyle || !this.currentStyle.hasLayout) this.style.zoom = 1;
+        if (window.ie) this.style.filter = (opacity == 1) ? '' : "alpha(opacity=" + opacity * 100 + ")";
+        this.style.opacity = this.$tmp.opacity = opacity;
+        return this;
+    },
+
+/*
+    Property: getStyle
+        Returns the style of the Element given the property passed in.
+
+    Arguments:
+        property - the css style property you want to retrieve
+
+    Example:
+        >$('myElement').getStyle('width'); //returns "400px"
+        >//but you can also use
+        >$('myElement').getStyle('width').toInt(); //returns 400
+
+    Returns:
+        the style as a string
+    */
+
+    getStyle: function(property) {
+        property = property.camelCase();
+        var result = this.style[property];
+        if (!$chk(result)) {
+            if (property == 'opacity') return this.$tmp.opacity;
+            result = [];
+            for (var style in Element.Styles) {
+                if (property == style) {
+                    Element.Styles[style].each(function(s) {
+                        var style = this.getStyle(s);
+                        result.push(parseInt(style) ? style : '0px');
+                    }, this);
+                    if (property == 'border') {
+                        var every = result.every(function(bit) {
+                            return (bit == result[0]);
+                        });
+                        return (every) ? result[0] : false;
+                    }
+                    return result.join(' ');
+                }
+            }
+            if (property.contains('border')) {
+                if (Element.Styles.border.contains(property)) {
+                    return ['Width', 'Style', 'Color'].map(function(p) {
+                        return this.getStyle(property + p);
+                    }, this).join(' ');
+                } else if (Element.borderShort.contains(property)) {
+                    return ['Top', 'Right', 'Bottom', 'Left'].map(function(p) {
+                        return this.getStyle('border' + p + property.replace('border', ''));
+                    }, this).join(' ');
+                }
+            }
+            if (document.defaultView) result = document.defaultView.getComputedStyle(this, null).getPropertyValue(property.hyphenate());
+            else if (this.currentStyle) result = this.currentStyle[property];
+        }
+        if (window.ie) result = Element.fixStyle(property, result, this);
+        if (result && property.test(/color/i) && result.contains('rgb')) {
+            return result.split('rgb').splice(1, 4).map(function(color) {
+                return color.rgbToHex();
+            }).join(' ');
+        }
+        return result;
+    },
+
+/*
+    Property: getStyles
+        Returns an object of styles of the Element for each argument passed in.
+        Arguments:
+        properties - strings; any number of style properties
+    Example:
+        >$('myElement').getStyles('width','height','padding');
+        >//returns an object like:
+        >{width: "10px", height: "10px", padding: "10px 0px 10px 0px"}
+    */
+
+    getStyles: function() {
+        return Element.getMany(this, 'getStyle', arguments);
+    },
+
+    walk: function(brother, start) {
+        brother += 'Sibling';
+        var el = (start) ? this[start] : this[brother];
+        while (el && $type(el) != 'element') el = el[brother];
+        return $(el);
+    },
+
+/*
+    Property: getPrevious
+        Returns the previousSibling of the Element, excluding text nodes.
+
+    Example:
+        >$('myElement').getPrevious(); //get the previous DOM element from myElement
+
+    Returns:
+        the sibling element or undefined if none found.
+    */
+
+    getPrevious: function() {
+        return this.walk('previous');
+    },
+
+/*
+    Property: getNext
+        Works as Element.getPrevious, but tries to find the nextSibling.
+    */
+
+    getNext: function() {
+        return this.walk('next');
+    },
+
+/*
+    Property: getFirst
+        Works as <Element.getPrevious>, but tries to find the firstChild.
+    */
+
+    getFirst: function() {
+        return this.walk('next', 'firstChild');
+    },
+
+/*
+    Property: getLast
+        Works as <Element.getPrevious>, but tries to find the lastChild.
+    */
+
+    getLast: function() {
+        return this.walk('previous', 'lastChild');
+    },
+
+/*
+    Property: getParent
+        returns the $(element.parentNode)
+    */
+
+    getParent: function() {
+        return $(this.parentNode);
+    },
+
+/*
+    Property: getChildren
+        returns all the $(element.childNodes), excluding text nodes. Returns as <Elements>.
+    */
+
+    getChildren: function() {
+        return $$(this.childNodes);
+    },
+
+/*
+    Property: hasChild
+        returns true if the passed in element is a child of the $(element).
+    */
+
+    hasChild: function(el) {
+        return !!$A(this.getElementsByTagName('*')).contains(el);
+    },
+
+/*
+    Property: getProperty
+        Gets the an attribute of the Element.
+
+    Arguments:
+        property - string; the attribute to retrieve
+
+    Example:
+        >$('myImage').getProperty('src') // returns whatever.gif
+
+    Returns:
+        the value, or an empty string
+    */
+
+    getProperty: function(property) {
+        var index = Element.Properties[property];
+        if (index) return this[index];
+        var flag = Element.PropertiesIFlag[property] || 0;
+        if (!window.ie || flag) return this.getAttribute(property, flag);
+        var node = this.attributes[property];
+        return (node) ? node.nodeValue : null;
+    },
+
+/*
+    Property: removeProperty
+        Removes an attribute from the Element
+
+    Arguments:
+        property - string; the attribute to remove
+    */
+
+    removeProperty: function(property) {
+        var index = Element.Properties[property];
+        if (index) this[index] = '';
+        else this.removeAttribute(property);
+        return this;
+    },
+
+/*
+    Property: getProperties
+        same as <Element.getStyles>, but for properties
+    */
+
+    getProperties: function() {
+        return Element.getMany(this, 'getProperty', arguments);
+    },
+
+/*
+    Property: setProperty
+        Sets an attribute for the Element.
+
+    Arguments:
+        property - string; the property to assign the value passed in
+        value - the value to assign to the property passed in
+
+    Example:
+        >$('myImage').setProperty('src', 'whatever.gif'); //myImage now points to whatever.gif for its source
+    */
+
+    setProperty: function(property, value) {
+        var index = Element.Properties[property];
+        if (index) this[index] = value;
+        else this.setAttribute(property, value);
+        return this;
+    },
+
+/*
+    Property: setProperties
+        Sets numerous attributes for the Element.
+
+    Arguments:
+        source - an object with key/value pairs.
+
+    Example:
+        (start code)
+        $('myElement').setProperties({
+            src: 'whatever.gif',
+            alt: 'whatever dude'
+        });
+        <img src="whatever.gif" alt="whatever dude">
+        (end)
+    */
+
+    setProperties: function(source) {
+        return Element.setMany(this, 'setProperty', source);
+    },
+
+/*
+    Property: setHTML
+        Sets the innerHTML of the Element.
+
+    Arguments:
+        html - string; the new innerHTML for the element.
+
+    Example:
+        >$('myElement').setHTML(newHTML) //the innerHTML of myElement is now = newHTML
+    */
+
+    setHTML: function() {
+        this.innerHTML = $A(arguments).join('');
+        return this;
+    },
+
+/*
+    Property: setText
+        Sets the inner text of the Element.
+
+    Arguments:
+        text - string; the new text content for the element.
+
+    Example:
+        >$('myElement').setText('some text') //the text of myElement is now = 'some text'
+    */
+
+    setText: function(text) {
+        var tag = this.getTag();
+        if (['style', 'script'].contains(tag)) {
+            if (window.ie) {
+                if (tag == 'style') this.styleSheet.cssText = text;
+                else if (tag == 'script') this.setProperty('text', text);
+                return this;
+            } else {
+                this.removeChild(this.firstChild);
+                return this.appendText(text);
+            }
+        }
+        this[$defined(this.innerText) ? 'innerText' : 'textContent'] = text;
+        return this;
+    },
+
+/*
+    Property: getText
+        Gets the inner text of the Element.
+    */
+
+    getText: function() {
+        var tag = this.getTag();
+        if (['style', 'script'].contains(tag)) {
+            if (window.ie) {
+                if (tag == 'style') return this.styleSheet.cssText;
+                else if (tag == 'script') return this.getProperty('text');
+            } else {
+                return this.innerHTML;
+            }
+        }
+        return ($pick(this.innerText, this.textContent));
+    },
+
+/*
+    Property: getTag
+        Returns the tagName of the element in lower case.
+
+    Example:
+        >$('myImage').getTag() // returns 'img'
+
+    Returns:
+        The tag name in lower case
+    */
+
+    getTag: function() {
+        return this.tagName.toLowerCase();
+    },
+
+/*
+    Property: empty
+        Empties an element of all its children.
+
+    Example:
+        >$('myDiv').empty() // empties the Div and returns it
+
+    Returns:
+        The element.
+    */
+
+    empty: function() {
+        Garbage.trash(this.getElementsByTagName('*'));
+        return this.setHTML('');
+    }
+
+});
+
+Element.fixStyle = function(property, result, element) {
+    if ($chk(parseInt(result))) return result;
+    if (['height', 'width'].contains(property)) {
+        var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'];
+        var size = 0;
+        values.each(function(value) {
+            size += element.getStyle('border-' + value + '-width').toInt() + element.getStyle('padding-' + value).toInt();
+        });
+        return element['offset' + property.capitalize()] - size + 'px';
+    } else if (property.test(/border(.+)Width|margin|padding/)) {
+        return '0px';
+    }
+    return result;
+};
+
+Element.Styles = {'border': [], 'padding': [], 'margin': []};
+['Top', 'Right', 'Bottom', 'Left'].each(function(direction) {
+    for (var style in Element.Styles) Element.Styles[style].push(style + direction);
+});
+
+Element.borderShort = ['borderWidth', 'borderStyle', 'borderColor'];
+
+Element.getMany = function(el, method, keys) {
+    var result = {};
+    $each(keys, function(key) {
+        result[key] = el[method](key);
+    });
+    return result;
+};
+
+Element.setMany = function(el, method, pairs) {
+    for (var key in pairs) el[method](key, pairs[key]);
+    return el;
+};
+
+Element.Properties = new Abstract({
+    'class': 'className', 'for': 'htmlFor', 'colspan': 'colSpan', 'rowspan': 'rowSpan',
+    'accesskey': 'accessKey', 'tabindex': 'tabIndex', 'maxlength': 'maxLength',
+    'readonly': 'readOnly', 'frameborder': 'frameBorder', 'value': 'value',
+    'disabled': 'disabled', 'checked': 'checked', 'multiple': 'multiple', 'selected': 'selected'
+});
+Element.PropertiesIFlag = {
+    'href': 2, 'src': 2
+};
+
+Element.Methods = {
+    Listeners: {
+        addListener: function(type, fn) {
+            if (this.addEventListener) this.addEventListener(type, fn, false);
+            else this.attachEvent('on' + type, fn);
+            return this;
+        },
+
+        removeListener: function(type, fn) {
+            if (this.removeEventListener) this.removeEventListener(type, fn, false);
+            else this.detachEvent('on' + type, fn);
+            return this;
+        }
+    }
+};
+
+window.extend(Element.Methods.Listeners);
+document.extend(Element.Methods.Listeners);
+Element.extend(Element.Methods.Listeners);
+
+var Garbage = {
+
+    elements: [],
+
+    collect: function(el) {
+        if (!el.$tmp) {
+            Garbage.elements.push(el);
+            el.$tmp = {'opacity': 1};
+        }
+        return el;
+    },
+
+    trash: function(elements) {
+        for (var i = 0, j = elements.length, el; i < j; i++) {
+            if (!(el = elements[i]) || !el.$tmp) continue;
+            if (el.$events) el.fireEvent('trash').removeEvents();
+            for (var p in el.$tmp) el.$tmp[p] = null;
+            for (var d in Element.prototype) el[d] = null;
+            Garbage.elements[Garbage.elements.indexOf(el)] = null;
+            el.htmlElement = el.$tmp = el = null;
+        }
+        Garbage.elements.remove(null);
+    },
+
+    empty: function() {
+        Garbage.collect(window);
+        Garbage.collect(document);
+        Garbage.trash(Garbage.elements);
+    }
+
+};
+
+window.addListener('beforeunload', function() {
+    window.addListener('unload', Garbage.empty);
+    if (window.ie) window.addListener('unload', CollectGarbage);
+});
+
+/*
+Script: Element.Event.js
+	Contains the Event Class, Element methods to deal with Element events, custom Events, and the Function prototype bindWithEvent.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Event
+	Cross browser methods to manage events.
+
+Arguments:
+	event - the event
+
+Properties:
+	shift - true if the user pressed the shift
+	control - true if the user pressed the control
+	alt - true if the user pressed the alt
+	meta - true if the user pressed the meta key
+	wheel - the amount of third button scrolling
+	code - the keycode of the key pressed
+	page.x - the x position of the mouse, relative to the full window
+	page.y - the y position of the mouse, relative to the full window
+	client.x - the x position of the mouse, relative to the viewport
+	client.y - the y position of the mouse, relative to the viewport
+	key - the key pressed as a lowercase string. key also returns 'enter', 'up', 'down', 'left', 'right', 'space', 'backspace', 'delete', 'esc'. Handy for these special keys.
+	target - the event target
+	relatedTarget - the event related target
+
+Example:
+	(start code)
+	$('myLink').onkeydown = function(event){
+		var event = new Event(event);
+		//event is now the Event class.
+		alert(event.key); //returns the lowercase letter pressed
+		alert(event.shift); //returns true if the key pressed is shift
+		if (event.key == 's' && event.control) alert('document saved');
+	};
+	(end)
+*/
+
+var Event = new Class({
+
+    initialize: function(event) {
+        if (event && event.$extended) return event;
+        this.$extended = true;
+        event = event || window.event;
+        this.event = event;
+        this.type = event.type;
+        this.target = event.target || event.srcElement;
+        if (this.target.nodeType == 3) this.target = this.target.parentNode;
+        this.shift = event.shiftKey;
+        this.control = event.ctrlKey;
+        this.alt = event.altKey;
+        this.meta = event.metaKey;
+        if (['DOMMouseScroll', 'mousewheel'].contains(this.type)) {
+            this.wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
+        } else if (this.type.contains('key')) {
+            this.code = event.which || event.keyCode;
+            for (var name in Event.keys) {
+                if (Event.keys[name] == this.code) {
+                    this.key = name;
+                    break;
+                }
+            }
+            if (this.type == 'keydown') {
+                var fKey = this.code - 111;
+                if (fKey > 0 && fKey < 13) this.key = 'f' + fKey;
+            }
+            this.key = this.key || String.fromCharCode(this.code).toLowerCase();
+        } else if (this.type.test(/(click|mouse|menu)/)) {
+            this.page = {
+                'x': event.pageX || event.clientX + document.documentElement.scrollLeft,
+                'y': event.pageY || event.clientY + document.documentElement.scrollTop
+            };
+            this.client = {
+                'x': event.pageX ? event.pageX - window.pageXOffset : event.clientX,
+                'y': event.pageY ? event.pageY - window.pageYOffset : event.clientY
+            };
+            this.rightClick = (event.which == 3) || (event.button == 2);
+            switch (this.type) {
+                case 'mouseover': this.relatedTarget = event.relatedTarget || event.fromElement; break;
+                case 'mouseout': this.relatedTarget = event.relatedTarget || event.toElement;
+            }
+            this.fixRelatedTarget();
+        }
+        return this;
+    },
+
+/*
+    Property: stop
+        cross browser method to stop an event
+    */
+
+    stop: function() {
+        return this.stopPropagation().preventDefault();
+    },
+
+/*
+    Property: stopPropagation
+        cross browser method to stop the propagation of an event
+    */
+
+    stopPropagation: function() {
+        if (this.event.stopPropagation) this.event.stopPropagation();
+        else this.event.cancelBubble = true;
+        return this;
+    },
+
+/*
+    Property: preventDefault
+        cross browser method to prevent the default action of the event
+    */
+
+    preventDefault: function() {
+        if (this.event.preventDefault) this.event.preventDefault();
+        else this.event.returnValue = false;
+        return this;
+    }
+
+});
+
+Event.fix = {
+
+    relatedTarget: function() {
+        if (this.relatedTarget && this.relatedTarget.nodeType == 3) this.relatedTarget = this.relatedTarget.parentNode;
+    },
+
+    relatedTargetGecko: function() {
+        try {
+            Event.fix.relatedTarget.call(this);
+        } catch(e) {
+            this.relatedTarget = this.target;
+        }
+    }
+
+};
+
+Event.prototype.fixRelatedTarget = (window.gecko) ? Event.fix.relatedTargetGecko : Event.fix.relatedTarget;
+
+/*
+Property: keys
+	you can add additional Event keys codes this way:
+
+Example:
+	(start code)
+	Event.keys.whatever = 80;
+	$(myelement).addEvent(keydown, function(event){
+		event = new Event(event);
+		if (event.key == 'whatever') console.log(whatever key clicked).
+	});
+	(end)
+*/
+
+Event.keys = new Abstract({
+    'enter': 13,
+    'up': 38,
+    'down': 40,
+    'left': 37,
+    'right': 39,
+    'esc': 27,
+    'space': 32,
+    'backspace': 8,
+    'tab': 9,
+    'delete': 46
+});
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.Methods.Events = {
+
+/*
+    Property: addEvent
+        Attaches an event listener to a DOM element.
+
+    Arguments:
+        type - the event to monitor ('click', 'load', etc) without the prefix 'on'.
+        fn - the function to execute
+
+    Example:
+        >$('myElement').addEvent('click', function(){alert('clicked!')});
+    */
+
+    addEvent: function(type, fn) {
+        this.$events = this.$events || {};
+        this.$events[type] = this.$events[type] || {'keys': [], 'values': []};
+        if (this.$events[type].keys.contains(fn)) return this;
+        this.$events[type].keys.push(fn);
+        var realType = type;
+        var custom = Element.Events[type];
+        if (custom) {
+            if (custom.add) custom.add.call(this, fn);
+            if (custom.map) fn = custom.map;
+            if (custom.type) realType = custom.type;
+        }
+        if (!this.addEventListener) fn = fn.create({'bind': this, 'event': true});
+        this.$events[type].values.push(fn);
+        return (Element.NativeEvents.contains(realType)) ? this.addListener(realType, fn) : this;
+    },
+
+/*
+    Property: removeEvent
+        Works as Element.addEvent, but instead removes the previously added event listener.
+    */
+
+    removeEvent: function(type, fn) {
+        if (!this.$events || !this.$events[type]) return this;
+        var pos = this.$events[type].keys.indexOf(fn);
+        if (pos == -1) return this;
+        var key = this.$events[type].keys.splice(pos, 1)[0];
+        var value = this.$events[type].values.splice(pos, 1)[0];
+        var custom = Element.Events[type];
+        if (custom) {
+            if (custom.remove) custom.remove.call(this, fn);
+            if (custom.type) type = custom.type;
+        }
+        return (Element.NativeEvents.contains(type)) ? this.removeListener(type, value) : this;
+    },
+
+/*
+    Property: addEvents
+        As <addEvent>, but accepts an object and add multiple events at once.
+    */
+
+    addEvents: function(source) {
+        return Element.setMany(this, 'addEvent', source);
+    },
+
+/*
+    Property: removeEvents
+        removes all events of a certain type from an element. if no argument is passed in, removes all events.
+
+    Arguments:
+        type - string; the event name (e.g. 'click')
+    */
+
+    removeEvents: function(type) {
+        if (!this.$events) return this;
+        if (!type) {
+            for (var evType in this.$events) this.removeEvents(evType);
+            this.$events = null;
+        } else if (this.$events[type]) {
+            this.$events[type].keys.each(function(fn) {
+                this.removeEvent(type, fn);
+            }, this);
+            this.$events[type] = null;
+        }
+        return this;
+    },
+
+/*
+    Property: fireEvent
+        executes all events of the specified type present in the element.
+
+    Arguments:
+        type - string; the event name (e.g. 'click')
+        args - array or single object; arguments to pass to the function; if more than one argument, must be an array
+        delay - (integer) delay (in ms) to wait to execute the event
+    */
+
+    fireEvent: function(type, args, delay) {
+        if (this.$events && this.$events[type]) {
+            this.$events[type].keys.each(function(fn) {
+                fn.create({'bind': this, 'delay': delay, 'arguments': args})();
+            }, this);
+        }
+        return this;
+    },
+
+/*
+    Property: cloneEvents
+        Clones all events from an element to this element.
+
+    Arguments:
+        from - element, copy all events from this element
+        type - optional, copies only events of this type
+    */
+
+    cloneEvents: function(from, type) {
+        if (!from.$events) return this;
+        if (!type) {
+            for (var evType in from.$events) this.cloneEvents(from, evType);
+        } else if (from.$events[type]) {
+            from.$events[type].keys.each(function(fn) {
+                this.addEvent(type, fn);
+            }, this);
+        }
+        return this;
+    }
+
+};
+
+window.extend(Element.Methods.Events);
+document.extend(Element.Methods.Events);
+Element.extend(Element.Methods.Events);
+
+/* Section: Custom Events */
+
+Element.Events = new Abstract({
+
+/*
+    Event: mouseenter
+        In addition to the standard javascript events (load, mouseover, mouseout, click, etc.) <Event.js> contains two custom events
+        this event fires when the mouse enters the area of the dom element; will not be fired again if the mouse crosses over children of the element (unlike mouseover)
+
+
+    Example:
+        >$(myElement).addEvent('mouseenter', myFunction);
+    */
+
+    'mouseenter': {
+        type: 'mouseover',
+        map: function(event) {
+            event = new Event(event);
+            if (event.relatedTarget != this && !this.hasChild(event.relatedTarget)) this.fireEvent('mouseenter', event);
+        }
+    },
+
+/*
+    Event: mouseleave
+        this event fires when the mouse exits the area of the dom element; will not be fired again if the mouse crosses over children of the element (unlike mouseout)
+
+
+    Example:
+        >$(myElement).addEvent('mouseleave', myFunction);
+    */
+
+    'mouseleave': {
+        type: 'mouseout',
+        map: function(event) {
+            event = new Event(event);
+            if (event.relatedTarget != this && !this.hasChild(event.relatedTarget)) this.fireEvent('mouseleave', event);
+        }
+    },
+
+    'mousewheel': {
+        type: (window.gecko) ? 'DOMMouseScroll' : 'mousewheel'
+    }
+
+});
+
+Element.NativeEvents = [
+        'click', 'dblclick', 'mouseup', 'mousedown', //mouse buttons
+        'mousewheel', 'DOMMouseScroll', //mouse wheel
+        'mouseover', 'mouseout', 'mousemove', //mouse movement
+        'keydown', 'keypress', 'keyup', //keys
+        'load', 'unload', 'beforeunload', 'resize', 'move', //window
+        'focus', 'blur', 'change', 'submit', 'reset', 'select', //forms elements
+        'error', 'abort', 'contextmenu', 'scroll' //misc
+        ];
+
+/*
+Class: Function
+	A collection of The Function Object prototype methods.
+*/
+
+Function.extend({
+
+/*
+    Property: bindWithEvent
+        automatically passes MooTools Event Class.
+
+    Arguments:
+        bind - optional, the object that the "this" of the function will refer to.
+        args - optional, an argument to pass to the function; if more than one argument, it must be an array of arguments.
+
+    Returns:
+        a function with the parameter bind as its "this" and as a pre-passed argument event or window.event, depending on the browser.
+
+    Example:
+        >function myFunction(event){
+        >	alert(event.client.x) //returns the coordinates of the mouse..
+        >};
+        >myElement.addEvent('click', myFunction.bindWithEvent(myElement));
+    */
+
+    bindWithEvent: function(bind, args) {
+        return this.create({'bind': bind, 'arguments': args, 'event': Event});
+    }
+
+});
+
+
+/*
+Script: Element.Filters.js
+	add Filters capability to <Elements>.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Elements
+	A collection of methods to be used with <$$> elements collections.
+*/
+
+Elements.extend({
+
+/*
+    Property: filterByTag
+        Filters the collection by a specified tag name.
+        Returns a new Elements collection, while the original remains untouched.
+    */
+
+    filterByTag: function(tag) {
+        return new Elements(this.filter(function(el) {
+            return (Element.getTag(el) == tag);
+        }));
+    },
+
+/*
+    Property: filterByClass
+        Filters the collection by a specified class name.
+        Returns a new Elements collection, while the original remains untouched.
+    */
+
+    filterByClass: function(className, nocash) {
+        var elements = this.filter(function(el) {
+            return (el.className && el.className.contains(className, ' '));
+        });
+        return (nocash) ? elements : new Elements(elements);
+    },
+
+/*
+    Property: filterById
+        Filters the collection by a specified ID.
+        Returns a new Elements collection, while the original remains untouched.
+    */
+
+    filterById: function(id, nocash) {
+        var elements = this.filter(function(el) {
+            return (el.id == id);
+        });
+        return (nocash) ? elements : new Elements(elements);
+    },
+
+/*
+    Property: filterByAttribute
+        Filters the collection by a specified attribute.
+        Returns a new Elements collection, while the original remains untouched.
+
+    Arguments:
+        name - the attribute name.
+        operator - optional, the attribute operator.
+        value - optional, the attribute value, only valid if the operator is specified.
+    */
+
+    filterByAttribute: function(name, operator, value, nocash) {
+        var elements = this.filter(function(el) {
+            var current = Element.getProperty(el, name);
+            if (!current) return false;
+            if (!operator) return true;
+            switch (operator) {
+                case '=': return (current == value);
+                case '*=': return (current.contains(value));
+                case '^=': return (current.substr(0, value.length) == value);
+                case '$=': return (current.substr(current.length - value.length) == value);
+                case '!=': return (current != value);
+                case '~=': return current.contains(value, ' ');
+            }
+            return false;
+        });
+        return (nocash) ? elements : new Elements(elements);
+    }
+
+});
+
+/*
+Script: Element.Selectors.js
+	Css Query related functions and <Element> extensions
+
+License:
+	MIT-style license.
+*/
+
+/* Section: Utility Functions */
+
+/*
+Function: $E
+	Selects a single (i.e. the first found) Element based on the selector passed in and an optional filter element.
+	Returns as <Element>.
+
+Arguments:
+	selector - string; the css selector to match
+	filter - optional; a DOM element to limit the scope of the selector match; defaults to document.
+
+Example:
+	>$E('a', 'myElement') //find the first anchor tag inside the DOM element with id 'myElement'
+
+Returns:
+	a DOM element - the first element that matches the selector
+*/
+
+function $E(selector, filter) {
+    return ($(filter) || document).getElement(selector);
+}
+;
+
+/*
+Function: $ES
+	Returns a collection of Elements that match the selector passed in limited to the scope of the optional filter.
+	See Also: <Element.getElements> for an alternate syntax.
+	Returns as <Elements>.
+
+Returns:
+	an array of dom elements that match the selector within the filter
+
+Arguments:
+	selector - string; css selector to match
+	filter - optional; a DOM element to limit the scope of the selector match; defaults to document.
+
+Examples:
+	>$ES("a") //gets all the anchor tags; synonymous with $$("a")
+	>$ES('a','myElement') //get all the anchor tags within $('myElement')
+*/
+
+function $ES(selector, filter) {
+    return ($(filter) || document).getElementsBySelector(selector);
+}
+;
+
+$$.shared = {
+
+    'regexp': /^(\w*|\*)(?:#([\w-]+)|\.([\w-]+))?(?:\[(\w+)(?:([!*^$]?=)["']?([^"'\]]*)["']?)?])?$/,
+
+    'xpath': {
+
+        getParam: function(items, context, param, i) {
+            var temp = [context.namespaceURI ? 'xhtml:' : '', param[1]];
+            if (param[2]) temp.push('[@id="', param[2], '"]');
+            if (param[3]) temp.push('[contains(concat(" ", @class, " "), " ', param[3], ' ")]');
+            if (param[4]) {
+                if (param[5] && param[6]) {
+                    switch (param[5]) {
+                        case '*=': temp.push('[contains(@', param[4], ', "', param[6], '")]'); break;
+                        case '^=': temp.push('[starts-with(@', param[4], ', "', param[6], '")]'); break;
+                        case '$=': temp.push('[substring(@', param[4], ', string-length(@', param[4], ') - ', param[6].length, ' + 1) = "', param[6], '"]'); break;
+                        case '=': temp.push('[@', param[4], '="', param[6], '"]'); break;
+                        case '!=': temp.push('[@', param[4], '!="', param[6], '"]');
+                    }
+                } else {
+                    temp.push('[@', param[4], ']');
+                }
+            }
+            items.push(temp.join(''));
+            return items;
+        },
+
+        getItems: function(items, context, nocash) {
+            var elements = [];
+            var xpath = document.evaluate('.//' + items.join('//'), context, $$.shared.resolver, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
+            for (var i = 0, j = xpath.snapshotLength; i < j; i++) elements.push(xpath.snapshotItem(i));
+            return (nocash) ? elements : new Elements(elements.map($));
+        }
+
+    },
+
+    'normal': {
+
+        getParam: function(items, context, param, i) {
+            if (i == 0) {
+                if (param[2]) {
+                    var el = context.getElementById(param[2]);
+                    if (!el || ((param[1] != '*') && (Element.getTag(el) != param[1]))) return false;
+                    items = [el];
+                } else {
+                    items = $A(context.getElementsByTagName(param[1]));
+                }
+            } else {
+                items = $$.shared.getElementsByTagName(items, param[1]);
+                if (param[2]) items = Elements.filterById(items, param[2], true);
+            }
+            if (param[3]) items = Elements.filterByClass(items, param[3], true);
+            if (param[4]) items = Elements.filterByAttribute(items, param[4], param[5], param[6], true);
+            return items;
+        },
+
+        getItems: function(items, context, nocash) {
+            return (nocash) ? items : $$.unique(items);
+        }
+
+    },
+
+    resolver: function(prefix) {
+        return (prefix == 'xhtml') ? 'http://www.w3.org/1999/xhtml' : false;
+    },
+
+    getElementsByTagName: function(context, tagName) {
+        var found = [];
+        for (var i = 0, j = context.length; i < j; i++) found.extend(context[i].getElementsByTagName(tagName));
+        return found;
+    }
+
+};
+
+$$.shared.method = (window.xpath) ? 'xpath' : 'normal';
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.Methods.Dom = {
+
+/*
+    Property: getElements
+        Gets all the elements within an element that match the given (single) selector.
+        Returns as <Elements>.
+
+    Arguments:
+        selector - string; the css selector to match
+
+    Examples:
+        >$('myElement').getElements('a'); // get all anchors within myElement
+        >$('myElement').getElements('input[name=dialog]') //get all input tags with name 'dialog'
+        >$('myElement').getElements('input[name$=log]') //get all input tags with names ending with 'log'
+
+    Notes:
+        Supports these operators in attribute selectors:
+
+        - = : is equal to
+        - ^= : starts-with
+        - $= : ends-with
+        - != : is not equal to
+
+        Xpath is used automatically for compliant browsers.
+    */
+
+    getElements: function(selector, nocash) {
+        var items = [];
+        selector = selector.trim().split(' ');
+        for (var i = 0, j = selector.length; i < j; i++) {
+            var sel = selector[i];
+            var param = sel.match($$.shared.regexp);
+            if (!param) break;
+            param[1] = param[1] || '*';
+            var temp = $$.shared[$$.shared.method].getParam(items, this, param, i);
+            if (!temp) break;
+            items = temp;
+        }
+        return $$.shared[$$.shared.method].getItems(items, this, nocash);
+    },
+
+/*
+    Property: getElement
+        Same as <Element.getElements>, but returns only the first. Alternate syntax for <$E>, where filter is the Element.
+        Returns as <Element>.
+
+    Arguments:
+        selector - string; css selector
+    */
+
+    getElement: function(selector) {
+        return $(this.getElements(selector, true)[0] || false);
+    },
+
+/*
+    Property: getElementsBySelector
+        Same as <Element.getElements>, but allows for comma separated selectors, as in css. Alternate syntax for <$$>, where filter is the Element.
+        Returns as <Elements>.
+
+    Arguments:
+        selector - string; css selector
+    */
+
+    getElementsBySelector: function(selector, nocash) {
+        var elements = [];
+        selector = selector.split(',');
+        for (var i = 0, j = selector.length; i < j; i++) elements = elements.concat(this.getElements(selector[i], true));
+        return (nocash) ? elements : $$.unique(elements);
+    }
+
+};
+
+Element.extend({
+
+/*
+    Property: getElementById
+        Targets an element with the specified id found inside the Element. Does not overwrite document.getElementById.
+
+    Arguments:
+        id - string; the id of the element to find.
+    */
+
+    getElementById: function(id) {
+        var el = document.getElementById(id);
+        if (!el) return false;
+        for (var parent = el.parentNode; parent != this; parent = parent.parentNode) {
+            if (!parent) return false;
+        }
+        return el;
+    }/*compatibility*/,
+
+    getElementsByClassName: function(className) {
+        return this.getElements('.' + className);
+    }
+
+    /*end compatibility*/
+
+});
+
+document.extend(Element.Methods.Dom);
+Element.extend(Element.Methods.Dom);
+
+/*
+Script: Element.Form.js
+	Contains Element prototypes to deal with Forms and their elements.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: getValue
+        Returns the value of the Element, if its tag is textarea, select or input. getValue called on a multiple select will return an array.
+    */
+
+    getValue: function() {
+        switch (this.getTag()) {
+            case 'select':
+                var values = [];
+                $each(this.options, function(option) {
+                    if (option.selected) values.push($pick(option.value, option.text));
+                });
+                return (this.multiple) ? values : values[0];
+            case 'input': if (!(this.checked && ['checkbox', 'radio'].contains(this.type)) && !['hidden', 'text', 'password'].contains(this.type)) break;
+            case 'textarea': return this.value;
+        }
+        return false;
+    },
+
+    getFormElements: function() {
+        return $$(this.getElementsByTagName('input'), this.getElementsByTagName('select'), this.getElementsByTagName('textarea'));
+    },
+
+/*
+    Property: toQueryString
+        Reads the children inputs of the Element and generates a query string, based on their values. Used internally in <Ajax>
+
+    Example:
+        (start code)
+        <form id="myForm" action="submit.php">
+        <input name="email" value="bob@bob.com">
+        <input name="zipCode" value="90210">
+        </form>
+
+        <script>
+         $('myForm').toQueryString()
+        </script>
+        (end)
+
+        Returns:
+            email=bob@bob.com&zipCode=90210
+    */
+
+    toQueryString: function() {
+        var queryString = [];
+        this.getFormElements().each(function(el) {
+            var name = el.name;
+            var value = el.getValue();
+            if (value === false || !name || el.disabled) return;
+            var qs = function(val) {
+                queryString.push(name + '=' + encodeURIComponent(val));
+            };
+            if ($type(value) == 'array') value.each(qs);
+            else qs(value);
+        });
+        return queryString.join('&');
+    }
+
+});
+
+/*
+Script: Element.Dimensions.js
+	Contains Element prototypes to deal with Element size and position in space.
+
+Note:
+	The functions in this script require n XHTML doctype.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: scrollTo
+        Scrolls the element to the specified coordinated (if the element has an overflow)
+
+    Arguments:
+        x - the x coordinate
+        y - the y coordinate
+
+    Example:
+        >$('myElement').scrollTo(0, 100)
+    */
+
+    scrollTo: function(x, y) {
+        this.scrollLeft = x;
+        this.scrollTop = y;
+    },
+
+/*
+    Property: getSize
+        Return an Object representing the size/scroll values of the element.
+
+    Example:
+        (start code)
+        $('myElement').getSize();
+        (end)
+
+    Returns:
+        (start code)
+        {
+            'scroll': {'x': 100, 'y': 100},
+            'size': {'x': 200, 'y': 400},
+            'scrollSize': {'x': 300, 'y': 500}
+        }
+        (end)
+    */
+
+    getSize: function() {
+        return {
+            'scroll': {'x': this.scrollLeft, 'y': this.scrollTop},
+            'size': {'x': this.offsetWidth, 'y': this.offsetHeight},
+            'scrollSize': {'x': this.scrollWidth, 'y': this.scrollHeight}
+        };
+    },
+
+/*
+    Property: getPosition
+        Returns the real offsets of the element.
+
+    Arguments:
+        overflown - optional, an array of nested scrolling containers for scroll offset calculation, use this if your element is inside any element containing scrollbars
+
+    Example:
+        >$('element').getPosition();
+
+    Returns:
+        >{x: 100, y:500};
+    */
+
+    getPosition: function(overflown) {
+        overflown = overflown || [];
+        var el = this, left = 0, top = 0;
+        do {
+            left += el.offsetLeft || 0;
+            top += el.offsetTop || 0;
+            el = el.offsetParent;
+        } while (el);
+        overflown.each(function(element) {
+            left -= element.scrollLeft || 0;
+            top -= element.scrollTop || 0;
+        });
+        return {'x': left, 'y': top};
+    },
+
+/*
+    Property: getTop
+        Returns the distance from the top of the window to the Element.
+
+    Arguments:
+        overflown - optional, an array of nested scrolling containers, see Element::getPosition
+    */
+
+    getTop: function(overflown) {
+        return this.getPosition(overflown).y;
+    },
+
+/*
+    Property: getLeft
+        Returns the distance from the left of the window to the Element.
+
+    Arguments:
+        overflown - optional, an array of nested scrolling containers, see Element::getPosition
+    */
+
+    getLeft: function(overflown) {
+        return this.getPosition(overflown).x;
+    },
+
+/*
+    Property: getCoordinates
+        Returns an object with width, height, left, right, top, and bottom, representing the values of the Element
+
+    Arguments:
+        overflown - optional, an array of nested scrolling containers, see Element::getPosition
+
+    Example:
+        (start code)
+        var myValues = $('myElement').getCoordinates();
+        (end)
+
+    Returns:
+        (start code)
+        {
+            width: 200,
+            height: 300,
+            left: 100,
+            top: 50,
+            right: 300,
+            bottom: 350
+        }
+        (end)
+    */
+
+    getCoordinates: function(overflown) {
+        var position = this.getPosition(overflown);
+        var obj = {
+            'width': this.offsetWidth,
+            'height': this.offsetHeight,
+            'left': position.x,
+            'top': position.y
+        };
+        obj.right = obj.left + obj.width;
+        obj.bottom = obj.top + obj.height;
+        return obj;
+    }
+
+});
+
+/*
+Script: Window.DomReady.js
+	Contains the custom event domready, for window.
+
+License:
+	MIT-style license.
+*/
+
+/* Section: Custom Events */
+
+/*
+Event: domready
+	executes a function when the dom tree is loaded, without waiting for images. Only works when called from window.
+
+Credits:
+	(c) Dean Edwards/Matthias Miller/John Resig, remastered for MooTools.
+
+Arguments:
+	fn - the function to execute when the DOM is ready
+
+Example:
+	> window.addEvent('domready', function(){
+	>	alert('the dom is ready');
+	> });
+*/
+
+Element.Events.domready = {
+
+    add: function(fn) {
+        if (window.loaded) {
+            fn.call(this);
+            return;
+        }
+        var domReady = function() {
+            if (window.loaded) return;
+            window.loaded = true;
+            window.timer = $clear(window.timer);
+            this.fireEvent('domready');
+        }.bind(this);
+        if (document.readyState && window.webkit) {
+            window.timer = function() {
+                if (['loaded','complete'].contains(document.readyState)) domReady();
+            }.periodical(50);
+        } else if (document.readyState && window.ie) {
+            if (!$('ie_ready')) {
+                var src = (window.location.protocol == 'https:') ? '://0' : 'javascript:void(0)';
+                document.write('<script id="ie_ready" defer src="' + src + '"><\/script>');
+                $('ie_ready').onreadystatechange = function() {
+                    if (this.readyState == 'complete') domReady();
+                };
+            }
+        } else {
+            window.addListener("load", domReady);
+            document.addListener("DOMContentLoaded", domReady);
+        }
+    }
+
+};
+
+/*compatibility*/
+
+window.onDomReady = function(fn) {
+    return this.addEvent('domready', fn);
+};
+
+/*end compatibility*/
+
+/*
+Script: Window.Size.js
+	Window cross-browser dimensions methods.
+
+Note:
+	The Functions in this script require an XHTML doctype.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: window
+	Cross browser methods to get various window dimensions.
+	Warning: All these methods require that the browser operates in strict mode, not quirks mode.
+*/
+
+window.extend({
+
+/*
+    Property: getWidth
+        Returns an integer representing the width of the browser window (without the scrollbar).
+    */
+
+    getWidth: function() {
+        if (this.webkit419) return this.innerWidth;
+        if (this.opera) return document.body.clientWidth;
+        return document.documentElement.clientWidth;
+    },
+
+/*
+    Property: getHeight
+        Returns an integer representing the height of the browser window (without the scrollbar).
+    */
+
+    getHeight: function() {
+        if (this.webkit419) return this.innerHeight;
+        if (this.opera) return document.body.clientHeight;
+        return document.documentElement.clientHeight;
+    },
+
+/*
+    Property: getScrollWidth
+        Returns an integer representing the scrollWidth of the window.
+        This value is equal to or bigger than <getWidth>.
+
+    See Also:
+        <http://developer.mozilla.org/en/docs/DOM:element.scrollWidth>
+    */
+
+    getScrollWidth: function() {
+        if (this.ie) return Math.max(document.documentElement.offsetWidth, document.documentElement.scrollWidth);
+        if (this.webkit) return document.body.scrollWidth;
+        return document.documentElement.scrollWidth;
+    },
+
+/*
+    Property: getScrollHeight
+        Returns an integer representing the scrollHeight of the window.
+        This value is equal to or bigger than <getHeight>.
+
+    See Also:
+        <http://developer.mozilla.org/en/docs/DOM:element.scrollHeight>
+    */
+
+    getScrollHeight: function() {
+        if (this.ie) return Math.max(document.documentElement.offsetHeight, document.documentElement.scrollHeight);
+        if (this.webkit) return document.body.scrollHeight;
+        return document.documentElement.scrollHeight;
+    },
+
+/*
+    Property: getScrollLeft
+        Returns an integer representing the scrollLeft of the window (the number of pixels the window has scrolled from the left).
+
+    See Also:
+        <http://developer.mozilla.org/en/docs/DOM:element.scrollLeft>
+    */
+
+    getScrollLeft: function() {
+        return this.pageXOffset || document.documentElement.scrollLeft;
+    },
+
+/*
+    Property: getScrollTop
+        Returns an integer representing the scrollTop of the window (the number of pixels the window has scrolled from the top).
+
+    See Also:
+        <http://developer.mozilla.org/en/docs/DOM:element.scrollTop>
+    */
+
+    getScrollTop: function() {
+        return this.pageYOffset || document.documentElement.scrollTop;
+    },
+
+/*
+    Property: getSize
+        Same as <Element.getSize>
+    */
+
+    getSize: function() {
+        return {
+            'size': {'x': this.getWidth(), 'y': this.getHeight()},
+            'scrollSize': {'x': this.getScrollWidth(), 'y': this.getScrollHeight()},
+            'scroll': {'x': this.getScrollLeft(), 'y': this.getScrollTop()}
+        };
+    },
+
+//ignore
+    getPosition: function() {
+        return {'x': 0, 'y': 0};
+    }
+
+});
+
+/*
+Script: Fx.Base.js
+	Contains <Fx.Base>, the foundamentals of the MooTools Effects.
+
+License:
+	MIT-style license.
+*/
+
+var Fx = {};
+
+/*
+Class: Fx.Base
+	Base class for the Effects.
+
+Options:
+	transition - the equation to use for the effect see <Fx.Transitions>; default is <Fx.Transitions.Sine.easeInOut>
+	duration - the duration of the effect in ms; 500 is the default.
+	unit - the unit is 'px' by default (other values include things like 'em' for fonts or '%').
+	wait - boolean: to wait or not to wait for a current transition to end before running another of the same instance. defaults to true.
+	fps - the frames per second for the transition; default is 50
+
+Events:
+	onStart - the function to execute as the effect begins; nothing (<Class.empty>) by default.
+	onComplete - the function to execute after the effect has processed; nothing (<Class.empty>) by default.
+	onCancel - the function to execute when you manually stop the effect.
+*/
+
+Fx.Base = new Class({
+
+    options: {
+        onStart: Class.empty,
+        onComplete: Class.empty,
+        onCancel: Class.empty,
+        transition: function(p) {
+            return -(Math.cos(Math.PI * p) - 1) / 2;
+        },
+        duration: 500,
+        unit: 'px',
+        wait: true,
+        fps: 50
+    },
+
+    initialize: function(options) {
+        this.element = this.element || null;
+        this.setOptions(options);
+        if (this.options.initialize) this.options.initialize.call(this);
+    },
+
+    step: function() {
+        var time = $time();
+        if (time < this.time + this.options.duration) {
+            this.delta = this.options.transition((time - this.time) / this.options.duration);
+            this.setNow();
+            this.increase();
+        } else {
+            this.stop(true);
+            this.set(this.to);
+            this.fireEvent('onComplete', this.element, 10);
+            this.callChain();
+        }
+    },
+
+/*
+    Property: set
+        Immediately sets the value with no transition.
+
+    Arguments:
+        to - the point to jump to
+
+    Example:
+        >var myFx = new Fx.Style('myElement', 'opacity').set(0); //will make it immediately transparent
+    */
+
+    set: function(to) {
+        this.now = to;
+        this.increase();
+        return this;
+    },
+
+    setNow: function() {
+        this.now = this.compute(this.from, this.to);
+    },
+
+    compute: function(from, to) {
+        return (to - from) * this.delta + from;
+    },
+
+/*
+    Property: start
+        Executes an effect from one position to the other.
+
+    Arguments:
+        from - integer: staring value
+        to - integer: the ending value
+
+    Examples:
+        >var myFx = new Fx.Style('myElement', 'opacity').start(0,1); //display a transition from transparent to opaque.
+    */
+
+    start: function(from, to) {
+        if (!this.options.wait) this.stop();
+        else if (this.timer) return this;
+        this.from = from;
+        this.to = to;
+        this.change = this.to - this.from;
+        this.time = $time();
+        this.timer = this.step.periodical(Math.round(1000 / this.options.fps), this);
+        this.fireEvent('onStart', this.element);
+        return this;
+    },
+
+/*
+    Property: stop
+        Stops the transition.
+    */
+
+    stop: function(end) {
+        if (!this.timer) return this;
+        this.timer = $clear(this.timer);
+        if (!end) this.fireEvent('onCancel', this.element);
+        return this;
+    }/*compatibility*/,
+
+    custom: function(from, to) {
+        return this.start(from, to);
+    },
+
+    clearTimer: function(end) {
+        return this.stop(end);
+    }
+
+    /*end compatibility*/
+
+});
+
+Fx.Base.implement(new Chain, new Events, new Options);
+
+/*
+Script: Fx.CSS.js
+	Css parsing class for effects. Required by <Fx.Style>, <Fx.Styles>, <Fx.Elements>. No documentation needed, as its used internally.
+
+License:
+	MIT-style license.
+*/
+
+Fx.CSS = {
+
+    select: function(property, to) {
+        if (property.test(/color/i)) return this.Color;
+        var type = $type(to);
+        if ((type == 'array') || (type == 'string' && to.contains(' '))) return this.Multi;
+        return this.Single;
+    },
+
+    parse: function(el, property, fromTo) {
+        if (!fromTo.push) fromTo = [fromTo];
+        var from = fromTo[0], to = fromTo[1];
+        if (!$chk(to)) {
+            to = from;
+            from = el.getStyle(property);
+        }
+        var css = this.select(property, to);
+        return {'from': css.parse(from), 'to': css.parse(to), 'css': css};
+    }
+
+};
+
+Fx.CSS.Single = {
+
+    parse: function(value) {
+        return parseFloat(value);
+    },
+
+    getNow: function(from, to, fx) {
+        return fx.compute(from, to);
+    },
+
+    getValue: function(value, unit, property) {
+        if (unit == 'px' && property != 'opacity') value = Math.round(value);
+        return value + unit;
+    }
+
+};
+
+Fx.CSS.Multi = {
+
+    parse: function(value) {
+        return value.push ? value : value.split(' ').map(function(v) {
+            return parseFloat(v);
+        });
+    },
+
+    getNow: function(from, to, fx) {
+        var now = [];
+        for (var i = 0; i < from.length; i++) now[i] = fx.compute(from[i], to[i]);
+        return now;
+    },
+
+    getValue: function(value, unit, property) {
+        if (unit == 'px' && property != 'opacity') value = value.map(Math.round);
+        return value.join(unit + ' ') + unit;
+    }
+
+};
+
+Fx.CSS.Color = {
+
+    parse: function(value) {
+        return value.push ? value : value.hexToRgb(true);
+    },
+
+    getNow: function(from, to, fx) {
+        var now = [];
+        for (var i = 0; i < from.length; i++) now[i] = Math.round(fx.compute(from[i], to[i]));
+        return now;
+    },
+
+    getValue: function(value) {
+        return 'rgb(' + value.join(',') + ')';
+    }
+
+};
+
+/*
+Script: Fx.Style.js
+	Contains <Fx.Style>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Fx.Style
+	The Style effect, used to transition any css property from one value to another. Includes colors.
+	Colors must be in hex format.
+	Inherits methods, properties, options and events from <Fx.Base>.
+
+Arguments:
+	el - the $(element) to apply the style transition to
+	property - the property to transition
+	options - the Fx.Base options (see: <Fx.Base>)
+
+Example:
+	>var marginChange = new Fx.Style('myElement', 'margin-top', {duration:500});
+	>marginChange.start(10, 100);
+*/
+
+Fx.Style = Fx.Base.extend({
+
+    initialize: function(el, property, options) {
+        this.element = $(el);
+        this.property = property;
+        this.parent(options);
+    },
+
+/*
+    Property: hide
+        Same as <Fx.Base.set> (0); hides the element immediately without transition.
+    */
+
+    hide: function() {
+        return this.set(0);
+    },
+
+    setNow: function() {
+        this.now = this.css.getNow(this.from, this.to, this);
+    },
+
+/*
+    Property: set
+        Sets the element's css property (specified at instantiation) to the specified value immediately.
+
+    Example:
+        (start code)
+        var marginChange = new Fx.Style('myElement', 'margin-top', {duration:500});
+        marginChange.set(10); //margin-top is set to 10px immediately
+        (end)
+    */
+
+    set: function(to) {
+        this.css = Fx.CSS.select(this.property, to);
+        return this.parent(this.css.parse(to));
+    },
+
+/*
+    Property: start
+        Displays the transition to the value/values passed in
+
+    Arguments:
+        from - (integer; optional) the starting position for the transition
+        to - (integer) the ending position for the transition
+
+    Note:
+        If you provide only one argument, the transition will use the current css value for its starting value.
+
+    Example:
+        (start code)
+        var marginChange = new Fx.Style('myElement', 'margin-top', {duration:500});
+        marginChange.start(10); //tries to read current margin top value and goes from current to 10
+        (end)
+    */
+
+    start: function(from, to) {
+        if (this.timer && this.options.wait) return this;
+        var parsed = Fx.CSS.parse(this.element, this.property, [from, to]);
+        this.css = parsed.css;
+        return this.parent(parsed.from, parsed.to);
+    },
+
+    increase: function() {
+        this.element.setStyle(this.property, this.css.getValue(this.now, this.options.unit, this.property));
+    }
+
+});
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: effect
+        Applies an <Fx.Style> to the Element; This a shortcut for <Fx.Style>.
+
+    Arguments:
+        property - (string) the css property to alter
+        options - (object; optional) key/value set of options (see <Fx.Style>)
+
+    Example:
+        >var myEffect = $('myElement').effect('height', {duration: 1000, transition: Fx.Transitions.linear});
+        >myEffect.start(10, 100);
+        >//OR
+        >$('myElement').effect('height', {duration: 1000, transition: Fx.Transitions.linear}).start(10,100);
+    */
+
+    effect: function(property, options) {
+        return new Fx.Style(this, property, options);
+    }
+
+});
+
+/*
+Script: Fx.Styles.js
+	Contains <Fx.Styles>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Fx.Styles
+	Allows you to animate multiple css properties at once;
+	Colors must be in hex format.
+	Inherits methods, properties, options and events from <Fx.Base>.
+
+Arguments:
+	el - the $(element) to apply the styles transition to
+	options - the fx options (see: <Fx.Base>)
+
+Example:
+	(start code)
+	var myEffects = new Fx.Styles('myElement', {duration: 1000, transition: Fx.Transitions.linear});
+
+	//height from 10 to 100 and width from 900 to 300
+	myEffects.start({
+		'height': [10, 100],
+		'width': [900, 300]
+	});
+
+	//or height from current height to 100 and width from current width to 300
+	myEffects.start({
+		'height': 100,
+		'width': 300
+	});
+	(end)
+*/
+
+Fx.Styles = Fx.Base.extend({
+
+    initialize: function(el, options) {
+        this.element = $(el);
+        this.parent(options);
+    },
+
+    setNow: function() {
+        for (var p in this.from) this.now[p] = this.css[p].getNow(this.from[p], this.to[p], this);
+    },
+
+    set: function(to) {
+        var parsed = {};
+        this.css = {};
+        for (var p in to) {
+            this.css[p] = Fx.CSS.select(p, to[p]);
+            parsed[p] = this.css[p].parse(to[p]);
+        }
+        return this.parent(parsed);
+    },
+
+/*
+    Property: start
+        Executes a transition for any number of css properties in tandem.
+
+    Arguments:
+        obj - an object containing keys that specify css properties to alter and values that specify either the from/to values (as an array) or just the end value (an integer).
+
+    Example:
+        see <Fx.Styles>
+    */
+
+    start: function(obj) {
+        if (this.timer && this.options.wait) return this;
+        this.now = {};
+        this.css = {};
+        var from = {}, to = {};
+        for (var p in obj) {
+            var parsed = Fx.CSS.parse(this.element, p, obj[p]);
+            from[p] = parsed.from;
+            to[p] = parsed.to;
+            this.css[p] = parsed.css;
+        }
+        return this.parent(from, to);
+    },
+
+    increase: function() {
+        for (var p in this.now) this.element.setStyle(p, this.css[p].getValue(this.now[p], this.options.unit, p));
+    }
+
+});
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: effects
+        Applies an <Fx.Styles> to the Element; This a shortcut for <Fx.Styles>.
+
+    Example:
+        >var myEffects = $(myElement).effects({duration: 1000, transition: Fx.Transitions.Sine.easeInOut});
+         >myEffects.start({'height': [10, 100], 'width': [900, 300]});
+    */
+
+    effects: function(options) {
+        return new Fx.Styles(this, options);
+    }
+
+});
+
+/*
+Script: Fx.Elements.js
+	Contains <Fx.Elements>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Fx.Elements
+	Fx.Elements allows you to apply any number of styles transitions to a selection of elements. Includes colors (must be in hex format).
+	Inherits methods, properties, options and events from <Fx.Base>.
+
+Arguments:
+	elements - a collection of elements the effects will be applied to.
+	options - same as <Fx.Base> options.
+*/
+
+Fx.Elements = Fx.Base.extend({
+
+    initialize: function(elements, options) {
+        this.elements = $$(elements);
+        this.parent(options);
+    },
+
+    setNow: function() {
+        for (var i in this.from) {
+            var iFrom = this.from[i], iTo = this.to[i], iCss = this.css[i], iNow = this.now[i] = {};
+            for (var p in iFrom) iNow[p] = iCss[p].getNow(iFrom[p], iTo[p], this);
+        }
+    },
+
+    set: function(to) {
+        var parsed = {};
+        this.css = {};
+        for (var i in to) {
+            var iTo = to[i], iCss = this.css[i] = {}, iParsed = parsed[i] = {};
+            for (var p in iTo) {
+                iCss[p] = Fx.CSS.select(p, iTo[p]);
+                iParsed[p] = iCss[p].parse(iTo[p]);
+            }
+        }
+        return this.parent(parsed);
+    },
+
+/*
+    Property: start
+        Applies the passed in style transitions to each object named (see example). Each item in the collection is refered to as a numerical string ("1" for instance). The first item is "0", the second "1", etc.
+
+    Example:
+        (start code)
+        var myElementsEffects = new Fx.Elements($$('a'));
+        myElementsEffects.start({
+            '0': { //let's change the first element's opacity and width
+                'opacity': [0,1],
+                'width': [100,200]
+            },
+            '4': { //and the fifth one's opacity
+                'opacity': [0.2, 0.5]
+            }
+        });
+        (end)
+    */
+
+    start: function(obj) {
+        if (this.timer && this.options.wait) return this;
+        this.now = {};
+        this.css = {};
+        var from = {}, to = {};
+        for (var i in obj) {
+            var iProps = obj[i], iFrom = from[i] = {}, iTo = to[i] = {}, iCss = this.css[i] = {};
+            for (var p in iProps) {
+                var parsed = Fx.CSS.parse(this.elements[i], p, iProps[p]);
+                iFrom[p] = parsed.from;
+                iTo[p] = parsed.to;
+                iCss[p] = parsed.css;
+            }
+        }
+        return this.parent(from, to);
+    },
+
+    increase: function() {
+        for (var i in this.now) {
+            var iNow = this.now[i], iCss = this.css[i];
+            for (var p in iNow) this.elements[i].setStyle(p, iCss[p].getValue(iNow[p], this.options.unit, p));
+        }
+    }
+
+});
+
+/*
+Script: Fx.Scroll.js
+	Contains <Fx.Scroll>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Fx.Scroll
+	Scroll any element with an overflow, including the window element.
+	Inherits methods, properties, options and events from <Fx.Base>.
+
+Note:
+	Fx.Scroll requires an XHTML doctype.
+
+Arguments:
+	element - the element to scroll
+	options - optional, see Options below.
+
+Options:
+	all the Fx.Base options and events, plus:
+	offset - the distance for the scrollTo point/element. an Object with x/y properties.
+	overflown - an array of nested scrolling containers, see <Element.getPosition>
+*/
+
+Fx.Scroll = Fx.Base.extend({
+
+    options: {
+        overflown: [],
+        offset: {'x': 0, 'y': 0},
+        wheelStops: true
+    },
+
+    initialize: function(element, options) {
+        this.now = [];
+        this.element = $(element);
+        this.bound = {'stop': this.stop.bind(this, false)};
+        this.parent(options);
+        if (this.options.wheelStops) {
+            this.addEvent('onStart', function() {
+                document.addEvent('mousewheel', this.bound.stop);
+            }.bind(this));
+            this.addEvent('onComplete', function() {
+                document.removeEvent('mousewheel', this.bound.stop);
+            }.bind(this));
+        }
+    },
+
+    setNow: function() {
+        for (var i = 0; i < 2; i++) this.now[i] = this.compute(this.from[i], this.to[i]);
+    },
+
+/*
+    Property: scrollTo
+        Scrolls the chosen element to the x/y coordinates.
+
+    Arguments:
+        x - the x coordinate to scroll the element to
+        y - the y coordinate to scroll the element to
+    */
+
+    scrollTo: function(x, y) {
+        if (this.timer && this.options.wait) return this;
+        var el = this.element.getSize();
+        var values = {'x': x, 'y': y};
+        for (var z in el.size) {
+            var max = el.scrollSize[z] - el.size[z];
+            if ($chk(values[z])) values[z] = ($type(values[z]) == 'number') ? values[z].limit(0, max) : max;
+            else values[z] = el.scroll[z];
+            values[z] += this.options.offset[z];
+        }
+        return this.start([el.scroll.x, el.scroll.y], [values.x, values.y]);
+    },
+
+/*
+    Property: toTop
+        Scrolls the chosen element to its maximum top.
+    */
+
+    toTop: function() {
+        return this.scrollTo(false, 0);
+    },
+
+/*
+    Property: toBottom
+        Scrolls the chosen element to its maximum bottom.
+    */
+
+    toBottom: function() {
+        return this.scrollTo(false, 'full');
+    },
+
+/*
+    Property: toLeft
+        Scrolls the chosen element to its maximum left.
+    */
+
+    toLeft: function() {
+        return this.scrollTo(0, false);
+    },
+
+/*
+    Property: toRight
+        Scrolls the chosen element to its maximum right.
+    */
+
+    toRight: function() {
+        return this.scrollTo('full', false);
+    },
+
+/*
+    Property: toElement
+        Scrolls the specified element to the position the passed in element is found.
+
+    Arguments:
+        el - the $(element) to scroll the window to
+    */
+
+    toElement: function(el) {
+        var parent = this.element.getPosition(this.options.overflown);
+        var target = $(el).getPosition(this.options.overflown);
+        return this.scrollTo(target.x - parent.x, target.y - parent.y);
+    },
+
+    increase: function() {
+        this.element.scrollTo(this.now[0], this.now[1]);
+    }
+
+});
+
+/*
+Script: Fx.Slide.js
+	Contains <Fx.Slide>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Fx.Slide
+	The slide effect; slides an element in horizontally or vertically, the contents will fold inside.
+	Inherits methods, properties, options and events from <Fx.Base>.
+
+Note:
+	Fx.Slide requires an XHTML doctype.
+
+Options:
+	mode - set it to vertical or horizontal. Defaults to vertical.
+	options - all the <Fx.Base> options
+
+Example:
+	(start code)
+	var mySlider = new Fx.Slide('myElement', {duration: 500});
+	mySlider.toggle() //toggle the slider up and down.
+	(end)
+*/
+
+Fx.Slide = Fx.Base.extend({
+
+    options: {
+        mode: 'vertical'
+    },
+
+    initialize: function(el, options) {
+        this.element = $(el);
+        this.wrapper = new Element('div', {'styles': $extend(this.element.getStyles('margin'), {'overflow': 'hidden'})}).injectAfter(this.element).adopt(this.element);
+        this.element.setStyle('margin', 0);
+        this.setOptions(options);
+        this.now = [];
+        this.parent(this.options);
+        this.open = true;
+        this.addEvent('onComplete', function() {
+            this.open = (this.now[0] === 0);
+        });
+        if (window.webkit419) this.addEvent('onComplete', function() {
+            if (this.open) this.element.remove().inject(this.wrapper);
+        });
+    },
+
+    setNow: function() {
+        for (var i = 0; i < 2; i++) this.now[i] = this.compute(this.from[i], this.to[i]);
+    },
+
+    vertical: function() {
+        this.margin = 'margin-top';
+        this.layout = 'height';
+        this.offset = this.element.offsetHeight;
+    },
+
+    horizontal: function() {
+        this.margin = 'margin-left';
+        this.layout = 'width';
+        this.offset = this.element.offsetWidth;
+    },
+
+/*
+    Property: slideIn
+        Slides the elements in view horizontally or vertically.
+
+    Arguments:
+        mode - (optional, string) 'horizontal' or 'vertical'; defaults to options.mode.
+    */
+
+    slideIn: function(mode) {
+        this[mode || this.options.mode]();
+        return this.start([this.element.getStyle(this.margin).toInt(), this.wrapper.getStyle(this.layout).toInt()], [0, this.offset]);
+    },
+
+/*
+    Property: slideOut
+        Sides the elements out of view horizontally or vertically.
+
+    Arguments:
+        mode - (optional, string) 'horizontal' or 'vertical'; defaults to options.mode.
+    */
+
+    slideOut: function(mode) {
+        this[mode || this.options.mode]();
+        return this.start([this.element.getStyle(this.margin).toInt(), this.wrapper.getStyle(this.layout).toInt()], [-this.offset, 0]);
+    },
+
+/*
+    Property: hide
+        Hides the element without a transition.
+
+    Arguments:
+        mode - (optional, string) 'horizontal' or 'vertical'; defaults to options.mode.
+    */
+
+    hide: function(mode) {
+        this[mode || this.options.mode]();
+        this.open = false;
+        return this.set([-this.offset, 0]);
+    },
+
+/*
+    Property: show
+        Shows the element without a transition.
+
+    Arguments:
+        mode - (optional, string) 'horizontal' or 'vertical'; defaults to options.mode.
+    */
+
+    show: function(mode) {
+        this[mode || this.options.mode]();
+        this.open = true;
+        return this.set([0, this.offset]);
+    },
+
+/*
+    Property: toggle
+        Slides in or Out the element, depending on its state
+
+    Arguments:
+        mode - (optional, string) 'horizontal' or 'vertical'; defaults to options.mode.
+
+    */
+
+    toggle: function(mode) {
+        if (this.wrapper.offsetHeight == 0 || this.wrapper.offsetWidth == 0) return this.slideIn(mode);
+        return this.slideOut(mode);
+    },
+
+    increase: function() {
+        this.element.setStyle(this.margin, this.now[0] + this.options.unit);
+        this.wrapper.setStyle(this.layout, this.now[1] + this.options.unit);
+    }
+
+});
+
+/*
+Script: Fx.Transitions.js
+	Effects transitions, to be used with all the effects.
+
+License:
+	MIT-style license.
+
+Credits:
+	Easing Equations by Robert Penner, <http://www.robertpenner.com/easing/>, modified & optimized to be used with mootools.
+*/
+
+/*
+Class: Fx.Transitions
+	A collection of tweening transitions for use with the <Fx.Base> classes.
+
+Example:
+	>//Elastic.easeOut with default values:
+	>new Fx.Style('margin', {transition: Fx.Transitions.Elastic.easeOut});
+	>//Elastic.easeOut with user-defined value for elasticity.
+	> var myTransition = new Fx.Transition(Fx.Transitions.Elastic, 3);
+	>new Fx.Style('margin', {transition: myTransition.easeOut});
+
+See also:
+	http://www.robertpenner.com/easing/
+*/
+
+Fx.Transition = function(transition, params) {
+    params = params || [];
+    if ($type(params) != 'array') params = [params];
+    return $extend(transition, {
+        easeIn: function(pos) {
+            return transition(pos, params);
+        },
+        easeOut: function(pos) {
+            return 1 - transition(1 - pos, params);
+        },
+        easeInOut: function(pos) {
+            return (pos <= 0.5) ? transition(2 * pos, params) / 2 : (2 - transition(2 * (1 - pos), params)) / 2;
+        }
+    });
+};
+
+Fx.Transitions = new Abstract({
+
+/*
+    Property: linear
+        displays a linear transition.
+
+    Graph:
+        (see Linear.png)
+    */
+
+    linear: function(p) {
+        return p;
+    }
+
+});
+
+Fx.Transitions.extend = function(transitions) {
+    for (var transition in transitions) {
+        Fx.Transitions[transition] = new Fx.Transition(transitions[transition]);
+        /*compatibility*/
+        Fx.Transitions.compat(transition);
+        /*end compatibility*/
+    }
+};
+
+/*compatibility*/
+
+Fx.Transitions.compat = function(transition) {
+    ['In', 'Out', 'InOut'].each(function(easeType) {
+        Fx.Transitions[transition.toLowerCase() + easeType] = Fx.Transitions[transition]['ease' + easeType];
+    });
+};
+
+/*end compatibility*/
+
+Fx.Transitions.extend({
+
+/*
+    Property: Quad
+        displays a quadratic transition. Must be used as Quad.easeIn or Quad.easeOut or Quad.easeInOut
+
+    Graph:
+        (see Quad.png)
+    */
+
+//auto generated
+
+/*
+    Property: Cubic
+        displays a cubicular transition. Must be used as Cubic.easeIn or Cubic.easeOut or Cubic.easeInOut
+
+    Graph:
+        (see Cubic.png)
+    */
+
+//auto generated
+
+/*
+    Property: Quart
+        displays a quartetic transition. Must be used as Quart.easeIn or Quart.easeOut or Quart.easeInOut
+
+    Graph:
+        (see Quart.png)
+    */
+
+//auto generated
+
+/*
+    Property: Quint
+        displays a quintic transition. Must be used as Quint.easeIn or Quint.easeOut or Quint.easeInOut
+
+    Graph:
+        (see Quint.png)
+    */
+
+//auto generated
+
+/*
+    Property: Pow
+        Used to generate Quad, Cubic, Quart and Quint.
+        By default is p^6.
+
+    Graph:
+        (see Pow.png)
+    */
+
+    Pow: function(p, x) {
+        return Math.pow(p, x[0] || 6);
+    },
+
+/*
+    Property: Expo
+        displays a exponential transition. Must be used as Expo.easeIn or Expo.easeOut or Expo.easeInOut
+
+    Graph:
+        (see Expo.png)
+    */
+
+    Expo: function(p) {
+        return Math.pow(2, 8 * (p - 1));
+    },
+
+/*
+    Property: Circ
+        displays a circular transition. Must be used as Circ.easeIn or Circ.easeOut or Circ.easeInOut
+
+    Graph:
+        (see Circ.png)
+    */
+
+    Circ: function(p) {
+        return 1 - Math.sin(Math.acos(p));
+    },
+
+
+/*
+    Property: Sine
+        displays a sineousidal transition. Must be used as Sine.easeIn or Sine.easeOut or Sine.easeInOut
+
+    Graph:
+        (see Sine.png)
+    */
+
+    Sine: function(p) {
+        return 1 - Math.sin((1 - p) * Math.PI / 2);
+    },
+
+/*
+    Property: Back
+        makes the transition go back, then all forth. Must be used as Back.easeIn or Back.easeOut or Back.easeInOut
+
+    Graph:
+        (see Back.png)
+    */
+
+    Back: function(p, x) {
+        x = x[0] || 1.618;
+        return Math.pow(p, 2) * ((x + 1) * p - x);
+    },
+
+/*
+    Property: Bounce
+        makes the transition bouncy. Must be used as Bounce.easeIn or Bounce.easeOut or Bounce.easeInOut
+
+    Graph:
+        (see Bounce.png)
+    */
+
+    Bounce: function(p) {
+        var value;
+        for (var a = 0, b = 1; 1; a += b,b /= 2) {
+            if (p >= (7 - 4 * a) / 11) {
+                value = - Math.pow((11 - 6 * a - 11 * p) / 4, 2) + b * b;
+                break;
+            }
+        }
+        return value;
+    },
+
+/*
+    Property: Elastic
+        Elastic curve. Must be used as Elastic.easeIn or Elastic.easeOut or Elastic.easeInOut
+
+    Graph:
+        (see Elastic.png)
+    */
+
+    Elastic: function(p, x) {
+        return Math.pow(2, 10 * --p) * Math.cos(20 * p * Math.PI * (x[0] || 1) / 3);
+    }
+
+});
+
+['Quad', 'Cubic', 'Quart', 'Quint'].each(function(transition, i) {
+    Fx.Transitions[transition] = new Fx.Transition(function(p) {
+        return Math.pow(p, [i + 2]);
+    });
+
+    /*compatibility*/
+    Fx.Transitions.compat(transition);
+    /*end compatibility*/
+});
+
+/*
+Script: Drag.Base.js
+	Contains <Drag.Base>, <Element.makeResizable>
+
+License:
+	MIT-style license.
+*/
+
+var Drag = {};
+
+/*
+Class: Drag.Base
+	Modify two css properties of an element based on the position of the mouse.
+
+Note:
+	Drag.Base requires an XHTML doctype.
+
+Arguments:
+	el - the $(element) to apply the transformations to.
+	options - optional. The options object.
+
+Options:
+	handle - the $(element) to act as the handle for the draggable element. defaults to the $(element) itself.
+	modifiers - an object. see Modifiers Below.
+	limit - an object, see Limit below.
+	grid - optional, distance in px for snap-to-grid dragging
+	snap - optional, the distance you have to drag before the element starts to respond to the drag. defaults to false
+
+	modifiers:
+		x - string, the style you want to modify when the mouse moves in an horizontal direction. defaults to 'left'
+		y - string, the style you want to modify when the mouse moves in a vertical direction. defaults to 'top'
+
+	limit:
+		x - array with start and end limit relative to modifiers.x
+		y - array with start and end limit relative to modifiers.y
+
+Events:
+	onStart - optional, function to execute when the user starts to drag (on mousedown);
+	onComplete - optional, function to execute when the user completes the drag.
+	onDrag - optional, function to execute at every step of the drag
+*/
+
+Drag.Base = new Class({
+
+    options: {
+        handle: false,
+        unit: 'px',
+        onStart: Class.empty,
+        onBeforeStart: Class.empty,
+        onComplete: Class.empty,
+        onSnap: Class.empty,
+        onDrag: Class.empty,
+        limit: false,
+        modifiers: {x: 'left', y: 'top'},
+        grid: false,
+        snap: 6
+    },
+
+    initialize: function(el, options) {
+        this.setOptions(options);
+        this.element = $(el);
+        this.handle = $(this.options.handle) || this.element;
+        this.mouse = {'now': {}, 'pos': {}};
+        this.value = {'start': {}, 'now': {}};
+        this.bound = {
+            'start': this.start.bindWithEvent(this),
+            'check': this.check.bindWithEvent(this),
+            'drag': this.drag.bindWithEvent(this),
+            'stop': this.stop.bind(this)
+        };
+        this.attach();
+        if (this.options.initialize) this.options.initialize.call(this);
+    },
+
+    attach: function() {
+        this.handle.addEvent('mousedown', this.bound.start);
+        return this;
+    },
+
+    detach: function() {
+        this.handle.removeEvent('mousedown', this.bound.start);
+        return this;
+    },
+
+    start: function(event) {
+        this.fireEvent('onBeforeStart', this.element);
+        this.mouse.start = event.page;
+        var limit = this.options.limit;
+        this.limit = {'x': [], 'y': []};
+        for (var z in this.options.modifiers) {
+            if (!this.options.modifiers[z]) continue;
+            this.value.now[z] = this.element.getStyle(this.options.modifiers[z]).toInt();
+            this.mouse.pos[z] = event.page[z] - this.value.now[z];
+            if (limit && limit[z]) {
+                for (var i = 0; i < 2; i++) {
+                    if ($chk(limit[z][i])) this.limit[z][i] = ($type(limit[z][i]) == 'function') ? limit[z][i]() : limit[z][i];
+                }
+            }
+        }
+        if ($type(this.options.grid) == 'number') this.options.grid = {'x': this.options.grid, 'y': this.options.grid};
+        document.addListener('mousemove', this.bound.check);
+        document.addListener('mouseup', this.bound.stop);
+        this.fireEvent('onStart', this.element);
+        event.stop();
+    },
+
+    check: function(event) {
+        var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
+        if (distance > this.options.snap) {
+            document.removeListener('mousemove', this.bound.check);
+            document.addListener('mousemove', this.bound.drag);
+            this.drag(event);
+            this.fireEvent('onSnap', this.element);
+        }
+        event.stop();
+    },
+
+    drag: function(event) {
+        this.out = false;
+        this.mouse.now = event.page;
+        for (var z in this.options.modifiers) {
+            if (!this.options.modifiers[z]) continue;
+            this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
+            if (this.limit[z]) {
+                if ($chk(this.limit[z][1]) && (this.value.now[z] > this.limit[z][1])) {
+                    this.value.now[z] = this.limit[z][1];
+                    this.out = true;
+                } else if ($chk(this.limit[z][0]) && (this.value.now[z] < this.limit[z][0])) {
+                    this.value.now[z] = this.limit[z][0];
+                    this.out = true;
+                }
+            }
+            if (this.options.grid[z]) this.value.now[z] -= (this.value.now[z] % this.options.grid[z]);
+            this.element.setStyle(this.options.modifiers[z], this.value.now[z] + this.options.unit);
+        }
+        this.fireEvent('onDrag', this.element);
+        event.stop();
+    },
+
+    stop: function() {
+        document.removeListener('mousemove', this.bound.check);
+        document.removeListener('mousemove', this.bound.drag);
+        document.removeListener('mouseup', this.bound.stop);
+        this.fireEvent('onComplete', this.element);
+    }
+
+});
+
+Drag.Base.implement(new Events, new Options);
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: makeResizable
+        Makes an element resizable (by dragging) with the supplied options.
+
+    Arguments:
+        options - see <Drag.Base> for acceptable options.
+    */
+
+    makeResizable: function(options) {
+        return new Drag.Base(this, $merge({modifiers: {x: 'width', y: 'height'}}, options));
+    }
+
+});
+
+/*
+Script: Drag.Move.js
+	Contains <Drag.Move>, <Element.makeDraggable>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Drag.Move
+	Extends <Drag.Base>, has additional functionality for dragging an element, support snapping and droppables.
+	Drag.move supports either position absolute or relative. If no position is found, absolute will be set.
+	Inherits methods, properties, options and events from <Drag.Base>.
+
+Note:
+	Drag.Move requires an XHTML doctype.
+
+Arguments:
+	el - the $(element) to apply the drag to.
+	options - optional. see Options below.
+
+Options:
+	all the drag.Base options, plus:
+	container - an element, will fill automatically limiting options based on the $(element) size and position. defaults to false (no limiting)
+	droppables - an array of elements you can drop your draggable to.
+	overflown - an array of nested scrolling containers, see Element::getPosition
+*/
+
+Drag.Move = Drag.Base.extend({
+
+    options: {
+        droppables: [],
+        container: false,
+        overflown: []
+    },
+
+    initialize: function(el, options) {
+        this.setOptions(options);
+        this.element = $(el);
+        this.droppables = $$(this.options.droppables);
+        this.container = $(this.options.container);
+        this.position = {'element': this.element.getStyle('position'), 'container': false};
+        if (this.container) this.position.container = this.container.getStyle('position');
+        if (!['relative', 'absolute', 'fixed'].contains(this.position.element)) this.position.element = 'absolute';
+        var top = this.element.getStyle('top').toInt();
+        var left = this.element.getStyle('left').toInt();
+        if (this.position.element == 'absolute' && !['relative', 'absolute', 'fixed'].contains(this.position.container)) {
+            top = $chk(top) ? top : this.element.getTop(this.options.overflown);
+            left = $chk(left) ? left : this.element.getLeft(this.options.overflown);
+        } else {
+            top = $chk(top) ? top : 0;
+            left = $chk(left) ? left : 0;
+        }
+        this.element.setStyles({'top': top, 'left': left, 'position': this.position.element});
+        this.parent(this.element);
+    },
+
+    start: function(event) {
+        this.overed = null;
+        if (this.container) {
+            var cont = this.container.getCoordinates();
+            var el = this.element.getCoordinates();
+            if (this.position.element == 'absolute' && !['relative', 'absolute', 'fixed'].contains(this.position.container)) {
+                this.options.limit = {
+                    'x': [cont.left, cont.right - el.width],
+                    'y': [cont.top, cont.bottom - el.height]
+                };
+            } else {
+                this.options.limit = {
+                    'y': [0, cont.height - el.height],
+                    'x': [0, cont.width - el.width]
+                };
+            }
+        }
+        this.parent(event);
+    },
+
+    drag: function(event) {
+        this.parent(event);
+        var overed = this.out ? false : this.droppables.filter(this.checkAgainst, this).getLast();
+        if (this.overed != overed) {
+            if (this.overed) this.overed.fireEvent('leave', [this.element, this]);
+            this.overed = overed ? overed.fireEvent('over', [this.element, this]) : null;
+        }
+        return this;
+    },
+
+    checkAgainst: function(el) {
+        el = el.getCoordinates(this.options.overflown);
+        var now = this.mouse.now;
+        return (now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
+    },
+
+    stop: function() {
+        if (this.overed && !this.out) this.overed.fireEvent('drop', [this.element, this]);
+        else this.element.fireEvent('emptydrop', this);
+        this.parent();
+        return this;
+    }
+
+});
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: makeDraggable
+        Makes an element draggable with the supplied options.
+
+    Arguments:
+        options - see <Drag.Move> and <Drag.Base> for acceptable options.
+    */
+
+    makeDraggable: function(options) {
+        return new Drag.Move(this, options);
+    }
+
+});
+
+/*
+Script: XHR.js
+	Contains the basic XMLHttpRequest Class Wrapper.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: XHR
+	Basic XMLHttpRequest Wrapper.
+
+Arguments:
+	options - an object with options names as keys. See options below.
+
+Options:
+	method - 'post' or 'get' - the protocol for the request; optional, defaults to 'post'.
+	async - boolean: asynchronous option; true uses asynchronous requests. Defaults to true.
+	encoding - the encoding, defaults to utf-8.
+	autoCancel - cancels the already running request if another one is sent. defaults to false.
+	headers - accepts an object, that will be set to request headers.
+
+Events:
+	onRequest - function to execute when the XHR request is fired.
+	onSuccess - function to execute when the XHR request completes.
+	onStateChange - function to execute when the state of the XMLHttpRequest changes.
+	onFailure - function to execute when the state of the XMLHttpRequest changes.
+
+Properties:
+	running - true if the request is running.
+	response - object, text and xml as keys. You can access this property in the onSuccess event.
+
+Example:
+	>var myXHR = new XHR({method: 'get'}).send('http://site.com/requestHandler.php', 'name=john&lastname=dorian');
+*/
+
+var XHR = new Class({
+
+    options: {
+        method: 'post',
+        async: true,
+        onRequest: Class.empty,
+        onSuccess: Class.empty,
+        onFailure: Class.empty,
+        urlEncoded: true,
+        encoding: 'utf-8',
+        autoCancel: false,
+        headers: {}
+    },
+
+    setTransport: function() {
+        this.transport = (window.XMLHttpRequest) ? new XMLHttpRequest() : (window.ie ? new ActiveXObject('Microsoft.XMLHTTP') : false);
+        return this;
+    },
+
+    initialize: function(options) {
+        this.setTransport().setOptions(options);
+        this.options.isSuccess = this.options.isSuccess || this.isSuccess;
+        this.headers = {};
+        if (this.options.urlEncoded && this.options.method == 'post') {
+            var encoding = (this.options.encoding) ? '; charset=' + this.options.encoding : '';
+            this.setHeader('Content-type', 'application/x-www-form-urlencoded' + encoding);
+        }
+        if (this.options.initialize) this.options.initialize.call(this);
+    },
+
+    onStateChange: function() {
+        if (this.transport.readyState != 4 || !this.running) return;
+        this.running = false;
+        var status = 0;
+        try {
+            status = this.transport.status;
+        } catch(e) {
+        }
+        ;
+        if (this.options.isSuccess.call(this, status)) this.onSuccess();
+        else this.onFailure();
+        this.transport.onreadystatechange = Class.empty;
+    },
+
+    isSuccess: function(status) {
+        return ((status >= 200) && (status < 300));
+    },
+
+    onSuccess: function() {
+        this.response = {
+            'text': this.transport.responseText,
+            'xml': this.transport.responseXML
+        };
+        this.fireEvent('onSuccess', [this.response.text, this.response.xml]);
+        this.callChain();
+    },
+
+    onFailure: function() {
+        this.fireEvent('onFailure', this.transport);
+    },
+
+/*
+    Property: setHeader
+        Add/modify an header for the request. It will not override headers from the options.
+
+    Example:
+        >var myXhr = new XHR(url, {method: 'get', headers: {'X-Request': 'JSON'}});
+        >myXhr.setHeader('Last-Modified','Sat, 1 Jan 2005 05:00:00 GMT');
+    */
+
+    setHeader: function(name, value) {
+        this.headers[name] = value;
+        return this;
+    },
+
+/*
+    Property: send
+        Opens the XHR connection and sends the data. Data has to be null or a string.
+
+    Example:
+        >var myXhr = new XHR({method: 'post'});
+        >myXhr.send(url, querystring);
+        >
+        >var syncXhr = new XHR({async: false, method: 'post'});
+        >syncXhr.send(url, null);
+        >
+    */
+
+    send: function(url, data) {
+        if (this.options.autoCancel) this.cancel();
+        else if (this.running) return this;
+        this.running = true;
+        if (data && this.options.method == 'get') {
+            url = url + (url.contains('?') ? '&' : '?') + data;
+            data = null;
+        }
+        this.transport.open(this.options.method.toUpperCase(), url, this.options.async);
+        this.transport.onreadystatechange = this.onStateChange.bind(this);
+        if ((this.options.method == 'post') && this.transport.overrideMimeType) this.setHeader('Connection', 'close');
+        $extend(this.headers, this.options.headers);
+        for (var type in this.headers) try {
+            this.transport.setRequestHeader(type, this.headers[type]);
+        } catch(e) {
+        }
+        ;
+        this.fireEvent('onRequest');
+        this.transport.send($pick(data, null));
+        return this;
+    },
+
+/*
+    Property: cancel
+        Cancels the running request. No effect if the request is not running.
+
+    Example:
+        >var myXhr = new XHR({method: 'get'}).send(url);
+        >myXhr.cancel();
+    */
+
+    cancel: function() {
+        if (!this.running) return this;
+        this.running = false;
+        this.transport.abort();
+        this.transport.onreadystatechange = Class.empty;
+        this.setTransport();
+        this.fireEvent('onCancel');
+        return this;
+    }
+
+});
+
+XHR.implement(new Chain, new Events, new Options);
+
+/*
+Script: Ajax.js
+	Contains the <Ajax> class. Also contains methods to generate querystings from forms and Objects.
+
+Credits:
+	Loosely based on the version from prototype.js <http://prototype.conio.net>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Ajax
+	An Ajax class, For all your asynchronous needs.
+	Inherits methods, properties, options and events from <XHR>.
+
+Arguments:
+	url - the url pointing to the server-side script.
+	options - optional, an object containing options.
+
+Options:
+	data - you can write parameters here. Can be a querystring, an object or a Form element.
+	update - $(element) to insert the response text of the XHR into, upon completion of the request.
+	evalScripts - boolean; default is false. Execute scripts in the response text onComplete. When the response is javascript the whole response is evaluated.
+	evalResponse - boolean; default is false. Force global evalulation of the whole response, no matter what content-type it is.
+
+Events:
+	onComplete - function to execute when the ajax request completes.
+
+Example:
+	>var myAjax = new Ajax(url, {method: 'get'}).request();
+*/
+
+var Ajax = XHR.extend({
+
+    options: {
+        data: null,
+        update: null,
+        onComplete: Class.empty,
+        evalScripts: false,
+        evalResponse: false
+    },
+
+    initialize: function(url, options) {
+        this.addEvent('onSuccess', this.onComplete);
+        this.setOptions(options);
+        /*compatibility*/
+        this.options.data = this.options.data || this.options.postBody;
+        /*end compatibility*/
+        if (!['post', 'get'].contains(this.options.method)) {
+            this._method = '_method=' + this.options.method;
+            this.options.method = 'post';
+        }
+        this.parent();
+        this.setHeader('X-Requested-With', 'XMLHttpRequest');
+        this.setHeader('Accept', 'text/javascript, text/html, application/xml, text/xml, */*');
+        this.url = url;
+    },
+
+    onComplete: function() {
+        if (this.options.update) $(this.options.update).empty().setHTML(this.response.text);
+        if (this.options.evalScripts || this.options.evalResponse) this.evalScripts();
+        this.fireEvent('onComplete', [this.response.text, this.response.xml], 20);
+    },
+
+/*
+    Property: request
+        Executes the ajax request.
+
+    Example:
+        >var myAjax = new Ajax(url, {method: 'get'});
+        >myAjax.request();
+
+        OR
+
+        >new Ajax(url, {method: 'get'}).request();
+    */
+
+    request: function(data) {
+        data = data || this.options.data;
+        switch ($type(data)) {
+            case 'element': data = $(data).toQueryString(); break;
+            case 'object': data = Object.toQueryString(data);
+        }
+        if (this._method) data = (data) ? [this._method, data].join('&') : this._method;
+        return this.send(this.url, data);
+    },
+
+/*
+    Property: evalScripts
+        Executes scripts in the response text
+    */
+
+    evalScripts: function() {
+        var script, scripts;
+        if (this.options.evalResponse || (/(ecma|java)script/).test(this.getHeader('Content-type'))) scripts = this.response.text;
+        else {
+            scripts = [];
+            var regexp = /<script[^>]*>([\s\S]*?)<\/script>/gi;
+            while ((script = regexp.exec(this.response.text))) scripts.push(script[1]);
+            scripts = scripts.join('\n');
+        }
+        if (scripts) (window.execScript) ? window.execScript(scripts) : window.setTimeout(scripts, 0);
+    },
+
+/*
+    Property: getHeader
+        Returns the given response header or null
+    */
+
+    getHeader: function(name) {
+        try {
+            return this.transport.getResponseHeader(name);
+        } catch(e) {
+        }
+        ;
+        return null;
+    }
+
+});
+
+/* Section: Object related Functions */
+
+/*
+Function: Object.toQueryString
+	Generates a querystring from key/pair values in an object
+
+Arguments:
+	source - the object to generate the querystring from.
+
+Returns:
+	the query string.
+
+Example:
+	>Object.toQueryString({apple: "red", lemon: "yellow"}); //returns "apple=red&lemon=yellow"
+*/
+
+Object.toQueryString = function(source) {
+    var queryString = [];
+    for (var property in source) queryString.push(encodeURIComponent(property) + '=' + encodeURIComponent(source[property]));
+    return queryString.join('&');
+};
+
+/*
+Class: Element
+	Custom class to allow all of its methods to be used with any DOM element via the dollar function <$>.
+*/
+
+Element.extend({
+
+/*
+    Property: send
+        Sends a form with an ajax post request
+
+    Arguments:
+        options - option collection for ajax request. See <Ajax> for the options list.
+
+    Returns:
+        The Ajax Class Instance
+
+    Example:
+        (start code)
+        <form id="myForm" action="submit.php">
+        <input name="email" value="bob@bob.com">
+        <input name="zipCode" value="90210">
+        </form>
+        <script>
+        $('myForm').send()
+        </script>
+        (end)
+    */
+
+    send: function(options) {
+        return new Ajax(this.getProperty('action'), $merge({data: this.toQueryString()}, options, {method: 'post'})).request();
+    }
+
+});
+
+/*
+Script: Cookie.js
+	A cookie reader/creator
+
+Credits:
+	based on the functions by Peter-Paul Koch (http://quirksmode.org)
+*/
+
+/*
+Class: Cookie
+	Class for creating, getting, and removing cookies.
+*/
+
+var Cookie = new Abstract({
+
+    options: {
+        domain: false,
+        path: false,
+        duration: false,
+        secure: false
+    },
+
+/*
+    Property: set
+        Sets a cookie in the browser.
+
+    Arguments:
+        key - the key (name) for the cookie
+        value - the value to set, cannot contain semicolons
+        options - an object representing the Cookie options. See Options below. Default values are stored in Cookie.options.
+
+    Options:
+        domain - the domain the Cookie belongs to. If you want to share the cookie with pages located on a different domain, you have to set this value. Defaults to the current domain.
+        path - the path the Cookie belongs to. If you want to share the cookie with pages located in a different path, you have to set this value, for example to "/" to share the cookie with all pages on the domain. Defaults to the current path.
+        duration - the duration of the Cookie before it expires, in days.
+                    If set to false or 0, the cookie will be a session cookie that expires when the browser is closed. This is default.
+        secure - Stored cookie information can be accessed only from a secure environment.
+
+    Returns:
+        An object with the options, the key and the value. You can give it as first parameter to Cookie.remove.
+
+    Example:
+        >Cookie.set('username', 'Harald'); // session cookie (duration is false), or ...
+        >Cookie.set('username', 'JackBauer', {duration: 1}); // save this for 1 day
+
+    */
+
+    set: function(key, value, options) {
+        options = $merge(this.options, options);
+        value = encodeURIComponent(value);
+        if (options.domain) value += '; domain=' + options.domain;
+        if (options.path) value += '; path=' + options.path;
+        if (options.duration) {
+            var date = new Date();
+            date.setTime(date.getTime() + options.duration * 24 * 60 * 60 * 1000);
+            value += '; expires=' + date.toGMTString();
+        }
+        if (options.secure) value += '; secure';
+        document.cookie = key + '=' + value;
+        return $extend(options, {'key': key, 'value': value});
+    },
+
+/*
+    Property: get
+        Gets the value of a cookie.
+
+    Arguments:
+        key - the name of the cookie you wish to retrieve.
+
+    Returns:
+        The cookie string value, or false if not found.
+
+    Example:
+        >Cookie.get("username") //returns JackBauer
+    */
+
+    get: function(key) {
+        var value = document.cookie.match('(?:^|;)\\s*' + key.escapeRegExp() + '=([^;]*)');
+        return value ? decodeURIComponent(value[1]) : false;
+    },
+
+/*
+    Property: remove
+        Removes a cookie from the browser.
+
+    Arguments:
+        cookie - the name of the cookie to remove or a previous cookie (for domains)
+        options - optional. you can also pass the domain and path here. Same as options in <Cookie.set>
+
+    Examples:
+        >Cookie.remove('username') //bye-bye JackBauer, cya in 24 hours
+        >
+        >var myCookie = Cookie.set('username', 'Aaron', {domain: 'mootools.net'}); // Cookie.set returns an object with all values need to remove the cookie
+        >Cookie.remove(myCookie);
+    */
+
+    remove: function(cookie, options) {
+        if ($type(cookie) == 'object') this.set(cookie.key, '', $merge(cookie, {duration: -1}));
+        else this.set(cookie, '', $merge(options, {duration: -1}));
+    }
+
+});
+
+/*
+Script: Json.js
+	Simple Json parser and Stringyfier, See: <http://www.json.org/>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Json
+	Simple Json parser and Stringyfier, See: <http://www.json.org/>
+*/
+
+var Json = {
+
+/*
+    Property: toString
+        Converts an object to a string, to be passed in server-side scripts as a parameter. Although its not normal usage for this class, this method can also be used to convert functions and arrays to strings.
+
+    Arguments:
+        obj - the object to convert to string
+
+    Returns:
+        A json string
+
+    Example:
+        (start code)
+        Json.toString({apple: 'red', lemon: 'yellow'}); '{"apple":"red","lemon":"yellow"}'
+        (end)
+    */
+
+    toString: function(obj) {
+        switch ($type(obj)) {
+            case 'string':
+                return '"' + obj.replace(/(["\\])/g, '\\$1') + '"';
+            case 'array':
+                return '[' + obj.map(Json.toString).join(',') + ']';
+            case 'object':
+                var string = [];
+                for (var property in obj) string.push(Json.toString(property) + ':' + Json.toString(obj[property]));
+                return '{' + string.join(',') + '}';
+            case 'number':
+                if (isFinite(obj)) break;
+            case false:
+                return 'null';
+        }
+        return String(obj);
+    },
+
+/*
+    Property: evaluate
+        converts a json string to an javascript Object.
+
+    Arguments:
+        str - the string to evaluate. if its not a string, it returns false.
+        secure - optionally, performs syntax check on json string. Defaults to false.
+
+    Credits:
+        Json test regexp is by Douglas Crockford <http://crockford.org>.
+
+    Example:
+        >var myObject = Json.evaluate('{"apple":"red","lemon":"yellow"}');
+        >//myObject will become {apple: 'red', lemon: 'yellow'}
+    */
+
+    evaluate: function(str, secure) {
+        return (($type(str) != 'string') || (secure && !str.test(/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/))) ? null : eval('(' + str + ')');
+    }
+
+};
+
+/*
+Script: Json.Remote.js
+	Contains <Json.Remote>.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Json.Remote
+	Wrapped XHR with automated sending and receiving of Javascript Objects in Json Format.
+	Inherits methods, properties, options and events from <XHR>.
+
+Arguments:
+	url - the url you want to send your object to.
+	options - see <XHR> options
+
+Example:
+	this code will send user information based on name/last name
+	(start code)
+	var jSonRequest = new Json.Remote("http://site.com/tellMeAge.php", {onComplete: function(person){
+		alert(person.age); //is 25 years
+		alert(person.height); //is 170 cm
+		alert(person.weight); //is 120 kg
+	}}).send({'name': 'John', 'lastName': 'Doe'});
+	(end)
+*/
+
+Json.Remote = XHR.extend({
+
+    initialize: function(url, options) {
+        this.url = url;
+        this.addEvent('onSuccess', this.onComplete);
+        this.parent(options);
+        this.setHeader('X-Request', 'JSON');
+    },
+
+    send: function(obj) {
+        return this.parent(this.url, 'json=' + Json.toString(obj));
+    },
+
+    onComplete: function() {
+        this.fireEvent('onComplete', [Json.evaluate(this.response.text, this.options.secure)]);
+    }
+
+});
+
+/*
+Script: Assets.js
+	provides dynamic loading for images, css and javascript files.
+
+License:
+	MIT-style license.
+*/
+
+var Asset = new Abstract({
+
+/*
+    Property: javascript
+        Injects a javascript file in the page.
+
+    Arguments:
+        source - the path of the javascript file
+        properties - some additional attributes you might want to add to the script element
+
+    Example:
+        > new Asset.javascript('/scripts/myScript.js', {id: 'myScript'});
+    */
+
+    javascript: function(source, properties) {
+        properties = $merge({
+            'onload': Class.empty
+        }, properties);
+        var script = new Element('script', {'src': source}).addEvents({
+            'load': properties.onload,
+            'readystatechange': function() {
+                if (this.readyState == 'complete') this.fireEvent('load');
+            }
+        });
+        delete properties.onload;
+        return script.setProperties(properties).inject(document.head);
+    },
+
+/*
+    Property: css
+        Injects a css file in the page.
+
+    Arguments:
+        source - the path of the css file
+        properties - some additional attributes you might want to add to the link element
+
+    Example:
+        > new Asset.css('/css/myStyle.css', {id: 'myStyle', title: 'myStyle'});
+    */
+
+    css: function(source, properties) {
+        return new Element('link', $merge({
+            'rel': 'stylesheet', 'media': 'screen', 'type': 'text/css', 'href': source
+        }, properties)).inject(document.head);
+    },
+
+/*
+    Property: image
+        Preloads an image and returns the img element. does not inject it to the page.
+
+    Arguments:
+        source - the path of the image file
+        properties - some additional attributes you might want to add to the img element
+
+    Example:
+        > new Asset.image('/images/myImage.png', {id: 'myImage', title: 'myImage', onload: myFunction});
+
+    Returns:
+        the img element. you can inject it anywhere you want with <Element.injectInside>/<Element.injectAfter>/<Element.injectBefore>
+    */
+
+    image: function(source, properties) {
+        properties = $merge({
+            'onload': Class.empty,
+            'onabort': Class.empty,
+            'onerror': Class.empty
+        }, properties);
+        var image = new Image();
+        image.src = source;
+        var element = new Element('img', {'src': source});
+        ['load', 'abort', 'error'].each(function(type) {
+            var event = properties['on' + type];
+            delete properties['on' + type];
+            element.addEvent(type, function() {
+                this.removeEvent(type, arguments.callee);
+                event.call(this);
+            });
+        });
+        if (image.width && image.height) element.fireEvent('load', element, 1);
+        return element.setProperties(properties);
+    },
+
+/*
+    Property: images
+        Preloads an array of images (as strings) and returns an array of img elements. does not inject them to the page.
+
+    Arguments:
+        sources - array, the paths of the image files
+        options - object, see below
+
+    Options:
+        onComplete - a function to execute when all image files are loaded in the browser's cache
+        onProgress - a function to execute when one image file is loaded in the browser's cache
+
+    Example:
+        (start code)
+        new Asset.images(['/images/myImage.png', '/images/myImage2.gif'], {
+            onComplete: function(){
+                alert('all images loaded!');
+            }
+        });
+        (end)
+
+    Returns:
+        the img elements as $$. you can inject them anywhere you want with <Element.injectInside>/<Element.injectAfter>/<Element.injectBefore>
+    */
+
+    images: function(sources, options) {
+        options = $merge({
+            onComplete: Class.empty,
+            onProgress: Class.empty
+        }, options);
+        if (!sources.push) sources = [sources];
+        var images = [];
+        var counter = 0;
+        sources.each(function(source) {
+            var img = new Asset.image(source, {
+                'onload': function() {
+                    options.onProgress.call(this, counter);
+                    counter++;
+                    if (counter == sources.length) options.onComplete();
+                }
+            });
+            images.push(img);
+        });
+        return new Elements(images);
+    }
+
+});
+
+/*
+Script: Hash.js
+	Contains the class Hash.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Hash
+	It wraps an object that it uses internally as a map. The user must use set(), get(), and remove() to add/change, retrieve and remove values, it must not access the internal object directly. null/undefined values are allowed.
+
+Note:
+	Each hash instance has the length property.
+
+Arguments:
+	obj - an object to convert into a Hash instance.
+
+Example:
+	(start code)
+	var hash = new Hash({a: 'hi', b: 'world', c: 'howdy'});
+	hash.remove('b'); // b is removed.
+	hash.set('c', 'hello');
+	hash.get('c'); // returns 'hello'
+	hash.length // returns 2 (a and c)
+	(end)
+*/
+
+var Hash = new Class({
+
+    length: 0,
+
+    initialize: function(object) {
+        this.obj = object || {};
+        this.setLength();
+    },
+
+/*
+    Property: get
+        Retrieves a value from the hash.
+
+    Arguments:
+        key - The key
+
+    Returns:
+        The value
+    */
+
+    get: function(key) {
+        return (this.hasKey(key)) ? this.obj[key] : null;
+    },
+
+/*
+    Property: hasKey
+        Check the presence of a specified key-value pair in the hash.
+
+    Arguments:
+        key - The key
+
+    Returns:
+        True if the Hash contains a value for the specified key, otherwise false
+    */
+
+    hasKey: function(key) {
+        return (key in this.obj);
+    },
+
+/*
+    Property: set
+        Adds a key-value pair to the hash or replaces a previous value associated with the key.
+
+    Arguments:
+        key - The key
+        value - The value
+    */
+
+    set: function(key, value) {
+        if (!this.hasKey(key)) this.length++;
+        this.obj[key] = value;
+        return this;
+    },
+
+    setLength: function() {
+        this.length = 0;
+        for (var p in this.obj) this.length++;
+        return this;
+    },
+
+/*
+    Property: remove
+        Removes a key-value pair from the hash.
+
+    Arguments:
+        key - The key
+    */
+
+    remove: function(key) {
+        if (this.hasKey(key)) {
+            delete this.obj[key];
+            this.length--;
+        }
+        return this;
+    },
+
+/*
+    Property: each
+        Calls a function for each key-value pair. The first argument passed to the function will be the value, the second one will be the key, like $each.
+
+    Arguments:
+        fn - The function to call for each key-value pair
+        bind - Optional, the object that will be referred to as "this" in the function
+    */
+
+    each: function(fn, bind) {
+        $each(this.obj, fn, bind);
+    },
+
+/*
+    Property: extend
+        Extends the current hash with an object containing key-value pairs. Values for duplicate keys will be replaced by the new ones.
+
+    Arguments:
+        obj - An object containing key-value pairs
+    */
+
+    extend: function(obj) {
+        $extend(this.obj, obj);
+        return this.setLength();
+    },
+
+/*
+    Property: merge
+        Merges the current hash with multiple objects.
+    */
+
+    merge: function() {
+        this.obj = $merge.apply(null, [this.obj].extend(arguments));
+        return this.setLength();
+    },
+
+/*
+    Property: empty
+        Empties all hash values properties and values.
+    */
+
+    empty: function() {
+        this.obj = {};
+        this.length = 0;
+        return this;
+    },
+
+/*
+    Property: keys
+        Returns an array containing all the keys, in the same order as the values returned by <Hash.values>.
+
+    Returns:
+        An array containing all the keys of the hash
+    */
+
+    keys: function() {
+        var keys = [];
+        for (var property in this.obj) keys.push(property);
+        return keys;
+    },
+
+/*
+    Property: values
+        Returns an array containing all the values, in the same order as the keys returned by <Hash.keys>.
+
+    Returns:
+        An array containing all the values of the hash
+    */
+
+    values: function() {
+        var values = [];
+        for (var property in this.obj) values.push(this.obj[property]);
+        return values;
+    }
+
+});
+
+/* Section: Utility Functions */
+
+/*
+Function: $H
+	Shortcut to create a Hash from an Object.
+*/
+
+function $H(obj) {
+    return new Hash(obj);
+}
+;
+
+/*
+Script: Hash.Cookie.js
+	Stores and loads an Hash as a cookie using Json format.
+*/
+
+/*
+Class: Hash.Cookie
+	Inherits all the methods from <Hash>, additional methods are save and load.
+	Hash json string has a limit of 4kb (4096byte), so be careful with your Hash size.
+	Creating a new instance automatically loads the data from the Cookie into the Hash.
+	If the Hash is emptied, the cookie is also removed.
+
+Arguments:
+	name - the key (name) for the cookie
+	options - options are identical to <Cookie> and are simply passed along to it.
+		In addition, it has the autoSave option, to save the cookie at every operation. defaults to true.
+
+Example:
+	(start code)
+	var fruits = new Hash.Cookie('myCookieName', {duration: 3600});
+	fruits.extend({
+		'lemon': 'yellow',
+		'apple': 'red'
+	});
+	fruits.set('melon', 'green');
+	fruits.get('lemon'); // yellow
+
+	// ... on another page ... values load automatically
+
+	var fruits = new Hash.Cookie('myCookieName', {duration: 365});
+	fruits.get('melon'); // green
+
+	fruits.erase(); // delete cookie
+	(end)
+*/
+
+Hash.Cookie = Hash.extend({
+
+    initialize: function(name, options) {
+        this.name = name;
+        this.options = $extend({'autoSave': true}, options || {});
+        this.load();
+    },
+
+/*
+    Property: save
+        Saves the Hash to the cookie. If the hash is empty, removes the cookie.
+
+    Returns:
+        Returns false when the JSON string cookie is too long (4kb), otherwise true.
+
+    Example:
+        (start code)
+        var login = new Hash.Cookie('userstatus', {autoSave: false});
+
+        login.extend({
+            'username': 'John',
+            'credentials': [4, 7, 9]
+        });
+        login.set('last_message', 'User logged in!');
+
+        login.save(); // finally save the Hash
+        (end)
+    */
+
+    save: function() {
+        if (this.length == 0) {
+            Cookie.remove(this.name, this.options);
+            return true;
+        }
+        var str = Json.toString(this.obj);
+        if (str.length > 4096) return false; //cookie would be truncated!
+        Cookie.set(this.name, str, this.options);
+        return true;
+    },
+
+/*
+    Property: load
+        Loads the cookie and assigns it to the Hash.
+    */
+
+    load: function() {
+        this.obj = Json.evaluate(Cookie.get(this.name), true) || {};
+        this.setLength();
+    }
+
+});
+
+Hash.Cookie.Methods = {};
+['extend', 'set', 'merge', 'empty', 'remove'].each(function(method) {
+    Hash.Cookie.Methods[method] = function() {
+        Hash.prototype[method].apply(this, arguments);
+        if (this.options.autoSave) this.save();
+        return this;
+    };
+});
+Hash.Cookie.implement(Hash.Cookie.Methods);
+
+/*
+Script: Color.js
+	Contains the Color class.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Color
+	Creates a new Color Object, which is an array with some color specific methods.
+Arguments:
+	color - the hex, the RGB array or the HSB array of the color to create. For HSB colors, you need to specify the second argument.
+	type - a string representing the type of the color to create. needs to be specified if you intend to create the color with HSB values, or an array of HEX values. Can be 'rgb', 'hsb' or 'hex'.
+
+Example:
+	(start code)
+	var black = new Color('#000');
+	var purple = new Color([255,0,255]);
+	// mix black with white and purple, each time at 10% of the new color
+	var darkpurple = black.mix('#fff', purple, 10);
+	$('myDiv').setStyle('background-color', darkpurple);
+	(end)
+*/
+
+var Color = new Class({
+
+    initialize: function(color, type) {
+        type = type || (color.push ? 'rgb' : 'hex');
+        var rgb, hsb;
+        switch (type) {
+            case 'rgb':
+                rgb = color;
+                hsb = rgb.rgbToHsb();
+                break;
+            case 'hsb':
+                rgb = color.hsbToRgb();
+                hsb = color;
+                break;
+            default:
+                rgb = color.hexToRgb(true);
+                hsb = rgb.rgbToHsb();
+        }
+        rgb.hsb = hsb;
+        rgb.hex = rgb.rgbToHex();
+        return $extend(rgb, Color.prototype);
+    },
+
+/*
+    Property: mix
+        Mixes two or more colors with the Color.
+
+    Arguments:
+        color - a color to mix. you can use as arguments how many colors as you want to mix with the original one.
+        alpha - if you use a number as the last argument, it will be threated as the amount of the color to mix.
+    */
+
+    mix: function() {
+        var colors = $A(arguments);
+        var alpha = ($type(colors[colors.length - 1]) == 'number') ? colors.pop() : 50;
+        var rgb = this.copy();
+        colors.each(function(color) {
+            color = new Color(color);
+            for (var i = 0; i < 3; i++) rgb[i] = Math.round((rgb[i] / 100 * (100 - alpha)) + (color[i] / 100 * alpha));
+        });
+        return new Color(rgb, 'rgb');
+    },
+
+/*
+    Property: invert
+        Inverts the Color.
+    */
+
+    invert: function() {
+        return new Color(this.map(function(value) {
+            return 255 - value;
+        }));
+    },
+
+/*
+    Property: setHue
+        Modifies the hue of the Color, and returns a new one.
+
+    Arguments:
+        value - the hue to set
+    */
+
+    setHue: function(value) {
+        return new Color([value, this.hsb[1], this.hsb[2]], 'hsb');
+    },
+
+/*
+    Property: setSaturation
+        Changes the saturation of the Color, and returns a new one.
+
+    Arguments:
+        percent - the percentage of the saturation to set
+    */
+
+    setSaturation: function(percent) {
+        return new Color([this.hsb[0], percent, this.hsb[2]], 'hsb');
+    },
+
+/*
+    Property: setBrightness
+        Changes the brightness of the Color, and returns a new one.
+
+    Arguments:
+        percent - the percentage of the brightness to set
+    */
+
+    setBrightness: function(percent) {
+        return new Color([this.hsb[0], this.hsb[1], percent], 'hsb');
+    }
+
+});
+
+/* Section: Utility Functions */
+
+/*
+Function: $RGB
+	Shortcut to create a new color, based on red, green, blue values.
+
+Arguments:
+	r - (integer) red value (0-255)
+	g - (integer) green value (0-255)
+	b - (integer) blue value (0-255)
+
+*/
+
+function $RGB(r, g, b) {
+    return new Color([r, g, b], 'rgb');
+}
+;
+
+/*
+Function: $HSB
+	Shortcut to create a new color, based on hue, saturation, brightness values.
+
+Arguments:
+	h - (integer) hue value (0-100)
+	s - (integer) saturation value (0-100)
+	b - (integer) brightness value (0-100)
+*/
+
+function $HSB(h, s, b) {
+    return new Color([h, s, b], 'hsb');
+}
+;
+
+/*
+Class: Array
+	A collection of The Array Object prototype methods.
+*/
+
+Array.extend({
+
+/*
+    Property: rgbToHsb
+        Converts a RGB array to an HSB array.
+
+    Returns:
+        the HSB array.
+    */
+
+    rgbToHsb: function() {
+        var red = this[0], green = this[1], blue = this[2];
+        var hue, saturation, brightness;
+        var max = Math.max(red, green, blue), min = Math.min(red, green, blue);
+        var delta = max - min;
+        brightness = max / 255;
+        saturation = (max != 0) ? delta / max : 0;
+        if (saturation == 0) {
+            hue = 0;
+        } else {
+            var rr = (max - red) / delta;
+            var gr = (max - green) / delta;
+            var br = (max - blue) / delta;
+            if (red == max) hue = br - gr;
+            else if (green == max) hue = 2 + rr - br;
+            else hue = 4 + gr - rr;
+            hue /= 6;
+            if (hue < 0) hue++;
+        }
+        return [Math.round(hue * 360), Math.round(saturation * 100), Math.round(brightness * 100)];
+    },
+
+/*
+    Property: hsbToRgb
+        Converts an HSB array to an RGB array.
+
+    Returns:
+        the RGB array.
+    */
+
+    hsbToRgb: function() {
+        var br = Math.round(this[2] / 100 * 255);
+        if (this[1] == 0) {
+            return [br, br, br];
+        } else {
+            var hue = this[0] % 360;
+            var f = hue % 60;
+            var p = Math.round((this[2] * (100 - this[1])) / 10000 * 255);
+            var q = Math.round((this[2] * (6000 - this[1] * f)) / 600000 * 255);
+            var t = Math.round((this[2] * (6000 - this[1] * (60 - f))) / 600000 * 255);
+            switch (Math.floor(hue / 60)) {
+                case 0: return [br, t, p];
+                case 1: return [q, br, p];
+                case 2: return [p, br, t];
+                case 3: return [p, q, br];
+                case 4: return [t, p, br];
+                case 5: return [br, p, q];
+            }
+        }
+        return false;
+    }
+
+});
+
+/*
+Script: Scroller.js
+	Contains the <Scroller>.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Scroller
+	The Scroller is a class to scroll any element with an overflow (including the window) when the mouse cursor reaches certain buondaries of that element.
+	You must call its start method to start listening to mouse movements.
+
+Note:
+	The Scroller requires an XHTML doctype.
+
+Arguments:
+	element - required, the element to scroll.
+	options - optional, see options below, and <Fx.Base> options.
+
+Options:
+	area - integer, the necessary boundaries to make the element scroll.
+	velocity - integer, velocity ratio, the modifier for the window scrolling speed.
+
+Events:
+	onChange - optionally, when the mouse reaches some boundaries, you can choose to alter some other values, instead of the scrolling offsets.
+		Automatically passes as parameters x and y values.
+*/
+
+var Scroller = new Class({
+
+    options: {
+        area: 20,
+        velocity: 1,
+        onChange: function(x, y) {
+            this.element.scrollTo(x, y);
+        }
+    },
+
+    initialize: function(element, options) {
+        this.setOptions(options);
+        this.element = $(element);
+        this.mousemover = ([window, document].contains(element)) ? $(document.body) : this.element;
+    },
+
+/*
+    Property: start
+        The scroller starts listening to mouse movements.
+    */
+
+    start: function() {
+        this.coord = this.getCoords.bindWithEvent(this);
+        this.mousemover.addListener('mousemove', this.coord);
+    },
+
+/*
+    Property: stop
+        The scroller stops listening to mouse movements.
+    */
+
+    stop: function() {
+        this.mousemover.removeListener('mousemove', this.coord);
+        this.timer = $clear(this.timer);
+    },
+
+    getCoords: function(event) {
+        this.page = (this.element == window) ? event.client : event.page;
+        if (!this.timer) this.timer = this.scroll.periodical(50, this);
+    },
+
+    scroll: function() {
+        var el = this.element.getSize();
+        var pos = this.element.getPosition();
+
+        var change = {'x': 0, 'y': 0};
+        for (var z in this.page) {
+            if (this.page[z] < (this.options.area + pos[z]) && el.scroll[z] != 0)
+                change[z] = (this.page[z] - this.options.area - pos[z]) * this.options.velocity;
+            else if (this.page[z] + this.options.area > (el.size[z] + pos[z]) && el.scroll[z] + el.size[z] != el.scrollSize[z])
+                change[z] = (this.page[z] - el.size[z] + this.options.area - pos[z]) * this.options.velocity;
+        }
+        if (change.y || change.x) this.fireEvent('onChange', [el.scroll.x + change.x, el.scroll.y + change.y]);
+    }
+
+});
+
+Scroller.implement(new Events, new Options);
+
+/*
+Script: Slider.js
+	Contains <Slider>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Slider
+	Creates a slider with two elements: a knob and a container. Returns the values.
+
+Note:
+	The Slider requires an XHTML doctype.
+
+Arguments:
+	element - the knob container
+	knob - the handle
+	options - see Options below
+
+Options:
+	steps - the number of steps for your slider.
+	mode - either 'horizontal' or 'vertical'. defaults to horizontal.
+	offset - relative offset for knob position. default to 0.
+
+Events:
+	onChange - a function to fire when the value changes.
+	onComplete - a function to fire when you're done dragging.
+	onTick - optionally, you can alter the onTick behavior, for example displaying an effect of the knob moving to the desired position.
+		Passes as parameter the new position.
+*/
+
+var Slider = new Class({
+
+    options: {
+        onChange: Class.empty,
+        onComplete: Class.empty,
+        onTick: function(pos) {
+            this.knob.setStyle(this.p, pos);
+        },
+        mode: 'horizontal',
+        steps: 100,
+        offset: 0
+    },
+
+    initialize: function(el, knob, options) {
+        this.element = $(el);
+        this.knob = $(knob);
+        this.setOptions(options);
+        this.previousChange = -1;
+        this.previousEnd = -1;
+        this.step = -1;
+        this.element.addEvent('mousedown', this.clickedElement.bindWithEvent(this));
+        var mod, offset;
+        switch (this.options.mode) {
+            case 'horizontal':
+                this.z = 'x';
+                this.p = 'left';
+                mod = {'x': 'left', 'y': false};
+                offset = 'offsetWidth';
+                break;
+            case 'vertical':
+                this.z = 'y';
+                this.p = 'top';
+                mod = {'x': false, 'y': 'top'};
+                offset = 'offsetHeight';
+        }
+        this.max = this.element[offset] - this.knob[offset] + (this.options.offset * 2);
+        this.half = this.knob[offset] / 2;
+        this.getPos = this.element['get' + this.p.capitalize()].bind(this.element);
+        this.knob.setStyle('position', 'relative').setStyle(this.p, - this.options.offset);
+        var lim = {};
+        lim[this.z] = [- this.options.offset, this.max - this.options.offset];
+        this.drag = new Drag.Base(this.knob, {
+            limit: lim,
+            modifiers: mod,
+            snap: 0,
+            onStart: function() {
+                this.draggedKnob();
+            }.bind(this),
+            onDrag: function() {
+                this.draggedKnob();
+            }.bind(this),
+            onComplete: function() {
+                this.draggedKnob();
+                this.end();
+            }.bind(this)
+        });
+        if (this.options.initialize) this.options.initialize.call(this);
+    },
+
+/*
+    Property: set
+        The slider will get the step you pass.
+
+    Arguments:
+        step - one integer
+    */
+
+    set: function(step) {
+        this.step = step.limit(0, this.options.steps);
+        this.checkStep();
+        this.end();
+        this.fireEvent('onTick', this.toPosition(this.step));
+        return this;
+    },
+
+    clickedElement: function(event) {
+        var position = event.page[this.z] - this.getPos() - this.half;
+        position = position.limit(-this.options.offset, this.max - this.options.offset);
+        this.step = this.toStep(position);
+        this.checkStep();
+        this.end();
+        this.fireEvent('onTick', position);
+    },
+
+    draggedKnob: function() {
+        this.step = this.toStep(this.drag.value.now[this.z]);
+        this.checkStep();
+    },
+
+    checkStep: function() {
+        if (this.previousChange != this.step) {
+            this.previousChange = this.step;
+            this.fireEvent('onChange', this.step);
+        }
+    },
+
+    end: function() {
+        if (this.previousEnd !== this.step) {
+            this.previousEnd = this.step;
+            this.fireEvent('onComplete', this.step + '');
+        }
+    },
+
+    toStep: function(position) {
+        return Math.round((position + this.options.offset) / this.max * this.options.steps);
+    },
+
+    toPosition: function(step) {
+        return this.max * step / this.options.steps;
+    }
+
+});
+
+Slider.implement(new Events);
+Slider.implement(new Options);
+
+/*
+Script: SmoothScroll.js
+	Contains <SmoothScroll>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: SmoothScroll
+	Auto targets all the anchors in a page and display a smooth scrolling effect upon clicking them.
+	Inherits methods, properties, options and events from <Fx.Scroll>.
+
+Note:
+	SmoothScroll requires an XHTML doctype.
+
+Arguments:
+	options - the Fx.Scroll options (see: <Fx.Scroll>) plus links, a collection of elements you want your smoothscroll on. Defaults to document.links.
+
+Example:
+	>new SmoothScroll();
+*/
+
+var SmoothScroll = Fx.Scroll.extend({
+
+    initialize: function(options) {
+        this.parent(window, options);
+        this.links = (this.options.links) ? $$(this.options.links) : $$(document.links);
+        var location = window.location.href.match(/^[^#]*/)[0] + '#';
+        this.links.each(function(link) {
+            if (link.href.indexOf(location) != 0) return;
+            var anchor = link.href.substr(location.length);
+            if (anchor && $(anchor)) this.useLink(link, anchor);
+        }, this);
+        if (!window.webkit419) this.addEvent('onComplete', function() {
+            window.location.hash = this.anchor;
+        });
+    },
+
+    useLink: function(link, anchor) {
+        link.addEvent('click', function(event) {
+            this.anchor = anchor;
+            this.toElement(anchor);
+            event.stop();
+        }.bindWithEvent(this));
+    }
+
+});
+
+/*
+Script: Sortables.js
+	Contains <Sortables> Class.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Sortables
+	Creates an interface for <Drag.Base> and drop, resorting of a list.
+
+Note:
+	The Sortables require an XHTML doctype.
+
+Arguments:
+	list - required, the list that will become sortable.
+	options - an Object, see options below.
+
+Options:
+	handles - a collection of elements to be used for drag handles. defaults to the elements.
+
+Events:
+	onStart - function executed when the item starts dragging
+	onComplete - function executed when the item ends dragging
+*/
+
+var Sortables = new Class({
+
+    options: {
+        handles: false,
+        onStart: Class.empty,
+        onComplete: Class.empty,
+        ghost: true,
+        snap: 3,
+        onDragStart: function(element, ghost) {
+            ghost.setStyle('opacity', 0.7);
+            element.setStyle('opacity', 0.7);
+        },
+        onDragComplete: function(element, ghost) {
+            element.setStyle('opacity', 1);
+            ghost.remove();
+            this.trash.remove();
+        }
+    },
+
+    initialize: function(list, options) {
+        this.setOptions(options);
+        this.list = $(list);
+        this.elements = this.list.getChildren();
+        this.handles = (this.options.handles) ? $$(this.options.handles) : this.elements;
+        this.bound = {
+            'start': [],
+            'moveGhost': this.moveGhost.bindWithEvent(this)
+        };
+        for (var i = 0, l = this.handles.length; i < l; i++) {
+            this.bound.start[i] = this.start.bindWithEvent(this, this.elements[i]);
+        }
+        this.attach();
+        if (this.options.initialize) this.options.initialize.call(this);
+        this.bound.move = this.move.bindWithEvent(this);
+        this.bound.end = this.end.bind(this);
+    },
+
+    attach: function() {
+        this.handles.each(function(handle, i) {
+            handle.addEvent('mousedown', this.bound.start[i]);
+        }, this);
+    },
+
+    detach: function() {
+        this.handles.each(function(handle, i) {
+            handle.removeEvent('mousedown', this.bound.start[i]);
+        }, this);
+    },
+
+    start: function(event, el) {
+        this.active = el;
+        this.coordinates = this.list.getCoordinates();
+        if (this.options.ghost) {
+            var position = el.getPosition();
+            this.offset = event.page.y - position.y;
+            this.trash = new Element('div').inject(document.body);
+            this.ghost = el.clone().inject(this.trash).setStyles({
+                'position': 'absolute',
+                'left': position.x,
+                'top': event.page.y - this.offset
+            });
+            document.addListener('mousemove', this.bound.moveGhost);
+            this.fireEvent('onDragStart', [el, this.ghost]);
+        }
+        document.addListener('mousemove', this.bound.move);
+        document.addListener('mouseup', this.bound.end);
+        this.fireEvent('onStart', el);
+        event.stop();
+    },
+
+    moveGhost: function(event) {
+        var value = event.page.y - this.offset;
+        value = value.limit(this.coordinates.top, this.coordinates.bottom - this.ghost.offsetHeight);
+        this.ghost.setStyle('top', value);
+        event.stop();
+    },
+
+    move: function(event) {
+        var now = event.page.y;
+        this.previous = this.previous || now;
+        var up = ((this.previous - now) > 0);
+        var prev = this.active.getPrevious();
+        var next = this.active.getNext();
+        if (prev && up && now < prev.getCoordinates().bottom) this.active.injectBefore(prev);
+        if (next && !up && now > next.getCoordinates().top) this.active.injectAfter(next);
+        this.previous = now;
+    },
+
+    serialize: function(converter) {
+        return this.list.getChildren().map(converter || function(el) {
+            return this.elements.indexOf(el);
+        }, this);
+    },
+
+    end: function() {
+        this.previous = null;
+        document.removeListener('mousemove', this.bound.move);
+        document.removeListener('mouseup', this.bound.end);
+        if (this.options.ghost) {
+            document.removeListener('mousemove', this.bound.moveGhost);
+            this.fireEvent('onDragComplete', [this.active, this.ghost]);
+        }
+        this.fireEvent('onComplete', this.active);
+    }
+
+});
+
+Sortables.implement(new Events, new Options);
+
+/*
+Script: Tips.js
+	Tooltips, BubbleTips, whatever they are, they will appear on mouseover
+
+License:
+	MIT-style license.
+
+Credits:
+	The idea behind Tips.js is based on Bubble Tooltips (<http://web-graphics.com/mtarchive/001717.php>) by Alessandro Fulcitiniti <http://web-graphics.com>
+*/
+
+/*
+Class: Tips
+	Display a tip on any element with a title and/or href.
+
+Note:
+	Tips requires an XHTML doctype.
+
+Arguments:
+	elements - a collection of elements to apply the tooltips to on mouseover.
+	options - an object. See options Below.
+
+Options:
+	maxTitleChars - the maximum number of characters to display in the title of the tip. defaults to 30.
+	showDelay - the delay the onShow method is called. (defaults to 100 ms)
+	hideDelay - the delay the onHide method is called. (defaults to 100 ms)
+
+	className - the prefix for your tooltip classNames. defaults to 'tool'.
+
+		the whole tooltip will have as classname: tool-tip
+
+		the title will have as classname: tool-title
+
+		the text will have as classname: tool-text
+
+	offsets - the distance of your tooltip from the mouse. an Object with x/y properties.
+	fixed - if set to true, the toolTip will not follow the mouse.
+
+Events:
+	onShow - optionally you can alter the default onShow behaviour with this option (like displaying a fade in effect);
+	onHide - optionally you can alter the default onHide behaviour with this option (like displaying a fade out effect);
+
+Example:
+	(start code)
+	<img src="/images/i.png" title="The body of the tooltip is stored in the title" class="toolTipImg"/>
+	<script>
+		var myTips = new Tips($$('.toolTipImg'), {
+			maxTitleChars: 50	//I like my captions a little long
+		});
+	</script>
+	(end)
+
+Note:
+	The title of the element will always be used as the tooltip body. If you put :: on your title, the text before :: will become the tooltip title.
+*/
+
+var Tips = new Class({
+
+    options: {
+        onShow: function(tip) {
+            tip.setStyle('visibility', 'visible');
+        },
+        onHide: function(tip) {
+            tip.setStyle('visibility', 'hidden');
+        },
+        maxTitleChars: 30,
+        showDelay: 100,
+        hideDelay: 100,
+        className: 'tool',
+        offsets: {'x': 16, 'y': 16},
+        fixed: false
+    },
+
+    initialize: function(elements, options) {
+        this.setOptions(options);
+        this.toolTip = new Element('div', {
+            'class': this.options.className + '-tip',
+            'styles': {
+                'position': 'absolute',
+                'top': '0',
+                'left': '0',
+                'visibility': 'hidden'
+            }
+        }).inject(document.body);
+        this.wrapper = new Element('div').inject(this.toolTip);
+        $$(elements).each(this.build, this);
+        if (this.options.initialize) this.options.initialize.call(this);
+    },
+
+    build: function(el) {
+        el.$tmp.myTitle = (el.href && el.getTag() == 'a') ? el.href.replace('http://', '') : (el.rel || false);
+        if (el.title) {
+            var dual = el.title.split('::');
+            if (dual.length > 1) {
+                el.$tmp.myTitle = dual[0].trim();
+                el.$tmp.myText = dual[1].trim();
+            } else {
+                el.$tmp.myText = el.title;
+            }
+            el.removeAttribute('title');
+        } else {
+            el.$tmp.myText = false;
+        }
+        if (el.$tmp.myTitle && el.$tmp.myTitle.length > this.options.maxTitleChars) el.$tmp.myTitle = el.$tmp.myTitle.substr(0, this.options.maxTitleChars - 1) + "&hellip;";
+        el.addEvent('mouseenter', function(event) {
+            this.start(el);
+            if (!this.options.fixed) this.locate(event);
+            else this.position(el);
+        }.bind(this));
+        if (!this.options.fixed) el.addEvent('mousemove', this.locate.bindWithEvent(this));
+        var end = this.end.bind(this);
+        el.addEvent('mouseleave', end);
+        el.addEvent('trash', end);
+    },
+
+    start: function(el) {
+        this.wrapper.empty();
+        if (el.$tmp.myTitle) {
+            this.title = new Element('span').inject(new Element('div', {'class': this.options.className + '-title'}).inject(this.wrapper)).setHTML(el.$tmp.myTitle);
+        }
+        if (el.$tmp.myText) {
+            this.text = new Element('span').inject(new Element('div', {'class': this.options.className + '-text'}).inject(this.wrapper)).setHTML(el.$tmp.myText);
+        }
+        $clear(this.timer);
+        this.timer = this.show.delay(this.options.showDelay, this);
+    },
+
+    end: function(event) {
+        $clear(this.timer);
+        this.timer = this.hide.delay(this.options.hideDelay, this);
+    },
+
+    position: function(element) {
+        var pos = element.getPosition();
+        this.toolTip.setStyles({
+            'left': pos.x + this.options.offsets.x,
+            'top': pos.y + this.options.offsets.y
+        });
+    },
+
+    locate: function(event) {
+        var win = {'x': window.getWidth(), 'y': window.getHeight()};
+        var scroll = {'x': window.getScrollLeft(), 'y': window.getScrollTop()};
+        var tip = {'x': this.toolTip.offsetWidth, 'y': this.toolTip.offsetHeight};
+        var prop = {'x': 'left', 'y': 'top'};
+        for (var z in prop) {
+            var pos = event.page[z] + this.options.offsets[z];
+            if ((pos + tip[z] - scroll[z]) > win[z]) pos = event.page[z] - this.options.offsets[z] - tip[z];
+            this.toolTip.setStyle(prop[z], pos);
+        }
+        ;
+    },
+
+    show: function() {
+        if (this.options.timeout) this.timer = this.hide.delay(this.options.timeout, this);
+        this.fireEvent('onShow', [this.toolTip]);
+    },
+
+    hide: function() {
+        this.fireEvent('onHide', [this.toolTip]);
+    }
+
+});
+
+Tips.implement(new Events, new Options);
+
+/*
+Script: Group.js
+	For Grouping Classes or Elements Events. The Event added to the Group will fire when all of the events of the items of the group are fired.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Group
+	An "Utility" Class.
+
+Arguments:
+	List of Class instances
+
+Example:
+	(start code)
+	xhr1 = new Ajax('data.js', {evalScript: true});
+	xhr2 = new Ajax('abstraction.js', {evalScript: true});
+	xhr3 = new Ajax('template.js', {evalScript: true});
+
+	var group = new Group(xhr1, xhr2, xhr3);
+	group.addEvent('onComplete', function(){
+		alert('All Scripts loaded');
+	});
+
+	xhr1.request();
+	xhr2.request();
+	xhr3.request();
+	(end)
+
+*/
+
+var Group = new Class({
+
+    initialize: function() {
+        this.instances = $A(arguments);
+        this.events = {};
+        this.checker = {};
+    },
+
+/*
+    Property: addEvent
+        adds an event to the stack of events of the Class instances.
+
+    Arguments:
+        type - string; the event name (e.g. 'onComplete')
+        fn - function to execute when all instances fired this event
+    */
+
+    addEvent: function(type, fn) {
+        this.checker[type] = this.checker[type] || {};
+        this.events[type] = this.events[type] || [];
+        if (this.events[type].contains(fn)) return false;
+        else this.events[type].push(fn);
+        this.instances.each(function(instance, i) {
+            instance.addEvent(type, this.check.bind(this, [type, instance, i]));
+        }, this);
+        return this;
+    },
+
+    check: function(type, instance, i) {
+        this.checker[type][i] = true;
+        var every = this.instances.every(function(current, j) {
+            return this.checker[type][j] || false;
+        }, this);
+        if (!every) return;
+        this.checker[type] = {};
+        this.events[type].each(function(event) {
+            event.call(this, this.instances, instance);
+        }, this);
+    }
+
+});
+
+/*
+Script: Accordion.js
+	Contains <Accordion>
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Accordion
+	The Accordion class creates a group of elements that are toggled when their handles are clicked. When one elements toggles in, the others toggles back.
+	Inherits methods, properties, options and events from <Fx.Elements>.
+
+Note:
+	The Accordion requires an XHTML doctype.
+
+Arguments:
+	togglers - required, a collection of elements, the elements handlers that will be clickable.
+	elements - required, a collection of elements the transitions will be applied to.
+	options - optional, see options below, and <Fx.Base> options and events.
+
+Options:
+	show - integer, the Index of the element to show at start.
+	display - integer, the Index of the element to show at start (with a transition). defaults to 0.
+	fixedHeight - integer, if you want the elements to have a fixed height. defaults to false.
+	fixedWidth - integer, if you want the elements to have a fixed width. defaults to false.
+	height - boolean, will add a height transition to the accordion if true. defaults to true.
+	opacity - boolean, will add an opacity transition to the accordion if true. defaults to true.
+	width - boolean, will add a width transition to the accordion if true. defaults to false, css mastery is required to make this work!
+	alwaysHide - boolean, will allow to hide all elements if true, instead of always keeping one element shown. defaults to false.
+
+Events:
+	onActive - function to execute when an element starts to show
+	onBackground - function to execute when an element starts to hide
+*/
+
+var Accordion = Fx.Elements.extend({
+
+    options: {
+        onActive: Class.empty,
+        onBackground: Class.empty,
+        display: 0,
+        show: false,
+        height: true,
+        width: false,
+        opacity: true,
+        fixedHeight: false,
+        fixedWidth: false,
+        wait: false,
+        alwaysHide: false
+    },
+
+    initialize: function() {
+        var options, togglers, elements, container;
+        $each(arguments, function(argument, i) {
+            switch ($type(argument)) {
+                case 'object': options = argument; break;
+                case 'element': container = $(argument); break;
+                default:
+                    var temp = $$(argument);
+                    if (!togglers) togglers = temp;
+                    else elements = temp;
+            }
+        });
+        this.togglers = togglers || [];
+        this.elements = elements || [];
+        this.container = $(container);
+        this.setOptions(options);
+        this.previous = -1;
+        if (this.options.alwaysHide) this.options.wait = true;
+        if ($chk(this.options.show)) {
+            this.options.display = false;
+            this.previous = this.options.show;
+        }
+        if (this.options.start) {
+            this.options.display = false;
+            this.options.show = false;
+        }
+        this.effects = {};
+        if (this.options.opacity) this.effects.opacity = 'fullOpacity';
+        if (this.options.width) this.effects.width = this.options.fixedWidth ? 'fullWidth' : 'offsetWidth';
+        if (this.options.height) this.effects.height = this.options.fixedHeight ? 'fullHeight' : 'scrollHeight';
+        for (var i = 0, l = this.togglers.length; i < l; i++) this.addSection(this.togglers[i], this.elements[i]);
+        this.elements.each(function(el, i) {
+            if (this.options.show === i) {
+                this.fireEvent('onActive', [this.togglers[i], el]);
+            } else {
+                for (var fx in this.effects) el.setStyle(fx, 0);
+            }
+        }, this);
+        this.parent(this.elements);
+        if ($chk(this.options.display)) this.display(this.options.display);
+    },
+
+/*
+    Property: addSection
+        Dynamically adds a new section into the accordion at the specified position.
+
+    Arguments:
+        toggler - (dom element) the element that toggles the accordion section open.
+        element - (dom element) the element that stretches open when the toggler is clicked.
+        pos - (integer) the index where these objects are to be inserted within the accordion.
+    */
+
+    addSection: function(toggler, element, pos) {
+        toggler = $(toggler);
+        element = $(element);
+        var test = this.togglers.contains(toggler);
+        var len = this.togglers.length;
+        this.togglers.include(toggler);
+        this.elements.include(element);
+        if (len && (!test || pos)) {
+            pos = $pick(pos, len - 1);
+            toggler.injectBefore(this.togglers[pos]);
+            element.injectAfter(toggler);
+        } else if (this.container && !test) {
+            toggler.inject(this.container);
+            element.inject(this.container);
+        }
+        var idx = this.togglers.indexOf(toggler);
+        toggler.addEvent('click', this.display.bind(this, idx));
+        if (this.options.height) element.setStyles({'padding-top': 0, 'border-top': 'none', 'padding-bottom': 0, 'border-bottom': 'none'});
+        if (this.options.width) element.setStyles({'padding-left': 0, 'border-left': 'none', 'padding-right': 0, 'border-right': 'none'});
+        element.fullOpacity = 1;
+        if (this.options.fixedWidth) element.fullWidth = this.options.fixedWidth;
+        if (this.options.fixedHeight) element.fullHeight = this.options.fixedHeight;
+        element.setStyle('overflow', 'hidden');
+        if (!test) {
+            for (var fx in this.effects) element.setStyle(fx, 0);
+        }
+        return this;
+    },
+
+/*
+    Property: display
+        Shows a specific section and hides all others. Useful when triggering an accordion from outside.
+
+    Arguments:
+        index - integer, the index of the item to show, or the actual element to show.
+    */
+
+    display: function(index) {
+        index = ($type(index) == 'element') ? this.elements.indexOf(index) : index;
+        if ((this.timer && this.options.wait) || (index === this.previous && !this.options.alwaysHide)) return this;
+        this.previous = index;
+        var obj = {};
+        this.elements.each(function(el, i) {
+            obj[i] = {};
+            var hide = (i != index) || (this.options.alwaysHide && (el.offsetHeight > 0));
+            this.fireEvent(hide ? 'onBackground' : 'onActive', [this.togglers[i], el]);
+            for (var fx in this.effects) obj[i][fx] = hide ? 0 : el[this.effects[fx]];
+        }, this);
+        return this.start(obj);
+    },
+
+    showThisHideOpen: function(index) {
+        return this.display(index);
+    }
+
+});
+
+Fx.Accordion = Accordion;
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/shadedborder.js b/trunk/wise-webapp/src/main/webapp/js/shadedborder.js
new file mode 100644
index 00000000..79eadff3
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/shadedborder.js
@@ -0,0 +1,298 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/**
+ * RUZEE.ShadedBorder 0.2
+ * (c) 2006 Steffen Rusitschka
+ *
+ * RUZEE.ShadedBorder is freely distributable under the terms of an MIT-style license.
+ * For details, see http://www.ruzee.com/
+ */
+
+var RUZEE = window.RUZEE || {};
+
+RUZEE.ShadedBorder = {
+
+    create: function(opts) {
+        var isie = /msie/i.test(navigator.userAgent) && !window.opera;
+        function sty(el, h) {
+            for (k in h) {
+                if (/ie_/.test(k)) {
+                    if (isie) el.style[k.substr(3)] = h[k];
+                } else el.style[k] = h[k];
+            }
+        }
+        function crdiv(h) {
+            var el = document.createElement("div");
+            el.className = "sb-gen";
+            sty(el, h);
+            return el;
+        }
+        function op(v) {
+            v = v < 0 ? 0 : v;
+            v = v > 0.99999 ? 0.99999 : v;
+            if (isie) {
+                return " filter:alpha(opacity=" + (v * 100) + ");";
+            } else {
+                return " opacity:" + v + ';';
+            }
+        }
+
+        var sr = opts.shadow || 0;
+        var r = opts.corner || 0;
+        var bor = 0;
+        var bow = opts.border || 0;
+        var shadow = sr != 0;
+        var lw = r > sr ? r : sr;
+        var rw = lw;
+        var th = lw;
+        var bh = lw;
+        if (bow > 0) {
+            bor = r;
+            r = r - bow;
+        }
+        var cx = r != 0 && shadow ? Math.round(lw / 3) : 0;
+        var cy = cx;
+        var cs = Math.round(cx / 2);
+        var iclass = r > 0 ? "sb-inner" : "sb-shadow";
+        var sclass = "sb-shadow";
+        var bclass = "sb-border";
+        var edges = opts.edges || "trlb";
+        if (!/t/i.test(edges)) th = 0;
+        if (!/b/i.test(edges)) bh = 0;
+        if (!/l/i.test(edges)) lw = 0;
+        if (!/r/i.test(edges)) rw = 0;
+
+        var p = { position:"absolute", left:"0", top:"0", width:lw + "px", height:th + "px",
+            ie_fontSize:"1px", overflow:"hidden" };
+        var tl = crdiv(p);
+        delete p.left;
+        p.right = "0";
+        p.width = rw + "px";
+        var tr = crdiv(p);
+        delete p.top;
+        p.bottom = "0";
+        p.height = bh + "px";
+        var br = crdiv(p);
+        delete p.right;
+        p.left = "0";
+        p.width = lw + "px";
+        var bl = crdiv(p);
+
+        var tw = crdiv({ position:"absolute", width:"100%", height:th + "px", ie_fontSize:"1px",
+            top:"0", left:"0", overflow:"hidden" });
+        var t = crdiv({ position:"relative", height:th + "px", ie_fontSize:"1px", marginLeft:lw + "px",
+            marginRight:rw + "px", overflow:"hidden" });
+        tw.appendChild(t);
+
+        var bw = crdiv({ position:"absolute", left:"0", bottom:"0", width:"100%", height:bh + "px",
+            ie_fontSize:"1px", overflow:"hidden" });
+
+        var b = crdiv({ position:"relative", height:bh + "px", ie_fontSize:"1px", marginLeft:lw + "px",
+            marginRight:rw + "px", overflow:"hidden" });
+
+        bw.appendChild(b);
+
+        var mw = crdiv({ position:"absolute", top:(-bh) + "px", left:"0", width:"100%", height:"100%",
+            overflow:"hidden", ie_fontSize:"1px" });
+
+        function corner(el, t, l) {
+            var w = l ? lw : rw;
+            var h = t ? th : bh;
+            var s = t ? cs : -cs;
+            var dsb = [];
+            var dsi = [];
+            var dss = [];
+
+            var xp = 0;
+            var xd = 1;
+            if (l) {
+                xp = w - 1;
+                xd = -1;
+            }
+            for (var x = 0; x < w; ++x) {
+                var yp = 0;
+                var yd = 1;
+                if (t) {
+                    yp = h - 1;
+                    yd = -1;
+                }
+                for (var y = 0; y < h; ++y) {
+                    var div = '<div style="position:absolute; top:' + yp + 'px; left:' + xp + 'px; ' +
+                              'width:1px; height:1px; overflow:hidden;';
+
+                    var xc = x - cx;
+                    var yc = y - cy - s;
+                    var d = Math.sqrt(xc * xc + yc * yc);
+                    var doShadow = false;
+
+                    if (r > 0) {
+                        // draw border
+                        if (xc < 0 && yc < bor && yc >= r || yc < 0 && xc < bor && xc >= r) {
+                            dsb.push(div + '" class="' + bclass + '"></div>');
+                        } else
+                            if (d < bor && d >= r - 1 && xc >= 0 && yc >= 0) {
+                                var dd = div;
+                                if (d >= bor - 1) {
+                                    dd += op(bor - d);
+                                    doShadow = true;
+                                }
+                                dsb.push(dd + '" class="' + bclass + '"></div>');
+                            }
+
+                            // draw inner
+                        var dd = div + ' z-index:2;';
+                        if (xc < 0 && yc < r || yc < 0 && xc < r) {
+                            dsi.push(dd + '" class="' + iclass + '"></div>');
+                        } else
+                            if (d < r && xc >= 0 && yc >= 0) {
+                                if (d >= r - 1) {
+                                    dd += op(r - d);
+                                    doShadow = true;
+                                }
+                                dsi.push(dd + '" class="' + iclass + '"></div>');
+                            } else doShadow = true;
+                    } else doShadow = true;
+
+                    // draw shadow
+                    if (sr > 0 && doShadow) {
+                        d = Math.sqrt(x * x + y * y);
+                        if (d < sr) {
+                            dss.push(div + ' z-index:0; ' + op(1 - (d / sr)) + '" class="' + sclass + '"></div>');
+                        }
+                    }
+                    yp += yd;
+                }
+                xp += xd;
+            }
+            el.innerHTML = dss.concat(dsb.concat(dsi)).join('');
+        }
+
+        function mid(mw) {
+            var ds = [];
+
+            ds.push('<div style="position:relative; top:' + (th + bh) + 'px;' +
+                    ' height:10000px; margin-left:' + (lw - r - cx) + 'px;' +
+                    ' margin-right:' + (rw - r - cx) + 'px; overflow:hidden;"' +
+                    ' class="' + iclass + '"></div>');
+
+            var dd = '<div style="position:absolute; width:1px;' +
+                     ' top:' + (th + bh) + 'px; height:10000px;';
+            for (var x = 0; x < lw - r - cx; ++x) {
+                ds.push(dd + ' left:' + x + 'px;' + op((x + 1.0) / lw) +
+                        '" class="' + sclass + '"></div>');
+            }
+
+            for (var x = 0; x < rw - r - cx; ++x) {
+                ds.push(dd + ' right:' + x + 'px;' + op((x + 1.0) / rw) +
+                        '" class="' + sclass + '"></div>');
+            }
+
+            if (bow > 0) {
+                var su = ' width:' + bow + 'px;' + '" class="' + bclass + '"></div>';
+                ds.push(dd + ' left:' + (lw - bor - cx) + 'px;' + su);
+                ds.push(dd + ' right:' + (rw - bor - cx) + 'px;' + su);
+            }
+
+            mw.innerHTML = ds.join('');
+        }
+
+        function tb(el, t) {
+            var ds = [];
+            var h = t ? th : bh;
+            var dd = '<div style="height:1px; overflow:hidden; position:absolute;' +
+                     ' width:100%; left:0px; ';
+            var s = t ? cs : -cs;
+            for (var y = 0; y < h - s - cy - r; ++y) {
+                ds.push(dd + (t ? 'top:' : 'bottom:') + y + 'px;' + op((y + 1) * 1.0 / h) +
+                        '" class="' + sclass + '"></div>');
+            }
+            if (y >= bow) {
+                ds.push(dd + (t ? 'top:' : 'bottom:') + (y - bow) + 'px;' +
+                        ' height:' + bow + 'px;" class="' + bclass + '"></div>');
+            }
+
+            ds.push(dd + (t ? 'top:' : 'bottom:') + y + 'px;' +
+                    ' height:' + (r + cy + s) + 'px;" class="' + iclass + '"></div>');
+
+            el.innerHTML = ds.join('');
+        }
+
+        corner(tl, true, true);
+        corner(tr, true, false);
+        corner(bl, false, true);
+        corner(br, false, false);
+        mid(mw);
+        tb(t, true);
+        tb(b, false);
+
+        return {
+            render: function(el) {
+                if (typeof el == 'string') el = document.getElementById(el);
+                if (el.length != undefined) {
+                    for (var i = 0; i < el.length; ++i) this.render(el[i]);
+                    return;
+                }
+                // remove generated children
+                var node = el.firstChild;
+                while (node) {
+                    var nextNode = node.nextSibling;
+                    if (node.nodeType == 1 && node.className == 'sb-gen')
+                        el.removeChild(node);
+                    node = nextNode;
+                }
+
+                var iel = el.firstChild;
+
+                var twc = tw.cloneNode(true);
+                var mwc = mw.cloneNode(true);
+                var bwc = bw.cloneNode(true);
+
+                el.insertBefore(tl.cloneNode(true), iel);
+                el.insertBefore(tr.cloneNode(true), iel);
+                el.insertBefore(bl.cloneNode(true), iel);
+                el.insertBefore(br.cloneNode(true), iel);
+                el.insertBefore(twc, iel);
+                el.insertBefore(mwc, iel);
+                el.insertBefore(bwc, iel);
+
+                if (isie) {
+                    function resize() {
+                        twc.style.width = bwc.style.width = mwc.style.width = el.offsetWidth + "px";
+                        mwc.firstChild.style.height = el.offsetHeight + "px";
+                    }
+                    el.onresize = resize;
+                    resize();
+                }
+            }
+        };
+    }
+};
+
+// add our styles to the document
+document.write(
+        '<style type="text/css">' +
+        '.sb, .sbi, .sb *, .sbi * { position:relative;}' +
+        '* html .sb, * html .sbi { height:1%; }' +
+        '.sbi { display:inline-block; }' +
+        '.sb-inner { background:#ddd; }' +
+        '.sb-shadow { background:#000; }' +
+        '.sb-border { background:#bbb; }' +
+        '</style>'
+        );
diff --git a/trunk/wise-webapp/src/main/webapp/js/slideShow.js b/trunk/wise-webapp/src/main/webapp/js/slideShow.js
new file mode 100644
index 00000000..c3fc0404
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/slideShow.js
@@ -0,0 +1,190 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/*
+var _START_TRANSITION_TIME = 2000;
+var _WAITING_PERIOD = 2800;
+var _TRANSITION_TIME = 800;
+
+slideShow = {
+    init: function (options) {
+        // init default options
+        this.options = Object.extend({
+            startTransitionTime: _START_TRANSITION_TIME,
+            waitingPeriod: _WAITING_PERIOD,
+            transitionTime: _TRANSITION_TIME
+        }, options || {});
+        this.scanScreen();
+        this.img = new Element('img').injectInside(this.screen);
+
+        var nextEffect = this.nextEffect.bind(this);
+
+        this.imgEffect = this.img.effect('opacity', { duration: this.options.startTransitionTime, onComplete: nextEffect }).hide();
+        this.steps = 0;
+        this.nextEffect();
+
+    },
+    scanScreen: function () {
+        var el = $E('img[rel]', $(window.body));
+        el.rel = el.getProperty('rel');
+        el.srcs = el.getProperty('srcs');
+        if (el.rel.test('^slideShow', 'i'))
+        {
+            var parent = el.getParent();
+            el.remove();
+            var aDim = el.rel.match(/[0-9.]+(px|%)/g);
+            var width = "500px";
+            var height = "200px";
+            if (aDim && aDim[0])
+            {
+                var w = aDim[0].toInt();
+                if (w > 0)
+                    width = w;
+            }
+            if (aDim && aDim[1])
+            {
+                var h = aDim[1].toInt();
+                if (h > 0)
+                    height = h;
+            }
+            this.screen = new Element('div').setProperties({width:width, height:height}).injectInside(parent);
+            if (el.srcs)
+                this.screen.srcs = el.srcs;
+        }
+    },
+    nextEffect: function () {
+        switch (this.steps++)
+                {
+            case 0:
+                if (this.showing)
+                    this.imgEffect.options.duration = this.options.transitionTime;
+                var srcs = this.screen.srcs.split(',');
+                if (!$defined(this.index))
+                {
+                    this.index = 0;
+                }
+                else
+                {
+                    this.index++;
+                    if (this.index >= srcs.length)
+                        this.index = 0;
+                }
+                this.img.src = srcs[this.index];
+                this.showing = true;
+                this.imgEffect.start(0, 1);
+                break;
+            case 1:
+                this.nextEffect.delay(this.options.waitingPeriod, this);
+                break;
+            case 2:
+                this.steps = 0;
+                this.imgEffect.start(1, 0);
+                break;
+        }
+    }
+};
+
+window.onDomReady(slideShow.init.bind(slideShow));
+*/
+var SlideShow = new Class({
+    options: {
+        id: 'SlideShow',
+        startTransitionTime: 2000,
+        waitingPeriod: 6000,
+        transitionTime: 800
+    },
+
+    initialize: function(el, options) {
+        // init default options
+        this.setOptions(options);
+        this.container = el;
+        this.buildScreen();
+
+        var nextEffect = this.nextEffect.bind(this);
+
+        this.imgEffect = this.container.effect('opacity', { duration: this.options.startTransitionTime, onComplete: nextEffect }).hide();
+        this.steps = 0;
+        this.nextEffect();
+
+    },
+    buildScreen: function () {
+        this.container.rel = this.container.getProperty('rel');
+        this.container.srcs = this.container.getProperty('srcs');
+        if (this.container.rel.test('^slideShow', 'i'))
+        {
+            var aDim = this.container.rel.match(/[0-9.]+(px|%)/g);
+            var width = "500px";
+            var height = "200px";
+            if (aDim && aDim[0])
+            {
+                var w = aDim[0].toInt();
+                if (w > 0)
+                    width = w;
+            }
+            if (aDim && aDim[1])
+            {
+                var h = aDim[1].toInt();
+                if (h > 0)
+                    height = h;
+            }
+            this.container.setProperties({width:width, height:height});
+            if (this.container.srcs)
+                this.srcs = this.container.srcs.split(',');
+        }
+    },
+    nextEffect: function () {
+        switch (this.steps++)
+                {
+            case 0:
+                if (this.showing)
+                    this.imgEffect.options.duration = this.options.transitionTime;
+                if (!$defined(this.index))
+                {
+                    this.index = 0;
+                }
+                else
+                {
+                    this.index++;
+                    if (this.index >= this.srcs.length)
+                        this.index = 0;
+                    var firstElem = this.container.getFirst();
+                    firstElem.remove();
+                    firstElem.setStyle('display', 'none');
+                    firstElem.injectInside(this.slidesContainer);
+                }
+
+                var nextElem = $(this.srcs[this.index]);
+                if (!$defined(this.slidesContainer))
+                    this.slidesContainer = nextElem.getParent();
+                nextElem.injectInside(this.container);
+                nextElem.setStyle('display', 'block');
+                this.showing = true;
+                this.imgEffect.start(0, 1);
+                break;
+            case 1:
+                this.nextEffect.delay(this.options.waitingPeriod, this);
+                break;
+            case 2:
+                this.steps = 0;
+                this.imgEffect.start(1, 0);
+                break;
+        }
+    }
+});
+SlideShow.implement(new Options);
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/transcorners.js b/trunk/wise-webapp/src/main/webapp/js/transcorners.js
new file mode 100644
index 00000000..9dba27c7
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/transcorners.js
@@ -0,0 +1,120 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+/* transcorners : Yaroslaff Fedin (inviz.ru). updates : [url=http://forum.mootools.net/topic.php?id=1202]http://forum.mootools.net/topic.php?id=1202[/url] */
+
+var Transcorner = new Class({
+    setOptions: function(options) {
+        this.options = Object.extend({
+            radius: 10,
+            borderColor: null,
+            backgroundColor: this.el.getStyle('background-color'),
+            transition: this.fx,
+            onComplete: Class.empty
+        }, options || {});
+    }
+    ,initialize: function(el, sides, options) {
+    this.el = $(el);
+    if (!sides || $type(sides) == 'object') {
+        options = sides || false;
+        sides = 'top, bottom';
+    }
+    ;
+    this.setOptions(options);
+    sides.split(',').each(function(side) {
+        side = side.clean().test(' ') ? side.clean().split(' ') : [side.trim()];
+        this.assemble(side[0], side[1]);
+    }, this);
+}
+    ,fx: function(pos) {
+    return -(Math.sqrt(1 - Math.pow(pos, 2)) - 1);
+}
+    ,assemble: function(vertical, horizontal) {
+    var corner;
+    var el = this.el;
+    while ((el = el.getParent()) && el.getTag() != 'html' && [false, 'transparent'].test(corner = el.getStyle('background-color'))) {
+    }
+    ;
+    var s = function(property, dontParse) {
+        return !dontParse ? (parseInt(this.el.getStyle(property)) || 0) : this.el.getStyle(property);
+    }.bind(this);
+    var sides = {
+        left:'right',
+        right:'left'
+    };
+    var styles = {
+        display: 'block',
+        backgroundColor: corner,
+        zIndex: 1,
+        position: 'relative',
+        zoom: 1
+    };
+    for (side in sides) {
+        styles['margin-' + side] = "-" + (s('padding-' + side) + s('border-' + side + '-width')) + "px";
+    }
+    for (side in {top:1, bottom:1}) {
+        styles['margin-' + side] = vertical == side ? "0" : (s('padding-' + vertical) - this.options.radius) + "px";
+    }
+    var handler = new Element("b").setStyles(styles).addClass('corner-container');
+    this.options.borderColor = this.options.borderColor || (s('border-' + vertical + '-width') > 0 ? s('border-' + vertical + '-color', 1) : this.options.backgroundColor);
+    this.el.setStyle('border-' + vertical, '0').setStyle('padding-' + vertical, '0');
+    var stripes = [];
+    var borders = {};
+    var exMargin = 0;
+    for (side in sides) {
+        borders[side] = s('border-' + side + '-width', 1) + " " + s('border-' + side + '-style', 1) + " " + s('border-' + side + '-color', 1);
+    }
+    for (var i = 1; i < this.options.radius; i++) {
+        margin = Math.round(this.options.transition((this.options.radius - i) / this.options.radius) * this.options.radius);
+        var styles = {
+            background: i == 1 ? this.options.borderColor : this.options.backgroundColor,
+            display: 'block',
+            height: '1px',
+            overflow: 'hidden',
+            zoom: 1
+        };
+        for (side in sides) {
+            var check = horizontal == sides[side];
+            styles['border-' + side] = check ? borders[side] : (((exMargin || margin) - margin) || 1) + 'px solid ' + this.options.borderColor;
+            styles['margin-' + side] = check ? 0 : margin + 'px';
+        }
+        ;
+        exMargin = margin;
+        stripes.push(new Element("b").setStyles(styles).addClass('corner'));
+    }
+    ;
+    if (vertical == 'top') {
+        this.el.insertBefore(handler, this.el.firstChild);
+    }
+    else {
+        handler.injectInside(this.el);
+        stripes = stripes.reverse();
+    }
+    ;
+    stripes.each(function(stripe) {
+        stripe.injectInside(handler);
+    });
+    this.options.onComplete();
+}
+});
+Element.extend({
+    makeRounded: function(side, options) {
+        return new Transcorner(this, side, options);
+    }
+});
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/js/windoo.js b/trunk/wise-webapp/src/main/webapp/js/windoo.js
new file mode 100644
index 00000000..46798546
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/js/windoo.js
@@ -0,0 +1,1473 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+//Windoo: Mootools window class <http://code.google.com/p/windoo>. Copyright (c) 2007 Yevgen Gorshkov, MIT Style License.
+
+
+Fx.Overlay = new Class({
+
+    options: {
+        'styles': {
+            'position': 'absolute',
+            'top': 0,
+            'left': 0
+        }
+    },
+
+    initialize: function(element, props, tag) {
+        this.element = $(element);
+        this.setOptions(props);
+        if ([window, $(document.body)].contains(this.element)) {
+            this.padding = Fx.Overlay.windowPadding;
+            this.container = $(document.body);
+            this.element = window;
+        } else {
+            this.padding = {x: 0, y: 0};
+            this.container = this.element;
+        }
+        this.overlay = new Element($pick(tag, 'div'), {'styles': {'display': 'none'}}).inject(this.container);
+        this.update();
+    },
+
+    show: function() {
+        this.overlay.setStyle('display', 'block');
+        return this;
+    },
+
+    update: function(props) {
+        this.overlay.set($merge(this.options, {'styles': {
+            width: this.element.getScrollWidth() - this.padding.x,
+            height: this.element.getScrollHeight() - this.padding.y
+        }}, props));
+        return this;
+    },
+
+    hide: function() {
+        this.overlay.setStyle('display', 'none');
+        return this;
+    },
+
+    destroy: function() {
+        this.overlay.remove(true);
+        return this;
+    }
+
+});
+Fx.Overlay.implement(new Options);
+Fx.Overlay.windowPadding = (window.ie6) ? {x: 21, y: 4} : {x: 0, y: 0};
+
+
+Element.$overlay = function(hide, deltaZ) {
+    deltaZ = $pick(deltaZ, 1);
+    if (!this.fixOverlayElement) this.fixOverlayElement = new Element('iframe', {
+        'properties': {'frameborder': '0', 'scrolling': 'no', 'src': 'javascript:void(0);'},
+        'styles': {'position': this.getStyle('position'), 'border': 'none', 'filter': 'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'}}).injectBefore(this);
+    if (hide) return this.fixOverlayElement.setStyle('display', 'none');
+    var z = this.getStyle('z-index').toInt() || 0;
+    if (z < deltaZ) this.setStyle('z-index', '' + (z = deltaZ + 1));
+    var pos = this.getCoordinates();
+    return this.fixOverlayElement.setStyles({'display' : '', 'z-index': '' + (z - deltaZ),
+        'left': pos.left + 'px', 'top': pos.top + 'px',
+        'width': pos.width + 'px', 'height': pos.height + 'px'});
+};
+
+Element.extend({
+
+    fixOverlay: window.ie6 ? Element.$overlay : function() {
+        return false;
+    },
+
+    remove: function(trash) {
+        if (this.fixOverlayElement) {
+            this.fixOverlayElement.remove();
+            if (trash) {
+                Garbage.trash([this.fixOverlayElement]);
+            }
+        }
+        this.parentNode.removeChild(this);
+        if (trash) {
+            Garbage.trash([this.empty()]);
+            return false;
+        }
+        return this;
+    }
+
+});
+Drag.Transition = {
+    linear:{
+        step: function(start, current, direction) {
+            return direction * current - start;
+        },
+        inverse: function(start, current, direction) {
+            return (start + current) / direction;
+        }
+    }
+};
+
+Drag.Multi = Drag.Base.extend({
+
+    options: {
+        handle: false,
+        onStart: Class.empty,
+        onBeforeStart: Class.empty,
+        onComplete: Class.empty,
+        onDrag: Class.empty,
+        snap: 6
+    },
+
+    elementOptions: {
+        unit: 'px',
+        direction: 1,
+        limit: false,
+        grid: false,
+        bind: false,
+        fn: Drag.Transition.linear
+    },
+
+    initialize: function(options) {
+        this.setOptions(options);
+        this.handle = $(this.options.handle);
+        this.element = [];
+        this.mouse = {'start': {}, 'now': {}};
+        this.modifiers = {};
+        this.bound = {
+            'start': this.start.bindWithEvent(this),
+            'check': this.check.bindWithEvent(this),
+            'drag': this.drag.bindWithEvent(this),
+            'stop': this.stop.bind(this)
+        };
+        this.attach();
+        if (this.options.initialize) this.options.initialize.call(this);
+    },
+
+    add: function(el, options, bind) {
+        el = $(el);
+        if (!$defined(bind)) bind = {};
+        var result = {};
+        for (var z in options) {
+            if ($type(options[z]) != 'object' || !$defined(options[z].style)) continue;
+            if (!$defined(this.modifiers[z])) this.modifiers[z] = [];
+            var mod = $merge(this.elementOptions, options[z], {modifier: z, element: el, bind: false, binded: false});
+            if (bind[z]) {
+                mod.bind = bind[z];
+                mod.bind.binded = true;
+            }
+            var sign = mod.style.slice(0, 1);
+            if (sign == '-' || sign == '+') {
+                mod.direction = (sign + 1).toInt();
+                mod.style = mod.style.slice(1);
+            }
+            this.modifiers[z].push(mod);
+            result[z] = mod;
+        }
+        if (!this.element.contains(el)) this.element.push(el);
+        return result;
+    },
+
+    remove: function(el) {
+        el = $(el);
+        for (var z in this.modifiers) this.modifiers[z] = this.modifiers[z].filter(function(e) {
+            return el != e.element;
+        });
+        this.element.remove(el);
+        return this;
+    },
+
+    detach: function(mod) {
+        for (var z in mod) if ($type(mod[z]) == 'object' && !mod[z].binded) this.modifiers[z].remove(mod[z]);
+        return this;
+    },
+
+    start: function(event) {
+        this.fireEvent('onBeforeStart', this.element);
+        this.mouse.start = event.page;
+        for (var z in this.modifiers) {
+            var mouse = this.mouse.start[z];
+            this.modifiers[z].each(function(mod) {
+                mod.now = mod.element.getStyle(mod.style).toInt();
+                mod.start = mod.fn.step(mod.now, mouse, mod.direction, true);
+                mod.$limit = [];
+                var limit = mod.limit;
+                if (limit) for (var i = 0; i < 2; i++) {
+                    if ($chk(limit[i])) mod.$limit[i] = ($type(limit[i]) == 'function') ? limit[i](mod) : limit[i];
+                }
+            }, this);
+        }
+        document.addListener('mousemove', this.bound.check);
+        document.addListener('mouseup', this.bound.stop);
+        this.fireEvent('onStart', this.element);
+        event.stop();
+    },
+
+    modifierUpdate: function(mod) {
+        var z = mod.modifier, mouse = this.mouse.now[z];
+        mod.out = false;
+        mod.now = mod.fn.step(mod.start, mod.bind ? mod.bind.inverse : mouse, mod.direction);
+        if (mod.$limit && $chk(mod.$limit[1]) && (mod.now > mod.$limit[1])) {
+            mod.now = mod.$limit[1];
+            mod.out = true;
+        } else if (mod.$limit && $chk(mod.$limit[0]) && (mod.now < mod.$limit[0])) {
+            mod.now = mod.$limit[0];
+            mod.out = true;
+        }
+        if (mod.grid) mod.now -= ((mod.now + mod.grid / 2) % mod.grid) - mod.grid / 2;
+        if (mod.binded) mod.inverse = mod.fn.inverse(mod.start, mod.now, mod.direction);
+        mod.element.setStyle(mod.style, mod.now + mod.unit);
+    },
+
+    drag: function(event) {
+        this.mouse.now = event.page;
+        for (var z in this.modifiers) this.modifiers[z].each(this.modifierUpdate, this);
+        this.fireEvent('onDrag', this.element);
+        event.stop();
+    }
+
+});
+
+Drag.Multi.$direction = {
+    east: { 'x':1 },
+    west: { 'x':-1 },
+    north: { 'y':-1 },
+    south: { 'y':1 },
+    nw: { 'x':-1, 'y':-1 },
+    ne: { 'x':1, 'y':-1 },
+    sw: { 'x':-1, 'y':1 },
+    se: { 'x':1, 'y':1 }
+};
+
+Drag.Resize = new Class({
+
+    options:{
+        zIndex: 10000,
+        moveLimit: false,
+        resizeLimit: {'x': [0], 'y': [0]},
+        grid: false,
+        modifiers: {'x': 'left', 'y': 'top', 'width': 'width', 'height': 'height'},
+        container: null, preserveRatio: false,
+        ghost: false,
+        snap: 6,
+        direction: Drag.Multi.$direction,
+        limiter:{
+            'x': {'-1': ['left', 'right'], '1': ['right', 'left']},
+            'y': {'-1': ['top', 'bottom'], '1': ['bottom', 'top']}
+        },
+        moveLimiter:{
+            'x': ['left', 'right'],
+            'y': ['top', 'bottom']
+        },
+        ghostClass: 'ghost-sizer sizer-visible',
+        classPrefix: 'sizer sizer-',
+        hoverClass: 'sizer-visible',
+        shadeBackground: 'transparent url(s.gif)',
+
+        onBuild: Class.empty,
+        onBeforeStart: Class.empty,
+        onStart: Class.empty,
+        onSnap: Class.empty,
+        onResize: Class.empty,
+        onComplete: Class.empty
+    },
+
+    initialize: function(el, options) {
+        var self = this;
+        this.element = this.el = $(el);
+        this.fx = {};
+        this.binds = {};
+        this.bound = {};
+        this.setOptions(options);
+        this.options.container = this.options.container === null ? this.el.getParent() : $(this.options.container);
+        if ($type(this.options.direction) == 'string') {
+            if (dir == 'all') {
+                this.options.direction = Drag.Multi.$direction;
+            } else {
+                var dir = this.options.direction.split(/\s+/);
+                this.options.direction = {};
+                dir.each(function(d) {
+                    this[d] = Drag.Multi.$direction[d];
+                }, this.options.direction);
+            }
+        }
+        var ce = this.el.getCoordinates(), positionStyle = this.el.getStyle('position');
+        this.el.setStyles({'width': ce.width, 'height': ce.height});
+        if (this.options.container) {
+            if (!(['relative', 'fixed'].contains(positionStyle))) {
+                var cc = this.options.container.getCoordinates();
+                this.el.setStyles({'left': ce.left - cc.left, 'top': ce.top - cc.top});
+            }
+            this.options.moveLimit = $merge({'x': [0], 'y': [0]}, this.options.moveLimit);
+        }
+        if (this.options.preserveRatio) {
+            var R = ce.width / ce.height;
+            var rlim = self.options.resizeLimit;
+            var fix = function(z1, z2, op, no, coeff) {
+                if (rlim && rlim[z1] && rlim[z2] && rlim[z1][no] && rlim[z2][no])
+                    rlim[z1][no] = Math[op](rlim[z1][no], coeff * rlim[z2][no]);
+            };
+            fix('x', 'y', 'max', 0, R);
+            fix('y', 'x', 'max', 0, 1 / R);
+            fix('x', 'y', 'min', 1, R);
+            fix('y', 'x', 'min', 1, 1 / R);
+            this.aspectStep = {
+                x: {step: function(s, c, d) {
+                    return d * c / R - s;
+                }},
+                y: {step: function(s, c, d) {
+                    return d * c * R - s;
+                }}
+            };
+            this.options.direction = $merge(this.options.direction);
+            ['nw','ne','sw','se'].each(function(z) {
+                delete this[z];
+            }, this.options.direction);
+        }
+        if (this.options.ghost) {
+            this.ghost = new Element('div', {'class': this.options.ghostClass, 'styles': {'display': 'none'}}).injectAfter(this.el);
+            for (var d in this.options.direction) this.ghost.adopt(new Element('div', {'class': this.options.classPrefix + d}));
+        }
+        var rOpts = {
+            snap: this.options.snap,
+            onBeforeStart: function() {
+                self.fireEvent('onBeforeStart', this);
+                self.started = true;
+                this.shade = new Fx.Overlay(window, {'styles': {
+                    'position': positionStyle,
+                    'cursor': this.options.handle.getStyle('cursor'),
+                    'background': self.options.shadeBackground,
+                    'z-index': self.options.zIndex + 1
+                }}).show();
+                if (self.ghost) {
+                    var ce = self.el.getCoordinates();
+                    self.ghost.setStyles({
+                        'display': 'block',
+                        'z-index': self.options.zIndex,
+                        'left': self.el.getStyle('left'),
+                        'top': self.el.getStyle('top'),
+                        'width': ce.width,
+                        'height': ce.height
+                    });
+                    for (var z in this.modifiers)
+                        this.modifiers[z].each(function(mod) {
+                            if (mod.element === self.ghost)
+                                mod.element.setStyle(mod.style, self.el.getStyle(mod.style));
+                        });
+                    if (self.options.hoverClass) self.el.removeClass(self.options.hoverClass);
+                }
+            },
+            onSnap: function() {
+                self.fireEvent('onSnap', this);
+            },
+            onStart: function() {
+                self.fireEvent('onStart', this);
+            },
+            onDrag: function() {
+                self.fireEvent('onResize', this);
+            },
+            onComplete: function() {
+                self.started = false;
+                if (self.options.hoverClass) self.el.removeClass(self.options.hoverClass);
+                this.shade.destroy();
+                if (self.ghost) {
+                    for (var z in this.modifiers) {
+                        this.modifiers[z].each(function(mod) {
+                            if (mod.element === self.ghost) self.el.setStyle(mod.style, mod.now + mod.unit);
+                        });
+                    }
+                    self.ghost.setStyle('display', 'none');
+                }
+                self.fireEvent('onComplete', this);
+            }
+        };
+        var rlimitFcn = function(sign, props, limit) {
+            if (!self.options.container) return limit;
+            if (!limit) limit = [0];
+            var generator = function(lim) {
+                return function(mod) {
+                    var cc = self.options.container.getCoordinates(),
+                            ec = mod.element.getCoordinates();
+                    var value = sign * (cc[props[0]] - ec[props[1]]);
+                    switch ($type(lim)) {
+                        case 'number': return Math.min(value, lim);
+                        case 'function': return Math.min(value, lim(mod));
+                        default: return value;
+                    }
+                };
+            };
+            return [limit[0], generator(limit[1])];
+        };
+        var mlimitFcn = function(props, limit, rlimit) {
+            var container = self.options.container;
+            var generator = function(lim, rlim, op, rdef) {
+                if (!$type(rlim)) rlim = rdef;
+                var lim_type = $type(lim);
+                if (rlim === null) return lim_type == 'function' ? lim : function() {
+                    return lim;
+                };
+                return function(mod) {
+                    var cc = container.getCoordinates(),
+                            ec = mod.element.getCoordinates();
+                    var value = ec[props[1]] - cc[props[0]] - rlim;
+                    switch (lim_type) {
+                        case 'number': return Math[op](value, lim);
+                        case 'function': return Math[op](value, lim(mod));
+                        default: return value;
+                    }
+                };
+            };
+            if (!container) {
+                if (!limit) limit = false;
+                container = self.el.getParent();
+            } else if (!limit) limit = [0];
+            return [generator(limit[0], rlimit[1], 'max', null), generator(limit[1], rlimit[0], 'min', limit[1])];
+        };
+        var opt = this.options, el = this.ghost ? this.ghost : this.el;
+        if ($type(opt.grid) == 'number') opt.grid = {'x': opt.grid, 'y': opt.grid};
+        for (var d in opt.direction) {
+            var mod = opt.direction[d];
+            rOpts.handle = new Element('div', {'class': opt.classPrefix + d});
+            var drag = this.fx[d] = new Drag.Multi(rOpts);
+            var resizeLimit = {
+                'x': rlimitFcn(mod.x, opt.limiter.x['' + mod.x], opt.resizeLimit.x),
+                'y': rlimitFcn(mod.y, opt.limiter.y['' + mod.y], opt.resizeLimit.y)
+            };
+            var moveOpts = {};
+            for (var z in mod) {
+                if (mod[z] < 0) {
+                    moveOpts[z] = {
+                        limit: mlimitFcn(opt.moveLimiter[z], opt.moveLimit[z], opt.resizeLimit[z]),
+                        style: opt.modifiers[z],
+                        grid: opt.grid.x
+                    };
+                }
+            }
+            var binds = {move: drag.add(el, moveOpts)}, resize = {opts: {}, bind: {}};
+            this.binds[d] = binds;
+            if ($defined(mod.x)) {
+                resize.opts.x = {
+                    limit: mod.x < 0 ? false : resizeLimit.x,
+                    grid: mod.x < 0 ? false : opt.grid.x,
+                    style: opt.modifiers.width,
+                    direction: mod.x
+                };
+                if (mod.x < 0) resize.bind.x = binds.move.x;
+            }
+            if ($defined(mod.y)) {
+                resize.opts.y = {
+                    limit: mod.y < 0 ? false : resizeLimit.y,
+                    grid: mod.y < 0 ? false : opt.grid.y,
+                    style: opt.modifiers.height,
+                    direction: mod.y
+                };
+                if (mod.y < 0) resize.bind.y = binds.move.y;
+            }
+            binds.resize = drag.add(el, resize.opts, resize.bind);
+            if (opt.preserveRatio) {
+                var aspect = {
+                    'x': {
+                        fn: this.aspectStep.x,
+                        style: ($defined(mod.x)) ? opt.modifiers.height : null,
+                        direction: mod.x
+                    },
+                    'y': {
+                        fn: this.aspectStep.y,
+                        style: ($defined(mod.y)) ? opt.modifiers.width : null,
+                        direction: mod.y
+                    }
+                };
+                binds.aspect = drag.add(el, aspect, binds.resize);
+            }
+            this.fireEvent('onBuild', [d, binds]);
+        }
+        this.bound = (!this.options.hoverClass) ? {} : {
+            'mouseenter': function(ev) {
+                this.addClass(self.options.hoverClass);
+            },
+            'mouseleave': function(ev) {
+                if (!self.started) this.removeClass(self.options.hoverClass);
+            }
+        };
+        this.attach();
+        if (this.options.initialize) this.options.initialize();
+    },
+
+    add: function(callback) {
+        for (var d in this.options.direction)
+            callback.call(this, d, this.binds[d]);
+    },
+
+    attach: function() {
+        $each(this.bound, function(fn, ev) {
+            this.addEvent(ev, fn)
+        }, this.el);
+        for (var z in this.fx) this.element.adopt(this.fx[z].handle);
+        return this;
+    },
+
+    detach: function() {
+        $each(this.bound, function(fn, ev) {
+            this.removeEvent(ev, fn)
+        }, this.el);
+        for (var z in this.fx) this.fx[z].handle.remove();
+        return this;
+    },
+
+    stop: function() {
+        this.detach();
+        var garbage = [this.ghost];
+        for (var z in this.fx) garbage.push(this.fx[z].handle);
+        Garbage.trash(garbage);
+        this.fx = this.bound = this.binds = {};
+    }
+
+});
+Drag.Resize.implement(new Events, new Options);
+
+Element.extend({
+
+    makeResizable: function(options) {
+        options = options || {};
+        if (options.handle)
+            return new Drag.Base(this, $merge({modifiers: {'x': 'width', 'y': 'height'}}, options));
+        return new Drag.Resize(this, options);
+    }
+
+});
+
+Drag.ResizeImage = new Class({
+
+    initialize: function(el, options) {
+        this.image = $(el);
+        this.styles = this.image.getStyles('position', 'top', 'left', 'right', 'bottom', 'z-index', 'margin');
+        if (!['absolute', 'fixed', 'relative'].contains(this.styles.position)) this.styles.position = 'relative';
+        this.wrapper = new Element('div', {'styles': $merge(this.styles, {
+            'width': this.image.offsetWidth,
+            'height': this.image.offsetHeight
+        })}).injectBefore(this.image).adopt(
+                this.image.remove().setStyles({'position': 'absolute', 'top':'0', 'left':'0', 'margin':'0', 'width': '100%', 'height': '100%', 'zIndex': '0'})
+                );
+        this.fx = new Drag.Resize(this.wrapper, $merge({'preserveRatio': true}, options));
+    },
+
+    stop: function() {
+        this.image.setStyles($merge(this.styles, {'width': this.wrapper.getStyle('width'), 'height': this.wrapper.getStyle('height')})).remove().injectBefore(this.wrapper);
+        this.fx = null;
+        this.wrapper.remove(true);
+    }
+
+});
+
+var Windoo = new Class({
+    options: {
+        type: 'dom',
+        url: false,
+        title: 'Windoo!',
+        width: 300,
+        height: 200,
+        position: 'center',
+        top: 0,
+        left: 0,
+        resizable: true,
+        draggable: true,
+        positionStyle: 'absolute',
+        resizeLimit: {'x': [0], 'y': [0]},
+        padding: {'top': 0, 'right': 0, 'bottom': 0, 'left': 0},
+        ghost: {'resize': false, 'move': false},
+        snap: {'resize': 6, 'move': 6},
+        destroyOnClose: true,
+        container: null,
+        restrict: true,
+        theme: 'alphacube',
+        shadow: true,
+        modal: false,
+        buttons: {
+            menu: false,
+            close: true,
+            minimize: true,
+            roll: false,
+            maximize: true
+        },
+        'class': '',
+        wm: false,
+        effects: {
+            show: {
+                options: {'duration': 600},
+                styles: {'opacity': [0, 1]}
+            },
+            close: {
+                options: {'duration': 600},
+                styles: {'opacity': [1, 0]}
+            },
+            hide: {
+                options: {'duration': 600},
+                styles: {'opacity': [1, 0]}
+            }
+        },
+        onFocus: Class.empty,
+        onBlur: Class.empty,
+        onClose: Class.empty,
+        onDestroy: Class.empty,
+        onHide: Class.empty,
+        onShow: Class.empty,
+        onMaximize: Class.empty,
+        onMinimize: Class.empty,
+        onRestore: Class.empty,
+        onBeforeDrag: Class.empty,
+        onStartDrag: Class.empty,
+        onDrag: Class.empty,
+        onDragComplete: Class.empty,
+        onBeforeResize: Class.empty,
+        onStartResize: Class.empty,
+        onResize: Class.empty,
+        onResizeComplete: Class.empty
+    },
+
+    makeResizable: Class.empty,
+    makeDraggable: Class.empty,
+
+    initialize: function(options) {
+        var self = this;
+        this.fx = {};
+        this.bound = {};
+        this.padding = {};
+        this.panels = [];
+        this.zIndex = 0;
+        this.visible = false;
+
+        this.options.id = 'windoo-' + (new Date().getTime());
+        this.setOptions(options);
+        var theme = this.theme = $type(this.options.theme) == 'string' ? Windoo.Themes[this.options.theme] : this.options.theme;
+        this.options.container = $(this.options.container || document.body);
+        for (var side in theme.padding) this.padding[side] = theme.padding[side] + this.options.padding[side];
+
+        ['x', 'y'].each(function(z) {
+            var lim = this.options.resizeLimit;
+            if ($type(lim[z][0]) == 'number') lim[z][0] = Math.max(lim[z][0], theme.resizeLimit[z][0])
+        }, this);
+
+        this.buildDOM()
+                .setSize(this.options.width, this.options.height)
+                .setTitle(this.options.title)
+                .fix();
+        if (this.options.position == 'center') this.positionAtCenter();
+
+        this.minimized = false;
+        if (this.options.draggable) this.makeDraggable();
+        if (this.options.resizable) this.makeResizable();
+
+        this.wm = this.options.wm || Windoo.$wm;
+        this.wm.register(this);
+    },
+
+    buildDOM: function() {
+        var theme = this.theme, _p = theme.classPrefix;
+        this.el = new Element('div', {
+            'id': this.options.id,
+            'class': theme.className,
+            'styles': {
+                'position': this.options.positionStyle,
+                'overflow': 'hidden',
+                'visibility': 'hidden',
+                'top': this.options.top,
+                'left': this.options.left
+            },
+            'events': {
+                'mousedown': this.focus.bind(this)
+            }
+        });
+
+        if (this.options['class']) this.el.addClass(this.options['class']);
+
+        var $row = function(prefix, contentClass) {
+            return '<div class="' + prefix + '-left ' + _p + '-drag"><div class="' + prefix + '-right"><div class="' + contentClass + '"></div></div></div>';
+        };
+        var iefix = window.ie && this.options.type != 'iframe',
+                innerContent = '<div class="' + _p + '-frame">' + $row("top", "title") + $row("bot", "strut") + '</div><div class="' + _p + '-body">' + (iefix ? Windoo.ieTableCell : '') + '</div>';
+        this.el.setHTML(innerContent).inject(this.options.container);
+        if (window.ie) this.el.addClass(_p + '-' + theme.name + '-ie');
+
+        var frame = this.el.getFirst(),
+                body = this.el.getLast(),
+                title = frame.getElement('.title'),
+                titleText = new Element('div', {'class': 'title-text'}).inject(title);
+        this.dom = {
+            frame: frame,
+            body: body,
+            title: titleText,
+            strut: frame.getElement('.strut').setHTML('&nbsp;'),
+            content: iefix ? body.getElement('td') : body
+        };
+        this.dom.title.addEvent('dblclick', this.maximize.bind(this));
+
+        if (this.options.type == 'iframe') {
+            this.dom.iframe = new Element('iframe', {
+                'frameborder': '0',
+                'class': _p + '-body',
+                'styles': {'width': '100%', 'height': '100%'}
+            });
+            this.dom.body.setStyle('overflow', 'hidden');
+            this.adopt(this.dom.iframe).setURL(this.options.url);
+        }
+        return this.buildShadow().buildButtons();
+    },
+
+    buildButtons: function() {
+        var self = this, buttons = this.options.buttons, _p = this.theme.classPrefix;
+        var action = function(name, bind) {
+            return function(ev) {
+                new Event(ev).stop();
+                (bind[name])();
+            };
+        };
+        this.bound.noaction = function(ev) {
+            new Event(ev).stop();
+        };
+        var makeButton = function(opt, name, title, action) {
+            self.bound[name] = action;
+            if (opt) {
+                var klass = _p + '-button ' + _p + '-' + name + ( opt == 'disabled' ? ' ' + _p + '-' + name + '-disabled' : '' );
+                self.dom[name] = new Element('a', {'class': klass, 'href': '#', 'title': title}).setHTML('x').inject(self.el);
+                self.dom[name].addEvent('click', opt == 'disabled' ? self.bound.noaction : action);
+            }
+        };
+        makeButton(buttons.close, 'close', 'Close', action('close', this));
+        makeButton(buttons.maximize, 'maximize', 'Maximize', action('maximize', this));
+        makeButton(buttons.minimize, 'minimize', 'Minimize', action(buttons.roll ? 'roll' : 'minimize', this));
+        makeButton(buttons.minimize, 'restore', 'Restore', action('minimize', this));
+        makeButton(buttons.menu, 'menu', 'Menu', action('openmenu', this));
+        return this;
+    },
+
+    buildShadow: function() {
+        var theme = this.theme;
+        if (this.options.modal) this.modalOverlay = new Fx.Overlay(this.el.getParent(), {'class': this.classPrefix('modal-overlay')});
+        if (!theme.shadow || !this.options.shadow) return this;
+        this.shadow = new Element('div', {
+            'styles': {
+                'position': this.options.positionStyle,
+                'display': 'none'
+            },
+            'class': theme.classPrefix + '-shadow-' + theme.shadow
+        }).injectAfter(this.el);
+        if (theme.complexShadow) {
+            var $row = function(name) {
+                var els = ['l', 'r', 'm'].map(function(e) {
+                    return new Element('div', {'class': e});
+                });
+                var el = new Element('div', {'class': name});
+                return el.adopt.apply(el, els);
+            };
+            this.shadow.adopt($row('top'), this.dom.shm = $row('mid'), $row('bot'));
+        } else {
+            this.shadow.adopt(new Element('div', {'class': 'c'}));
+        }
+        return this;
+    },
+
+    setHTML: function(content) {
+        if (!this.dom.iframe) this.dom.content.empty().setHTML(content);
+        return this;
+    },
+
+    adopt: function() {
+        this.dom.content.empty().adopt.apply(this.dom.content, arguments);
+        return this;
+    },
+
+    wrap: function(el, options) {
+        var styles = {'margin': '0', 'position': 'static'};
+        el = $(el);
+        options = options || {};
+        var size = el.getSize().size, pos = el.getPosition(), coeff = options.ignorePadding ? 0 : 1, pad = this.padding;
+        this.setSize(size.x + coeff * (pad.right + pad.left), size.y + coeff * (pad.top + pad.bottom));
+        if (options.resetWidth) styles.width = 'auto';
+        if (options.position) this.setPosition(pos.x - coeff * pad.left, pos.y - coeff * pad.top);
+        this.dom.content.empty().adopt(el.remove().setStyles(styles));
+        return this;
+    },
+
+    empty: function() {
+        if (this.dom.iframe) this.dom.iframe.src = 'about:blank';
+        else this.dom.content.empty();
+        return this;
+    },
+
+    setURL: function(url) {
+        if (this.dom.iframe) this.dom.iframe.src = url || 'about:blank';
+        return this;
+    },
+
+    getContent: function() {
+        return this.dom.content;
+    },
+
+    setTitle: function(title) {
+        this.dom.title.setHTML(title || '&nbsp;');
+        return this;
+    },
+
+    effect: function(name, noeffect, onComplete) {
+        opts = {onComplete: onComplete};
+        if (noeffect) opts.duration = 0;
+        var fx = this.options.effects[name];
+        new Fx.Styles(fx.el || this.el, $merge(fx.options, opts)).start(fx.styles);
+        if (this.shadow) new Fx.Styles(this.shadow, fx.options).start(fx.styles);
+        return this;
+    },
+
+    hide: function(noeffect) {
+        if (!this.visible) return this;
+        this.visible = false;
+        return this.effect('hide', noeffect, function() {
+            this.el.setStyle('display', 'none');
+            if (this.modalOverlay) this.modalOverlay.hide();
+            this.fix(true).fireEvent('onHide');
+        }.bind(this));
+    },
+
+    show: function(noeffect) {
+        if (this.visible) return this;
+        this.visible = true;
+        if (this.modalOverlay) this.modalOverlay.show();
+        this.el.setStyle('display', '');
+        this.bringTop().fix();
+        if (this.shadow) this.shadow.setStyle('visibility', 'hidden');
+        return this.effect('show', noeffect, function() {
+            this.el.setStyle('visibility', 'visible');
+            this.fireEvent('onShow').fix();
+        }.bind(this));
+    },
+
+    fix: function(hide) {
+        this.el.fixOverlay(hide || !this.visible);
+        return this.fixShadow(hide);
+    },
+
+    fixShadow: function(hide) {
+        if (this.shadow) {
+            this.shadow[(this.maximized ? 'add' : 'remove') + 'Class']('windoo-shadow-' + this.theme.name + '-maximized');
+            if (hide || !this.visible) {
+                this.shadow.setStyle('display', 'none');
+            } else {
+                var pos = this.el.getCoordinates(), pad = this.theme.shadowDisplace;
+                this.shadow.setStyles({'display': '', 'zIndex': this.zIndex - 1,
+                    'left': this.el.offsetLeft + pad.left, 'top': this.el.offsetTop + pad.top,
+                    'width': pos.width + pad.width, 'height': pos.height + pad.height});
+                if (this.dom.shm) this.dom.shm.setStyle('height', pos.height - pad.delta);
+            }
+        }
+        return this;
+    },
+
+    getState: function() {
+        var outer = this.el.getCoordinates(), container = this.options.container,
+                cont = container === $(document.body) ? {'top': 0, 'left': 0} : container.getCoordinates();
+        outer.top -= cont.top;
+        outer.right -= cont.left;
+        outer.bottom -= cont.top;
+        outer.left -= cont.left;
+        return {outer: outer, inner: this.dom.content.getSize()};
+    },
+
+    setSize: function(width, height) {
+        var pad = this.padding;
+        this.el.setStyles({'width': width, 'height': height});
+        this.dom.strut.setStyle('height', Math.max(0, height - pad.top));
+        this.dom.body.setStyle('height', Math.max(0, height - pad.top - pad.bottom));
+        return this.fix().fireEvent('onResizeComplete', this.fx.resize);
+    },
+
+    positionAtCenter: function(offset) {
+        offset = $merge({'x': 0, 'y': 0}, offset);
+        var container = this.options.container;
+        if (container === document.body) container = window;
+        var s = container.getSize(), esize = this.el.getSize().size,
+                fn = function(z) {
+                    return Math.max(0, offset[z] + s.scroll[z] + (s.size[z] - esize[z]) / 2);
+                };
+        this.el.setStyles({'left': fn('x'), 'top': fn('y')});
+        return this.fix();
+    },
+
+    setPosition: function(x, y) {
+        this.el.setStyles({'left': x, 'top': y});
+        return this.fix();
+    },
+
+    preventClose: function(prevent) {
+        this.$preventClose = $defined(prevent) ? prevent : true;
+        return this;
+    },
+
+    close: function(noeffect) {
+        this.$preventClose = false;
+        this.fireEvent('onBeforeClose');
+        if (this.$preventClose) return this;
+        if (!this.visible) return this;
+        this.visible = false;
+        return this.effect('close', noeffect, function() {
+            this.el.setStyle('display', 'none');
+            if (this.modalOverlay) this.modalOverlay.hide();
+            this.fix(true).fireEvent('onClose');
+            if (this.options.destroyOnClose) this.destroy();
+        }.bind(this));
+    },
+
+    destroy: function() {
+        this.fireEvent('onDestroy');
+        this.wm.unregister(this);
+        if (this.modalOverlay) this.modalOverlay.destroy();
+        if (this.shadow) this.shadow.remove(true);
+        this.el.remove(true);
+        for (var z in this) this[z] = null;
+        this.destroyed = true;
+    },
+
+    classPrefix: function(klass) {
+        return [this.theme.classPrefix, this.theme.name, klass + ' ' + this.theme.classPrefix, klass].join('-');
+    },
+
+    maximize: function(noeffect) {
+        if (this.minimized) return this.minimize();
+        if (this.rolled) this.roll(true);
+        var bound = function(value, limit) {
+            if (!limit) return value;
+            if (value < limit[0]) return limit[0];
+            if (limit.length > 1 && value > limit[1]) return limit[1];
+            return value;
+        };
+        var klass = this.classPrefix('maximized');
+        this.maximized = !this.maximized;
+        this.minimized = false;
+        if (this.maximized) {
+            this.$restoreMaxi = this.getState();
+            var container = this.options.container;
+            if (container === document.body) container = window;
+            var s = container.getSize(), limit = this.options.resizeLimit;
+            if (limit) for (var z in limit) s.size[z] = bound(s.size[z], limit[z]);
+            this.el.addClass(klass);
+            this.setSize(s.size.x, s.size.y)
+                    .setPosition(s.scroll.x, s.scroll.y)
+                    .fireEvent('onMaximize');
+        } else {
+            this.el.removeClass(klass);
+            this.restoreState(this.$restoreMaxi).fireEvent('onRestore', 'maximize');
+        }
+        return this.fix();
+    },
+
+    minimize: function(noeffect) {
+        var klass = this.classPrefix('minimized');
+        this.minimized = !this.minimized;
+        if (this.minimized) {
+            this.$restoreMini = this.getState();
+            var container = this.options.container;
+            if (container === document.body) container = window;
+            var s = container.getSize(), height = this.theme.padding.top + this.theme.padding.bottom;
+            this.el.addClass(klass);
+            this.setSize('auto', height)
+                    .setPosition(s.scroll.x + 10, s.scroll.y + s.size.y - height - 10)
+                    .fireEvent('onMinimize');
+        } else {
+            this.el.removeClass(klass);
+            this.restoreState(this.$restoreMini).fireEvent('onRestore', 'minimize');
+        }
+        return this.fix();
+    },
+
+    restoreState: function(state) {
+        state = state.outer;
+        return this.setSize(state.width, state.height).setPosition(state.left, state.top);
+    },
+
+    roll: function(noeffect) {
+        var klass = this.classPrefix('rolled');
+        this.rolled = !this.rolled;
+        if (this.rolled) {
+            this.$restoreRoll = this.getState().outer;
+            var pad = this.theme.padding;
+            this.setSize(this.$restoreRoll.width, pad.top + pad.bottom);
+            this.el.addClass(klass);
+            this.fireEvent('onRoll');
+        } else {
+            this.el.removeClass(klass);
+            var state = this.$restoreRoll;
+            this.setSize(state.width, state.height).fireEvent('onRestore', 'roll');
+        }
+        return this.fix();
+    },
+
+    openmenu: function() {
+        this.fireEvent('onMenu');
+        return this;
+    },
+
+    setZIndex: function(z) {
+        this.zIndex = z;
+        this.el.setStyle('zIndex', z);
+        if (this.el.fixOverlayElement) this.el.fixOverlayElement.setStyle('zIndex', z - 1);
+        if (this.shadow) this.shadow.setStyle('zIndex', z - 1);
+        if (this.fx.resize) this.fx.resize.options.zIndex = z + 1;
+        if (this.modalOverlay) this.modalOverlay.overlay.setStyle('zIndex', z - 2);
+        return this;
+    },
+
+    focus: function() {
+        this.el.removeClass(this.theme.classPrefix + '-blur');
+        this.wm.focus(this);
+        return this;
+    },
+
+    blur: function() {
+        this.el.addClass(this.theme.classPrefix + '-blur');
+        if (this.wm.blur(this)) this.fireEvent('onBlur');
+        return this;
+    },
+
+    bringTop: function() {
+        return this.setZIndex(this.wm.maxZIndex());
+    }
+});
+Windoo.implement(new Events, new Options);
+Windoo.ieTableCell = '<table style="position:absolute;top:0;left:0;border:none;border-collapse:collapse;padding:0;"><tr><td style="border:none;overflow:auto;position:relative;padding:0;"></td></tr></table>';
+
+Windoo.Themes = {
+
+    cssFirefoxMac: '.windoo-blur * {overflow: hidden !important;}',
+
+    alphacube: {
+        'name': 'alphacube',
+        'padding': {'top': 22, 'right': 10, 'bottom': 15, 'left': 10},
+        'resizeLimit': {'x': [275], 'y': [37]},
+        'className': 'windoo windoo-alphacube',
+        'sizerClass': 'sizer',
+        'classPrefix': 'windoo',
+        'ghostClass': 'windoo-ghost windoo-alphacube-ghost windoo-hover',
+        'hoverClass': 'windoo-hover',
+        'shadow': 'simple window-shadow-alphacube-simple',
+        'shadeBackground': 'transparent url(windoo/s.gif)',
+        'shadowDisplace': {'left': 3, 'top': 3, 'width': 0, 'height': 0}
+    }
+};
+
+if (window.gecko && navigator.appVersion.indexOf('acintosh') >= 0) window.addEvent('domready', function() {
+    new Element('style', {'type': 'text/css', 'media': 'all'}).inject(document.head).appendText(Windoo.Themes.cssFirefoxMac);
+});
+
+Windoo.Manager = new Class({
+    focused: false,
+    options: {
+        zIndex: 100,
+        onRegister: Class.empty,
+        onUnregister: Class.empty,
+        onFocus: Class.empty,
+        onBlur: Class.empty
+    },
+
+    initialize: function(options) {
+        this.hash = [];
+        this.setOptions(options);
+    },
+
+    maxZIndex: function() {
+        var windows = this.hash;
+        if (!windows.length) return this.options.zIndex;
+        var zindex = [];
+        windows.each(function(item) {
+            this.push(item.zIndex);
+        }, zindex);
+        zindex.sort(function(a, b) {
+            return a - b;
+        });
+        return zindex.getLast() + 3;
+    },
+
+    register: function(win) {
+        win.setZIndex(this.maxZIndex());
+        this.hash.push(win);
+        return this.fireEvent('onRegister', win);
+    },
+
+    unregister: function(win) {
+        this.hash.remove(win);
+        if (this.focused === win) this.focused = false;
+        return this.fireEvent('onUnregister', win);
+    },
+
+    focus: function(win) {
+        var idx = this.hash.indexOf(win);
+        if (idx === this.focused) return this;
+        if (this.focused) this.focused.blur();
+        this.focused = win;
+        win.bringTop(this.maxZIndex());
+        return this.fireEvent('onFocus', win);
+    },
+
+    blur: function(win) {
+        if (this.focused === win) {
+            this.focused = false;
+            this.fireEvent('onBlur', win);
+            return true;
+        }
+        return false;
+    }
+
+});
+Windoo.Manager.implement(new Events, new Options);
+
+Windoo.$wm = new Windoo.Manager();
+
+Windoo.implement({
+
+    makeResizable: function() {
+        var self = this, theme = this.theme, opt = this.options, inbody = opt.container === $(document.body);
+        this.fx.resize = this.el.makeResizable({
+            ghostClass: theme.ghostClass,
+            hoverClass: theme.hoverClass,
+            classPrefix: theme.classPrefix + '-sizer ' + theme.classPrefix + '-',
+            shadeBackground: theme.shadeBackground,
+
+            container: (opt.restrict && !inbody) ? opt.container : false,
+            resizeLimit: opt.resizeLimit,
+            ghost: opt.ghost.resize,
+            snap: opt.snap.resize,
+
+            onBeforeStart: function() {
+                self.fireEvent('onBeforeResize', this).focus();
+            },
+            onStart: function(fx) {
+                if (self.maximized) {
+                    fx.stop();
+                } else {
+                    if (!this.ghost && window.gecko) Element.$overlay.call(fx.shade.overlay);
+                    self.fireEvent('onStartResize', this);
+                }
+            },
+            onResize: function() {
+                self.fireEvent('onResize', this);
+            },
+            onComplete: function() {
+                if (this.ghost) {
+                    var size = self.getState().outer;
+                    self.setSize(size.width, size.height);
+                } else {
+                    self.fix().fireEvent('onResizeComplete', this);
+                }
+            },
+            onBuild: function(dir, binds) {
+                if (!this.ghost) {
+                    var fx = this.fx[dir], nolimit = {'x':{'limit': false}, 'y':{'limit': false}};
+                    if (binds.resize.y) ['strut', 'body', 'shm'].each(function(name) {
+                        if (this[name]) fx.add(this[name], {'y': {direction: binds.resize.y.direction, style: 'height'}}, binds.resize);
+                    }, self.dom);
+                    [self.shadow, self.el.fixOverlayElement].each(function(el) {
+                        if (el) {
+                            fx.add(el, $merge(binds.resize, nolimit), binds.resize);
+                            if (binds.move) fx.add(el, $merge(binds.move, nolimit), binds.move);
+                        }
+                    }, self);
+                }
+            }
+        });
+    },
+
+    makeDraggable: function() {
+        var self = this, fx = this.fx.drag = [], inbody = this.options.container === $(document.body);
+        var xLimit = function() {
+            return 2 - self.el.offsetWidth;
+        };
+        var opts = {
+            container: (this.options.restrict && !inbody ? this.options.container : null),
+            limit: (inbody ? {'x': [xLimit], 'y': [0]} : {}),
+            snap: this.options.snap.move,
+            onBeforeStart: function() {
+                self.focus();
+                this.shade = new Fx.Overlay(window, {'styles': {
+                    'cursor': this.options.handle.getStyle('cursor'),
+                    'background': self.theme.shadeBackground,
+                    'zIndex': self.zIndex + 3
+                }}).show();
+                if (self.ghost) {
+                    var ce = self.el.getSize().size;
+                    this.element.setStyles({
+                        'zIndex': self.zIndex + 3,
+                        'left': self.el.getStyle('left'),
+                        'top': self.el.getStyle('top'),
+                        'width': ce.x,
+                        'height': ce.y
+                    });
+                } else if (window.gecko) {
+                    Element.$overlay.call(this.shade.overlay, false, 2);
+                }
+                self.fireEvent('onBeforeDrag', this);
+            },
+            onStart: function() {
+                if (self.maximized && !self.minimized) this.stop();
+                else self.fireEvent('onStartDrag', this);
+            },
+            onSnap: function() {
+                if (self.ghost) this.element.setStyle('display', 'block');
+            },
+            onDrag: function() {
+                self.fix().fireEvent('onDrag', this);
+            },
+            onComplete: function() {
+                this.shade.destroy();
+                if (self.ghost) {
+                    for (var z in this.options.modifiers) {
+                        var style = this.options.modifiers[z];
+                        self.el.setStyle(style, this.element.getStyle(style));
+                    }
+                    this.element.setStyle('display', 'none');
+                }
+                self.fix().fireEvent('onDragComplete', this);
+            }
+        };
+        if (this.options.ghost.move) this.ghost = new Element('div', {'class': this.theme.ghostClass, 'styles': {'display': 'none'}}).injectAfter(this.el);
+        this.el.getElements('.' + this.theme.classPrefix + '-drag').each(function(d) {
+            opts.handle = d;
+            d.setStyle('cursor', 'move');
+            fx.push((this.ghost || this.el).makeDraggable(opts));
+        }, this);
+    }
+
+});
+
+Windoo.Themes.aero = {
+    'name': 'aero',
+    'padding': {'top': 28, 'right': 10, 'bottom': 15, 'left': 10},
+    'resizeLimit': {'x': [175], 'y': [58]},
+    'className': 'windoo windoo-aero',
+    'sizerClass': 'sizer',
+    'classPrefix': 'windoo',
+    'ghostClass': 'windoo-ghost windoo-aero-ghost windoo-hover',
+    'hoverClass': 'windoo-hover',
+    'shadow': 'simple window-shadow-aero-simple',
+    'shadeBackground': 'transparent url(windoo/s.gif)',
+    'shadowDisplace': {'left': 3, 'top': 3, 'width': 0, 'height': 0}
+};
+
+Windoo.Themes.wise = {
+    'name': 'wise',
+    'padding': {'top': 28, 'right': 10, 'bottom': 15, 'left': 10},
+    'resizeLimit': {'x': [175], 'y': [58]},
+    'className': 'windoo windoo-wise',
+    'sizerClass': 'sizer',
+    'classPrefix': 'windoo',
+    'ghostClass': 'windoo-ghost windoo-wise-ghost windoo-hover',
+    'hoverClass': 'windoo-hover'
+};
+
+Windoo.Themes.aqua = {
+    'name': 'aqua',
+    'padding': {'top': 23, 'right': 0, 'bottom': 15, 'left': 0},
+    'resizeLimit': {'x': [275], 'y': [37]},
+    'className': 'windoo windoo-aqua',
+    'sizerClass': 'sizer',
+    'classPrefix': 'windoo',
+    'ghostClass': 'windoo-ghost windoo-aqua-ghost windoo-hover',
+    'hoverClass': 'windoo-hover',
+    'shadeBackground': 'transparent url(themes/windoo/s.gif)',
+    'shadow': 'aqua',
+    'complexShadow': true,
+    'shadowDisplace': {'left': -13, 'top': -8, 'width': 26, 'height': 31, 'delta': 23}
+};
+
+Windoo.Ajax = Ajax.extend({
+    onComplete: function() {
+        if (this.options.window) this.options.window.setHTML(this.response.text);
+        this.parent();
+    }
+});
+
+Windoo.implement({
+
+    addPanel: function(element, position) {
+        position = $pick(position, 'bottom');
+        var dim, ndim,
+                size = this.el.getSize().size,
+                styles = {'position': 'absolute'},
+                panel = {'element': $(element), 'position': position, 'fx': []};
+        switch (position) {
+            case 'top':
+            case 'bottom': dim = 'x'; ndim = 'y'; break;
+            case 'left':
+            case 'right': dim = 'y'; ndim = 'x'; break;
+            default: return this;
+        }
+        var options = Windoo.panelOptions[dim];
+        styles[position] = this.padding[position];
+        styles[options.deltaP] = this.padding[options.deltaP];
+        element = panel.element.addClass(this.classPrefix('pane')).setStyles(styles).inject(this.el);
+        panel.padding = element.getSize().size[ndim];
+        this.padding[position] += panel.padding;
+        if (this.options.resizable && !this.options.ghost.resize) {
+            this.fx.resize.add(function(dir, binds) {
+                if (binds.resize[dim]) {
+                    var fx = this.fx[dir], mod = {};
+                    mod[dim] = $merge(binds.resize[dim]);
+                    mod[dim].limit = null;
+                    panel.fx.push({
+                        'fx': fx,
+                        'bind': fx.add(panel.element, mod, binds.resize)
+                    });
+                }
+            });
+        }
+        this.addEvent('onResizeComplete', function() {
+            panel.element.setStyle(options.style, this.el.getSize().size[dim] - this.padding[options.deltaM] - this.padding[options.deltaP] - 1);
+        });
+        this.panels.push(panel);
+        return this.setSize(size.x, size.y);
+    },
+
+    removePanel: function(element) {
+        var panel, size;
+        element = $(element);
+        for (var i = 0, len = this.panels.length; i < len; i++) {
+            panel = this.panels[i];
+            if (panel.element === element) {
+                this.padding[panel.position] -= panel.padding;
+                panel.element.remove();
+                panel.fx.each(function(pfx) {
+                    pfx.fx.detach(pfx.bind);
+                }, this);
+                this.panels.splice(i, 1);
+                size = this.el.getSize().size;
+                this.setSize(size.x, size.y);
+                break;
+            }
+        }
+        return this;
+    }
+
+});
+
+Windoo.panelOptions = {
+    'x': {'style': 'width', 'deltaP': 'left', 'deltaM': 'right'},
+    'y': {'style': 'height', 'deltaP': 'top', 'deltaM': 'bottom'}
+};
+
+Windoo.Dialog = Windoo.extend({
+
+    initialize: function(message, options) {
+        var self = this, dialog = this.dialog = {
+            dom: {},
+            buttons: {},
+            options: $merge(Windoo.Dialog.options, options),
+            message: message
+        };
+        this.parent($merge({
+            'onShow': function() {
+                if (dialog.buttons.ok) dialog.buttons.ok.focus();
+            }
+        }, dialog.options.window));
+        dialog.bound = function(ev) {
+            ev = new Event(ev);
+            if (['enter', 'esc'].contains(ev.key)) {
+                dialog.result = (ev.key == 'enter') ? !dialog.cancelFocused : false;
+                self.close();
+                ev.stop();
+            }
+        };
+        document.addEvent('keydown', dialog.bound);
+        this.addEvent('onClose', function() {
+            document.removeEvent('keydown', dialog.bound);
+            dialog.options[(dialog.result) ? 'onConfirm' : 'onCancel'].call(this);
+        });
+    },
+
+    buildDialog: function(klass, buttons) {
+        var self = this, dialog = this.dialog;
+        if ('ok' in buttons) dialog.buttons.ok = new Element('input', $merge({
+            'events': {
+                'click': function() {
+                    dialog.result = true;
+                    self.close();
+                }
+            }
+        }, dialog.options.buttons.ok));
+        if ('cancel' in buttons) dialog.buttons.cancel = new Element('input', $merge({
+            'events': {
+                'click': function() {
+                    dialog.result = false;
+                    self.close();
+                }
+            }
+        }, dialog.options.buttons.cancel)).addEvents({
+            'focus': function() {
+                dialog.cancelFocused = true;
+            },
+            'blur': function() {
+                dialog.cancelFocused = false;
+            }
+        });
+        dialog.dom.panel = new Element('div', $merge({'class': this.classPrefix(klass + '-pane')}, dialog.options.panel));
+        for (var btn in buttons) if (buttons[btn]) dialog.dom.panel.adopt(dialog.buttons[btn]);
+        dialog.dom.message = new Element('div', $merge({'class': this.classPrefix(klass + '-message')}, dialog.options.message));
+        return this.addPanel(dialog.dom.panel).adopt(dialog.dom.message.setHTML(dialog.message));
+    }
+
+});
+
+Windoo.Dialog.options = {
+    'window': {
+        'modal': true,
+        'resizable': false,
+        'buttons': {
+            'minimize': false,
+            'maximize': false
+        }
+    },
+    'buttons': {
+        'ok': {
+            'properties': {
+                'type': 'button',
+                'value': 'OK'
+            }
+        },
+        'cancel': {
+            'properties': {
+                'type': 'button',
+                'value': 'Cancel'
+            }
+        }
+    },
+    'panel': null,
+    'message': null,
+    'onConfirm': Class.empty,
+    'onCancel': Class.empty
+};
+
+Windoo.Alert = Windoo.Dialog.extend({
+
+    initialize: function(message, options) {
+        this.parent(message, options);
+        this.buildDialog('alert', {'ok': true}).show();
+    }
+
+});
+
+Windoo.Confirm = Windoo.Dialog.extend({
+
+    initialize: function(message, options) {
+        this.parent(message, options);
+        this.buildDialog('confirm', {'ok': true, 'cancel': true}).show();
+    }
+
+});
+
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/accessDenied.jsp b/trunk/wise-webapp/src/main/webapp/jsp/accessDenied.jsp
new file mode 100644
index 00000000..89d88ce3
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/accessDenied.jsp
@@ -0,0 +1,20 @@
+<%@ page import="org.acegisecurity.context.SecurityContextHolder" %>
+<%@ page import="org.acegisecurity.Authentication" %>
+<%@ page import="org.acegisecurity.ui.AccessDeniedHandlerImpl" %>
+
+<h1>Sorry, access is denied</h1>
+
+
+<p>
+    <%= request.getAttribute(AccessDeniedHandlerImpl.ACEGI_SECURITY_ACCESS_DENIED_EXCEPTION_KEY)%>
+
+<p>
+
+    <%
+
+    Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+         if (auth != null) {
+
+    %>
+    Authentication object as a String: <%= auth.toString() %><BR><BR>
+    <%      } %>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/activationAccountConfirmation.jsp b/trunk/wise-webapp/src/main/webapp/jsp/activationAccountConfirmation.jsp
new file mode 100755
index 00000000..58571af4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/activationAccountConfirmation.jsp
@@ -0,0 +1,19 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<div class="modalDialog">
+
+    <h1>
+        <spring:message code="ACCOUNT_ACTIVED"/>
+    </h1>
+
+    <h2 style="font-weight:bold;">Thanks for signing up!</h2>
+
+    <p>
+        Thanks so much for your interest in WiseMapping.
+    </p>
+    <br/>
+    <p>
+        If you have any questions or have any feedback, please don't hesitate to use the on line form.
+        We'd love to hear from you.
+    </p>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/activationAccountConfirmationFail.jsp b/trunk/wise-webapp/src/main/webapp/jsp/activationAccountConfirmationFail.jsp
new file mode 100755
index 00000000..7ea5e3c0
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/activationAccountConfirmationFail.jsp
@@ -0,0 +1,14 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<div class="modalDialog">
+
+    <h1>
+        <spring:message code="ACCOUNT_ACTIVED_FAIL"/>
+    </h1>
+
+    <h2 style="font-weight:bold;">An error occured trying to activate your account.</h2>
+   
+    <p>
+        We're sorry, an error has occurred and we can't process your request. Please try again, or use the on line support form to contact with us in order to resolve the problem.        
+    </p>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/browserNotSupported.jsp b/trunk/wise-webapp/src/main/webapp/jsp/browserNotSupported.jsp
new file mode 100644
index 00000000..7eebddeb
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/browserNotSupported.jsp
@@ -0,0 +1,30 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<h1>
+    <spring:message code="USUPPORTED_BROWSER"/>
+</h1>
+
+<h2>You are using an unsupported browser.</h2>
+
+<p>Although you can use our site with that browser, some features may not be functional.</p>
+WiseMapping is optimized for use with:
+<ul>
+    <li>Internet Explorer 6.0 or greater</li>
+    <li>Firefox 1.5 or greater</li>
+    <li>Opera 9.21 or greater</li>
+</ul>
+
+<p style="font-weight:bold;">
+    We suggest Firefox for an optimal experience.
+</p>
+
+<p>
+    <a href="http://www.mozilla.com/en/firefox/" target="_blank"><img src="../images/firefox.gif"
+                                                                      alt="Get Firefox!" align="absmiddle"
+                                                                      border="0" height="48" width="143"></a>
+</p>
+</br>
+<p>
+    We are working to support more browser in the future. Stay tuned !
+
+<p>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/changePassword.jsp b/trunk/wise-webapp/src/main/webapp/jsp/changePassword.jsp
new file mode 100644
index 00000000..2974c88f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/changePassword.jsp
@@ -0,0 +1,37 @@
+<%@ include file="/jsp/init.jsp" %>
+<div>
+    <form:form method="post" commandName="changePassword">
+        <table>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="PASSWORD"/>
+                    :
+                </td>
+                <td>
+                    <form:password path="password" id="password" tabindex="1"/>
+                    <form:errors path="password" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="RETYPE_PASSWORD"/>
+                    :
+                </td>
+                <td>
+                    <form:password path="retryPassword" id="retryPassword" tabindex="2"/>
+                    <form:errors path="retryPassword" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                           onclick="MOOdalBox.close();">
+                </td>
+            </tr>
+        </table>
+    </form:form>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/closeDialog.jsp b/trunk/wise-webapp/src/main/webapp/jsp/closeDialog.jsp
new file mode 100644
index 00000000..8231182b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/closeDialog.jsp
@@ -0,0 +1,8 @@
+<script type="text/javascript">
+    MOOdalBox.close();
+
+    if(MOOdalBox.reloadRequered)
+    {
+         window.location.reload( true );
+    }
+</script>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/deleteMapConfirmation.jsp b/trunk/wise-webapp/src/main/webapp/jsp/deleteMapConfirmation.jsp
new file mode 100644
index 00000000..62f41681
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/deleteMapConfirmation.jsp
@@ -0,0 +1,14 @@
+<%@ include file="/jsp/init.jsp" %>
+<c:url value="mymaps.htm" var="deleteMapUrl">
+    <c:param name="action" value="delete"/>
+    <c:param name="mapId" value="${mindmap.id}"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+<div>
+    <spring:message code="DELETE_SELECTED_CONFIRMATION"/>
+</div>
+<form method="post" id="deleteConfirmation" action="<c:out value="${deleteMapUrl}"/>">
+    <input type="hidden" name="action" value="deleteMap">
+    <input type="submit" value="<spring:message code="YES"/>">
+    <input type="button" value="<spring:message code="NO"/>" onclick="MOOdalBox.close();">
+</form>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/editProfile.jsp b/trunk/wise-webapp/src/main/webapp/jsp/editProfile.jsp
new file mode 100755
index 00000000..ba55105e
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/editProfile.jsp
@@ -0,0 +1,58 @@
+<%@ include file="/jsp/init.jsp" %>
+<div>
+    <form:form method="post" commandName="editProfile">
+        <table>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="FIRSTNAME"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="firstname" id="firstname" tabindex="1"/>
+                    <form:errors path="firstname" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="LASTNAME"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="lastname" id="lastname" tabindex="2"/>
+                    <form:errors path="lastname" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="EMAIL"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="email" id="email" tabindex="3"/>
+                    <form:errors path="email" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel">                                        
+                    <spring:message code="NEWSLETTER_DESC"/>
+                    :
+                </td>
+                <td>
+                    <form:checkbox path="allowSendEmail" id="allowSendEmail" tabindex="4"/>
+                    <form:errors path="allowSendEmail" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                           onclick="MOOdalBox.close();">
+                </td>
+            </tr>
+        </table>
+    </form:form>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/editorHeader.jsp b/trunk/wise-webapp/src/main/webapp/jsp/editorHeader.jsp
new file mode 100644
index 00000000..914aca1b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/editorHeader.jsp
@@ -0,0 +1,41 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<div id="editorHeader">
+    <div id="headerToolbar">
+        <c:if test="${mindmap != null}">
+            <div id="headerTitle">${mindmap.title}<span id="headerSubTitle">&nbsp;<spring:message
+                    code='EDITOR.LAST_SAVED' arguments='${mindmap.lastModifierUser}'/></span></div>
+        </c:if>
+        <c:choose>
+            <c:when test="${principal != null}">
+                <div id="headerActions">
+                    <spring:message code="WELCOME"/>
+                    , ${principal.firstname}
+                    | <a href="${pageContext.request.contextPath}/c/mymaps.htm" title="<spring:message code="MY_WISEMAPS"/>">
+                    <spring:message code="MY_WISEMAPS"/>
+                </a>
+                    | <a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
+                         title="<spring:message code="SETTINGS_DETAIL"/>">
+                    <spring:message code="SETTINGS"/>
+                </a>
+                    | <a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
+                    <spring:message code="LOGOUT"/>
+                </a>
+                </div>
+            </c:when>
+            <c:when test="${param.removeSignin!=true}">
+                <div id="signUpHeader">
+                    <spring:message code="ALREADY_A_MEMBER"/>
+                    <a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
+                        <spring:message code="SIGN_IN"/>
+                    </a>
+                </div>
+            </c:when>
+        </c:choose>
+    </div>
+</div>
+<div id="headerLoading">
+    <spring:message code="LOADING_MSG"/>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/emailNotExistsError.jsp b/trunk/wise-webapp/src/main/webapp/jsp/emailNotExistsError.jsp
new file mode 100755
index 00000000..10c6dd32
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/emailNotExistsError.jsp
@@ -0,0 +1,13 @@
+<%@ include file="/jsp/init.jsp" %>
+<h1>
+    <spring:message code="INVALID_EMAIL_ERROR"/>
+</h1>
+
+<h2>The email is not register or you account is not active yet.</h2>
+
+<p>If the problem persist please send us an email to <a href="mailto:support@wisemapping.com">support@wisemapping.com </a></p>
+</br>
+<p>We are working to add more features in the future. Stay tuned !</p>
+</br>
+<p>Best Regards,</p>
+<p>WiseMapping Team.</p>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/embeddedView.jsp b/trunk/wise-webapp/src/main/webapp/jsp/embeddedView.jsp
new file mode 100644
index 00000000..e5cc0de6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/embeddedView.jsp
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/jsp/init.jsp" %>
+
+<html>
+<head>
+    <meta http-equiv="Content-type" value="text/html; charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="../css/embedded.css">
+    <link rel="stylesheet" type="text/css" href="../css/bubble.css">
+
+    <script type='text/javascript' src='../js/mootools.js'></script>
+    <script type='text/javascript' src='../js/core.js'></script>
+
+</head>
+<body>
+
+<div id="waitDialog" style="display:none">
+    <div id="loadingContainer">
+        <div class="loadingIcon"></div>
+        <div class="loadingText">
+            <spring:message code="EDITOR.LOADING"/>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    //Dialog box display ...
+    var loadingDialog = new core.WaitDialog('waitDialog');
+    addLightboxMarkup();
+    loadingDialog.activate(true);
+    var mapId = '${mindmap.id}';
+    var mapXml = '${mapXml}';
+    var editorProperties = {zoom:${zoom}};
+</script>
+
+<div id="mapContainer">
+    <div id="mindplot"></div>
+    <div id="embFooter">
+        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+            <div id="logo"></div>
+        </a>
+
+        <div id="zoomIn" class="button"></div>
+        <div id="zoomOut" class="button"></div>
+        <div id="mapDetails">
+            <span class="title"><spring:message code="CREATOR"/>:</span><span>${mindmap.creator}</span>
+            <span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.description}</span>
+        </div>
+    </div>
+</div>
+<div id="ffoxworkarround" style="display:none;"><input id="ffoxWorkarroundInput" type="text"></div>
+<script type="text/javascript" src="../js/embedded.js"></script>
+</body>
+</html>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp b/trunk/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp
new file mode 100644
index 00000000..41f0d4b4
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@ include file="/jsp/init.jsp" %>
+<html>
+<head>
+    <title>
+        <spring:message code="NO_ENOUGH_PERMISSIONS"/>
+    </title>
+    <meta http-equiv="Content-type" value="text/html; charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="../css/wisehome.css">
+    <link rel="stylesheet" type="text/css" href="../css/embedded.css">
+    <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon">
+</head>
+<body>
+
+    <div class="pageBodyContent" style="padding:40px;padding-top:100px;">
+    <h1>
+     <spring:message code="NO_ENOUGH_PERMISSIONS"/>
+     </h1>
+    <p>
+    <spring:message code="NO_ENOUGH_PERMISSIONS_DETAILS"/>
+    </p>
+    </div>
+    <div id="embFooter">
+        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+            <div id="logo"></div>
+        </a>
+    </div>
+</body>
+</html>
+
+
+
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/embeddedViewImg.jsp b/trunk/wise-webapp/src/main/webapp/jsp/embeddedViewImg.jsp
new file mode 100644
index 00000000..20b8869c
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/embeddedViewImg.jsp
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/jsp/init.jsp" %>
+<c:url value="export.htm?exportFormat=IMG_EXPORT_FORMAT&imgFormat=PNG&imgSize=MEDIUM&action=export&mapId=${mindmap.id}"
+       var="exportImgUrl"/>
+
+<html>
+<head>
+    <meta http-equiv="Content-type" value="text/html; charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="../css/embedded.css">
+    <script type='text/javascript' src='../js/mootools.js'></script>
+
+</head>
+<body>
+
+
+<div id="mapContainer">
+    <div id='mindplot'
+         style='background: url( ../images/grid.gif ) bottom left repeat !important;overflow:hidden;width:100%;height:100%;'>
+        <div style="100%;height:100%;background: url( ${exportImgUrl} );background-position: 0px -100px;background-repeat: no-repeat;"></div>
+    </div>
+    <div id="embFooter">
+        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+            <div id="logo"></div>
+        </a>
+
+        <div id="mapDetails">
+            <span class="title"><spring:message code="CREATOR"/>:</span><span>${mindmap.creator}</span>
+            <span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.description}</span>
+        </div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/error.jsp b/trunk/wise-webapp/src/main/webapp/jsp/error.jsp
new file mode 100644
index 00000000..52408677
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/error.jsp
@@ -0,0 +1,6 @@
+<%@ page autoFlush="true" buffer="none" %>
+<%@ include file="/jsp/init.jsp" %>
+
+<h1>
+    <spring:message code="UNEXPECTED_ERROR"/>
+</h1>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/errorTemplate.jsp b/trunk/wise-webapp/src/main/webapp/jsp/errorTemplate.jsp
new file mode 100644
index 00000000..be7ba916
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/errorTemplate.jsp
@@ -0,0 +1,32 @@
+<%@ page import="org.apache.log4j.Logger" %>
+<%@ page autoFlush="true" buffer="none" %>
+<%@ include file="/jsp/init.jsp" %>
+
+<%!
+    final Logger logger = Logger.getLogger("com.wisemapping");
+%>
+<h1>
+    <spring:message code="${requestScope.title}"/>
+</h1>
+
+<p style="font-weight:bold;">
+     <spring:message code="${requestScope.details}"/>
+</p>
+<!--
+<%
+    final Throwable exception = (Throwable) request.getAttribute("exception");
+    if (exception != null) {
+        exception.printStackTrace(response.getWriter());
+        String usrMail = "anonymous";
+        if(user!=null)
+        {
+            usrMail = user.getEmail();
+        }
+
+        logger.error("Unexpected error on user '" + usrMail+ " ':", exception);
+
+    }
+%>
+
+-->
+
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/footer.jsp b/trunk/wise-webapp/src/main/webapp/jsp/footer.jsp
new file mode 100644
index 00000000..916f21de
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/footer.jsp
@@ -0,0 +1,23 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<div id="footer">
+    <div style="width:20%; float:left;">&nbsp;</div>
+    <div style="float:left; width:60%;">
+        <a href="mailto:team@wisemapping.com"><spring:message code="CONTACT"/></a>
+
+        <p><spring:message code="COPYRIGHT"/></p>
+    </div>
+    <div style="float:left; text-align:left;padding:5px;">
+        <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+            <input type="hidden" name="cmd" value="_s-xclick">
+            <input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
+            <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
+            <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHwQYJKoZIhvcNAQcEoIIHsjCCB64CAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYBvLN5PRNvfylLOCDCi65JktD2se3FdTyRH1+Ptw+OrhDWUX76pT8qt89aCzRjroJikwKfgmiyLHSOw4rDF5xGbzesCdAjpkrv5KwMRxiaf/FEdXDHHufv2pwP591+h7mY36I0+nDdwVykq7KteiQRsfFQeLkHikRsZ6Gtw3eRuBjELMAkGBSsOAwIaBQAwggE9BgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcECNad8bwThZeKgIIBGEkN7nh0XMYn8N6aOZm9Dqtnty8qTW42ACmxf9llJ1wzj4SRT9SEpHfq4tMG3hRRjAhJ6DRW8k+0QacC5exvzddGo1bIFGvNxWnXF3CEUy2yc2Dw/YaUlsZsSYcyChi9yxjmNnrH7YYDgnpAq7V1fcKN89t8gnNA2+KAPENtT6yF8eNzrzf5ckfFBOJXawLW4lACk5h1jrCmF5oWL/SicDsjLMFvXkD6P7tHsxOlLHj1Oe6k+Ejb1xsFpagsiU5/CWyTpP0sjgXyY/z08sJXk9HBYNJOwTXd7u6h9h6mjHKuCb1p5vCQbFY0yDV881ILsnpzguAOGHbMTzmYSenDcdj6JnzQDQxYUQTNYfLgtKgO1Xy3M63UA9mgggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYw FAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS+Ndl72T7oKJ4u4uw+6awntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe/hJl66/RGqrj5rFb08sAABNTzDTiqqNpJeBsYs/c2aiGozptX2RlnBktH+SUNpAajW724Nv2Wvhif6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7BgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIFfOlaagFrl71+jq6OKidbWFSE+Q4FqROvdgIONth +8kSK//Y/4ihuE4Ymvzn5ceE3S/iBSQQMjyvb+s2TWbQYDwcp129OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa+u4qectsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNzA5MDQxMTMyMTNaMCMGCSqGSIb3DQEJBDEWBBTF2vsxwMzHX7TQrdpdCFCp3Rk6TDANBgkqhkiG9w0BAQEFAASBgJS4fx+wCQaPzs3wvgaJOvbgub23AuGbaMc3fYKGxJf5JTxUVsSkQY9t6itXUr2llwc/GprbKaCvcOnOBXT8NkZ6gWqNX9iwDq83rblm3XI7yrjRUCQrvIkhJ80xKGrhBn48V61FawASYdpE1AmhZoga9XAIZruO0NrnT2QXxe2p-----END PKCS7-----">
+        </form>
+    </div>
+</div>
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+    _uacct = "UA-2347723-1";
+    urchinTracker();
+</script>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp b/trunk/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
new file mode 100755
index 00000000..5fb3a4e6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
@@ -0,0 +1,57 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<script type="text/javascript">
+    window.onload = function() {
+        var simpleButtonGenerator = RUZEE.ShadedBorder.create({ corner:8,  border:1 });
+        simpleButtonGenerator.render('forgotPasswordContainer');
+
+        $('submitButton').onclick = displayLoading;
+    };
+</script>
+
+<div id="forgotPasswordContent">
+    <div id="forgotPasswordContainer" class="sb">
+        <h1>
+            <spring:message code="FORGOT_PASSWORD"/>
+        </h1>
+
+        <h2>
+            <spring:message code="FORGOT_PASSWORD_MESSAGE"/>
+        </h2>
+        <form:form method="post" commandName="forgotPassword">
+            <table>
+                <tbody>
+                    <tr>
+                        <td>
+                            <spring:message code="EMAIL"/>
+                            :
+                        </td>
+                        <td>
+                            <form:input path="email" id="email" tabindex="1"/>
+                            <form:errors path="email" cssClass="errorMsg"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>&nbsp;</td>
+                        <td>
+                            <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary"
+                                   id="submitButton">
+                            <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                                   onclick="window.location='<c:url value="mymaps.htm"/>'">
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </form:form>
+    </div>
+</div>
+
+<div id="register">
+    <b>
+        <spring:message code="NOT_READY_A_USER"/>
+    </b>
+    <spring:message code="NOT_READY_A_USER_MESSAGE"/>
+    <a href="userRegistration.htm">
+        <spring:message code="JOIN_NOW"/>
+    </a>
+</div>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/formDialogTemplate.jsp b/trunk/wise-webapp/src/main/webapp/jsp/formDialogTemplate.jsp
new file mode 100644
index 00000000..902d5e33
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/formDialogTemplate.jsp
@@ -0,0 +1,25 @@
+<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %>
+
+<%@ include file="/jsp/init.jsp" %>
+
+<tiles:importAttribute name="title" scope="page"/>
+<tiles:importAttribute name="details" scope="page"/>
+
+<div class="modalDialog">
+
+    <!--  Header can be customized -->
+
+    <c:if test="${(not empty pageScope.title)}">
+        <h1>
+            <spring:message code="${pageScope.title}"/>
+        </h1>
+
+        <c:if test="${(not empty pageScope.details)}">
+            <h2>
+                <spring:message code="${pageScope.details}"/>
+            </h2>
+        </c:if>
+    </c:if>
+
+    <tiles:insert name="body"/>
+</div>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/header.jsp b/trunk/wise-webapp/src/main/webapp/jsp/header.jsp
new file mode 100644
index 00000000..cec1619b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/header.jsp
@@ -0,0 +1,56 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<div id="header">
+    <div id="headerToolbar">
+        <c:choose>
+            <c:when test="${principal != null}">
+                <div id="headerActions">
+                    <spring:message code="WELCOME"/>
+                    , ${principal.firstname}
+                    | <a href="${pageContext.request.contextPath}/c/mymaps.htm">
+                    <spring:message code="MY_WISEMAPS"/>
+                </a>
+                    | <a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
+                         title="<spring:message code="SETTINGS_DETAIL"/>">
+                    <spring:message code="SETTINGS"/>
+                </a>
+                    | <a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
+                    <spring:message code="LOGOUT"/>
+                </a>
+                </div>
+            </c:when>
+            <c:when test="${param.removeSignin!=true}">
+                <div id="signUpHeader">
+                    <spring:message code="ALREADY_A_MEMBER"/>
+                    <a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
+                        <spring:message code="SIGN_IN"/>
+                    </a>
+                </div>
+            </c:when>
+        </c:choose>
+    </div>
+</div>
+<c:if test="${param.onlyActionHeader!=true}">
+    <div id="headerContent">
+        <div id="headerButtons">
+            <%--<div id="blogLink">--%>
+                <%--<a href="${pageContext.request.contextPath}/c/blog.htm" title="<spring:message code="BLOG_TITLE"/>">--%>
+                    <%--<spring:message code="BLOG"/>--%>
+                <%--</a>--%>
+            <%--</div>--%>
+        </div>
+        <a href="${pageContext.request.contextPath}/c/home.htm" title="Homepage">
+            <div id="headerLogo">&nbsp;</div>
+        </a>
+
+        <div id="headerPBetaLogo">&nbsp;</div>
+        <div id="headerSlogan">
+            <spring:message code="SITE.SLOGAN"/>
+        </div>
+    </div>
+</c:if>
+<div id="headerLoading">
+    <spring:message code="LOADING_MSG"/>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/homepage.jsp b/trunk/wise-webapp/src/main/webapp/jsp/homepage.jsp
new file mode 100644
index 00000000..418686af
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/homepage.jsp
@@ -0,0 +1,3 @@
+<%
+    response.sendRedirect(request.getContextPath() + "/c/login.htm");
+%>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/init.jsp b/trunk/wise-webapp/src/main/webapp/jsp/init.jsp
new file mode 100644
index 00000000..5b2df322
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/init.jsp
@@ -0,0 +1,20 @@
+<%@ page import="com.wisemapping.model.User" %>
+<%@ page import="com.wisemapping.security.Utils" %>
+<%@ page import="com.wisemapping.filter.UserAgent" %>
+<%@ page import="com.wisemapping.filter.BrowserSupportInterceptor" %>
+<%@ page session="false" contentType="text/html;charset=UTF-8" %>
+
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%--<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>--%>
+<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%
+    User user = Utils.getUser(request);
+    request.setAttribute("principal", user);
+
+    UserAgent userAgent = null;
+    final HttpSession session = request.getSession();
+    if (session != null) {
+        userAgent = (UserAgent) session.getAttribute(BrowserSupportInterceptor.USER_AGENT);
+    }
+%>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/keyboard.jsp b/trunk/wise-webapp/src/main/webapp/jsp/keyboard.jsp
new file mode 100644
index 00000000..445e4f58
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/keyboard.jsp
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/jsp/init.jsp" %>
+
+<div id="keyboardTable">
+    <table>
+        <colgroup>
+            <col width="40%"/>
+            <col width="30%"/>
+            <col width="30%"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th>Action</th>
+                <th>Windows - Linux</th>
+                <th>OS X</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>Create Sibling Node</td>
+                <td>Enter</td>
+                <td>Enter</td>
+            </tr>
+            <tr>
+                <td>Create Child Node</td>
+                <td>Insert</td>
+                <td><img src="../images/mac-metaKey.png" alt="Meta"/>+Enter</td>
+            </tr>
+            <tr>
+                <td>Delete Child Node</td>
+                <td>Delete</td>
+                <td>Delete</td>
+            </tr>
+            <tr>
+                <td>Edit Node Text</td>
+                <td>Just start typing | F2</td>
+                <td>Just start typing | F2</td>
+            </tr>
+            <tr>
+                <td>Cancel Text Changes</td>
+                <td>Esc</td>
+                <td>Esc</td>
+            </tr>
+            <tr>
+                <td>Collapse / Extend Node</td>
+                <td>Space Bar</td>
+                <td>Space Bar</td>
+            </tr>
+            <tr>
+                <td>Node Navigation</td>
+                <td>Arrow Keys</td>
+                <td>Arrow Keys</td>
+            </tr>
+            <tr>
+                <td>Select Multiple Nodes</td>
+                <td>Ctrl+click</td>
+                <td>Ctrl+click</td>
+            </tr>
+            <tr>
+                <td>Undo Edition</td>
+                <td>Ctrl+z</td>
+                <td><img src="../images/mac-metaKey.png" alt="Meta"/>+z</td>
+            </tr>
+            <tr>
+                <td>Redo Edition</td>
+                <td>Ctrl+Shift+z</td>
+                <td><img src="../images/mac-metaKey.png" alt="Meta"/>+Shift+z</td>
+            </tr>
+        </tbody>
+    </table>
+</div>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/login.jsp b/trunk/wise-webapp/src/main/webapp/jsp/login.jsp
new file mode 100644
index 00000000..03fb4f69
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -0,0 +1,102 @@
+<%@ include file="/jsp/init.jsp" %>
+<script type="text/javascript">
+    window.onload = function() {
+        var simpleButtonGenerator = RUZEE.ShadedBorder.create({ corner:8,  border:1 });
+        simpleButtonGenerator.render('login');
+
+        $('submitButton').onclick = displayLoading;
+    };
+</script>
+
+<div id="loginContent">
+
+    <div id="news" class="sb">
+        <h1>What's New:</h1>
+        <ul>
+            <li>New Toolbar</li>
+            <li>Add icons to Topics</li>
+            <li>History changes for the last 10 modifications</li>
+            <li>Auto Save</li>
+        </ul>
+        <h1>Upcoming Features:</h1>
+            <li>Add notes to Topics</li>
+        <ul>
+        </ul>
+    </div>
+    <div id="login" class="sb">
+        <h1>
+            <spring:message code="SIGN_IN"/>
+        </h1>
+
+        <form action="<c:url value='j_acegi_security_check'/>" method="POST">
+            <table>
+                <tbody>
+                    <tr>
+                        <c:if test="${not empty param.login_error}">
+                        <td>
+                            &nbsp;
+                        </td>
+                        <td class="errorMsg">
+                            <c:choose>
+                                <c:when test="${param.login_error == 3}">
+                                    <spring:message code="USER_INACTIVE"/>
+                                </c:when>
+                                <c:otherwise>
+                                    <spring:message code="LOGIN_ERROR"/>
+                                </c:otherwise>
+                            </c:choose>
+                        </td>
+                    </tr>
+                    </c:if>
+                    <tr>
+                        <td class="formLabel">
+                            <spring:message code="EMAIL"/>
+                            :
+                        </td>
+                        <td>
+                            <input type='text' tabindex="1" id="email" name='j_username'/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="formLabel">
+                            <spring:message code="PASSWORD"/>
+                            :
+                        </td>
+                        <td>
+                            <input type='password' tabindex="2" id="password" name='j_password'/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="formLabel">
+                            <input type="checkbox" id="rememberme" name="_acegi_security_remember_me"/>
+                        </td>
+                        <td>
+                            <spring:message code="REMEMBER_ME"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>&nbsp;</td>
+                        <td>
+                            <input type="submit" class="btn-primary" id="submitButton"
+                                   value="<spring:message code="SIGN_IN"/>">
+
+                            <div style="text-align:right;"><a href="<c:url value="forgotPassword.htm"/>">
+                                <spring:message code="FORGOT_PASSWORD"/>
+                            </a></div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </form>
+    </div>
+</div>
+
+<div id="register">
+    <b>
+        <spring:message code="NOT_READY_A_USER"/>
+    </b>
+    <spring:message code="NOT_READY_A_USER_MESSAGE"/>
+    <a href="userRegistration.htm">
+        <spring:message code="JOIN_NOW"/>
+    </a>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp
new file mode 100644
index 00000000..c38d961b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp
@@ -0,0 +1,130 @@
+<%@ include file="/jsp/init.jsp" %>
+<c:url value="mymaps.htm" var="shareMap">
+    <c:param name="action" value="removeCollaborator"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+<c:url value="sharing.htm" var="removeCollaborator">
+    <c:param name="actionId" value="removeCollaborator"/>
+    <c:param name="mapId" value="${mindmap.id}"/>
+</c:url>
+<h1>
+    <spring:message code="COLLABORATION"/>:<spring:message code="SHARING"/>  
+    '${mindmap.title}'</h1>
+
+<div id="addCollaboratorPanel">
+    <form method="post" name="sharingForm"
+          action="${pageContext.request.contextPath}/c/sharing.htm?mapId=${mindmap.id}">
+
+        <div id="userEmails">
+            <h2>
+                <spring:message code="INVITE_USERS"/>
+            </h2>
+            <input type="button" id="collaboratorButton" value="<spring:message code="AS_COLLABORATOR"/>"
+                   onclick="toogleUserType(this.value)"
+                   style="border: 1px solid #39C;padding: 5px;margin:5px;background-color: #838383;color: white;font-weight: bold;"/>
+            <input type="button" id="viewerButton" value="<spring:message code="AS_VIEWER"/>"
+                   onclick="toogleUserType(this.value)"
+                   style="border: 1px solid black;padding: 5px;margin:5px;background-color: #838383;color: white;font-weight: bold;"/>
+
+            <br/>
+            <textarea name="userEmails" id="emailList" rows="7"></textarea>
+            <h5>
+                <spring:message code="COMMA_SEPARATED_EMAILS"/>
+            </h5>
+            <a href="#" onclick="return toogleInvitation()">
+                <spring:message code="CUSTOMIZE_INVITATION"/>
+            </a><br/>
+
+            <div id="invitation" style="display:none;">
+                <h2>
+                    <spring:message code="INVITATION"/>
+                </h2>
+                <span><spring:message code="SUBJECT"/>: </span><input name="subject" type="text"
+                                                                      value="${principal.firstname} <spring:message code="SUBJECT_MESSAGE"/>" style="width:80%;">
+                <br>
+                <span><spring:message code="MESSAGE"/>:</span>
+
+                <div>
+                    <textarea name="message" rows="5" style="width:100%;"><spring:message code="INVITATION_MSG"/>
+                    </textarea>
+                </div>
+            </div>
+
+            <br/>
+            <input id="invitationButton" type="submit" value="Invite Collaborators" class="btn-primary">
+            <input type="button" value="<spring:message code="CANCEL"/>" onclick="MOOdalBox.close();"
+                   class="btn-primary"/>
+        </div>
+
+        <div id="currentUsers">
+            <h2>
+                <spring:message code="CURRENT_COLLABORATORS"/> (${mindmap.countColaborators})
+            </h2>
+            <table>
+                <colgroup><col width="95%"/></colgroup>
+            <c:forEach items="${mindmap.collaborators}" var="mindmapCollaborator">
+                <tr>
+                    <td>
+                        ${mindmapCollaborator.username}
+                    </td>
+                    <td>
+                        <a href="${removeCollaborator}&colaboratorId=${mindmapCollaborator.id}"><img src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
+                    </td>
+                </tr>
+            </c:forEach>
+            </table>
+
+            <h2>
+                <spring:message code="CURRENT_VIEWERS"/> (${mindmap.countViewers})
+            </h2>
+            <table>
+                <colgroup><col width="95%"/></colgroup>
+            <c:forEach items="${mindmap.viewers}" var="mindmapViewer">
+                <tr>
+                    <td>
+                        ${mindmapViewer.username}
+                    </td>
+                    <td>
+                        <a href="${removeCollaborator}&colaboratorId=${mindmapViewer.id}"><img src="../images/close12_1.gif" alt="<spring:message code="DELETE"/>" border="0"/></a>
+                    </td>
+                </tr>
+            </c:forEach>
+            </table>
+        </div>
+        <input type="hidden" name="actionId" value="addCollaborator"/>
+        <input type="hidden" name="colaboratorId" value=""/>
+    </form>
+</div>
+</div>
+
+<script type="text/javascript">
+    function toogleUserType(buttonValue) {
+        var collaboratorButton = $("collaboratorButton");
+        var viewerButton = $("viewerButton");
+        var newDisplay = "Invite Collaborators";
+        if (buttonValue == '<spring:message code="AS_VIEWER"/>') {
+            newDisplay = "Invite Viewers";
+            viewerButton.setStyle('border', '1px solid #39C');
+            collaboratorButton.setStyle('border', '1px solid black');
+            document.sharingForm.actionId.value = "addViewer";
+        } else {
+            viewerButton.setStyle('border', '1px solid black');
+            collaboratorButton.setStyle('border', '1px solid #39C');
+            document.sharingForm.actionId.value = "addCollaborator";
+        }
+
+        var invitationButton = document.getElementById("invitationButton");
+        invitationButton.value = newDisplay;
+    }
+
+    function toogleInvitation() {
+        var invitationContainer = $("invitation");
+        var newDisplay = "none";
+        if (invitationContainer.style.display == 'none') {
+            newDisplay = "";
+        }
+        invitationContainer.style.display = newDisplay;
+        return false;
+    }
+
+</script>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp
new file mode 100644
index 00000000..41ae0742
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp
@@ -0,0 +1,29 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<h1>Mindmap Cooker</h1>
+
+<div>
+    <form action='<c:url value="/c/cooker.htm"/>' method="post">
+        <input type="hidden" name="action" value="save"/>
+        <input type="hidden" name="mapId" value="${mindmap.id}"/>
+        <table>
+            <tbody>
+                <tr>
+                    <td class="formLabel">
+                        Native XML:
+                    </td>
+                    <td>
+                        <textarea name="nativeXml" id="xml" rows="20" cols="70">${mindmap.nativeXml}</textarea>
+                    </td>
+                </tr>
+                <tr>
+                    <td>&nbsp;</td>
+                    <td>
+                        <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary"/>
+                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"/>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp
new file mode 100644
index 00000000..63dbecaf
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp
@@ -0,0 +1,205 @@
+<%@ include file="/jsp/init.jsp" %>
+<%--@elvariable id="wisemapDetail" type="com.wisemapping.view.MindMapBean"--%>
+
+<script type="text/javascript">
+    window.onload = function() {
+        var boxGenerator = RUZEE.ShadedBorder.create({ corner:16,  border:1 });
+        boxGenerator.render('detailContent');
+        boxGenerator.render('detail');
+    };
+
+    MOOdalBox.reloadRequered = true;
+
+</script>
+
+<c:url value="mymaps.htm" var="shareMap">
+    <c:param name="action" value="collaborator"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+
+<div id="detailContent" class="sb">
+<div id="detailTitle">
+    <c:out value="${wisemapDetail.title}"/>
+    <c:choose>
+        <c:when test="${not wisemapDetail.public}">
+            <img src="../images/key.png" title="<spring:message code="PRIVATE"/>"/>
+            <span>(<spring:message code="PRIVATE"/>)</span>
+        </c:when>
+        <c:otherwise>
+            <img src="../images/world2.png " title="<spring:message code="PUBLIC"/>"/>
+            <span>(<spring:message code="PUBLIC"/>)</span>
+        </c:otherwise>
+    </c:choose>
+</div>
+
+<div id="detail" class="sb">
+<spring:message code="DETAIL_INFORMATION"/>
+<table>
+<tr class="evenRow">
+    <td class="formLabel">
+        <spring:message code="CREATOR"/>
+        :
+    </td>
+    <td>${wisemapDetail.creationUser}</td>
+</tr>
+<tr class="oddRow">
+    <td class="formLabel">
+        <a href="renameMap.htm?mapId=${wisemapDetail.id}"
+           rel="moodalbox 400px 200px wizard"
+           title="<spring:message code="RENAME_DETAILS"/>">
+            <spring:message code="DESCRIPTION"/>
+            :
+        </a>
+    </td>
+    <td>${wisemapDetail.description}</td>
+</tr>
+<tr class="evenRow">
+    <td class="formLabel">
+        <spring:message code="CREATION_TIME"/>
+        :
+    </td>
+    <td>${wisemapDetail.creationTime}</td>
+</tr>
+<tr class="oddRow">
+    <td class="formLabel">
+        <c:choose>
+            <c:when test="${wisemapDetail.owner==requestScope.user}">
+                <a href="<c:out value="${shareMap}"/>&mapId=${wisemapDetail.id}" rel="moodalbox 780px 530px wizard"
+                   title="<spring:message code="SHARE_DETAILS"/>">
+                    <spring:message code="COLLABORATORS"/>
+                </a>
+            </c:when>
+            <c:otherwise>
+                <spring:message code="COLLABORATORS"/>
+            </c:otherwise>
+        </c:choose>:<br/>
+    </td>
+
+    <td>
+        <div id="divCollaboratorsList">
+            <table>
+                <tr>
+                    <td>
+                        <b>
+                            <spring:message code="EDITORS"/>
+                        </b>
+                        (
+                        <c:out value="${wisemapDetail.countColaborators}"/>
+                        )
+                        <br/>
+                        <c:forEach items="${wisemapDetail.collaborators}" var="mindmapCollaborator">
+                            ${mindmapCollaborator.username}
+                            <br/>
+                        </c:forEach>
+                    </td>
+                    <td>
+                        <b>
+                            <spring:message code="VIEWERS"/>
+                        </b>
+                        (
+                        <c:out value="${wisemapDetail.countViewers}"/>
+                        )
+                        <br/>
+                        <c:forEach items="${wisemapDetail.viewers}" var="mindmapViewer">
+                            ${mindmapViewer.username}
+                            <br/>
+                        </c:forEach>
+                    </td>
+                </tr>
+            </table>
+        </div>
+    </td>
+</tr>
+<tr class="evenRow">
+    <td class="formLabel">
+        <a href="tags.htm?mapId=${wisemapDetail.id}"
+           rel="moodalbox 400px 200px wizard"
+           title="<spring:message code="TAGS_DETAILS"/>">
+            <spring:message code="TAGS"/>
+        </a>
+        :
+    </td>
+    <td>
+        <c:out value="${wisemapDetail.tags}"/>
+    </td>
+</tr>
+<tr class="oddRow">
+    <td class="formLabel">
+        <c:choose>
+            <c:when test="${wisemapDetail.owner==requestScope.user}">
+                <a href="publish.htm?mapId=${wisemapDetail.id}" rel="moodalbox 600px 400px wizard"
+                   title="<spring:message code="PUBLISH_MSG"/>">
+                    <spring:message code="PUBLISH"/>
+                </a>
+            </c:when>
+            <c:otherwise>
+                <spring:message code="PUBLISH"/>
+            </c:otherwise>
+        </c:choose>
+        :
+        <div id="divSendLink"/>
+    </td>
+    <td>
+        <c:choose>
+            <c:when test="${wisemapDetail.public}">
+                <spring:message code="ALL_VIEW_PUBLIC"/>
+                <br/>
+
+                <table class="oddRow">
+                    <colgroup>
+                        <col width="10%"/>
+                        <col width="90%"/>
+                    </colgroup>
+                    <tbody>
+                        <tr>
+                            <td class="formLabel">
+                                <spring:message code="URL"/>
+                                :
+                            </td>
+                            <td>
+                                <input name="url"
+                                       value="http://www.wisemapping.com/c/publicView.htm?mapId=${wisemapDetail.id}"
+                                       style="width:400px" readonly="readonly"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="formLabel">
+                                <spring:message code="DIRECT_LINK"/>
+                                :
+                            </td>
+                            <td>
+                                <textarea style="width:400px;height:30px;overflow:hidden;" cols="55" rows="3"
+                                          readonly="readonly">
+                                    &lt;a
+                                    href="http://www.wisemapping.com/c/publicView.htm?mapId=${wisemapDetail.id}">${wisemapDetail.title}&lt;/a></textarea>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="formLabel" style="white-space:normal;">
+                                <spring:message code="BLOG_INCLUSION"/>
+                                :
+                            </td>
+                            <td>
+                                <textarea style="width:400px;height:70px;overflow:hidden;" cols="55" rows="5"
+                                          readonly="readonly">
+                                    &lt;iframe
+                                    style="border:0;width:600px;height:400px;border: 1px solid black"
+                                    src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${wisemapDetail.id}&zoom=1"&gt;
+                                    &lt;/iframe&gt;
+                                </textarea>
+
+                                <p><spring:message code="EMBEDDED_MAP_SIZE"/></p>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </c:when>
+            <c:otherwise>
+                <spring:message code="ONLY_VIEW_PRIVATE"/>
+            </c:otherwise>
+        </c:choose>
+    </td>
+</tr>
+</table>
+</div>
+</div>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
new file mode 100644
index 00000000..36c47664
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -0,0 +1,335 @@
+<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
+<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
+<%--@elvariable id="user" type="com.wisemapping.model.User"--%>
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/jsp/init.jsp" %>
+<c:url value="mymaps.htm" var="shareMap">
+    <c:param name="action" value="collaborator"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+<html>
+<head>
+    <title>
+        <spring:message code="SITE.TITLE"/>
+        - ${mindmap.title} </title>
+    <meta http-equiv="Content-type" value="text/html; charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="../css/editor.css">
+    <link rel="stylesheet" type="text/css" href="../css/bubble.css">
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/thirdparty.css">
+
+    <script type='text/javascript' src='../js/wiseLibrary.js'></script>
+    <script type='text/javascript' src='../js/core.js'></script>
+
+    <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
+</head>
+<body>
+<jsp:include page="editorHeader.jsp">
+    <jsp:param name="onlyActionHeader" value="true"/>
+</jsp:include>
+
+<form method="post" id="printForm" name="printForm" action='<c:url value="export.htm"/>' style="height:100%;"
+      target="${mindmap.title}">
+    <input type="hidden" name="action" value="print"/>
+    <input type="hidden" name="mapId" value="${mindmap.id}"/>
+</form>
+
+<div id="waitDialog" style="display:none">
+    <div id="loadingContainer">
+        <div class="loadingIcon"></div>
+        <div class="loadingText">
+            <spring:message code="EDITOR.LOADING"/>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    //Dialog box display ...
+    var loadingDialog = new core.WaitDialog('waitDialog');
+    addLightboxMarkup();
+    loadingDialog.activate(true);
+    var mapId = '${mindmap.id}';
+    var mapXml = '${mapXml}';
+    var editorProperties = ${mindmap.properties};
+    var isTryMode = ${editorTryMode};
+
+    function printMap() {
+        document.printForm.submit();
+    }
+</script>
+
+<div id="colorPalette">
+    <div id="paletteHeader"></div>
+</div>
+
+<div id="fontFamilyPanel" class="toolbarPanel">
+    <div id="times" class="toolbarPanelLink" style="font-family:times;">Times</div>
+    <div id="arial" class="toolbarPanelLink" style="font-family:arial;">Arial</div>
+    <div id="tahoma" class="toolbarPanelLink" style="font-family:tahoma;">Tahoma</div>
+    <div id="verdana" class="toolbarPanelLink" style="font-family:verdana;">Verdana</div>
+</div>
+
+<div id="fontSizePanel" class="toolbarPanel">
+    <div id="small" class="toolbarPanelLink" style="font-size:8px">Small</div>
+    <div id="normal" class="toolbarPanelLink" style="font-size:12px">Normal</div>
+    <div id="large" class="toolbarPanelLink" style="font-size:15px">Large</div>
+    <div id="huge" class="toolbarPanelLink" style="font-size:24px">Huge</div>
+</div>
+
+<div id="topicShapePanel" class="toolbarPanel">
+    <!--<div id="automatic" class="toolbarPanelLink">Automatic</div>-->
+    <div id="rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle.png" alt="Rectangle" width="40px"
+                                                     height="25px"></div>
+    <div id="rounded rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle-rounded.png"
+                                                             alt="Rounded Rectangle" width="40px" height="25px"></div>
+    <div id="line" class="toolbarPanelLink"><img src="../images/shape-line.png" alt="Line" width="40px" height="7px">
+    </div>
+    <div id="elipse" class="toolbarPanelLink"><img src="../images/shape-elipse.png" alt="Elipse" width="40px"
+                                                   height="25px"></div>
+</div>
+
+<div id="actionsContainer">
+</div>
+<div>
+    <c:url value="mymaps.htm" var="shareMap">
+        <c:param name="action" value="collaborator"/>
+        <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+    </c:url>
+</div>
+
+<div id="toolbar">
+<div id="editTab" class="tabContent">
+<div id="file" class="buttonContainer" title="<spring:message code="FILE"/>">
+    <fieldset>
+        <legend>
+            <spring:message code="FILE"/>
+        </legend>
+        <div id="saveButton" class="button" title="<spring:message code="SAVE"/>">
+            <div class="toolbarLabel"><p><spring:message code="SAVE"/></p></div>
+        </div>
+        <div id="discardButton" class="button" title="<spring:message code="CLOSE"/>">
+            <div class="toolbarLabel"><p><spring:message code="CLOSE"/></p></div>
+        </div>
+        <div id="undoEdition" class="button" title="<spring:message code="UNDO_EDITION"/>">
+            <div class="toolbarLabel"><p><spring:message code="UNDO"/></p></div>
+        </div>
+        <div id="redoEdition" class="button" title="<spring:message code="REDO_EDITION"/>">
+            <div class="toolbarLabel"><p><spring:message code="REDO"/></p></div>
+        </div>
+        <a id="printAnchor" href="javascript:printMap();" title="<spring:message code="PRINT"/>">
+            <div id="print" class="button" title="<spring:message code="PRINT"/>">
+                <div class="toolbarLabel"><p><spring:message code="PRINT"/></p></div>
+            </div>
+        </a>
+        <a id="exportAnchor" href="export.htm?mapId=${mindmap.id}" rel="moodalbox 600px 400px"
+           title="<spring:message code="EXPORT_DETAILS"/>">
+            <div id="export" class="button" title="<spring:message code="EXPORT"/>">
+                <div class="toolbarLabel"><p><spring:message code="EXPORT"/></p></div>
+            </div>
+        </a>
+    </fieldset>
+</div>
+<div id="zoom" class="buttonContainer" title="Zoom In">
+    <fieldset>
+        <legend>
+            <spring:message code="ZOOM"/>
+        </legend>
+        <div id="zoomIn" class="button" title="<spring:message code="ZOOM_IN"/>">
+            <div class="toolbarLabel"><p><spring:message code="IN"/></p></div>
+        </div>
+        <div id="zoomOut" class="button" title="<spring:message code="ZOOM_OUT"/>">
+            <div class="toolbarLabel"><p><spring:message code="OUT"/></p></div>
+        </div>
+    </fieldset>
+</div>
+<div id="node" class="buttonContainer" title="Node Properties">
+    <fieldset>
+        <legend>
+            <spring:message code="TOPIC"/>
+        </legend>
+        <div id="topicShape" class="button comboButton" title="<spring:message code="TOPIC_SHAPE"/>">
+            <div class="toolbarLabel"><p><spring:message code="SHAPE"/></p></div>
+        </div>
+        <div id="addTopic" class="button" title="<spring:message code="TOPIC_ADD"/>">
+            <div class="toolbarLabel"><p><spring:message code="ADD"/></p></div>
+        </div>
+        <div id="deleteTopic" class="button" title="<spring:message code="TOPIC_DELETE"/>">
+            <div class="toolbarLabel"><p><spring:message code="DELETE"/></p></div>
+        </div>
+        <div id="topicBorder" class="button comboButton" title="<spring:message code="TOPIC_BORDER_COLOR"/>">
+            <div class="toolbarLabel"><p><spring:message code="BORDER"/></p></div>
+        </div>
+        <div id="topicColor" class="button comboButton" title="<spring:message code="TOPIC_BACKGROUND_COLOR"/>">
+            <div class="toolbarLabel"><p><spring:message code="COLOR"/></p></div>
+        </div>
+        <div id="topicIcon" class="button comboButton" title="<spring:message code="TOPIC_ICON"/>">
+            <div class="toolbarLabel"><p><spring:message code="ICON"/></p></div>
+        </div>
+        <div id="topicNote" class="button comboButton" title="<spring:message code="TOPIC_NOTE"/>">
+            <div class="toolbarLabel"><p><spring:message code="NOTE"/></p></div>
+        </div>
+        <div id="topicLink" class="button" title="<spring:message code="TOPIC_LINK"/>">
+            <div class="toolbarLabel"><p><spring:message code="LINK"/></p></div>
+        </div>
+    </fieldset>
+</div>
+<div id="font" class="buttonContainer" title="Font Properties">
+    <fieldset>
+        <legend>
+            <spring:message code="FONT"/>
+        </legend>
+        <div id="fontFamily" class="button comboButton" title="<spring:message code="FONT_TYPE"/>">
+            <div class="toolbarLabel"><p><spring:message code="TYPE"/></p></div>
+        </div>
+        <div id="fontSize" class="button comboButton" title="<spring:message code="FONT_SIZE"/>">
+            <div class="toolbarLabel"><p><spring:message code="SIZE"/></p></div>
+        </div>
+        <div id="fontBold" class="button" title="<spring:message code="FONT_BOLD"/>">
+            <div class="toolbarLabel"><p><spring:message code="BOLD"/></p></div>
+        </div>
+        <div id="fontItalic" class="button" title="<spring:message code="FONT_ITALIC"/>">
+            <div class="toolbarLabel"><p><spring:message code="ITALIC"/></p></div>
+        </div>
+        <div id="fontColor" class="button comboButton" title="<spring:message code="FONT_COLOR"/>">
+            <div class="toolbarLabel"><p><spring:message code="COLOR"/></p></div>
+        </div>
+    </fieldset>
+</div>
+<div id="share" class="buttonContainer" title="Share Properties">
+    <c:choose>
+        <c:when test="${editorTryMode==false}">
+            <fieldset>
+                <legend>
+                    <spring:message code="COLLABORATION"/>
+                </legend>
+                <a id="tagAnchor" href="tags.htm?mapId=${mindmap.id}" rel="moodalbox 400px 200px wizard"
+                   title="<spring:message code="TAGS_DETAILS"/>">
+                    <div id="tagIt" class="button" title="<spring:message code="TAG"/>">
+                        <div class="toolbarLabel"><p><spring:message code="TAG"/></p></div>
+                    </div>
+                </a>
+                <c:choose>
+                    <c:when test="${mindmap.owner==user}">
+                        <a id="shareAnchor" href="<c:out value="${shareMap}"/>&mapId=${mindmap.id}"
+                           rel="moodalbox 780px 530px wizard" title="<spring:message code="SHARE_DETAILS"/>">
+                            <div id="shareIt" class="button" title="<spring:message code="COLLABORATION"/>">
+                                <div class="toolbarLabel"><p><spring:message code="SHARE"/></p></div>
+                            </div>
+                        </a>
+                        <a id="publishAnchor" href="publish.htm?mapId=${mindmap.id}" rel="moodalbox 600px 400px wizard"
+                           title="<spring:message code="PUBLISH_MSG"/>">
+                            <div id="publishIt" class="button" title="<spring:message code="PUBLISH"/>">
+                                <div class="toolbarLabel"><p><spring:message code="PUBLISH"/></p></div>
+                            </div>
+                        </a>
+                    </c:when>
+                </c:choose>
+                <a id="historyAnchor" href="history.htm?action=list&mapId=${mindmap.id}"
+                   rel="moodalbox 600px 400px wizard" title="<spring:message code="HISTORY_MSG"/>">
+                    <div id="history" class="button" title="<spring:message code="HISTORY_MSG"/>">
+                        <div class="toolbarLabel"><p><spring:message code="HISTORY"/></p></div>
+                    </div>
+                </a>
+            </fieldset>
+        </c:when>
+        <c:otherwise>
+            <fieldset>
+                <legend>
+                    <spring:message code="COLLABORATION"/>
+                </legend>
+                <div id="tagIt" class="button" title="<spring:message code="TAG"/>">
+                    <div class="toolbarLabel"><p><spring:message code="TAG"/></p></div>
+                </div>
+                <div id="shareIt" class="button" title="<spring:message code="COLLABORATE"/>">
+                    <div class="toolbarLabel"><p><spring:message code="SHARE"/></p></div>
+                </div>
+                <div id="publishIt" class="button" title="<spring:message code="PUBLISH"/>">
+                    <div class="toolbarLabel"><p><spring:message code="PUBLISH"/></p></div>
+                </div>
+                <div id="history" class="button" title="<spring:message code="HISTORY_MSG"/>">
+                    <div class="toolbarLabel"><p><spring:message code="HISTORY"/></p></div>
+                </div>
+            </fieldset>
+        </c:otherwise>
+    </c:choose>
+</div>
+</div>
+</div>
+
+<div id="mindplot"></div>
+
+<div id="footerEditor">
+    <div style="position:absolute; top:0px; width:100%">
+        <a href="${pageContext.request.contextPath}/c/home.htm">
+            <div id="logo"></div>
+        </a>
+
+        <div id='msgLoggerContainer' class="msgLoggerContainer">
+            <div id="msgStart"></div>
+            <div id='msgLogger'></div>
+            <div id="msgEnd"></div>
+        </div>
+    </div>
+    <%if (userAgent != null && !(userAgent.getOs() == UserAgent.OS.MAC && userAgent.getProduct() == UserAgent.Product.FIREFOX && userAgent.getVersionMajor() < 3)) { %>
+    <div id="helpButton"
+         style="text-align:center; width:90px; height:20px; background-color:#f5f5f5; border: 1px solid #BBB6D6; cursor:pointer; padding-left:5px; margin-left:3px;">
+        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:15px;"><img
+                src="../images/help.png"/></div>
+        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:4px;">Help</div>
+    </div>
+    <% } else {%>
+    <div id="helpButtonFirstSteps"
+         style="text-align:center; width:90px; height:20px; background-color:#f5f5f5; border: 1px solid #BBB6D6; cursor:pointer; padding-left:5px; margin-left:3px;float:left;">
+        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:5px;"><img
+                src="../images/help.png"/></div>
+        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:4px;">First Steps</div>
+    </div>
+    <div id="helpButtonKeyboard"
+         style="text-align:center; width:100px; height:20px; background-color:#f5f5f5; border: 1px solid #BBB6D6; cursor:pointer; padding-left:5px; margin-left:3px;float:left;">
+        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:5px;"><img
+                src="../images/help.png"/></div>
+        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:4px;">Shortcuts</div>
+    </div>
+    <% } %>
+</div>
+<c:if test="${editorTryMode==true}">
+    <div id="tryEditorWarning" class="sb">
+        <div class="close" id="tryClose"
+             style="position:absolute;">
+        </div>
+        <div>
+            <h1>Warning</h1>
+            This is a demo editor. That's why you won't be able to save your changes.
+            If you want to start creating your maps, <a href="userRegistration.htm">
+            <spring:message code="JOIN_NOW"/></a>. Registration is free and takes just a moment.
+        </div>
+    </div>
+    <script type="text/javascript">
+        // Register close event ...
+        //$('tryEditorWarning').makeRounded({radius: 8,borderColor: '#69686F',backgroundColor: '#69686F'});
+
+        var tryElem = $('tryEditorWarning');
+        tryElem.addClass('drag').makeDraggable();
+        $('tryClose').addEvent('click', function(event) {
+            tryElem.setStyle('visibility', 'hidden');
+        });
+
+    </script>
+</c:if>
+<div id="ffoxworkarround" style="display:none;"><input id="ffoxWorkarroundInput" type="text"></div>
+<script type="text/javascript" src="../dwr/engine.js"></script>
+<c:if test="${editorTryMode==false}">
+    <script type="text/javascript" src="../dwr/interface/MapEditorService.js"></script>
+</c:if>
+<script type="text/javascript" src="../dwr/interface/LoggerService.js"></script>
+<script type="text/javascript" src="../js/editor.js"></script>
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+    _uacct = "UA-2347723-1";
+    urchinTracker();
+</script>
+</body>
+</html>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
new file mode 100644
index 00000000..75fb5dd6
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
@@ -0,0 +1,91 @@
+<%@ include file="/jsp/init.jsp" %>
+<h1>
+    <spring:message code="EXPORT"/>
+    '${mindmap.title}'</h1>
+
+<div>
+    <form method="post" id="exportForm" name="exportForm" action="<c:url value="export.htm"/>" style="height:100%;">
+        <input type="hidden" name="action" value="export"/>
+        <input type="hidden" name="mapId" value="${mindmap.id}"/>
+        <table>
+            <tbody>
+                <tr>
+                    <td>
+                        <input type="radio" id="svg" name="exportFormat" value="SVG"/>
+                        <b>
+                            <spring:message code="SVG_EXPORT_FORMAT"/>
+                        </b>
+
+                        <p>
+                            <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="radio" name="exportFormat" value="PDF" id="pdf"/>
+                        <b>
+                            <spring:message code="PDF_EXPORT_FORMAT"/>
+                        </b>
+
+                        <p>
+                            <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </td>
+                </tr>
+                 <tr>
+                    <td>
+                        <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
+                        <b>
+                            <spring:message code="FREEMIND_EXPORT_FORMAT"/>
+                        </b>
+
+                        <p>
+                            <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT"/>
+                        <b>
+                            <spring:message code="IMG_EXPORT_FORMAT"/>
+                        </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
+                        <option>PNG</option>
+                        <option>JPEG</option>
+                    </select>
+
+                        <p>
+                            <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align:center;margin-top:10px;">
+                        <input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
+                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                               onclick="MOOdalBox.close();">
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+<script type="text/javascript">
+    $('img').addEvent('click', function(event) {
+        $('imgFormat').setStyle('visibility', 'visible');
+    });
+    $('pdf').addEvent('click', function(event) {
+        $('imgFormat').setStyle('visibility', 'hidden');
+    });
+    $('svg').addEvent('click', function(event) {
+        $('imgFormat').setStyle('visibility', 'hidden');
+    });
+
+    $('ok').addEvent('click', function(event) {
+        $('exportForm').submit();
+        MOOdalBox.close();
+
+    });
+
+</script>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp
new file mode 100755
index 00000000..84b5a493
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp
@@ -0,0 +1,74 @@
+<%@ page import="java.util.List" %>
+<%@ page import="com.wisemapping.view.HistoryBean" %>
+<%@ include file="/jsp/init.jsp" %>
+<script type="text/javascript">
+    function revertHistory(mapId, historyId)
+    {
+        document.revertForm.mapId.value = mapId;
+        document.revertForm.historyId.value = historyId;
+        document.revertForm.submit();
+        return false;
+    }
+</script>
+<table style="border:1px gray dashed;width:100%;margin-top:10px;">
+    <thead>
+        <tr style="border:1px gray dashed;color:white;background:black;">
+            <td>
+                <spring:message code="MODIFIED"/>
+            </td>
+            <td>
+                <spring:message code="BY"/>
+            </td>
+            <td>
+                &nbsp;
+            </td>
+        </tr>
+    </thead>
+    <tbody>
+        <%
+            final List<HistoryBean> list = (List<HistoryBean>) request.getAttribute("historyBeanList");
+            if (list != null && !list.isEmpty()) {
+        %>
+        <%
+            for (HistoryBean history : list) {
+
+        %>
+
+        <tr>
+            <td>
+                <%=history.getCreation(request.getLocale())%>
+            </td>
+            <td>
+                <%=history.getAuthor()%>
+            </td>
+            <td>
+                <a onclick="return revertHistory('<%=history.getMindMapId()%>',<%=history.getHistoryId()%>)" href=""><spring:message code="REVERT"/></a>
+            </td>
+        </tr>
+        <%
+            }
+        } else {
+        %>
+
+        <td colspan="3">
+            <spring:message code="NO_HISTORY_RESULTS"/>
+        </td>
+        <%
+            }
+        %>
+    </tbody>
+</table>
+<form name="revertForm" action="<c:url value="history.htm"/>">
+    <input type="hidden" name="action" value="revert"/>
+    <%        
+        if (request.getAttribute("goToMindmapList") != null)
+        {
+    %>
+        <input type="hidden" name="goToMindmapList"/>
+    <%
+        }
+    %>
+    <input type="hidden" name="mapId"/>
+    <input type="hidden" name="historyId"/>
+</form>
+
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
new file mode 100644
index 00000000..01068199
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
@@ -0,0 +1,55 @@
+<%@ include file="/jsp/init.jsp" %>
+<div>
+    <form:form method="post" commandName="importMap" enctype="multipart/form-data">
+        <table>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="NAME"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="title" id="title" tabindex="1"/>
+                    <form:errors path="title" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel">
+                    <spring:message code="DESCRIPTION"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="description" id="description" tabindex="2"/>
+                    <form:errors path="description" cssClass="errorMsg"/>
+                </td>
+            </tr>
+             <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="FREE_MIND_FILE"/>
+                    :
+                </td>
+                <td>
+                    <input type="file" name="mapFile"/>
+                   <form:errors path="mapFile" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
+                       <c:choose>
+                    <c:when test="${!errorView}">
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                           onclick="MOOdalBox.close();">
+                    </c:when>
+                     <c:otherwise>
+                    <input type="button" value="<spring:message code="BACK"/>" class="btn-primary"
+                           onclick="window.location='mymaps.htm'">
+                    </c:otherwise>
+                    </c:choose>
+                </td>
+            </tr>
+        </table>
+    </form:form>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapImportError.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapImportError.jsp
new file mode 100644
index 00000000..974d35ed
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapImportError.jsp
@@ -0,0 +1,10 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<h1>
+    <spring:message code="${requestScope.title}"/>
+</h1>
+
+<p style="font-weight:bold;">
+    <spring:message code="${requestScope.details}"/>
+</p>
+<jsp:include page="/jsp/mindmapImport.jsp"/>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
new file mode 100644
index 00000000..996ef695
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -0,0 +1,498 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ page import="com.wisemapping.view.MindMapBean" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Collections" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ include file="/jsp/init.jsp" %>
+<html>
+<head>
+    <title>
+        <spring:message code="SITE.TITLE"/>
+    </title>
+    <meta http-equiv="Content-type" value="text/html; charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="../css/mymaps.css">
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/commonLibs.css">
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/thirdparty.css">
+    <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon">
+    <script type="text/javascript" src="${pageContext.request.contextPath}/js/wiseLibrary.js"></script>
+
+    <script type="text/javascript">
+        window.onload = function() {
+            var boxGenerator = RUZEE.ShadedBorder.create({ corner:16,  border:1 });
+            boxGenerator.render('recentFiles');
+            boxGenerator.render('recentItems');
+            $('mydocs').makeRounded({radius: 16,borderColor: '#a7c6df',backgroundColor: '#c3def5'});
+        };
+    </script>
+</head>
+<body>
+<div class="content">
+<jsp:include page="header.jsp">
+    <jsp:param name="removeSignin" value="false"/>
+    <jsp:param name="showLogout" value="true"/>
+</jsp:include>
+
+
+<c:url value="mymaps.htm" var="mapDetail">
+    <c:param name="action" value="detail"/>
+</c:url>
+<c:url value="mymaps.htm" var="deleteSelectedMapUrl">
+    <c:param name="action" value="deleteAll"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+
+<div id="mapListContainer">
+
+<div id="myDocsContainer">
+
+<div id="recentFiles" class="sb">
+    <div id="recentText">
+        <spring:message code="RECENT_FILES"/>
+    </div>
+    <div id="recentItems" class="sb">
+        <div class="recentItemContainer">
+            <%
+                int MAX_RECENT_MAPS = 6;
+                List<MindMapBean> list = (List<MindMapBean>) request.getAttribute("wisemapsList");
+                if (list != null && !list.isEmpty()) {
+                    List<MindMapBean> recentMaps = new ArrayList<MindMapBean>();
+                    recentMaps.addAll(list);
+                    Collections.sort(recentMaps, new MindMapBean.MindMapBeanComparator());
+                    for (int i = recentMaps.size() - 1; i >= 0 && i >= recentMaps.size() - MAX_RECENT_MAPS; i--) {
+            %>
+
+            <div class="recentItemIcon"></div>
+            <div class="recentItemTitle">
+                <a href="javascript:openMap('<%=recentMaps.get(i).getId()%>')">
+                    <%=recentMaps.get(i).getTitle()%>
+                </a>
+            </div>
+
+            <%
+                }
+            } else {
+            %>
+            <div class="recentItemTitle">
+                <spring:message code="EMPTY_MINDMAP_TABLE"/>
+            </div>
+            <%
+                }
+            %>
+        </div>
+    </div>
+</div>
+
+<div id="mydocs">
+<div id="toolbar">
+    <input id="selectedMapIds" type="hidden" value=""/>
+
+    <div class="leftMenu">
+        <div class="button">
+            <a href="newMap.htm" rel="moodalbox 500px 190px" title="<spring:message code="NEW_MAP_MSG"/>">
+                <spring:message code="NEW_MINDMAP"/>
+            </a>
+        </div>
+        <div class="button menuLink" onclick="updateLinks($(this).getParent()); new Windoo.Confirm('<spring:message code="DELETE_SELECTED_CONFIRMATION"/>',
+                                                  {
+                                                    'window': {theme:Windoo.Themes.wise,
+                                                            title:'<spring:message code="DELETE_MAP"/>'
+                                                    },
+                                                    'onConfirm':function(){
+                                                        $(document.toolbarForm.mindmapIds).value=$('selectedMapIds').value;
+                                                        $(document.toolbarForm).action='${deleteSelectedMapUrl}';
+                                                        $(document.toolbarForm).submit();
+                                                    }
+                                                });">
+            <spring:message code="DELETE_SELECTED"/>
+        </div>
+    </div>
+    <div class="button">
+        <a href="importMap.htm" rel="moodalbox 500px 250px" title="<spring:message code="IMPORT_MINDMAP_DETAILS"/>">
+            <spring:message code="IMPORT_MINDMAP"/>
+        </a>
+    </div>
+</div>
+<c:url value="mymaps.htm" var="shareMap">
+    <c:param name="action" value="collaborator"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+<c:url value="mymaps.htm" var="deleteMapUrl">
+    <c:param name="action" value="delete"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+<c:url value="mymaps.htm" var="changeStatus">
+    <c:param name="action" value="changeStatus"/>
+    <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
+</c:url>
+<div id="docTable">
+<table>
+<colgroup>
+    <col width="3%"/>
+    <col width="3%"/>
+    <col width="15%"/>
+    <col width="30%"/>
+    <col width="14%"/>
+    <col width="10%"/>
+    <col width="20%"/>
+    <col width="5%"/>
+</colgroup>
+<thead>
+    <tr>
+        <th style="text-align:center">
+            <input id="checkAll" type="checkbox" onchange="selectAllMaps(this);">
+        </th>
+        <th>
+            <spring:message code="FILE"/>
+        </th>
+        <th>
+            <spring:message code="NAME"/>
+        </th>
+        <th>
+            <spring:message code="DESCRIPTION"/>
+        </th>
+
+        <th>
+            <spring:message code="STATUS"/>
+        </th>
+        <th>
+            <spring:message code="CREATOR"/>
+        </th>
+        <th>
+            <spring:message code="LAST_EDITOR"/>
+        </th>
+        <th>&nbsp;
+        </th>
+    </tr>
+</thead>
+<tbody>
+<c:forEach items="${wisemapsList}" var="mindmap">
+<tr>
+<td>
+    <div align="center"><input type="checkbox" name="chk" id="chk${mindmap.id}"
+                               onclick="addToSelectedMapList(this);"></div>
+</td>
+<td>
+    <div class="leftMenu">
+        <img src="../images/icon_list.png" border="0" class="button"
+             style="display:block;">
+
+        <div class="subMenu2">
+            <a href="javascript:openMap('${mindmap.id}')"
+               title="<spring:message code="OPEN_MSG"/>">
+                <spring:message code="OPEN"/>
+            </a>
+            <c:if test="${mindmap.owner==requestScope.user}">
+                <a href="renameMap.htm?mapId=${mindmap.id}"
+                   rel="moodalbox 400px 180px wizard"
+                   title="<spring:message code="RENAME_DETAILS"/>">
+                    <spring:message code="RENAME"/>
+                </a>
+            </c:if>
+            <a href="history.htm?action=list&goToMindmapList&mapId=${mindmap.id}"
+               rel="moodalbox 600px 400px wizard"
+               title="<spring:message code="HISTORY_INFO"/>">
+                <spring:message code="HISTORY"/>
+            </a>
+
+            <div class="menuButton menuLink subMenu2Sep" onclick="new Windoo.Confirm('<spring:message code="DELETE_CONFIRMATION"/>',
+                                                    {
+                                                         window: {'theme':Windoo.Themes.wise,
+                                                                     title:'<spring:message code="DELETE_MAP"/>'
+                                                   },
+                                                    'onConfirm':function(){
+                                                        var form = new Element('form').setProperties({action: '${deleteMapUrl}&mapId=${mindmap.id}', method:'post'}).injectInside(document.body);
+                                                        form.submit();
+                                                    }
+                                                });">
+                <spring:message code="DELETE"/>
+            </div>
+            <a href="tags.htm?mapId=${mindmap.id}"
+               rel="moodalbox 400px 200px wizard"
+               title="<spring:message code="TAGS_DETAILS"/>">
+                <spring:message code="TAGS"/>
+            </a>
+            <c:if test="${mindmap.owner==requestScope.user}">
+                <a href="${shareMap}&mapId=${mindmap.id}"
+                   rel="moodalbox 780px 530px wizard"
+                   title="<spring:message code="SHARE_DETAILS"/>">
+                    <spring:message code="COLLABORATION"/>
+                </a>
+                <a class="subMenu2Sep" href="publish.htm?mapId=${mindmap.id}" rel="moodalbox 600px 400px wizard"
+                   title="<spring:message code="PUBLISH_MSG"/>">
+                    <spring:message code="PUBLISH"/>
+                </a>
+            </c:if>
+            <a href="export.htm?mapId=${mindmap.id}"
+               rel="moodalbox 600px 400px" title="<spring:message code="EXPORT_DETAILS"/>">
+                <spring:message code="EXPORT"/>
+            </a>
+            <a href="javascript:printMap(${mindmap.id});">
+                <spring:message code="PRINT"/>
+            </a>
+        </div>
+    </div>
+</td>
+<td>
+    <div>
+        <div class="mapTitle">
+            <a href="javascript:openMap('${mindmap.id}')">
+                    ${mindmap.title}
+            </a>
+        </div>
+        <div class="mapTags">
+                ${mindmap.tags}
+        </div>
+    </div>
+</td>
+<td>
+        ${mindmap.description}
+</td>
+<td>
+    <c:choose>
+        <c:when test="${not mindmap.public}">
+            <img src="../images/key.png"
+                 title="<spring:message code="PRIVATE"/>: <spring:message code="ONLY_VIEW_PRIVATE"/>"
+                 alt="<spring:message code="PRIVATE"/>"/>
+        </c:when>
+        <c:otherwise>
+            <img src="../images/world2.png "
+                 title="<spring:message code="PUBLIC"/>: <spring:message code="ALL_VIEW_PUBLIC"/>"
+                 alt="title="
+            <spring:message code="PUBLIC"/>
+        </c:otherwise>
+    </c:choose>
+</td>
+<td>${mindmap.creationUser}</td>
+<td>${mindmap.lastEditDate} by ${mindmap.lastEditor}</td>
+<td><a href="${mapDetail}&mapId=${mindmap.id}">
+    <spring:message code="DETAIL"/>
+</a>
+</td>
+</tr>
+</c:forEach>
+</tbody>
+
+</table>
+</div>
+</div>
+
+<div id="ds1" class="submenu" style="display:none;">
+    <a href="${deleteSelectedMapUrl}&mindmapIds=" rel="moodalbox 300px 120px">Delete</a>
+    <a href="#">Tag</a>
+    <a href="#">Publish</a>
+</div>
+
+<div id="ds2" class="submenu" style="position:absolute; display:none;">
+    <a href="${shareMap}&mapId=" rel="moodalbox 780px 530px"
+       title="Share WiseMap">Share</a>
+    <a href="publish.htm?mapId=" rel="moodalbox 600px 400px wizard"
+       title="<spring:message code="PUBLISH_DETAILS"/>">
+        <spring:message code="PUBLISH"/>
+    </a>
+    <a href="${deleteMapUrl}&mapId=" rel="moodalbox 300px 120px"
+       title="Delete Confirmation">
+        Delete
+    </a>
+    <a href="export.htm?mapId=" rel="moodalbox 750px 400px"
+       title="<spring:message code="EXPORT_DETAILS"/>">
+        <spring:message code="EXPORT"/>
+    </a>
+
+</div>
+</div>
+</div>
+
+<c:url value="editor.htm" var="mindmapEditorUrl"/>
+<form name="openForm" action="${mindmapEditorUrl}" method="post">
+    <input type="hidden" name="action" value="open"/>
+    <input type="hidden" name="mapId" value=""/>
+</form>
+<form name="toolbarForm" method="post">
+    <input type="hidden" name="mindmapIds"/>
+</form>
+<form method="post" id="printForm" name="printForm" action="<c:url value="export.htm"/>" target="new">
+    <input type="hidden" name="action" value="print"/>
+    <input type="hidden" name="mapId" value="${mindmap.id}"/>
+</form>
+</div>
+<script type="text/javascript">
+function openMap(mapId) {
+    document.openForm.mapId.value = mapId;
+    document.openForm.submit();
+}
+function deleteOkButton(url)
+{
+    var form = document.createElement('form');
+    form.method = 'post';
+    form.action = url;
+    document.body.appendChild(form);
+    form.submit();
+}
+
+Window.onDomReady(initDropDowns);
+function initDropDowns()
+{
+    $ES('li[rel="submenu"]', $(document.body)).each(function(el) {
+        var items = $E('ul', el);
+        el.addEvent('click', showMenu.bind(items));
+    }, this);
+}
+
+function showMenu(evt)
+{
+    if ($(document).onclick)
+    {
+        $(document).fireEvent('click', 0);
+        showMenu.delay(110, this, evt);
+    }
+    else
+    {
+        this.myEffect = $(this).effects({duration:100, transition: Fx.Transitions.linear});
+        this.myEffect.start({'opacity':[0,1]});
+        $(document).onclick = hide.bind(this);
+        var event = new Event(evt);
+        event.stop();
+    }
+}
+
+function hide()
+{
+    this.myEffect.start({'opacity':[1,0]});
+    $(document).onclick = '';
+}
+
+function updateLinks(el)
+{
+    $ES('a', el).each(function(link) {
+        if (!link.ohref)
+        {
+            link.ohref = link.getProperty('ohref');
+        }
+        link.href = link.ohref + $('selectedMapIds').value;
+    });
+}
+
+function openWizard(href, title, rel)
+{
+    href = href + $('selectedMapIds').value;
+    MOOdalBox.open(href, title, rel);
+}
+
+function addToSelectedMapList(el)
+{
+    var ids = $('selectedMapIds');
+    var id = el.id.replace(/[^\d]/g, '');
+
+    var value = ids.getProperty("value");
+
+    if (value != "")
+    {
+        var allIds = $A(ids.value.split(','));
+        var changed = false;
+        if (allIds.contains(id) && !el.checked)
+        {
+            allIds.remove(id);
+            changed = true;
+        }
+        else if (!allIds.contains(id) && el.checked)
+        {
+            allIds.extend([id]);
+            changed = true;
+        }
+        if (changed)
+        {
+            var finalIds = "";
+            $each(allIds, function(el) {
+                if (!finalIds == "")
+                {
+                    el = "," + el;
+                }
+                finalIds = finalIds + el;
+            });
+            value = finalIds;
+        }
+    }
+    else
+    {
+        if (el.checked)
+        {
+            value = id;
+        }
+    }
+    ids.setProperty("value", value);
+}
+
+
+function selectAllMaps(elem)
+{
+    var value = elem.checked;
+    var ids = "";
+    $ES('input[type="checkbox"]', $('docTable')).each(function(el) {
+        if (el.name.contains('chk'))
+        {
+            el.checked = value;
+            var id = el.id.replace(/[^\d]/g, '');
+            if (!ids == "")
+            {
+                id = "," + id;
+            }
+            ids = ids + id;
+        }
+    });
+    if (!value)
+    {
+        $('selectedMapIds').setProperty('value', '');
+    }
+    else
+    {
+        $('selectedMapIds').setProperty('value', ids);
+    }
+    /*var allElems = document.getElementsByName("chk");
+    for (var i = 0; i < allElems.length; i++)
+    {
+        allElems[i].checked = value;
+    }*/
+}
+
+function printMap(mapId) {
+    document.printForm.mapId.value = mapId;
+    document.printForm.submit();
+}
+
+</script>
+<script type="text/javascript">
+
+    MOOdalBox.reloadRequered = true;
+
+    function removeCollaborator(collaboratorEmail)
+    {
+        document.removeCollaboratorForm.colaboratorId.value = collaboratorEmail;
+        document.removeCollaboratorForm.submit();
+        //submitDialog('removeCollaboratorForm');
+    }
+    function addFriendsEmails()
+    {
+        var newUsers = "";
+        var ob = $('friendList');
+        while (ob.selectedIndex != -1)
+        {
+            newUsers = newUsers + ", " + ob.options[ob.selectedIndex].value;
+            ob.options[ob.selectedIndex].selected = false;
+        }
+        var dest = $('emailList');
+        if (dest.value == "")
+            newUsers = newUsers.substr(2, newUsers.length);
+        dest.value = dest.value + newUsers;
+    }
+    function changeStatus(collaboratorEmail)
+    {
+        document.removeCollaboratorForm.userEmail.value = collaboratorEmail;
+        submitDialog('removeCollaboratorForm');
+    }
+
+</script>
+<jsp:include page="footer.jsp"/>
+</body>
+</html>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
new file mode 100644
index 00000000..c3956d16
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -0,0 +1,32 @@
+<%@ page import="java.text.DateFormat" %>
+<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="java.util.Calendar" %>
+<%
+    Calendar calendar = Calendar.getInstance(request.getLocale());
+    calendar.setTimeInMillis(System.currentTimeMillis());
+    DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, request.getLocale());
+    String todayString = dateFormat.format(calendar.getTime());
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@ include file="/jsp/init.jsp" %>
+<c:url value="export.htm" var="exportUrl">
+    <c:param name="action" value="image"/>
+    <c:param name="mapId" value="${mindmap.id}"/>
+</c:url>
+<html>
+<head>
+    <title>
+        <spring:message code="PRINT"/>
+        - ${mindmap.title}</title>
+    <link rel="stylesheet" type="text/css" href="../css/common.css">
+</head>
+<body onload="setTimeout('print()', 5)">
+    <div id="printHeader">
+        <div id="printLogo"></div>
+        <div id="headerTitle">${mindmap.title}<span id="headerSubTitle">&nbsp;(<%=todayString%>)</span></div>
+    </div>
+    <center>
+        <img src="${exportUrl}" alt="${mindmap.title}"/>
+    </center>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp
new file mode 100644
index 00000000..a40b29f5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp
@@ -0,0 +1,16 @@
+<%@ include file="/jsp/init.jsp" %>
+<h1>
+    <spring:message code="PUBLIC_VIEW_TITLE" arguments="'${mindmap.title}'"/>
+</h1>
+
+
+<c:url value="embeddedView.htm?mapId=${mindmap.id}&fullView=true"
+       var="embeddedUrl"/>
+
+
+<div id="publicViewContent">
+    <iframe style="border:0;width:800px;height:420px;border: 1px solid black;" src="${embeddedUrl}">
+
+    </iframe>
+
+</div>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
new file mode 100644
index 00000000..119c9f4b
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
@@ -0,0 +1,125 @@
+<%@ include file="/jsp/init.jsp" %>
+<h1>
+    <spring:message code="PUBLISH"/>
+    '${mindmap.title}'
+</h1>
+
+<h2>
+    <spring:message code="PUBLISH_DETAILS"/>
+</h2>
+
+<div>
+    <form method="post" id="publishForm" name="publishForm" action="<c:url value="publish.htm"/>" style="height:100%;">
+        <input type="hidden" name="actionId" value="save"/>
+        <input type="hidden" name="mapId" value="${mindmap.id}"/>
+        <table>
+            <colgroup>
+                <col width="10%"/>
+                <col width="90%"/>
+            </colgroup>
+            <tbody>
+                <tr>
+                    <td>
+                        &nbsp;
+                    </td>
+                    <td>
+
+                        <input type="checkbox" id="publicViewId" name="publicView" value="true"
+                                <c:if test="${mindmap.public}">
+
+                                    checked="checked"
+                                </c:if>
+
+                                />
+                        <spring:message code="PUBLISH_MAP_TO_INTERNET"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;
+                    </td>
+                    <td>
+                        <div id="disabledPanel"
+                             style="position:absolute;background-color:white;opacity:0.8;width:600px;height:180px;left:10px;visibility:hidden;">
+
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        <spring:message code="URL"/>
+                        :
+                    </td>
+                    <td>
+                        <input name="url" value="http://www.wisemapping.com/c/publicView.htm?mapId=${mindmap.id}"
+                               style="width:400px" readonly="readonly"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        <spring:message code="DIRECT_LINK"/>
+                        :
+                    </td>
+                    <td>
+                        <textarea style="width:400px;height:30px;overflow:hidden;" cols="55" rows="3" readonly="readonly">
+&lt;a href="http://www.wisemapping.com/c/publicView.htm?mapId=${mindmap.id}">${mindmap.title}&lt;/a></textarea>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        &nbsp;
+                    </td>
+                    <td>
+                        &nbsp;
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel" style="white-space:normal;">
+                        <spring:message code="BLOG_INCLUSION"/>
+                        :
+                    </td>
+                    <td>
+                        <textarea style="width:400px;height:70px;overflow:hidden;" cols="55" rows="5" readonly="readonly">
+&lt;iframe
+style="border:0;width:600px;height:400px;border: 1px solid black"
+src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${mindmap.id}&zoom=1"&gt;
+&lt;/iframe&gt;
+                         </textarea>
+
+                        <p><spring:message code="EMBEDDED_MAP_SIZE"/></p>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align:center;margin-top:30px;" colspan="2">
+                        <input type="submit" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
+                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                               onclick="MOOdalBox.close();">
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+
+<script type="text/javascript">
+
+    var isPublicPanelEnabled = false;
+    var panelEnabler = function()
+    {
+        if (isPublicPanelEnabled)
+        {
+            $('disabledPanel').setStyle("visibility", "hidden");
+        } else
+        {
+            $('disabledPanel').setStyle("visibility", "visible");
+        }
+        isPublicPanelEnabled = !isPublicPanelEnabled;
+    }
+
+    if (${mindmap.public==false})
+    {
+        panelEnabler()
+    }
+    $('publicViewId').addEvent('click', panelEnabler);
+
+</script>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapRename.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapRename.jsp
new file mode 100755
index 00000000..5a4a76e5
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapRename.jsp
@@ -0,0 +1,36 @@
+<%@ include file="/jsp/init.jsp" %>
+<div>
+    <form:form method="post" commandName="renameMap">
+        <table>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="NAME"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="title" id="title" tabindex="1"/>
+                    <form:errors path="title" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel">
+                    <spring:message code="DESCRIPTION"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="description" id="description" tabindex="2"/>
+                    <form:errors path="description" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                           onclick="MOOdalBox.close();">
+                </td>
+            </tr>
+        </table>
+    </form:form>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp
new file mode 100755
index 00000000..7ab916e1
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapTags.jsp
@@ -0,0 +1,46 @@
+<%@ include file="/jsp/init.jsp" %>
+<h1>
+    <spring:message code="TAG"/>
+    '${tag.mindmapTitle}'</h1>
+
+<h2>
+    <spring:message code="TAGS_MSG"/>
+</h2>
+
+<div>
+    <form:form method="post" commandName="tag">
+
+        <table>
+            <tbody>
+                <tr>
+                    <td class="formLabel">
+                        <spring:message code="TAGS"/>
+                        :
+                    </td>
+                    <td>
+                        <%--<input type="text" id="tags" name="tags" value="<c:out value="${tag.mindmapTags}"/>"/>--%>
+                        <form:input path="mindmapTags" id="mindmapTags" tabindex="0"/>
+                        <form:errors path="mindmapTags" cssClass="errorMsg"/>
+                    </td>
+                </tr>
+                <%--<tr>--%>
+                <%--<td class="formLabel">--%>
+                <%--<spring:message code="AVAILABLE_TAGS"/>--%>
+                <%--:--%>
+                <%--</td>--%>
+                <%--<td>--%>
+                <%--${userTags}--%>
+                <%--</td>--%>
+                <%--</tr>--%>
+                <tr>
+                    <td>&nbsp;</td>
+                    <td>
+                        <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
+                        <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                           onclick="MOOdalBox.close();">
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form:form>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp b/trunk/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp
new file mode 100644
index 00000000..ee971f54
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp
@@ -0,0 +1,86 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<html>
+<head>
+    <title>
+        <spring:message code="SITE.TITLE"/>
+        -</title>
+    <link rel="stylesheet" type="text/css" href="../css/wisehome.css">
+
+    <script type="text/javascript">
+        function removeViewer(viewerEmail)
+        {
+            document.removeViewerForm.userEmail.value = viewerEmail;
+            document.removeViewerForm.submit();
+        }
+    </script>
+</head>
+<body>
+
+<jsp:include page="header.jsp"/>
+
+<h1>${mindmap.title}</h1>
+
+<div>${mindmap.description}</div>
+<div>${mindmap.userRole}</div>
+
+<form method="post" action="<c:url value="sharing.htm"/>">
+    <input type="hidden" name="action" value="addViewer"/>
+    <input type="hidden" name="mapId" value="${mindmap.id}"/>
+
+    <div id="sharing1">
+        <fieldset id="sharing">
+
+            <legend>
+                <spring:message code="VIEWERS"/>
+            </legend>
+
+            <table>
+                <tr>
+                    <td>
+                        <div id="addSharing">
+                            <label for="viewers" accesskey="a">
+                                <spring:message code="ADD_VIEWERS"/>
+                                :</label>
+                            <textarea name="userEmails" id="viewers" tabindex="1" cols="50" rows="5"></textarea><br/>
+                            <input type="submit" value="<spring:message code="ADD"/>">
+                            <input type="button" value="<spring:message code="CANCEL"/>"
+                                   onclick="window.location='<c:url value="mymaps.htm"/>'">
+                        </div>
+                    </td>
+                    <td>
+                        <div id="currentSharing">
+                            <label for="viewers" accesskey="v">
+                                <spring:message code="CURRENT_VIEWERS"/>
+                                :</label><br/>
+                            <table>
+                                <c:forEach items="${mindmap.viewers}" var="mindmapViewer">
+                                    <tr>
+                                        <td>
+                                                ${mindmapViewer}
+                                        </td>
+                                        <td>
+                                            <a href="javascript:removeViewer('${mindmapViewer}')"><img
+                                                    src="../images/removeUser.jpeg" border="0"
+                                                    title="<spring:message code="REMOVE"/>"
+                                                    alt="<spring:message code="REMOVE"/>"/></a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </table>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </fieldset>
+    </div>
+</form>
+
+<form name="removeViewerForm" action="<c:url value="sharing.htm"/>">
+    <input type="hidden" name="action" value="removeViewer"/>
+    <input type="hidden" name="mapId" value="${mindmap.id}"/>
+    <input type="hidden" name="userEmail" value=""/>
+</form>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/newMap.jsp b/trunk/wise-webapp/src/main/webapp/jsp/newMap.jsp
new file mode 100644
index 00000000..5fd52488
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/newMap.jsp
@@ -0,0 +1,49 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<h1>
+    
+</h1>
+
+<div>
+    <form:form method="post" commandName="newMap">
+        <table>
+            <tr>
+                <td class="formLabel">
+                    <span class="fieldRequired">*</span>
+                    <spring:message code="NAME"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="title" id="title" tabindex="1"/>
+                    <form:errors path="title" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel">
+                    <spring:message code="DESCRIPTION"/>
+                    :
+                </td>
+                <td>
+                    <form:input path="description" id="description" tabindex="2"/>
+                    <form:errors path="description" cssClass="errorMsg"/>
+                </td>
+            </tr>
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
+                    <c:choose>
+                    <c:when test="${!errorView}">
+                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
+                           onclick="MOOdalBox.close();">
+                    </c:when>
+                     <c:otherwise>
+                    <input type="button" value="<spring:message code="BACK"/>" class="btn-primary"
+                           onclick="window.location='mymaps.htm'">
+                    </c:otherwise>
+                    </c:choose>
+                </td>
+            </tr>
+        </table>
+    </form:form>
+</div>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/newMapError.jsp b/trunk/wise-webapp/src/main/webapp/jsp/newMapError.jsp
new file mode 100644
index 00000000..731d6109
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/newMapError.jsp
@@ -0,0 +1,11 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<h1>
+    <spring:message code="${requestScope.title}"/>
+</h1>
+
+<p style="font-weight:bold;">
+    <spring:message code="${requestScope.details}"/>
+</p>
+
+<jsp:include page="/jsp/newMap.jsp"/>
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/search.jsp b/trunk/wise-webapp/src/main/webapp/jsp/search.jsp
new file mode 100755
index 00000000..9f1c2a62
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/search.jsp
@@ -0,0 +1,64 @@
+<%@ include file="/jsp/init.jsp" %>
+<script type="text/javascript">
+    window.onload = function() {
+        var boxGenerator = RUZEE.ShadedBorder.create({ corner:16,  border:1 });
+        boxGenerator.render('userRegistration');
+    };
+</script>
+<div id="userRegistrationBody">
+<div id="userRegistrationContent">
+
+<div id="userRegistration" class="sb">
+<h1>
+    <spring:message code="SEARCH"/>
+</h1>
+<h2>
+Please use a space " " to separate tags.
+</h2>    
+<form method="post" id="searchForm" name="searchForm" action="<c:url value="search.htm"/>">
+    <input type="hidden" name="action" value="search"/>    
+<table>
+<tbody>
+<tr>
+    <td class="formLabel">
+        <spring:message code="NAME"/>
+        :
+    </td>
+    <td>
+        <input id="title"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <spring:message code="DESCRIPTION"/>
+        :
+    </td>
+    <td>
+        <input id="description"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <spring:message code="TAGS"/>
+        :
+    </td>
+    <td>
+        <input id="tags"/>
+    </td>
+</tr>
+<tr>
+    <td>&nbsp;</td>
+    <td><input type="submit" value="<spring:message code="SEARCH"/>" id="submitButton" class="btn-primary">
+        <input type="button" value="<spring:message code="CANCEL"/>"
+               onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn-primary">
+    </td>
+</tr>
+</tbody>
+</table>
+</form>
+</div>
+</div>
+</div>
+<%--<jsp:include page="footer.jsp"/>--%>
+<!--</body>-->
+<!--</html>-->
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/searchResult.jsp b/trunk/wise-webapp/src/main/webapp/jsp/searchResult.jsp
new file mode 100755
index 00000000..f554d9ad
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/searchResult.jsp
@@ -0,0 +1,192 @@
+<%@ include file="/jsp/init.jsp" %>
+<script type="text/javascript">
+    window.onload = function() {
+        var boxGenerator = RUZEE.ShadedBorder.create({ corner:16,  border:1 });
+        boxGenerator.render('searchResult');
+
+        $("broweButton").addEvent('click', function() {
+            window.location = "${pageContext.request.contextPath}/c/search.htm?action=showAll";
+        });
+    };
+
+    function toogleAdvanceSearch() {
+        var searchDiv = document.getElementById("searchAdvance");
+        var newDisplayValue = "none";
+        if (searchDiv.style.display == "none") {
+            newDisplayValue = "";
+        }
+        document.getElementById("searchFormCell").style.display = searchDiv.style.display;
+        searchDiv.style.display = newDisplayValue;
+    }
+
+</script>
+<div class="content">
+<c:url value="mymaps.htm" var="mapDetail">
+    <c:param name="action" value="detail"/>
+</c:url>
+
+<div id="searchResult" class="sb">
+<h1 style="margin-right:5px;">
+    <spring:message code="SEARCH_PUBLIC"/>
+</h1>
+
+<table>
+    <tr>
+        <td colspan="2">
+            <spring:message code="SEARCH_MSG"/>
+            <br/><br/></td>
+    </tr>
+    <tr>
+        <td> &nbsp;
+        </td>
+        <td id="searchFormCell" style="display:${advanceSearch != null ? 'none' : ''}">
+            <form method="post" id="searchForm" name="searchForm" action="<c:url value="search.htm"/>">
+                <input type="hidden" name="action" value="search"/>
+                <input id="titleOrTags" name="titleOrTags" value="${titleOrTags}"/>
+                <input type="submit" value="<spring:message code="SEARCH"/>" id="submitButton1" class="btn-primary">
+                <input type="button" value="<spring:message code="BROWSE"/>" id="broweButton" class="btn-primary">
+                <br/>
+                <a href="javascript:toogleAdvanceSearch()" id="toAdvancedSearch">
+                    <spring:message code="ADVANCE_SEARCH"/>
+                </a>
+
+            </form>
+        </td>
+    </tr>
+</table>
+
+<div id="searchAdvance" style="display:${advanceSearch != null ? '' : 'none'};">
+    <form method="post" id="advanceSearchForm" name="searchForm" action="<c:url value="search.htm"/>">
+        <input type="hidden" name="action" value="search"/>
+        <input type="hidden" name="advanceSearch" value="true"/>
+        <table>
+            <thead>
+                <tr>
+                    <th colspan="2">
+                        <spring:message code="ADVANCE_SEARCH"/>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td class="formLabel">
+                        <spring:message code="NAME"/>
+                        :
+                    </td>
+                    <td>
+                        <input id="name" name="name" value="${name}"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        <spring:message code="DESCRIPTION"/>
+                        :
+                    </td>
+                    <td>
+                        <input id="description" name="description" value="${description}"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="formLabel">
+                        <spring:message code="TAGS"/>
+                        :
+                    </td>
+                    <td>
+                        <input id="tags" name="tags" value="${tags}"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>&nbsp;</td>
+                    <td><input type="submit" value="<spring:message code="SEARCH"/>" id="submitButton2"
+                               class="btn-primary">&nbsp;
+                        <a href="javascript:toogleAdvanceSearch()" id="toSimpleSearch">
+                            <spring:message code="SIMPLE_SEARCH"/>
+                        </a>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+<div id="searchResultTable">
+    <table>
+        <colgroup>
+            <col width="30%"/>
+            <col width="40%"/>
+            <col width="30%"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th>
+                    <spring:message code="NAME"/>
+                </th>
+                <th>
+                    <spring:message code="DESCRIPTION"/>
+                </th>
+                <th>
+                    <spring:message code="LAST_EDITOR"/>
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <c:if test="${emptyCriteria}">
+                <tr>
+                    <td colspan="3">
+                        <spring:message code="NO_SEARCH_TERM"/>
+                        <br>
+                        <a href="${pageContext.request.contextPath}/c/search.htm?action=showAll">
+                            <spring:message code="VIEW_ALL_RESULTS"/>
+                        </a>
+                    </td>
+                </tr>
+            </c:if>
+            <c:if test="${!emptyCriteria and empty wisemapsList}">
+                <tr>
+                    <td colspan="3">
+                        <spring:message code="NO_SEARCH_RESULTS"/>
+                        <c:if test="${user != null}">
+                            <br>
+                            <a href="${pageContext.request.contextPath}/c/mymaps.htm">
+                                <spring:message code="GO_TO"/>
+                            </a>
+                        </c:if>
+                        <c:if test="${user == null}">
+                            <dl>
+                                <dt>
+                                    <spring:message code="JOIN_NOW"/>
+                                </dt>
+                            </dl>
+                            <br>
+                            <a href="${pageContext.request.contextPath}/c/userRegistration.htm">
+                                <spring:message code="NOT_READY_A_USER_MESSAGE"/>
+                            </a>
+                        </c:if>
+                    </td>
+                </tr>
+            </c:if>
+            <c:forEach items="${wisemapsList}" var="mindmap">
+                <tr>
+                    <td>
+                        <div>
+                            <div class="mapTitle">
+                                <a href="${pageContext.request.contextPath}/c/publicView.htm?mapId=${mindmap.id}">
+                                        ${mindmap.title}
+                                </a>
+                            </div>
+                            <div class="mapTags">
+                                    ${mindmap.tags}
+                            </div>
+                        </div>
+                    </td>
+                    <td>
+                            ${mindmap.description}
+                    </td>
+                    <td>${mindmap.lastEditDate} by ${mindmap.lastEditor}</td>
+                </tr>
+            </c:forEach>
+        </tbody>
+    </table>
+</div>
+</div>
+</div>
+
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/setting.jsp b/trunk/wise-webapp/src/main/webapp/jsp/setting.jsp
new file mode 100755
index 00000000..3ef3907f
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/setting.jsp
@@ -0,0 +1,17 @@
+<%@ include file="/jsp/init.jsp" %>
+<div>
+    <ul>
+        <li><a rel="moodalbox 400px 200px wizard"
+               href="<c:out value="${pageContext.request.contextPath}/c/changePassword.htm"/>"
+               title="<spring:message code="CHANGE_PASSWORD"/>">
+            <spring:message code="CHANGE_PASSWORD"/>
+        </a>
+        </li>
+        <li><a rel="moodalbox 400px 250px wizard"
+               href="<c:out value="${pageContext.request.contextPath}/c/editProfile.htm"/>"
+               title="<spring:message code="EDIT_PROFILE"/>">
+            <spring:message code="EDIT_PROFILE"/>
+        </a>
+        </li>
+    </ul>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/template.jsp b/trunk/wise-webapp/src/main/webapp/jsp/template.jsp
new file mode 100644
index 00000000..cf874685
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %>
+<%@ include file="/jsp/init.jsp" %>
+
+<tiles:importAttribute name="title" scope="request"/>
+<tiles:importAttribute name="details" scope="request"/>
+<html>
+<head>
+    <title>
+        <spring:message code="SITE.TITLE"/>
+        -
+        <c:choose>
+            <c:when test="${requestScope.viewTitle!=null}">
+                ${requestScope.viewTitle}
+            </c:when>
+            <c:otherwise>
+                <spring:message code="${requestScope.title}"/>
+            </c:otherwise>
+        </c:choose>
+    </title>
+    <meta http-equiv="Content-type" value="text/html; charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="../css/wisehome.css">
+    <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon">
+    <script type="text/javascript" src="${pageContext.request.contextPath}/js/wiseLibrary.js"></script>
+</head>
+<body>
+
+<jsp:include page="header.jsp"/>
+
+<div class="pageBody">
+
+    <div class="pageBodyContent">
+        <tiles:insert name="body"/>
+    </div>
+</div>
+
+<jsp:include page="footer.jsp"/>
+</body>
+</html>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/trunk/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
new file mode 100644
index 00000000..6f72c663
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -0,0 +1,137 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<script type="text/javascript">
+    window.onload = function() {
+        var simpleButtonGenerator = RUZEE.ShadedBorder.create({ corner:8,  border:1 });
+        simpleButtonGenerator.render('userRegistration');
+
+        $('submitButton').addEvent('click', displayLoading);
+
+    };
+</script>
+
+<div id="userRegistrationContent">
+<div id="userRegistration" class="sb">
+<h1>
+    <spring:message code="USER_REGISTRATION"/>
+</h1>
+
+<h2>
+    <spring:message code="REGISTRATION_TITLE_MSG"/>
+    <br/><br/>
+    <spring:message code="FIELD_REQUIRED_MSG"/>
+</h2>
+<form:form method="post" commandName="user">
+<table>
+<tbody>
+<tr>
+    <td class="formLabel">
+        <span class="fieldRequired">*</span>
+        <spring:message code="EMAIL"/>
+        :
+    </td>
+    <td>
+        <form:input path="email" id="email"/>
+        <form:errors path="email" cssClass="errorMsg"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <span class="fieldRequired">*</span>
+        <spring:message code="USERNAME"/>
+        :
+    </td>
+    <td>
+        <form:input path="username" id="username"/>
+        <form:errors path="username" cssClass="errorMsg"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <span class="fieldRequired">*</span>
+        <spring:message code="FIRSTNAME"/>
+        :
+    </td>
+    <td>
+        <form:input path="firstname" id="firstname"/>
+        <form:errors path="firstname" cssClass="errorMsg"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <span class="fieldRequired">*</span>
+        <spring:message code="LASTNAME"/>
+        :
+    </td>
+    <td>
+        <form:input path="lastname" id="lastname"/>
+        <form:errors path="lastname" cssClass="errorMsg"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <span class="fieldRequired">*</span>
+        <spring:message code="PASSWORD"/>
+        :
+    </td>
+    <td>
+        <form:password path="password" id="password"/>
+        <form:errors path="password" cssClass="errorMsg"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <span class="fieldRequired">*</span>
+        <spring:message code="RETYPE_PASSWORD"/>
+        :
+    </td>
+    <td>
+        <form:password path="retypePassword" id="retypePassword"/>
+        <form:errors path="retypePassword" cssClass="errorMsg"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <span class="fieldRequired">*</span>
+        <spring:message code="WORD_VERIFICATION"/>
+        :
+    </td>
+    <td>
+        <p>
+            <spring:message code="TYPE_CHARACTER_BELOW"/>
+        </p>
+        <img src="captcha.htm"/><br/>
+        <input type="text" name="j_captcha_response"/><br/>
+        <form:errors path="captcha" cssClass="errorMsg"/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">
+        <spring:message code="TERM_OF_THE_SERVICE"/>
+        :
+    </td>
+    <td>
+        <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
+        <a href="termsOfUse.htm">
+            <spring:message code="HERE"/>
+        </a>.<br/>
+    </td>
+</tr>
+<tr>
+    <td class="formLabel">&nbsp;</td>
+    <td>
+        <spring:message code="REGISTRATION_CLICK_ADVICE"/>
+    </td>
+</tr>
+<tr>
+    <td>&nbsp;</td>
+    <td><input type="submit" value="<spring:message code="REGISTER"/>" id="submitButton" class="btn-primary">
+        <input type="button" value="<spring:message code="CANCEL"/>"
+               onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn-primary">
+    </td>
+</tr>
+</tbody>
+</table>
+</form:form>
+</div>
+</div>
diff --git a/trunk/wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp b/trunk/wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp
new file mode 100644
index 00000000..fe52bc47
--- /dev/null
+++ b/trunk/wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp
@@ -0,0 +1,24 @@
+<%@ include file="/jsp/init.jsp" %>
+
+<div class="modalDialog">
+
+    <h1>
+        <spring:message code="USER_REGISTRATION"/>
+    </h1>
+
+    <h2 style="font-weight:bold;">Thanks for signing up!</h2>
+
+    <p>
+        You will receive a confirmation message shortly from WiseMapping. This message will ask you to activate your WiseMapping account.
+        Please select the link to activate and start creating and sharing maps.
+    </p>
+    <br/>
+    <p>
+        Thanks so much for your interest in WiseMapping.
+    </p>
+    <br/>
+    <p>
+        If you have any questions or have any feedback, please don't hesitate to use the on line form.
+        We'd love to hear from you.
+    </p>
+</div>
diff --git a/trunk/wise-webapp/src/test/java/com/wisemapping/ws/test/WiseWebServicesTest.java b/trunk/wise-webapp/src/test/java/com/wisemapping/ws/test/WiseWebServicesTest.java
new file mode 100644
index 00000000..fe10f07f
--- /dev/null
+++ b/trunk/wise-webapp/src/test/java/com/wisemapping/ws/test/WiseWebServicesTest.java
@@ -0,0 +1,100 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
+package com.wisemapping.ws.test;
+
+import org.testng.annotations.Test;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import java.net.MalformedURLException;
+import java.io.StringWriter;
+import java.util.List;
+
+import com.wisemapping.ws.*;
+
+
+@Test(groups = {"wsintegration"})
+public class WiseWebServicesTest  {
+
+
+    @Test(dependsOnMethods = "addMapTest")
+    public void loadMapTest() throws MalformedURLException, JAXBException {
+
+        final WiseServicesPortTypeService portTypeService = new WiseServicesPortTypeService();
+        final WiseServicesPortType servicesPortType = portTypeService.getWiseServicesPortTypeSoap11();
+
+        final LoadMindmapRequest request = new LoadMindmapRequest();
+        request.setMapdId(1);
+        LoadMindmapResponse response = servicesPortType.loadMindmap(request);
+
+        JAXBContext jc = JAXBContext.newInstance("com.wisemapping.ws.test");
+        Marshaller marshaller = jc.createMarshaller();
+
+        final StringWriter xmlContext = new StringWriter();
+        marshaller.marshal(response,xmlContext);
+        System.out.println("Response:"+xmlContext);
+
+    }
+
+    public void addMapTest() throws MalformedURLException, JAXBException {
+
+        final WiseServicesPortTypeService portTypeService = new WiseServicesPortTypeService();
+        final WiseServicesPortType servicesPortType = portTypeService.getWiseServicesPortTypeSoap11();
+
+        final AddMindmapRequest request = new AddMindmapRequest();
+
+        request.setCreator("test@wisemapping.org");
+
+        request.setTitle("MyFirstMap");
+        request.setDescription("My First Map Description");
+
+        // Set Map ...
+        MapType sampleMap = createMockMap();
+        request.setMap(sampleMap);
+
+
+        AddMindmapResponse response = servicesPortType.addMindmap(request);
+
+        JAXBContext jc = JAXBContext.newInstance("com.wisemapping.ws.test");
+        Marshaller marshaller = jc.createMarshaller();
+
+        final StringWriter xmlContext = new StringWriter();
+        marshaller.marshal(response,xmlContext);
+        System.out.println("Response:"+xmlContext);
+
+    }
+
+    private MapType createMockMap() {
+        ObjectFactory factory = new ObjectFactory();
+        MapType mapType = factory.createMapType();
+        mapType.setName("map name");
+
+        TopicType topicType = factory.createTopicType();
+        topicType.setCentral(true);
+        topicType.setText("Central topic value");
+
+        List<TopicType> topics = mapType.getTopic();
+        topics.add(topicType);
+
+        return mapType;
+    }
+
+}
diff --git a/trunk/wise-webapp/src/test/sql/hsql/create-schemas.sql b/trunk/wise-webapp/src/test/sql/hsql/create-schemas.sql
new file mode 100644
index 00000000..a53615bc
--- /dev/null
+++ b/trunk/wise-webapp/src/test/sql/hsql/create-schemas.sql
@@ -0,0 +1,75 @@
+CREATE TABLE COLABORATOR (
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+email varchar(255) NOT NULL,
+creation_date date
+);
+
+CREATE TABLE USER (
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+colaborator_id INTEGER NOT NULL,
+username varchar(255)   NOT NULL,
+firstname varchar(255)  NOT NULL,
+lastname varchar(255)  NOT NULL,
+password varchar(255)  NOT NULL,
+activationCode BIGINT NOT NULL,
+activation_date DATE,
+allowSendEmail CHAR(1) NOT NULL,
+FOREIGN KEY(colaborator_id) REFERENCES colaborator(id)
+) ;
+
+CREATE TABLE MINDMAP (
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+title VARCHAR(255)  NOT NULL,
+description VARCHAR(255)  NOT NULL,
+xml LONGVARBINARY NOT NULL,
+public BOOLEAN not null,
+mindMapNative_id INTEGER NOT NULL,
+creation_date date,
+edition_date date,
+owner_id INTEGER not null,
+tags varchar(1014)  ,
+last_editor varchar(255)  ,
+creator_user varchar(255)  ,
+editor_properties varchar(512)
+--FOREIGN KEY(owner_id) REFERENCES USER(colaborator_id)
+)  ;
+
+CREATE TABLE MINDMAP_NATIVE
+(
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+svg_xml LONGVARBINARY,
+vml_xml LONGVARBINARY
+)  ;
+
+CREATE TABLE MINDMAP_HISTORY
+(
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+xml LONGVARBINARY NOT NULL,
+mindmap_id INTEGER NOT NULL,
+creation_date datetime,
+creator_user varchar(255)
+)  ;
+
+CREATE TABLE MINDMAP_COLABORATOR (
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+colaborator_id INTEGER NOT NULL,
+mindmap_id INTEGER NOT NULL,
+role_id INTEGER NOT NULL,
+FOREIGN KEY(colaborator_id) REFERENCES colaborator(id),
+FOREIGN KEY(mindmap_id) REFERENCES mindmap(id)
+)  ;
+
+CREATE TABLE TAG(
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+name varchar(255)  NOT NULL,
+user_id INTEGER NOT NULL
+--FOREIGN KEY(user_id) REFERENCES user(colaborator_id)
+);
+
+CREATE TABLE USER_LOGIN (
+id INTEGER NOT NULL IDENTITY PRIMARY KEY,
+email varchar(255)  ,
+login_date date
+)  ;
+COMMIT;
+SHUTDOWN;
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/test/sql/hsql/drop-schemas.sql b/trunk/wise-webapp/src/test/sql/hsql/drop-schemas.sql
new file mode 100644
index 00000000..7485defb
--- /dev/null
+++ b/trunk/wise-webapp/src/test/sql/hsql/drop-schemas.sql
@@ -0,0 +1,10 @@
+DROP TABLE TAG;
+DROP TABLE MINDMAP_NATIVE;
+DROP TABLE MINDMAP_COLABORATOR;
+DROP TABLE MINDMAP_HISTORY;
+DROP TABLE MINDMAP;
+DROP TABLE USER;
+DROP TABLE COLABORATOR;
+DROP TABLE USER_LOGIN;
+COMMIT;
+SHUTDOWN;
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/test/sql/hsql/test-data.sql b/trunk/wise-webapp/src/test/sql/hsql/test-data.sql
new file mode 100644
index 00000000..14f5ff70
--- /dev/null
+++ b/trunk/wise-webapp/src/test/sql/hsql/test-data.sql
@@ -0,0 +1,5 @@
+INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURDATE());
+INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail)
+values(1,'Wise Mapping Test User','Wise','test', 'test',1237,CURDATE(),1);
+COMMIT;
+SHUTDOWN;
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/test/sql/mysql/create-schemas.sql b/trunk/wise-webapp/src/test/sql/mysql/create-schemas.sql
new file mode 100644
index 00000000..d1c7e6f4
--- /dev/null
+++ b/trunk/wise-webapp/src/test/sql/mysql/create-schemas.sql
@@ -0,0 +1,74 @@
+CREATE TABLE COLABORATOR (
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+email varchar(255) CHARACTER SET utf8  NOT NULL UNIQUE,
+creation_date date
+) CHARACTER SET utf8;
+
+CREATE TABLE USER (
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+colaborator_id INTEGER NOT NULL,
+username varchar(255) CHARACTER SET utf8  NOT NULL,
+firstname varchar(255) CHARACTER SET utf8 NOT NULL,
+lastname varchar(255) CHARACTER SET utf8 NOT NULL,
+password varchar(255) CHARACTER SET utf8 NOT NULL,
+activationCode BIGINT(20) NOT NULL,
+activation_date date,
+allowSendEmail char(1) CHARACTER SET utf8 NOT NULL default 0,
+FOREIGN KEY(colaborator_id) REFERENCES colaborator(id)
+) CHARACTER SET utf8 ;
+
+CREATE TABLE MINDMAP (
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+title varchar(255) CHARACTER SET utf8 NOT NULL,
+description varchar(255) CHARACTER SET utf8 NOT NULL,
+xml blob NOT NULL,
+public BOOL not null default 0,
+mindMapNative_id INTEGER NOT NULL default 0,
+creation_date date,
+edition_date date,
+owner_id INTEGER not null,
+tags varchar(1014) CHARACTER SET utf8 ,
+last_editor varchar(255) CHARACTER SET utf8 ,
+creator_user varchar(255) CHARACTER SET utf8 ,
+editor_properties varchar(512) CHARACTER SET utf8 ,
+FOREIGN KEY(owner_id) REFERENCES user(colaborator_id)
+) CHARACTER SET utf8 ;
+
+CREATE TABLE MINDMAP_NATIVE
+(
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+svg_xml blob,
+vml_xml blob
+) CHARACTER SET utf8 ;
+
+CREATE TABLE MINDMAP_HISTORY
+(
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+xml blob NOT NULL,
+mindmap_id INTEGER NOT NULL,
+creation_date datetime,
+creator_user varchar(255) CHARACTER SET utf8
+) CHARACTER SET utf8 ;
+
+CREATE TABLE MINDMAP_COLABORATOR (
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+colaborator_id INTEGER NOT NULL,
+mindmap_id INTEGER NOT NULL,
+role_id INTEGER NOT NULL,
+FOREIGN KEY(colaborator_id) REFERENCES colaborator(id),
+FOREIGN KEY(mindmap_id) REFERENCES mindmap(id)
+) CHARACTER SET utf8 ;
+
+CREATE TABLE TAG(
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+name varchar(255) CHARACTER SET utf8 NOT NULL,
+user_id INTEGER NOT NULL,
+FOREIGN KEY(user_id) REFERENCES user(colaborator_id)
+) CHARACTER SET utf8 ;
+
+CREATE TABLE USER_LOGIN (
+id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+email varchar(255) CHARACTER SET utf8 ,
+login_date date
+) CHARACTER SET utf8 ;
+COMMIT;
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/test/sql/mysql/drop-schemas.sql b/trunk/wise-webapp/src/test/sql/mysql/drop-schemas.sql
new file mode 100644
index 00000000..de87f4ca
--- /dev/null
+++ b/trunk/wise-webapp/src/test/sql/mysql/drop-schemas.sql
@@ -0,0 +1,9 @@
+DROP TABLE TAG;
+DROP TABLE MINDMAP_NATIVE;
+DROP TABLE MINDMAP_COLABORATOR;
+DROP TABLE MINDMAP_HISTORY;
+DROP TABLE MINDMAP;
+DROP TABLE USER;
+DROP TABLE COLABORATOR;
+DROP TABLE USER_LOGIN;
+COMMIT;
\ No newline at end of file
diff --git a/trunk/wise-webapp/src/test/sql/mysql/test-data.sql b/trunk/wise-webapp/src/test/sql/mysql/test-data.sql
new file mode 100644
index 00000000..a9574cad
--- /dev/null
+++ b/trunk/wise-webapp/src/test/sql/mysql/test-data.sql
@@ -0,0 +1,4 @@
+INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.com',CURRENT_DATE());
+INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail)
+values(1,'Wise Mapping Test User','Wise','Test', 'test',1237,CURRENT_DATE(),1);
+COMMIT;
diff --git a/trunk/wise-webapp/testng.xml b/trunk/wise-webapp/testng.xml
new file mode 100644
index 00000000..e8193c47
--- /dev/null
+++ b/trunk/wise-webapp/testng.xml
@@ -0,0 +1,14 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="WiseWebServicesSuite" verbose="1" >
+  <test name="WiseMapping Web Services Integration API">
+    <groups>
+      <run>
+        <exclude name="wsintegration"/>
+      </run>
+    </groups>
+    <packages>
+      <package name="com.wisemapping.ws.test" />
+   </packages>
+ </test>
+</suite>
\ No newline at end of file