Author: rfelden
Date: Thu Dec 20 14:57:31 2007
New Revision: 19399
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19399&repname=
=3Djahia
Log:
project.xml fix
container cache properties map update
container cache debug navigation using navmenu
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cach=
e/ContainerHTMLCacheEntry.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/project.xml&rev=3D19399&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-INCLUDE-TAG-BRANCH/core/project.xml (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.xml Thu Dec 20 14:57:31 =
2007
@@ -1620,14 +1620,7 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>com.google.mygwt</groupId>
- <artifactId>mygwt</artifactId>
- <version>0.4.2</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+ =
=
=
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/cache/ContainerHTMLCacheEntry.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/cache/ContainerHTMLCacheEntry=
.java&rev=3D19399&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cach=
e/ContainerHTMLCacheEntry.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cach=
e/ContainerHTMLCacheEntry.java Thu Dec 20 14:57:31 2007
@@ -14,20 +14,20 @@
=
private String bodyContent ;
=
- private HashMap<String, Object> properties =3D null ;
+ private Map<Serializable, Serializable> properties =3D null ;
=
public ContainerHTMLCacheEntry(String bodyContent) {
this.bodyContent =3D bodyContent ;
}
=
- public ContainerHTMLCacheEntry(String bodyContent, Map<String, Object>=
map) {
+ public ContainerHTMLCacheEntry(String bodyContent, Map<Serializable, S=
erializable> map) {
this.bodyContent =3D bodyContent ;
- properties =3D new HashMap<String, Object>(map) ;
+ properties =3D map ;
}
=
- public ContainerHTMLCacheEntry(Map<String, Object> map) {
+ public ContainerHTMLCacheEntry(Map<Serializable, Serializable> map) {
this.bodyContent =3D "" ;
- properties =3D new HashMap<String, Object>(map) ;
+ properties =3D map ;
}
=
public Object getProperty(String key) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/menus/NavMenuTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/menus/NavMenuTag.java&rev=
=3D19399&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java Thu Dec 20 14:57:31 2007
@@ -40,6 +40,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import java.io.IOException;
+import java.io.Serializable;
import java.util.*;
=
public class NavMenuTag extends AbstractJahiaTag {
@@ -315,9 +316,12 @@
String disp =3D link.getHighLightDiffTitle(jPa=
rams) ;
=
if (cache) {
- sbf.append("<a href=3D\"").append(href).ap=
pend("\"");
- }
- else { // cache deactivated -> append /contain=
ercache/off to URLs
+ if (debug) {
+ sbf.append("<a href=3D\"").append(href=
).append("/containercache/debug").append("\"");
+ } else {
+ sbf.append("<a href=3D\"").append(href=
).append("\"");
+ } =
+ } else { // cache deactivated -> append /conta=
inercache/off to URLs
sbf.append("<a href=3D\"").append(href).ap=
pend("/containercache/off").append("\"");
}
sbf.append(" title=3D\"").append(title).append=
("\">");
@@ -326,7 +330,7 @@
// cache storage
if (cache) {
// Properties Map to cache
- Map<String, Object> map =3D new HashMap<St=
ring, Object>() ;
+ Map<Serializable, Serializable> map =3D ne=
w HashMap<Serializable, Serializable>() ;
map.put("pageID", Integer.valueOf(linkID))=
;
map.put("href", href) ;
map.put("title", title) ;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
