You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2007/11/06 23:00:39 UTC
svn commit: r592569 - in /myfaces/trinidad/trunk/trinidad: src/site/xdoc/
src/site/xdoc/devguide/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/cor...
Author: jwaldman
Date: Tue Nov 6 14:00:37 2007
New Revision: 592569
URL: http://svn.apache.org/viewvc?rev=592569&view=rev
Log:
TRINIDAD-761 StyleContextImpl.checkStylesModified should be configurable
Modified:
myfaces/trinidad/trunk/trinidad/src/site/xdoc/devguide/configuration.xml
myfaces/trinidad/trunk/trinidad/src/site/xdoc/release-notes.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
Modified: myfaces/trinidad/trunk/trinidad/src/site/xdoc/devguide/configuration.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/src/site/xdoc/devguide/configuration.xml?rev=592569&r1=592568&r2=592569&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/src/site/xdoc/devguide/configuration.xml (original)
+++ myfaces/trinidad/trunk/trinidad/src/site/xdoc/devguide/configuration.xml Tue Nov 6 14:00:37 2007
@@ -363,7 +363,7 @@
<subsection name="org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION">
<p>
If this parameter is enabled by setting to "true", Apache Trinidad will automatically
-check the modification date of your JSPs, and discard saved
+check the modification date of your JSPs and skinning CSS files, and discard saved
state when they change; this makes development easier,
but adds overhead that should be avoided when your application
is deployed.
Modified: myfaces/trinidad/trunk/trinidad/src/site/xdoc/release-notes.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/src/site/xdoc/release-notes.xml?rev=592569&r1=592568&r2=592569&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/src/site/xdoc/release-notes.xml (original)
+++ myfaces/trinidad/trunk/trinidad/src/site/xdoc/release-notes.xml Tue Nov 6 14:00:37 2007
@@ -60,14 +60,14 @@
<subsection name="Changes from previous release">
<ul>
-<li>Non-public web.xml setting 'org.apache.myfaces.trinidadinternal.DISABLE_CONTENT_COMPRESSION'
-made public as 'org.apache.myfaces.trinidad.DISABLE_CONTENT_COMPRESSION'.
-</li>
-<li>Non-public web.xml setting 'org.apache.myfaces.trinidadinternal.renderkit.USE_DIALOG_POPUP'
-made public as 'org.apache.myfaces.trinidad.ENABLE_LIGHTWEIGHT_DIALOGS'.
+<li>In previous releases, when you change a skinning css file, the change is reflected
+in the running application on refresh. To aid in performance, this is now a configuration
+option that defaults to false -- do not check for css file modifications.
+The web.xml configuration parameter org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION
+is used. Set this to true if you want your skinning css file changes to be reflected
+without stopping/starting the server.
</li>
<li>The style name for skinning the root of a panelAccordion has changed from "af|panelAccordion::container" to "af|panelAccordion".</li>
-</ul>
<li>The xOffset/yOffset attributes of panelPopup have been renamed to xoffset/yoffset.</li>
</ul>
</subsection>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?rev=592569&r1=592568&r2=592569&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Tue Nov 6 14:00:37 2007
@@ -45,6 +45,7 @@
import org.apache.myfaces.trinidad.util.Service;
import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
+import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.util.URLUtils;
/**
@@ -345,7 +346,7 @@
if (_checkTimestamp == null)
{
String checkTimestamp =
- context.getExternalContext().getInitParameter(_CHECK_TIMESTAMP_PARAM);
+ context.getExternalContext().getInitParameter(Configuration.CHECK_TIMESTAMP_PARAM);
// Detect when we're running inside of the JDeveloper embedded OC4J
// environment - and there, always use timestamp checking
// TODO: come up with a non-proprietary way of checking this?
@@ -355,7 +356,7 @@
if ("true".equals(checkTimestamp))
{
_LOG.info("TIMESTAMP_CHECKING_ENABLED_SHOULDNOT_IN_PRODUCTION",
- _CHECK_TIMESTAMP_PARAM);
+ Configuration.CHECK_TIMESTAMP_PARAM);
}
}
@@ -520,10 +521,6 @@
private final Map<String, Long> _timestamps;
private boolean _inited;
private Map<String, InternalView> _internalViews;
-
-
- private static final String _CHECK_TIMESTAMP_PARAM =
- "org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION";
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ViewHandlerImpl.class);
private static final Long _NOT_FOUND = Long.valueOf(0);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java?rev=592569&r1=592568&r2=592569&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java Tue Nov 6 14:00:37 2007
@@ -29,6 +29,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.HtmlRenderer;
import org.apache.myfaces.trinidad.context.LocaleContext;
import org.apache.myfaces.trinidad.skin.Skin;
+import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.skin.SkinStyleProvider;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
import org.apache.myfaces.trinidadinternal.style.StyleProvider;
@@ -84,9 +85,10 @@
public boolean checkStylesModified()
{
- // =-=AEW Expose a configuration option if this
- // is a performance issue
- return true;
+ FacesContext context = FacesContext.getCurrentInstance();
+ String checkTimestamp =
+ context.getExternalContext().getInitParameter(Configuration.CHECK_TIMESTAMP_PARAM);
+ return "true".equals(checkTimestamp);
}
public boolean disableStandardsMode()
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java?rev=592569&r1=592568&r2=592569&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java Tue Nov 6 14:00:37 2007
@@ -44,6 +44,9 @@
*/
static public final String DISABLE_CONTENT_COMPRESSION =
"org.apache.myfaces.trinidad.DISABLE_CONTENT_COMPRESSION";
+
+ static public final String CHECK_TIMESTAMP_PARAM =
+ "org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION";
/**
* Key for the base UIX directory.