Author: shuber
Date: Thu Jul 5 08:36:59 2007
New Revision: 17878
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17878&repname=
=3Djahia
Log:
- Reactivate code that was commented out
- Remove synchronized
- Minor identation correction
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaP=
ageField.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
heFactory.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/conten=
t.tld
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaPageField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaPageField.java&rev=3D17878=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaP=
ageField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaP=
ageField.java Thu Jul 5 08:36:59 2007
@@ -135,7 +135,6 @@
// for parameter call)
if ( (jParams.settings().lookupBoolean(SettingsBea=
n.OUTPUT_CACHE_ACTIVATED)) &&
(!jParams.settings().isOutputCacheExpirationO=
nly()) ) {
- /*
if (ContentPageXRefManager.getInstance() !=3D =
null) {
if (jParams !=3D null) {
try {
@@ -149,7 +148,6 @@
} else {
logger.error("PageXRefManager instance is =
null ");
}
- */
}
=
switch (thePage.getPageType()) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/CacheFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/CacheFactory.java&rev=3D1787=
8&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
heFactory.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
heFactory.java Thu Jul 5 08:36:59 2007
@@ -174,7 +174,7 @@
return cache;
}
=
- public synchronized ContainerHTMLCache getContainerHTMLCacheInstance()=
throws JahiaInitializationException {
+ public ContainerHTMLCache getContainerHTMLCacheInstance() throws Jahia=
InitializationException {
// if the Html cache already exists, then return the instance
ContainerHTMLCache cache =3D (ContainerHTMLCache)getCache (Contain=
erHTMLCache.CONTAINER_HTML_CACHE);
if (cache !=3D null)
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/=
content.tld
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/content.tld&rev=3D17878&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/conten=
t.tld (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/conten=
t.tld Thu Jul 5 08:36:59 2007
@@ -76,7 +76,7 @@
</attribute>
</tag>
=
- <tag>
+ <tag>
<name>declareContainerListProp</name>
<tagclass>org.jahia.taglibs.declarations.DeclareContainerListPropTag=
</tagclass>
<info>Declares a container list property</info>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
