You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/04/03 22:17:04 UTC
svn commit: r1309125 - in /rave/trunk:
rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/
rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/
rave-components/rave-web/src/test/java/org/apache/rave/portal/web/mo...
Author: carlucci
Date: Tue Apr 3 20:17:03 2012
New Revision: 1309125
URL: http://svn.apache.org/viewvc?rev=1309125&view=rev
Log:
RAVE-522: Administrative Preference to choose which JavaScript file to serve
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java Tue Apr 3 20:17:03 2012
@@ -23,8 +23,7 @@ import org.apache.rave.portal.model.Port
import java.util.Map;
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.PAGE_SIZE;
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.TITLE_SUFFIX;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.*;
/**
* Form object for portal preferences
@@ -33,6 +32,7 @@ public class PortalPreferenceForm {
public static final String DEFAULT_PAGE_SIZE = "10";
public static final String DEFAULT_TITLE_SUFFIX = "";
+ public static final String DEFAULT_JAVASCRIPT_DEBUG_MODE = "1";
private Map<String, PortalPreference> preferenceMap;
@@ -50,6 +50,9 @@ public class PortalPreferenceForm {
if (getTitleSuffix() == null) {
preferenceMap.put(TITLE_SUFFIX, new PortalPreference(TITLE_SUFFIX, DEFAULT_TITLE_SUFFIX));
}
+ if (getJavaScriptDebugMode() == null) {
+ preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new PortalPreference(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
+ }
}
public PortalPreference getPageSize() {
@@ -68,6 +71,14 @@ public class PortalPreferenceForm {
preferenceMap.put(TITLE_SUFFIX, titleSuffix);
}
+ public PortalPreference getJavaScriptDebugMode() {
+ return preferenceMap.get(JAVASCRIPT_DEBUG_MODE);
+ }
+
+ public void setJavaScriptDebugMode(PortalPreference javaScriptDebugMode) {
+ preferenceMap.put(JAVASCRIPT_DEBUG_MODE, javaScriptDebugMode);
+ }
+
public Map<String, PortalPreference> getPreferenceMap() {
return preferenceMap;
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java Tue Apr 3 20:17:03 2012
@@ -23,11 +23,9 @@ package org.apache.rave.portal.web.util;
* Utility class for {@link org.apache.rave.portal.model.PortalPreference} keys
*/
public final class PortalPreferenceKeys {
- private PortalPreferenceKeys() {
-
- }
+ private PortalPreferenceKeys() { }
public static final String TITLE_SUFFIX = "titleSuffix";
public static final String PAGE_SIZE = "pageSize";
-
+ public static final String JAVASCRIPT_DEBUG_MODE = "javaScriptDebugMode";
}
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java Tue Apr 3 20:17:03 2012
@@ -27,8 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import static junit.framework.Assert.assertEquals;
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.PAGE_SIZE;
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.TITLE_SUFFIX;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.*;
/**
* Test for {@link PortalPreferenceForm}
@@ -42,6 +41,8 @@ public class PortalPreferenceFormTest {
preferenceMap.put(TITLE_SUFFIX, titlePref);
PortalPreference pageSizePref = new PortalPreference(PAGE_SIZE, "20");
preferenceMap.put(PAGE_SIZE, pageSizePref);
+ PortalPreference javaScriptDebugMode = new PortalPreference(JAVASCRIPT_DEBUG_MODE, "0");
+ preferenceMap.put(JAVASCRIPT_DEBUG_MODE, javaScriptDebugMode);
}
@Test
@@ -49,6 +50,7 @@ public class PortalPreferenceFormTest {
PortalPreferenceForm form = new PortalPreferenceForm(preferenceMap);
assertEquals("Test portal", form.getTitleSuffix().getValue());
assertEquals("20", form.getPageSize().getValue());
+ assertEquals("0", form.getJavaScriptDebugMode().getValue());
}
@Test
@@ -56,5 +58,6 @@ public class PortalPreferenceFormTest {
PortalPreferenceForm form = new PortalPreferenceForm(new HashMap<String, PortalPreference>());
assertEquals(PortalPreferenceForm.DEFAULT_PAGE_SIZE, form.getPageSize().getValue());
assertEquals(PortalPreferenceForm.DEFAULT_TITLE_SUFFIX, form.getTitleSuffix().getValue());
+ assertEquals(PortalPreferenceForm.DEFAULT_JAVASCRIPT_DEBUG_MODE, form.getJavaScriptDebugMode().getValue());
}
}
Modified: rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Tue Apr 3 20:17:03 2012
@@ -259,6 +259,9 @@ admin.preferencedetail.title=Rave admin
admin.preferencedetail.titleSuffix=Page title suffix
admin.preferencedetail.pageSize=Number of items per page (list)
admin.preferencedetail.pageSize.malformed=Enter a whole number greater than 0
+admin.preferencedetail.javaScriptDebugMode=JavaScript Debug Mode
+admin.preferencedetail.javaScriptDebugMode.true=Enabled
+admin.preferencedetail.javaScriptDebugMode.false=Disabled
admin.preferencedetail.updateButton=Update preferences
admin.preferencedetail.action.update.success=Preferences have been updated
admin.preferencedetail.goback=\u00ab Back to overview
Modified: rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties Tue Apr 3 20:17:03 2012
@@ -270,6 +270,9 @@ admin.preferencedetail.title=Rave admin
admin.preferencedetail.titleSuffix=Toevoeging pagina titel
admin.preferencedetail.pageSize=Aantal items per pagina (lijst)
admin.preferencedetail.pageSize.malformed=Voer een geheel getal in groter dan 0
+admin.preferencedetail.javaScriptDebugMode=JavaScript Debug Mode
+admin.preferencedetail.javaScriptDebugMode.true=Ingeschakeld
+admin.preferencedetail.javaScriptDebugMode.false=Uitgeschakeld
admin.preferencedetail.updateButton=Wijzig voorkeuren
admin.preferencedetail.action.update.success=De voorkeuren zijn bijgewerkt
admin.preferencedetail.goback=\u00AB Terug naar overzicht
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql Tue Apr 3 20:17:03 2012
@@ -956,6 +956,13 @@ values (@next_portal_preference_id, 'pag
INSERT INTO portalpreference_values
values (@next_portal_preference_id, '10');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
+
+set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
+INSERT INTO portal_preference (entity_id, preference_key)
+values (@next_portal_preference_id, 'javaScriptDebugMode');
+INSERT INTO portalpreference_values
+values (@next_portal_preference_id, '1');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
-- end portal preferences
-- category
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp Tue Apr 3 20:17:03 2012
@@ -58,6 +58,19 @@
</p>
</fieldset>
<fieldset>
+ <p>
+ <spring:bind path="javaScriptDebugMode.value">
+ <form:label path="javaScriptDebugMode.value"><fmt:message key="admin.preferencedetail.javaScriptDebugMode"/> *</form:label>
+ <form:select id="javaScriptDebugMode" path="javaScriptDebugMode.value">
+ <form:option value="0"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.false"/></form:option>
+ <form:option value="1"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.true"/></form:option>
+ </form:select>
+ <form:errors path="javaScriptDebugMode.value" cssClass="error"/>
+ </spring:bind>
+ </p>
+ </fieldset>
+
+ <fieldset>
<fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
<input type="submit" value="${updateButtonText}"/>
</fieldset>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1309125&r1=1309124&r2=1309125&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag Tue Apr 3 20:17:03 2012
@@ -33,15 +33,23 @@
<portal:render-script location="${'AFTER_LIB'}" />
<%-- local rave scripts --%>
<portal:render-script location="${'BEFORE_RAVE'}" />
-<script src="<spring:url value="/script/rave.js"/>"></script>
-<script src="<spring:url value="/script/rave_api.js"/>"></script>
-<script src="<spring:url value="/script/rave_opensocial.js"/>"></script>
-<script src="<spring:url value="/script/rave_wookie.js"/>"></script>
-<script src="<spring:url value="/script/rave_layout.js"/>"></script>
-<script src="<spring:url value="/script/rave_forms.js"/>"></script>
-<script src="<spring:url value="/script/rave_person_profile.js"/>"></script>
-<script src="<spring:url value="/script/rave_store.js"/>"></script>
-<script src="<spring:url value="/script/rave_admin.js"/>"></script>
+<%-- check to see if the javaScriptDebugMode is on, if so render the individual JS files, otherwise render the minified single file --%>
+<c:choose>
+ <c:when test="${not empty portalSettings and not empty portalSettings['javaScriptDebugMode'] and portalSettings['javaScriptDebugMode'].value == '0'}">
+ <script src="<spring:url value="/script/rave_all.min.js"/>"></script>
+ </c:when>
+ <c:otherwise>
+ <script src="<spring:url value="/script/rave.js"/>"></script>
+ <script src="<spring:url value="/script/rave_api.js"/>"></script>
+ <script src="<spring:url value="/script/rave_opensocial.js"/>"></script>
+ <script src="<spring:url value="/script/rave_wookie.js"/>"></script>
+ <script src="<spring:url value="/script/rave_layout.js"/>"></script>
+ <script src="<spring:url value="/script/rave_forms.js"/>"></script>
+ <script src="<spring:url value="/script/rave_person_profile.js"/>"></script>
+ <script src="<spring:url value="/script/rave_store.js"/>"></script>
+ <script src="<spring:url value="/script/rave_admin.js"/>"></script>
+ </c:otherwise>
+</c:choose>
<script src="<spring:url value="/app/messagebundle/rave_client_messages.js"/>"></script>
<portal:render-script location="${'AFTER_RAVE'}" />
<%-- common javascript to execute on all pages --%>