Added: rave/branches/require/rave-portal-resources/src/main/resources/requireBuild.js URL: http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/resources/requireBuild.js?rev=1497114&view=auto ============================================================================== --- rave/branches/require/rave-portal-resources/src/main/resources/requireBuild.js (added) +++ rave/branches/require/rave-portal-resources/src/main/resources/requireBuild.js Wed Jun 26 21:33:04 2013 @@ -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. + */ + +({ + appDir: '../webapp/static/script', + mainConfigFile: '../webapp/static/script/requireConfig.js', + baseUrl: '.', + dir: '../webapp/static/script-built', + modules: [ + { + name: 'rave' + }, + { + name: 'ui', + exclude: ['rave'] + } + ] +}) \ No newline at end of file
Modified: rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag URL: http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1497114&r1=1497113&r2=1497114&view=diff ============================================================================== --- rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag (original) +++ rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag Wed Jun 26 21:33:04 2013 @@ -29,12 +29,18 @@ <c:choose> <c:when test="${jsDebugMode == '1'}"> <!--TODO: figure out js debug mode --> + <script src="<spring:url value="/static/script/requireConfig.js"/>"></script> + <script> + requirejs.config({baseUrl:"/portal/static/script"}); + </script> </c:when> <c:otherwise> - + <script src="<spring:url value="/static/script-built/requireConfig.js"/>"></script> + <script> + requirejs.config({baseUrl:"/portal/static/script-built"}); + </script> </c:otherwise> </c:choose> -<script src="<spring:url value="/static/script/app.js"/>"></script> <script> require(["rave", "jquery"], function (rave, $) { <%-- set the web application context --%> Copied: rave/branches/require/rave-portal-resources/src/main/webapp/static/script/requireConfig.js (from r1496170, rave/branches/require/rave-portal-resources/src/main/webapp/static/script/app.js) URL: http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/static/script/requireConfig.js?p2=rave/branches/require/rave-portal-resources/src/main/webapp/static/script/requireConfig.js&p1=rave/branches/require/rave-portal-resources/src/main/webapp/static/script/app.js&r1=1496170&r2=1497114&rev=1497114&view=diff ============================================================================== --- rave/branches/require/rave-portal-resources/src/main/webapp/static/script/app.js (original) +++ rave/branches/require/rave-portal-resources/src/main/webapp/static/script/requireConfig.js Wed Jun 26 21:33:04 2013 @@ -18,11 +18,10 @@ */ requirejs.config({ - baseUrl: '/portal/static/script', "paths":{ "backbone":"//cdnjs.cloudflare.com/ajax/libs/backbone.js/0.9.10/backbone-min", "bootstrap": '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.0.3/bootstrap.min', - "clientMessages": "/portal/app/messagebundle/rave_client_messages", + "clientMessages": "/portal/app/messagebundle/rave_client_messages.js?a=b", "handlebars":"//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.0.rc.2/handlebars.min", "jquery": "//ajax.aspnetcdn.com/ajax/jquery/jquery-1.7.2.min", "jqueryUi":"//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/jquery-ui.min",
