You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2003/05/16 10:49:19 UTC
cvs commit: cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/generation ProfilerGenerator.java
bruno 2003/05/16 01:49:19
Modified: src/blocks/profiler/java/org/apache/cocoon/generation
ProfilerGenerator.java
Log:
Use an explicit namespace for the profiler elements instead of the default
one, avoids potential problems with the embedded XML fragments.
Revision Changes Path
1.4 +35 -33 cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/generation/ProfilerGenerator.java
Index: ProfilerGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/generation/ProfilerGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProfilerGenerator.java 21 Mar 2003 17:28:42 -0000 1.3
+++ ProfilerGenerator.java 16 May 2003 08:49:19 -0000 1.4
@@ -99,6 +99,8 @@
private static final String SESSIONATTRIBUTE_ELEMENT = "attribute";
private static final String COMPONENT_ELEMENT = "component";
private static final String FRAGMENT_ELEMENT = "fragment";
+ private static final String PREFIX = "profiler";
+ private static final String PREFIX_COLON = "profiler:";
private Profiler profiler;
@@ -190,23 +192,23 @@
generateSAXFragment(fragment, false);
} else {
this.contentHandler.startDocument();
- this.contentHandler.startPrefixMapping("", PROFILER_NS);
- this.contentHandler.startElement(PROFILER_NS, "fragment-error", "fragment-error", new AttributesImpl());
+ this.contentHandler.startPrefixMapping(PREFIX, PROFILER_NS);
+ this.contentHandler.startElement(PROFILER_NS, "fragment-error", PREFIX_COLON + "fragment-error", new AttributesImpl());
char[] message = "Fragment is not available.".toCharArray();
this.contentHandler.characters(message, 0, message.length);
- this.contentHandler.endElement(PROFILER_NS, "fragment-error", "fragment-error");
- this.contentHandler.endPrefixMapping("");
+ this.contentHandler.endElement(PROFILER_NS, "fragment-error", PREFIX_COLON + "fragment-error");
+ this.contentHandler.endPrefixMapping(PREFIX);
this.contentHandler.endDocument();
}
} else {
// Start the document and set the PROFILER_NS.
this.contentHandler.startDocument();
- this.contentHandler.startPrefixMapping("", PROFILER_NS);
+ this.contentHandler.startPrefixMapping(PREFIX, PROFILER_NS);
generateProfilerInfo();
// End the document.
- this.contentHandler.endPrefixMapping("");
+ this.contentHandler.endPrefixMapping(PREFIX);
this.contentHandler.endDocument();
}
}
@@ -224,7 +226,7 @@
atts.addAttribute("", "date", "date", "CDATA", dateTime);
this.contentHandler.startElement(PROFILER_NS, PROFILERINFO_ELEMENT,
- PROFILERINFO_ELEMENT, atts);
+ PREFIX_COLON + PROFILERINFO_ELEMENT, atts);
Collection resultsKeys = profiler.getResultKeys();
@@ -238,7 +240,7 @@
// End root element.
this.contentHandler.endElement(PROFILER_NS, PROFILERINFO_ELEMENT,
- PROFILERINFO_ELEMENT);
+ PREFIX_COLON + PROFILERINFO_ELEMENT);
}
/**
@@ -274,7 +276,7 @@
Long.toString(totalTimeSum));
atts.addAttribute("", "key", "key", "CDATA", key.toString());
this.contentHandler.startElement(PROFILER_NS, RESULTS_ELEMENT,
- RESULTS_ELEMENT, atts);
+ PREFIX_COLON + RESULTS_ELEMENT, atts);
atts.clear();
// Generate average result
@@ -283,7 +285,7 @@
Long.toString(totalTimeSum/count));
this.contentHandler.startElement(PROFILER_NS,
AVERAGERESULT_ELEMENT,
- AVERAGERESULT_ELEMENT, atts);
+ PREFIX_COLON + AVERAGERESULT_ELEMENT, atts);
atts.clear();
// Total time of each component for all requests
@@ -316,15 +318,15 @@
this.contentHandler.startElement(PROFILER_NS,
COMPONENT_ELEMENT,
- COMPONENT_ELEMENT, atts);
+ PREFIX_COLON + COMPONENT_ELEMENT, atts);
atts.clear();
this.contentHandler.endElement(PROFILER_NS,
COMPONENT_ELEMENT,
- COMPONENT_ELEMENT);
+ PREFIX_COLON + COMPONENT_ELEMENT);
}
this.contentHandler.endElement(PROFILER_NS,
AVERAGERESULT_ELEMENT,
- AVERAGERESULT_ELEMENT);
+ PREFIX_COLON + AVERAGERESULT_ELEMENT);
}
for (int j = 0; j<count; j++) {
@@ -336,7 +338,7 @@
}
this.contentHandler.endElement(PROFILER_NS, RESULTS_ELEMENT,
- RESULTS_ELEMENT);
+ PREFIX_COLON + RESULTS_ELEMENT);
}
private void generateResult(int resultIndex, String[] roles,
@@ -353,7 +355,7 @@
atts.addAttribute("", "index", "index", "CDATA",
String.valueOf(resultIndex));
this.contentHandler.startElement(PROFILER_NS, RESULT_ELEMENT,
- RESULT_ELEMENT, atts);
+ PREFIX_COLON + RESULT_ELEMENT, atts);
atts.clear();
if (this.resultIndex!=-1) {
@@ -365,7 +367,7 @@
processingTimes[i], fragments[i]);
}
this.contentHandler.endElement(PROFILER_NS, RESULT_ELEMENT,
- RESULT_ELEMENT);
+ PREFIX_COLON + RESULT_ELEMENT);
}
private void generateComponent(int componentIndex, String role,
@@ -396,33 +398,33 @@
Long.toString(setupTime+processingTime));
this.contentHandler.startElement(PROFILER_NS, COMPONENT_ELEMENT,
- COMPONENT_ELEMENT, atts);
+ PREFIX_COLON + COMPONENT_ELEMENT, atts);
atts.clear();
if (this.componentIndex==componentIndex) {
this.contentHandler.startElement(PROFILER_NS, FRAGMENT_ELEMENT,
- FRAGMENT_ELEMENT,
+ PREFIX_COLON + FRAGMENT_ELEMENT,
new AttributesImpl());
generateSAXFragment(fragment, true);
this.contentHandler.endElement(PROFILER_NS, FRAGMENT_ELEMENT,
- FRAGMENT_ELEMENT);
+ PREFIX_COLON + FRAGMENT_ELEMENT);
}
this.contentHandler.endElement(PROFILER_NS, COMPONENT_ELEMENT,
- COMPONENT_ELEMENT);
+ PREFIX_COLON + COMPONENT_ELEMENT);
}
private void generateEnvironmentInfo(EnvironmentInfo environmentInfo)
throws SAXException {
this.contentHandler.startElement(PROFILER_NS, ENVIROMENTINFO_ELEMENT,
- ENVIROMENTINFO_ELEMENT,
+ PREFIX_COLON + ENVIROMENTINFO_ELEMENT,
new AttributesImpl());
if (environmentInfo!=null) {
// Generate SAX events for the request parameters
this.contentHandler.startElement(PROFILER_NS,
REQUESTPARAMETERS_ELEMENT,
- REQUESTPARAMETERS_ELEMENT,
+ PREFIX_COLON + REQUESTPARAMETERS_ELEMENT,
new AttributesImpl());
Map requestParameters = environmentInfo.getRequestParameters();
@@ -439,20 +441,20 @@
(String) entry.getValue());
this.contentHandler.startElement(PROFILER_NS,
REQUESTPARAMETER_ELEMENT,
- REQUESTPARAMETER_ELEMENT,
+ PREFIX_COLON + REQUESTPARAMETER_ELEMENT,
atts);
this.contentHandler.endElement(PROFILER_NS,
REQUESTPARAMETER_ELEMENT,
- REQUESTPARAMETER_ELEMENT);
+ PREFIX_COLON + REQUESTPARAMETER_ELEMENT);
}
this.contentHandler.endElement(PROFILER_NS,
REQUESTPARAMETERS_ELEMENT,
- REQUESTPARAMETERS_ELEMENT);
+ PREFIX_COLON + REQUESTPARAMETERS_ELEMENT);
// Generate SAX events for the session attributes
this.contentHandler.startElement(PROFILER_NS,
SESSIONATTRIBUTES_ELEMENT,
- SESSIONATTRIBUTES_ELEMENT,
+ PREFIX_COLON + SESSIONATTRIBUTES_ELEMENT,
new AttributesImpl());
Map sessionAttributes = environmentInfo.getSessionAttributes();
@@ -469,26 +471,26 @@
(String) entry.getValue());
this.contentHandler.startElement(PROFILER_NS,
SESSIONATTRIBUTE_ELEMENT,
- SESSIONATTRIBUTE_ELEMENT,
+ PREFIX_COLON + SESSIONATTRIBUTE_ELEMENT,
atts);
this.contentHandler.endElement(PROFILER_NS,
SESSIONATTRIBUTE_ELEMENT,
- SESSIONATTRIBUTE_ELEMENT);
+ PREFIX_COLON + SESSIONATTRIBUTE_ELEMENT);
}
this.contentHandler.endElement(PROFILER_NS,
SESSIONATTRIBUTES_ELEMENT,
- SESSIONATTRIBUTES_ELEMENT);
+ PREFIX_COLON + SESSIONATTRIBUTES_ELEMENT);
// And the rest
- this.contentHandler.startElement(PROFILER_NS, "uri", "uri",
+ this.contentHandler.startElement(PROFILER_NS, "uri", PREFIX_COLON + "uri",
new AttributesImpl());
this.contentHandler.characters(environmentInfo.getURI().toCharArray(),
0, environmentInfo.getURI().length());
- this.contentHandler.endElement(PROFILER_NS, "uri", "uri");
+ this.contentHandler.endElement(PROFILER_NS, "uri", PREFIX_COLON + "uri");
}
this.contentHandler.endElement(PROFILER_NS, ENVIROMENTINFO_ELEMENT,
- ENVIROMENTINFO_ELEMENT);
+ PREFIX_COLON + ENVIROMENTINFO_ELEMENT);
}
public void generateSAXFragment(Object fragment, boolean embed) throws SAXException {