Align ComBZ with master branch

build.xml

@@ -48,7 +48,20 @@
         </copy>
     </target>
 
-    <target name="buildjs" depends="init">
+    <target name="buildjs" depends="buildjsdefault,buildjsapp">
+    </target>
+
+	<target name="buildjsapp" depends="init" if="application">	
+	    <!-- mapcomposer -->
+        <mkdir dir="${composerbuild}/${ant.project.name}/WEB-INF/app/static/script"/>
+        <java jar="${ringojs.run}" fork="true" failonerror="true">
+            <sysproperty key="ringo.home" path="${ringojs.dir}"/>
+            <arg path="externals/buildkit/lib/buildkit/build.js"/>
+            <arg line="-o ${composerbuild}/${ant.project.name}/WEB-INF/app/static/script mapcomposer/app/applications/${application}/buildjs.cfg"/>
+        </java>	
+    </target>
+
+	<target name="buildjsdefault" depends="init">
 		<delete dir="${composerbuild}"/>
 
 	    <!-- mapcomposer -->
@@ -60,7 +73,7 @@
         </java>	
     </target>
 
-    <target name="dist" depends="test, buildjs, redist"/>
+    <target name="dist" depends="test, buildjs, redist, redistapp"/>
 
 	<!--  SITE START  -->	
 	<target name="site" depends="dist">
@@ -117,6 +130,14 @@
     </target>
     <!-- SITE END -->
 
+	<target name="redistapp" if="application">
+		<copy todir="${composerbuild}/${ant.project.name}/WEB-INF/app/applications/${application}">
+            <fileset dir="mapcomposer/app/applications/${application}">
+            </fileset>
+
+        </copy>
+	</target>
+
     <target name="redist">
 
         <mkdir dir="${composerbuild}/${ant.project.name}"/>
@@ -132,6 +153,7 @@
             <fileset dir="mapcomposer/app">
                 <exclude name="**/externals/**"/>
                 <exclude name="**/script/**"/>
+				<exclude name="**/applications/**"/>
             </fileset>
         </copy>
 
@@ -206,6 +228,10 @@
         <copy todir="${composerbuild}/${ant.project.name}/WEB-INF/app/static/externals/mapmanager/translations">
             <fileset dir="mapcomposer/app/static/externals/mapmanager/translations"/>
         </copy>		
+        <!-- copy CookieNotice resources -->
+        <copy todir="${composerbuild}/${ant.project.name}/WEB-INF/app/static/externals/cookiechoices">
+            <fileset dir="mapcomposer/app/static/externals/cookiechoices"/>
+        </copy>
     </target>
 
     <target name="war" depends="dist">
@@ -214,24 +240,54 @@
         </war>
     </target>
 
-    <target name="debug" depends="init">
+    <target name="debug" depends="debugdefault,debugapp">
+    </target>
+
+	<target name="debugdefault" depends="init" unless="application">
         <java jar="${ringojs.run}" fork="true" classpath="${ringojs.dir}/lib">
             <sysproperty key="app.proxy.geoserver" value="${app.proxy.geoserver}"/>
 			<sysproperty key="app.debug.proxy" value="${app.debug.proxy}"/>
             <sysproperty key="ringo.home" path="${ringojs.dir}"/>                              
             <!-- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/> -->
             <arg path="mapcomposer/app/main.js"/>
-            <arg line="-p ${app.port}"/>
+			<arg line="-p ${app.port}"/>
         </java>
     </target>
 
