mcardle 2005/08/30 17:40:13 CEST
Modified files:
core/src/java/org/jahia/services/esi Fragment.java
JesiObject.java
Template.java
Log:
* added more comments
* cut down on debugging info
Revision Changes Path
1.4 +9 -8 jahia/core/src/java/org/jahia/services/esi/Fragment.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/Fragment.java.diff?r1=1.3&r2=1.4&f=h
1.4 +2 -2
jahia/core/src/java/org/jahia/services/esi/JesiObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/JesiObject.java.diff?r1=1.3&r2=1.4&f=h
1.4 +95 -97 jahia/core/src/java/org/jahia/services/esi/Template.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/Template.java.diff?r1=1.3&r2=1.4&f=h
Index: Fragment.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/Fragment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Fragment.java 26 Aug 2005 15:20:33 -0000 1.3
+++ Fragment.java 30 Aug 2005 15:40:12 -0000 1.4
@@ -84,23 +84,24 @@
result.append("- fragID: ");
result.append(fragID);
- result.append("- fields: ");
- result.append(EsiService.printContents(fields));
-
//result.append(" els ");
+ result.append("- ctnLists: ");
+ result.append(EsiService.printContents(ctnlists));
+
result.append("- ctns: ");
result.append(EsiService.printContents(ctns));
//result.append(" els ");
- result.append("- ctnLists: ");
- result.append(EsiService.printContents(ctnlists));
-
result.append("- pages: ");
result.append(EsiService.printContents(pages));
//result.append(" els ");
- result.append("| URL: ");
+ result.append("- fields: ");
+ result.append(EsiService.printContents(fields));
+
+
+ /* result.append("| URL: ");
result.append(URL);
result.append(" ");
@@ -146,7 +147,7 @@
result.append("| Content Header: ");
result.append(header);
- result.append(" ");
+ result.append(" "); */
result.append(" ");
Index: JesiObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/JesiObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JesiObject.java 26 Aug 2005 15:20:33 -0000 1.3
+++ JesiObject.java 30 Aug 2005 15:40:12 -0000 1.4
@@ -114,9 +114,9 @@
}*/
//extract prefix part of url string i.e. /jahia/Jahia or
/defaultContextPath/defaultServletPath
- pos = path.indexOf("/", 1);
+ pos = path.indexOf("/", 1);//gets the second slash from the
start of the URL
if (pos != -1) {
- int endIndex = path.indexOf("/", pos + 1);
+ int endIndex = path.indexOf("/", pos + 1);//gets the third
slash from the start of the URL
if (endIndex == -1) { //in case URL is of the following form
: http://192.168.2.178:7780/jahia/Jahia
endIndex = path.length();
}
Index: Template.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/Template.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Template.java 26 Aug 2005 15:20:33 -0000 1.3
+++ Template.java 30 Aug 2005 15:40:12 -0000 1.4
@@ -4,116 +4,114 @@
import org.jahia.services.esi.EsiService;
/**
-* <p>Title: </p>
-*
-* <p>Description: Holds all the info associated to a ESI cache Template,
declated within a JSP template
+ * <p>Title: </p>
+ *
+ * <p>Description: Holds all the info associated to a ESI cache Template,
declated within a JSP template
* using the a <jesi:template> tag. All content which is accessed by
this Template is stored here.
* </p>
-*
-* <p>Copyright: Copyright (c) 2004</p>
-*
-* <p>Company: Jahia Ltd</p>
-* @author MC
-* @version 1.0
-*/
+ *
+ * <p>Copyright: Copyright (c) 2004</p>
+ *
+ * <p>Company: Jahia Ltd</p>
+ * @author MC
+ * @version 1.0
+ */
public class Template extends JesiObject {
private static org.apache.log4j.Logger logger =
- org.apache.log4j.Logger.getLogger(JesiObject.class);
+ org.apache.log4j.Logger.getLogger(JesiObject.class);
- Template (int siteID, int pageID, String URL) {
- this.siteID = siteID;
- this.pageID = pageID;
- this.URL = URL;
- parseUrl(URL);
- objType = "Template";
- }
+ Template (int siteID, int pageID, String URL) {
+ this.siteID = siteID;
+ this.pageID = pageID;
+ this.URL = URL;
+ parseUrl(URL);
+ objType = "Template";
+ }
public String getObjDetails() {
- return "Template on pageID["+pageID+"]";
- }
+ return "Template on pageID["+pageID+"]";
+ }
- public String toString () {
- StringBuffer result = new StringBuffer();
- final String newLine = System.getProperty("line.separator");
+ public String toString () {
+ StringBuffer result = new StringBuffer();
+ final String newLine = System.getProperty("line.separator");
+
+ result.append(this.getClass().getName() + " Object {");
+ result.append(" Name: ");
+ result.append("Template");
+ result.append(newLine);
+
+ result.append("- hash: ");
+ result.append(this.hashCode());
+
+ result.append("- siteID: ");
+ result.append(siteID);
+
+ result.append("- pageID: ");
+ result.append(pageID);
+
+ result.append("- ctnLists: ");
+ result.append(EsiService.printContents(ctnlists));
+
+ result.append("- ctns: ");
+ result.append(EsiService.printContents(ctns));
+ //result.append(" els ");
+
+ result.append("- pages: ");
+ result.append(EsiService.printContents(pages));
+ //result.append(" els ");
+
+ result.append("- fields: ");
+ result.append(EsiService.printContents(fields));
+
+ /* result.append("- URL: ");
+ result.append(URL);
+ result.append(" ");
+
+ result.append("- port: ");
+ result.append(port);
+ result.append(" ");
+
+ result.append("- host: ");
+ result.append(host);
+ result.append(" ");
+
+ result.append("- path: ");
+ result.append(path);
+ result.append(" ");
+ result.append("- query: ");
+ result.append(query);
+ result.append(" ");
+ result.append("- user: ");
+ result.append(user);
+ result.append(" ");
+ result.append("- group: ");
+ result.append(group);
+ result.append(" ");
+
+ result.append("| mode: ");
+ result.append(mode);
+ result.append(" ");
+
+ result.append("| pid: ");
+ result.append(pid);
+ result.append(" ");
+
+ result.append("| site: ");
+ result.append(site);
+ result.append(" ");
+
+ result.append("| Content Header: ");
+ result.append(header);
+ result.append(" "); */
- result.append(this.getClass().getName() + " Object {");
- result.append(" Name: ");
- result.append("Template");
- result.append(newLine);
+ result.append("}");
- result.append("- hash: ");
- result.append(this.hashCode());
-
- result.append("- siteID: ");
- result.append(siteID);
-
- result.append("- pageID: ");
- result.append(pageID);
-
- result.append("- fields: ");
- result.append(EsiService.printContents(fields));
-
- //result.append(" els ");
-
- result.append("- ctns: ");
- result.append(EsiService.printContents(ctns));
- //result.append(" els ");
-
- result.append("- ctnLists: ");
- result.append(EsiService.printContents(ctnlists));
- //result.append(" els ");
-
- result.append("- pages: ");
- result.append(EsiService.printContents(pages));
-
- result.append("- URL: ");
- result.append(URL);
- result.append(" ");
-
- result.append("- port: ");
- result.append(port);
- result.append(" ");
-
- result.append("- host: ");
- result.append(host);
- result.append(" ");
-
- result.append("- path: ");
- result.append(path);
- result.append(" ");
- result.append("- query: ");
- result.append(query);
- result.append(" ");
- result.append("- user: ");
- result.append(user);
- result.append(" ");
- result.append("- group: ");
- result.append(group);
- result.append(" ");
-
- result.append("| mode: ");
- result.append(mode);
- result.append(" ");
-
- result.append("| pid: ");
- result.append(pid);
- result.append(" ");
-
- result.append("| site: ");
- result.append(site);
- result.append(" ");
-
- result.append("| Content Header: ");
- result.append(header);
- result.append(" ");
-
- result.append("}");
-
- return result.toString();
- }
+ return result.toString();
+ }
}
