Commits

Juan Carlos Picado Herrera committed 74113d0

Changes related with ENCUESTAME-278

  • Participants
  • Parent commits 22c154f

Comments (0)

Files changed (4)

 #!/bin/bash
 DOJO_PATH=dojo
-SVN_DOJO=http://svn.dojotoolkit.org/src/tags/release-1.6.1/
-FILE_DOJO=http://download.dojotoolkit.org/release-1.6.1/dojo-release-1.6.1-src.zip
-FILE_NAME=dojo-release-1.6.1-src.zip
+DOJO_VERSION=1.6.1
+SVN_DOJO=http://svn.dojotoolkit.org/src/tags/release-${DOJO_VERSION}/
+FILE_DOJO=http://download.dojotoolkit.org/release-${DOJO_VERSION}/dojo-release-${DOJO_VERSION}-src.zip
+FILE_NAME=dojo-release-${DOJO_VERSION}-src.zip
 
 function createFromDownload {
         if [ -d ${DOJO_PATH} ]; then
     wget ${FILE_DOJO}
     echo "ZIP - Create work path"
     unzip ${FILE_NAME}
-    mv dojo-release-1.6.1-src ${DOJO_PATH}
+    mv dojo-release-${DOJO_VERSION}-src ${DOJO_PATH}
     echo "ZIP - Copy Resources"
     rm ${FILE_NAME}
     copyResources

encuestame-war/pom.xml

                                 resource/js/org/**/*,
                                 resource/js/org/**/*,
                                 resource/js/encuestame.profile.js,
+                                resource/js/default.js, <!-- This file is because a issue on Dojo 1.6 with AMD modules. -->
                                 **/*.properties,
                                 **/*.class,
                                 **/*.ico,
                                             </classpath>
                                             <jvmarg value="-Xmx512M"/>
                                             <arg value="build.js"/>
-                                            <arg value="version=1.6.1"/>
+                                            <arg value="version=1.6.0"/>
                                             <arg value="profileFile=${basedir}/src/main/webapp/resource/js/encuestame.profile.js"/>
                                             <arg value="action=clean,release"/>
                                             <arg value="releaseDir=${project.build.directory}/dojo-compiled"/>
             <groupId>com.googlecode.ehcache-spring-annotations</groupId>
             <artifactId>ehcache-spring-annotations</artifactId>
         </dependency>
-        <!-- wro4j -->
-        <dependency>
-          <groupId>ro.isdc.wro4j</groupId>
-          <artifactId>wro4j-core</artifactId>
-          <version>1.3.8</version>
-        </dependency>
-        <dependency>
-          <groupId>ro.isdc.wro4j</groupId>
-          <artifactId>wro4j-extensions</artifactId>
-          <version>1.3.8</version>
-        </dependency>
     </dependencies>
 </project>

encuestame-war/src/main/webapp/WEB-INF/jsp/includes/javascript.jsp

         var djConfig = { isDebug: true };
 </script>
 <script src="<%=request.getContextPath()%>/resources/js/dojo/encuestame-commons.js"></script>
-<script src="<%=request.getContextPath()%>/resources/js/encuestame/encuestame.js"></script>
+<%-- <script src="<%=request.getContextPath()%>/resources/js/encuestame/encuestame.js"></script> --%>
 <%=WidgetUtil.getAnalytics("analytics.inc")%>

encuestame-war/src/main/webapp/resource/js/default.js

+(function(){var a=dojo,i;a.mixin(a,{_loadedModules:{},_inFlightCount:0,_hasResource:{},_modulePrefixes:{dojo:{name:"dojo",value:"."},doh:{name:"doh",value:"../util/doh"},tests:{name:"tests",value:"tests"}},_moduleHasPrefix:function(b){var c=a._modulePrefixes;return!(!c[b]||!c[b].value)},_getModulePrefix:function(b){var c=a._modulePrefixes;if(a._moduleHasPrefix(b))return c[b].value;return b},_loadedUrls:[],_postLoad:!1,_loaders:[],_unloaders:[],_loadNotifying:!1});dojo._loadPath=function(b,c,d){b=
+(b.charAt(0)=="/"||b.match(/^\w+:/)?"":a.baseUrl)+b;try{return i=c,!c?a._loadUri(b,d):a._loadUriAndCheck(b,c,d)}catch(e){return console.error(e),!1}finally{i=null}};dojo._loadUri=function(b,c){if(a._loadedUrls[b])return!0;a._inFlightCount++;var d=a._getText(b,!0);if(d){a._loadedUrls[b]=!0;a._loadedUrls.push(b);d=c?/^define\(/.test(d)?d:"("+d+")":a._scopePrefix+d+a._scopeSuffix;a.isIE||(d+="\r\n//@ sourceURL="+b);var e=a.eval(d);c&&c(e)}--a._inFlightCount==0&&a._postLoad&&a._loaders.length&&setTimeout(function(){a._inFlightCount==
+0&&a._callLoaded()},0);return!!d};dojo._loadUriAndCheck=function(b,c,d){var e=!1;try{e=a._loadUri(b,d)}catch(f){console.error("failed loading "+b+" with error: "+f)}return!(!e||!a._loadedModules[c])};dojo.loaded=function(){a._loadNotifying=!0;a._postLoad=!0;var b=a._loaders;a._loaders=[];for(var c=0;c<b.length;c++)b[c]();a._loadNotifying=!1;a._postLoad&&a._inFlightCount==0&&b.length&&a._callLoaded()};dojo.unloaded=function(){for(var b=a._unloaders;b.length;)b.pop()()};a._onto=function(b,c,a){if(a){if(a){var e=
+typeof a=="string"?c[a]:a;b.push(function(){e.call(c)})}}else b.push(c)};dojo.ready=dojo.addOnLoad=function(b,c){a._onto(a._loaders,b,c);a._postLoad&&a._inFlightCount==0&&!a._loadNotifying&&a._callLoaded()};var h=a.config.addOnLoad;if(h)a.addOnLoad[h instanceof Array?"apply":"call"](a,h);dojo._modulesLoaded=function(){a._postLoad||(a._inFlightCount>0?console.warn("files still in flight!"):a._callLoaded())};dojo._callLoaded=function(){typeof setTimeout=="object"||a.config.useXDomain&&a.isOpera?setTimeout(a.isAIR?
+function(){a.loaded()}:a._scopeName+".loaded();",0):a.loaded()};dojo._getModuleSymbols=function(b){for(var b=b.split("."),c=b.length;c>0;c--){var d=b.slice(0,c).join(".");if(c==1&&!a._moduleHasPrefix(d))b[0]="../"+b[0];else{var e=a._getModulePrefix(d);if(e!=d){b.splice(0,c,e);break}}}return b};dojo._global_omit_module_check=!1;dojo.loadInit=function(b){b()};dojo._loadModule=dojo.require=function(b,c){var c=a._global_omit_module_check||c,d=a._loadedModules[b];if(d)return d;var e=a._getModuleSymbols(b).join("/")+
+".js";if(!a._loadPath(e,!c?b:null)&&!c)throw Error("Could not load '"+b+"'; last tried '"+e+"'");if(!c&&!a._isXDomain&&(d=a._loadedModules[b],!d))throw Error("symbol '"+b+"' is not defined after loading '"+e+"'");return d};dojo.provide=function(b){b+="";return a._loadedModules[b]=a.getObject(b,!0)};dojo.platformRequire=function(b){for(var b=(b.common||[]).concat(b[a._name]||b["default"]||[]),c=0;c<b.length;c++){var d=b[c];d.constructor==Array?a._loadModule.apply(a,d):a._loadModule(d)}};dojo.requireIf=
+function(b){if(b===!0){for(var c=[],d=1;d<arguments.length;d++)c.push(arguments[d]);a.require.apply(a,c)}};dojo.requireAfterIf=a.requireIf;dojo.registerModulePath=function(b,c){a._modulePrefixes[b]={name:b,value:c}};dojo.requireLocalization=function(){a.require("dojo.i18n");a.i18n._requireLocalization.apply(a.hostenv,arguments)};var n=/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/,o=/^((([^\[:]+):)?([^@]+)@)?(\[([^\]]+)\]|([^\[:]*))(:([0-9]+))?$/;dojo._Url=function(){for(var b=arguments,
+c=[b[0]],d=1;d<b.length;d++)if(b[d]){var e=new a._Url(b[d]+""),c=new a._Url(c[0]+"");if(e.path==""&&!e.scheme&&!e.authority&&!e.query){if(e.fragment!=null)c.fragment=e.fragment;e=c}else if(!e.scheme&&(e.scheme=c.scheme,!e.authority&&(e.authority=c.authority,e.path.charAt(0)!="/"))){for(var c=(c.path.substring(0,c.path.lastIndexOf("/")+1)+e.path).split("/"),f=0;f<c.length;f++)c[f]=="."?f==c.length-1?c[f]="":(c.splice(f,1),f--):f>0&&!(f==1&&c[0]=="")&&c[f]==".."&&c[f-1]!=".."&&(f==c.length-1?(c.splice(f,
+1),c[f-1]=""):(c.splice(f-1,2),f-=2));e.path=c.join("/")}c=[];e.scheme&&c.push(e.scheme,":");e.authority&&c.push("//",e.authority);c.push(e.path);e.query&&c.push("?",e.query);e.fragment&&c.push("#",e.fragment)}this.uri=c.join("");b=this.uri.match(n);this.scheme=b[2]||(b[1]?"":null);this.authority=b[4]||(b[3]?"":null);this.path=b[5];this.query=b[7]||(b[6]?"":null);this.fragment=b[9]||(b[8]?"":null);if(this.authority!=null)b=this.authority.match(o),this.user=b[3]||null,this.password=b[4]||null,this.host=
+b[6]||b[7],this.port=b[9]||null};dojo._Url.prototype.toString=function(){return this.uri};dojo.moduleUrl=function(b,c){var d=a._getModuleSymbols(b).join("/");if(!d)return null;d.lastIndexOf("/")!=d.length-1&&(d+="/");var e=d.indexOf(":");if(d.charAt(0)!="/"&&(e==-1||e>d.indexOf("/")))d=a.baseUrl+d;return new a._Url(d,c)};define=function(b,c,a){function e(a){if(a.charAt(0)==="."){for(a=b.substring(0,b.lastIndexOf("/")+1)+a;c!==a;)var c=a,a=a.replace(/\/[^\/]*\/\.\.\//,"/");a=a.replace(/\/\.\//g,"/")}return a.replace(/\//g,
+".")}a||(c?(a=c,c=b):(a=b,c=typeof a=="function"?["require","exports","module"].slice(0,a.length):[]),b=i?i.replace(/\./g,"/"):"anon");var f=b.replace(/\//g,"."),h=dojo.provide(f);if(typeof a=="function"){for(var k=[],g,j=0;j<c.length;j++){g=e(c[j]);var l=g.indexOf("!");if(l>-1)g.substring(0,l)=="i18n"&&(g=g.match(/^i18n\!(.+)\.nls\.([^\.]+)$/),dojo.requireLocalization(g[1],g[2])),g=null;else switch(g){case "require":g=function(a){return dojo.require(e(a))};break;case "exports":g=h;break;case "module":var m=
+g={exports:h};break;case "dojox":g=dojo.getObject(g);break;case "dojo/lib/kernel":case "dojo/lib/backCompat":g=dojo;break;default:g=dojo.require(g)}k.push(g)}c=a.apply(null,k)}else c=a;c&&(dojo._loadedModules[f]=c,dojo.setObject(f,c));if(m)dojo._loadedModules[f]=m.exports;return c};define.vendor="dojotoolkit.org";define.version=dojo.version;define("dojo/lib/kernel",[],dojo);define("dojo/lib/backCompat",[],dojo);define("dojo",[],dojo);define("dijit",[],this.dijit||(this.dijit={}))})();