-    <target name="debugall" depends="init">
+	<target name="debugapp" depends="init" if="application">
+        <java jar="${ringojs.run}" fork="true" classpath="${ringojs.dir}/lib">
+            <sysproperty key="app.proxy.geoserver" value="${app.proxy.geoserver}"/>
+			<sysproperty key="app.debug.proxy" value="${app.debug.proxy}"/>
+            <sysproperty key="ringo.home" path="${ringojs.dir}"/>                              
+            <!-- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/> -->
+            <arg path="mapcomposer/app/main.js"/>
+            <arg line="-a ${application}"/>
+			<arg line="-p ${app.port}"/>
+        </java>
+    </target>
+
+    <target name="debugall" depends="debugalldefault,debugallapp">
+    </target>
+
+	<target name="debugalldefault" depends="init" unless="application">
+        <java jar="${ringojs.run}" fork="true">
+            <sysproperty key="app.proxy.geoserver" value="${app.proxy.geoserver}"/>
+			<sysproperty key="app.debug.proxy" value="${app.debug.proxy}"/>
+            <sysproperty key="ringo.home" path="${ringojs.dir}"/>
+            <arg value="-d"/>
+            <arg path="mapcomposer/app/main.js"/>
+            <arg line="-p ${app.port}"/>
+        </java>
+    </target>
+
+	<target name="debugallapp" depends="init" if="application">
         <java jar="${ringojs.run}" fork="true">
             <sysproperty key="app.proxy.geoserver" value="${app.proxy.geoserver}"/>
 			<sysproperty key="app.debug.proxy" value="${app.debug.proxy}"/>
             <sysproperty key="ringo.home" path="${ringojs.dir}"/>
             <arg value="-d"/>
             <arg path="mapcomposer/app/main.js"/>
+			<arg line="-a ${application}"/>
             <arg line="-p ${app.port}"/>
         </java>
     </target>

mapcomposer/app/applications/example/buildjs.cfg

@@ -0,0 +1,5 @@
+[example.js]
+root = static/script
+include =
+    plugins/hello.js
+

mapcomposer/app/applications/example/config.js

@@ -0,0 +1,4 @@
+exports.config = function(urls, middleware) {
+	urls[0] = [(/^\/(index(.html)?)?/), require("./index").app];
+	middleware.push(require("ringo/middleware/static").middleware({base: module.resolve("static")}));
+};

mapcomposer/app/applications/example/index.js

@@ -0,0 +1,18 @@
+var Response = require("ringo/webapp/response").Response;
+var Request = require("ringo/webapp/request").Request;
+var auth = require("../../auth");
+
+exports.app = function(req) {
+    var request = new Request(req);
+    var details = auth.getDetails(request);
+
+	if(request.isPost){
+		var content = JSON.stringify(request.postParams);
+		print("Post Content is : " + content);
+		var response = Response.skin(module.resolve("templates/example.html"), {status: details.status || 404, content: content});
+	}else{
+		var response = Response.skin(module.resolve("templates/example.html"), {status: details.status || 404, content: "{}"});
+	}
+
+	return response;
+};

mapcomposer/app/applications/example/static/config/exampleConfig.js

@@ -0,0 +1,64 @@
+{
+    "portalConfig":{
+		"header":false
+	},
+    "gsSources": {
+        "google": {
+            "ptype": "gxp_googlesource"
+        }
+    },
+    "map":{
+        "projection": "EPSG:900913",
+        "units": "m",
+        "maxExtent": [
+            -20037508.34, -20037508.34,
+            20037508.34, 20037508.34
+        ],
+        "layers": [{
+            "source": "google",
+            "title": "Google Hybrid",
+            "name": "HYBRID",
+            "group": "background"
+        }],
+        "center": [1250000.000000, 5370000.000000],
+        "zoom": 5
+    },
+	"loadingPanel": {
+		"width": 100,
+		"height": 100,
+		"center": true
+	},
+	"customTools":[
+		{
+		   "ptype": "gxp_mouseposition",
+		   "displayProjectionCode":"EPSG:4326",
+		   "customCss": "font-weight: bold; text-shadow: 1px 0px 0px #FAFAFA, 1px 1px 0px #FAFAFA, 0px 1px 0px #FAFAFA,-1px 1px 0px #FAFAFA, -1px 0px 0px #FAFAFA, -1px -1px 0px #FAFAFA, 0px -1px 0px #FAFAFA, 1px -1px 0px #FAFAFA, 1px 4px 5px #aeaeae;color:#050505 "
+		}, {
+			"ptype": "gxp_geolocationmenu",
+			"actionTarget": {"target": "paneltbar", "index": 23},
+			"toggleGroup": "toolGroup"
+		}, {
+			"ptype": "gxp_wmsgetfeatureinfo", 
+			"useTabPanel": true,
+			"toggleGroup": "toolGroup",
+			"actionTarget": {"target": "paneltbar", "index": 24}
+		}, {
+			"ptype": "gxp_addlayer",
+			"showCapabilitiesGrid": true,
+			"useEvents": false,
+			"showReport": "never",
+			"directAddLayer": false,
+			"id": "addlayer"
+		}, {
+			"ptype": "gxp_about",
+			"poweredbyURL": "http://www.geo-solutions.it/about/contacts/",
+			"actionTarget": {"target": "panelbbar", "index": 1}
+		}, {
+			"ptype": "gxp_languageselector",
+			"actionTarget": {"target": "panelbbar", "index": 3}
+		}, {
+			"ptype": "gxp_hello",
+			"actionTarget": {"target": "paneltbar", "index": 25}
+		}
+	]
+}

