Author: cmailleux
Date: Wed Aug 9 16:51:43 2006
New Revision: 14881
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14881&repname=jahia
Log:
Remove logging of statistics in a file by default
Add a development mode allowing to disable the flush of html cache each time we
switch of operationnal mode
Correctly ordere element in web.xml
Display the groupname in tooltip window only available under firefox
Modified:
trunk/core/src/conf/java/logger.properties
trunk/core/src/java/org/jahia/params/ParamBean.java
trunk/core/src/java/org/jahia/settings/SettingsBean.java
trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
trunk/core/src/webapp/WEB-INF/web.xml
trunk/core/src/webapp/jsp/jahia/administration/group_management/group_search.jsp
Modified: trunk/core/src/conf/java/logger.properties
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/conf/java/logger.properties&rev=14881&repname=jahia
==============================================================================
--- trunk/core/src/conf/java/logger.properties (original)
+++ trunk/core/src/conf/java/logger.properties Wed Aug 9 16:51:43 2006
@@ -1,14 +1,14 @@
#LoggerSystem Jahia Statistics - System configuration
-systems.JahiaStatistics.loggers=file,statisticsservice
+systems.JahiaStatistics.loggers=statisticsservice
#Optional, Default: 50 - Must be >= 0
systems.JahiaStatistics.notification.queueSize=20
#Optional milliseconds, Default: 10000 - Must be > 0
systems.JahiaStatistics.notification.timeout=5000
#LoggerDelegate file - configuration
-delegate.file.className=org.jahia.services.logger.LoggerFile
-delegate.file.properties.fileName=C:\\hits.log
-delegate.file.properties.format=%dateTime,%systemId,%parentId,%eventType,User:
%userName,Site:%siteId,ObjectType:%objectType,Object id:%objectId,Action:
%actionId,%level{0},%level{1},%level{2},%level{3},%level{4},%level{5}
+#delegate.file.className=org.jahia.services.logger.LoggerFile
+#delegate.file.properties.fileName=C:\\hits.log
+#delegate.file.properties.format=%dateTime,%systemId,%parentId,%eventType,User:
%userName,Site:%siteId,ObjectType:%objectType,Object id:%objectId,Action:
%actionId,%level{0},%level{1},%level{2},%level{3},%level{4},%level{5}
#LoggerDelegate statisticsservice - configuration
delegate.statisticsservice.className=org.jahia.services.logger.LoggerJahiaStatistics
Modified: trunk/core/src/java/org/jahia/params/ParamBean.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/params/ParamBean.java&rev=14881&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/params/ParamBean.java (original)
+++ trunk/core/src/java/org/jahia/params/ParamBean.java Wed Aug 9 16:51:43 2006
@@ -3333,11 +3333,13 @@
servletDispatchingProvider.flushAllSessionsCaches(getSessionState());
// We flush all the pages for the current user.
- final HtmlCache htmlCache =
REGISTRY.getCacheService().getHtmlCacheInstance();
- if (htmlCache != null)
- htmlCache.invalidateUserEntries(getUser().getUsername());
- else
- logger.warn("Could not get the HTML cache instance!!");
+ if(Jahia.getSettings().isDevelopmentMode()) {
+ final HtmlCache htmlCache =
REGISTRY.getCacheService().getHtmlCacheInstance();
+ if (htmlCache != null)
+ htmlCache.invalidateUserEntries(getUser().getUsername());
+ else
+ logger.warn("Could not get the HTML cache instance!!");
+ }
}
}
Modified: trunk/core/src/java/org/jahia/settings/SettingsBean.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/settings/SettingsBean.java&rev=14881&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/settings/SettingsBean.java (original)
+++ trunk/core/src/java/org/jahia/settings/SettingsBean.java Wed Aug 9
16:51:43 2006
@@ -310,6 +310,7 @@
private boolean useFlatFileManager;
private boolean showTimeBasedPublishingIcons;
+ private boolean developmentMode = true;
/**
* Default constructor.
@@ -675,6 +676,7 @@
useFlatFileManager = getBoolean("useFlatFileManager", true);
showTimeBasedPublishingIcons =
getBoolean("showTimeBasedPublishingIcons", true);
localAccessUri = getString("localAccessUri",
"http://localhost:8080";);
+ developmentMode = getBoolean("developmentMode",true);
} catch (NullPointerException npe) {
logger.debug ("Properties file is not valid...!", npe);
} catch (NumberFormatException nfe) {
@@ -1797,4 +1799,8 @@
public boolean showTimeBasedPublishingIcons() {
return showTimeBasedPublishingIcons;
}
+
+ public boolean isDevelopmentMode() {
+ return developmentMode;
+ }
}
Modified: trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton&rev=14881&repname=jahia
==============================================================================
--- trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton Wed Aug 9 16:51:43
2006
@@ -713,6 +713,13 @@
showTimeBasedPublishingIcons = true
######################################################################
+### Development Mode #################################################
+######################################################################
+# This setting can be used to deactivate development mode which flush
+# the html cache each time you change the operation mode (live/edit)
+developmentMode = true
+
+######################################################################
### Deprecated settings ##############################################
######################################################################
# The following settings are deprecated, and will be removed in a future
Modified: trunk/core/src/webapp/WEB-INF/web.xml
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/WEB-INF/web.xml&rev=14881&repname=jahia
==============================================================================
--- trunk/core/src/webapp/WEB-INF/web.xml (original)
+++ trunk/core/src/webapp/WEB-INF/web.xml Wed Aug 9 16:51:43 2006
@@ -1260,6 +1260,21 @@
<taglib-location>/WEB-INF/tld/jesi-tags.tld</taglib-location>
</taglib>
+ <!-- JNDI Db resource -->
+ <resource-ref>
+ <description>DB Connection</description>
+ <res-ref-name>jdbc/jetspeed</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+ <resource-ref>
+ <description>Non Tx DB Connection</description>
+ <res-ref-name>jdbc/jetspeedNonTx</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
<security-constraint>
<web-resource-collection>
<web-resource-name>JAM monitoring report</web-resource-name>
@@ -1277,21 +1292,6 @@
<security-role>
<role-name>manager</role-name>
- </security-role>
-
- <!-- JNDI Db resource -->
- <resource-ref>
- <description>DB Connection</description>
- <res-ref-name>jdbc/jetspeed</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
-
- <resource-ref>
- <description>Non Tx DB Connection</description>
- <res-ref-name>jdbc/jetspeedNonTx</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
+ </security-role>
</web-app>
Modified:
trunk/core/src/webapp/jsp/jahia/administration/group_management/group_search.jsp
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/administration/group_management/group_search.jsp&rev=14881&repname=jahia
==============================================================================
---
trunk/core/src/webapp/jsp/jahia/administration/group_management/group_search.jsp
(original)
+++
trunk/core/src/webapp/jsp/jahia/administration/group_management/group_search.jsp
Wed Aug 9 16:51:43 2006
@@ -176,36 +176,12 @@
Iterator it = resultSet.iterator();
while (it.hasNext()) {
Principal p = (Principal)it.next();
- %><option
value="<%=((JahiaGroup)p).getGroupname()%>">
+ %><option
value="<%=((JahiaGroup)p).getGroupname()%>"
title="<%=((JahiaGroup)p).getGroupname()%>">
<%=principalViewHelper.getPrincipalTextOption(p)%>
</option><%
}
} %>
</select><br>
-
-<%-- <select
ondblclick="javascript:handleKey(event);"--%>
-<%--
onkeydown="javascript:handleKeyCode(event.keyCode);"--%>
-<%-- class="fontfix" name="selectedGroup"
size="25" multiple>--%>
-<%--<% if (resultList == null ||
resultList.size() == 0) {--%>
-<%--%>--%>
-<%-- <option value="null" selected>--%>
-<%--
--%>
-<%--
--%>
-<%--
--%>
-<%--
--%>
-<%-- </option>--%>
-<%--<% } else {--%>
-<%-- for (int i = 0; i < resultList.size(); i += 2) {--%>
-<%--%>--%>
-<%-- <!-- Option value = '<%=
JahiaTools.replacePattern((String)resultList.get(i), " ", "_")%>'--%>
-<%-- text = '<%=
JahiaTools.replacePattern((String)resultList.get(i + 1), " ", "_")%>'
-->--%>
-<%-- <option value="<%=
(String)resultList.get(i)%>">--%>
-<%-- <%= (String)resultList.get(i + 1)%>--%>
-<%-- </option>--%>
-<%--<% }--%>
-<%--}--%>
-<%--%>--%>
-<%-- </select><br>--%>
</td>
</tr>
</table>