mapcomposer/app/applications/example/static/css/example.css

@@ -0,0 +1,3 @@
+.gx-hello{
+	background:url(../images/hello.png) no-repeat;
+}

mapcomposer/app/applications/example/static/script/plugins/hello.js

@@ -0,0 +1,100 @@
+/**
+ *  Copyright (C) 2007 - 2012 GeoSolutions S.A.S.
+ *  http://www.geo-solutions.it
+ *
+ *  GPLv3 + Classpath exception
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** api: (define)
+ *  module = gxp.plugins
+ *  class = HelloWorld
+ */
+
+/** api: (extends)
+ *  plugins/Tool.js
+ */
+Ext.namespace("gxp.plugins");
+
+/** api: constructor
+ *  .. class:: HelloWorld(config)
+ *
+ *    Sample Plugin
+ *
+ */ 
+gxp.plugins.HelloWorld = Ext.extend(gxp.plugins.Tool, {
+    ptype:'gxp_hello',
+
+    /** i18n */
+    menuText:'hello',
+    text:'Hello', 
+    title:'Hello Window',
+    iconCls:'gx-hello',
+    tooltip:'Open the Hello Window',
+
+
+    /** end of i18n */
+    /** api: config[description]
+     *  ``String`` Html to show in the window
+     */
+    description: '<h2> Hello window</h2><p>I just wanted to say hello</p>',
+    /** api: config[showOnStartup]
+     *  ``Boolean`` Show the window on startup if true
+     */
+    showOnStartup:false,
+    /** api: config[windowOptions]
+     *  ``Object`` Options for override the window configuration
+     */
+    windowOptions:{
+        height:200,
+        width:500
+    },
+
+    /** api: method[addActions]
+     */
+    addActions: function() {
+        var actions = [{
+            menuText: this.menuText,
+            text:this.text,
+            enableToggle: false,
+            iconCls: this.iconCls,
+            tooltip: this.tooltip,
+            handler: function(button, state) {
+                this.showHello();
+            },
+            scope: this
+        }];
+        if(this.showOnStartup){
+            this.target.on('ready', this.showHello,this);
+
+        }
+        return gxp.plugins.HelloWorld.superclass.addActions.apply(this, [actions]);
+    },
+
+    showHello:function(){
+
+		new Ext.Window(Ext.apply({
+		   layout:'fit',
+		   title: this.title,
+		   border:false,
+		   autoScroll:false,
+		   items:{html: this.description, autoScroll:true, bodyStyle:'padding:10px'},
+		   modal:true,
+		   height:200
+		},this.windowOptions)).show();
+    }    
+});
+
+Ext.preg(gxp.plugins.HelloWorld.prototype.ptype, gxp.plugins.HelloWorld);