bloritsch 01/10/25 13:36:40
Modified: src/org/apache/cocoon/matching BrowserMatcherFactory.java
WildcardHeaderMatcherFactory.java
WildcardParameterValueMatcherFactory.java
WildcardSessionAttributeMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/selection HeaderSelectorFactory.java
RequestSelectorFactory.java
SessionAttributeSelectorFactory.java
src/org/apache/cocoon/sitemap Handler.java
src/org/apache/cocoon/util PostInputStream.java
Log:
Optimize critical path
Revision Changes Path
1.9 +3 -2
xml-cocoon2/src/org/apache/cocoon/matching/BrowserMatcherFactory.java
Index: BrowserMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/BrowserMatcherFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BrowserMatcherFactory.java 2001/10/22 10:17:45 1.8
+++ BrowserMatcherFactory.java 2001/10/25 20:36:39 1.9
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/10/22 10:17:45 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/10/25 20:36:39 $
* @deprecated not replaced, because it does nothing !!
*/
@@ -60,7 +60,8 @@
public String generateClassSource (String prefix, String pattern,
NodeList conf)
throws ConfigurationException {
- return "\n// Dummy values\nstatic String " + prefix + "_expr = \"" +
pattern + "\";\n";
+ return new StringBuffer("\n// Dummy values\nstatic String ")
+ .append(prefix).append("_expr =
\"").append(pattern).append("\";\n").toString();
}
public String generateParameterSource (NodeList conf)
1.10 +3 -3
xml-cocoon2/src/org/apache/cocoon/matching/WildcardHeaderMatcherFactory.java
Index: WildcardHeaderMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardHeaderMatcherFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WildcardHeaderMatcherFactory.java 2001/10/22 10:17:45 1.9
+++ WildcardHeaderMatcherFactory.java 2001/10/25 20:36:39 1.10
@@ -22,7 +22,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/10/22 10:17:45 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/25 20:36:39 $
* @deprecated replaced by WildcardHeaderMatcher - code factories should no longer
be used
*/
@@ -92,13 +92,13 @@
.append(" }");
} else {
sb
- .append(" parameterName = \""+parameterName+"\";")
+ .append(" parameterName = \"").append(parameterName).append("\";")
.append(" parameterValue = XSPRequestHelper.getHeader(objectModel,
parameterName);")
.append("} else { ")
.append(" parameterName = parameters.getParameter(\"parameter-name\",
null);")
.append(" if ( parameterName == null ) {")
.append(" getLogger().warn(\"No request header name given, will
use default\");")
- .append(" parameterName = \""+parameterName+"\";")
+ .append(" parameterName = \"").append(parameterName).append("\";")
.append(" }")
.append(" parameterValue = XSPRequestHelper.getHeader(objectModel,
parameterName); ");
}
1.10 +3 -3
xml-cocoon2/src/org/apache/cocoon/matching/WildcardParameterValueMatcherFactory.java
Index: WildcardParameterValueMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardParameterValueMatcherFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WildcardParameterValueMatcherFactory.java 2001/10/22 10:17:45 1.9
+++ WildcardParameterValueMatcherFactory.java 2001/10/25 20:36:39 1.10
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
* @deprecated replaced by WildcardParameterValueMatcher - code factories should no
longer be used
- * @version CVS $Revision: 1.9 $ $Date: 2001/10/22 10:17:45 $ */
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/25 20:36:39 $ */
public class WildcardParameterValueMatcherFactory extends WildcardURIMatcherFactory
{
@@ -71,13 +71,13 @@
.append(" }");
} else {
sb
- .append(" parameterName = \""+parameterName+"\";")
+ .append(" parameterName = \"").append(parameterName).append("\";")
.append(" parameterValue = XSPRequestHelper.getParameter(objectModel,
parameterName, null);")
.append("} else { ")
.append(" parameterName = parameters.getParameter(\"parameter-name\",
null);")
.append(" if ( parameterName == null ) {")
.append(" getLogger().warn(\"No request parameter name given, will
use default\");")
- .append(" parameterName = \""+parameterName+"\";")
+ .append(" parameterName = \"").append(parameterName).append("\";")
.append(" }")
.append(" parameterValue = XSPRequestHelper.getParameter(objectModel,
parameterName, null); ");
}
1.7 +3 -3
xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionAttributeMatcherFactory.java
Index: WildcardSessionAttributeMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionAttributeMatcherFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WildcardSessionAttributeMatcherFactory.java 2001/10/22 10:17:46 1.6
+++ WildcardSessionAttributeMatcherFactory.java 2001/10/25 20:36:39 1.7
@@ -21,7 +21,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/10/22 10:17:46 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/25 20:36:39 $
* @deprecated replaced by WildcardSessionAttributeMatcher - code factories should
no longer be used
*/
@@ -67,13 +67,13 @@
.append(" }");
} else {
sb
- .append(" attributeName = \""+attributeName+"\";")
+ .append(" attributeName = \"").append(attributeName).append("\";")
.append(" attributeValue = (String)
XSPRequestHelper.getSessionAttribute(objectModel, attributeName);")
.append("} else { ")
.append(" attributeName = parameters.getParameter(\"attribute-name\",
null);")
.append(" if ( attributeName == null ) {")
.append(" getLogger().warn(\"No session attribute given, will use
default\");")
- .append(" attributeName = \""+attributeName+"\";")
+ .append(" attributeName = \"").append(attributeName).append("\";")
.append(" }")
.append(" attributeValue = (String)
XSPRequestHelper.getSessionAttribute(objectModel, attributeName); ");
}
1.7 +7 -8
xml-cocoon2/src/org/apache/cocoon/matching/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardURIMatcherFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WildcardURIMatcherFactory.java 2001/10/22 10:17:46 1.6
+++ WildcardURIMatcherFactory.java 2001/10/25 20:36:39 1.7
@@ -19,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/10/22 10:17:46 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/25 20:36:39 $
* @deprecated replaced by WildcardURIMatcher - code factories should no longer be
used
*/
@@ -52,13 +52,12 @@
*/
public String generateMethodSource (NodeList conf)
throws ConfigurationException {
- return "HashMap map = new HashMap();" +
- "String uri = XSPRequestHelper.getSitemapURI(objectModel);" +
- "if (uri.startsWith(\"/\")) uri = uri.substring(1);" +
- "if (org.apache.cocoon.matching.helpers.WildcardURIMatcher.match
(map, uri, pattern)) {" +
- "return map;" +
- "} else {" +
- "return null;}";
+ return new StringBuffer("HashMap map = new HashMap();")
+ .append("String uri = XSPRequestHelper.getSitemapURI(objectModel);")
+ .append("if (uri.startsWith(\"/\")) uri = uri.substring(1);")
+ .append("if
(org.apache.cocoon.matching.helpers.WildcardURIMatcher.match (map, uri, pattern)) {")
+ .append("return map;").append("} else {")
+ .append("return null;}").toString();
}
/**
1.9 +3 -3
xml-cocoon2/src/org/apache/cocoon/selection/HeaderSelectorFactory.java
Index: HeaderSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/HeaderSelectorFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HeaderSelectorFactory.java 2001/10/22 10:17:46 1.8
+++ HeaderSelectorFactory.java 2001/10/25 20:36:40 1.9
@@ -22,7 +22,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/10/22 10:17:46 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/10/25 20:36:40 $
* @deprecated replaced by HeaderSelector - code factories should no longer be used
*/
public class HeaderSelectorFactory extends ParameterSelectorFactory {
@@ -62,12 +62,12 @@
.append(" }");
} else {
sb
- .append(" compareToString = (String)
XSPRequestHelper.getHeader(objectModel, \""+parameterName+"\");")
+ .append(" compareToString = (String)
XSPRequestHelper.getHeader(objectModel, \"").append(parameterName).append("\");")
.append("} else { ")
.append(" String parameterName =
param.getParameter(\"parameter-name\", null);")
.append(" if ( parameterName == null ) {")
.append(" getLogger().warn(\"No request header name given, will
use default\");")
- .append(" parameterName = \""+parameterName+"\";")
+ .append(" parameterName = \"").append(parameterName).append("\";")
.append(" }")
.append(" compareToString = (String)
XSPRequestHelper.getHeader(objectModel, parameterName);");
}
1.9 +3 -3
xml-cocoon2/src/org/apache/cocoon/selection/RequestSelectorFactory.java
Index: RequestSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/RequestSelectorFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RequestSelectorFactory.java 2001/10/22 10:17:46 1.8
+++ RequestSelectorFactory.java 2001/10/25 20:36:40 1.9
@@ -22,7 +22,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/10/22 10:17:46 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/10/25 20:36:40 $
* @deprecated replaced by RequestSelector - code factories should no longer be used
*/
public class RequestSelectorFactory extends ParameterSelectorFactory {
@@ -62,12 +62,12 @@
.append(" }");
} else {
sb
- .append(" compareToString = (String)
XSPRequestHelper.getParameter(objectModel, \""+parameterName+"\", null);")
+ .append(" compareToString = (String)
XSPRequestHelper.getParameter(objectModel, \"").append(parameterName).append("\",
null);")
.append("} else { ")
.append(" String parameterName =
param.getParameter(\"parameter-name\", null);")
.append(" if ( parameterName == null ) {")
.append(" getLogger().warn(\"No request parameter name given, will
use default\");")
- .append(" parameterName = \""+parameterName+"\";")
+ .append(" parameterName = \"").append(parameterName).append("\";")
.append(" }")
.append(" compareToString = (String)
XSPRequestHelper.getParameter(objectModel, parameterName, null);");
}
1.6 +3 -3
xml-cocoon2/src/org/apache/cocoon/selection/SessionAttributeSelectorFactory.java
Index: SessionAttributeSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/SessionAttributeSelectorFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionAttributeSelectorFactory.java 2001/10/22 10:17:46 1.5
+++ SessionAttributeSelectorFactory.java 2001/10/25 20:36:40 1.6
@@ -21,7 +21,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/22 10:17:46 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/25 20:36:40 $
* @deprecated replaced by SessionAttributeSelector - code factories should no
longer be used
*/
public class SessionAttributeSelectorFactory extends ParameterSelectorFactory {
@@ -61,12 +61,12 @@
.append(" }");
} else {
sb
- .append(" compareToString = (String)
XSPRequestHelper.getSessionAttribute(objectModel, \""+attributeName+"\");")
+ .append(" compareToString = (String)
XSPRequestHelper.getSessionAttribute(objectModel,
\"").append(attributeName).append("\");")
.append("} else { ")
.append(" String attributeName =
param.getParameter(\"attribute-name\", null);")
.append(" if ( attributeName == null ) {")
.append(" getLogger().warn(\"No session attribute given, will use
default\");")
- .append(" attributeName = \""+attributeName+"\";")
+ .append(" attributeName = \"").append(attributeName).append("\";")
.append(" }")
.append(" compareToString = (String)
XSPRequestHelper.getSessionAttribute(objectModel, attributeName); ");
}
1.23 +3 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Handler.java 2001/10/17 10:06:24 1.22
+++ Handler.java 2001/10/25 20:36:40 1.23
@@ -41,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.22 $ $Date: 2001/10/17 10:06:24 $
+ * @version CVS $Revision: 1.23 $ $Date: 2001/10/25 20:36:40 $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
@@ -274,7 +274,8 @@
if (systemId.indexOf(":") > 1)
return this.sourceHandler.getSource(null, systemId);
if (systemId.charAt(0) == '/')
- return this.sourceHandler.getSource(null, context.getProtocol() + ":" +
systemId);
+ return this.sourceHandler.getSource(null, new
StringBuffer(context.getProtocol())
+
.append(":").append(systemId).toString());
return this.sourceHandler.getSource(null, context, systemId);
}
1.7 +6 -2 xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java
Index: PostInputStream.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PostInputStream.java 2001/10/23 12:04:35 1.6
+++ PostInputStream.java 2001/10/25 20:36:40 1.7
@@ -14,7 +14,7 @@
* It allows to control read operation, restricting the number of bytes read to the
value returned by getContentLen() method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Kinga Dziembowski</a>
- * @version $Id: PostInputStream.java,v 1.6 2001/10/23 12:04:35 cziegeler Exp $
+ * @version $Id: PostInputStream.java,v 1.7 2001/10/25 20:36:40 bloritsch Exp $
*/
public class PostInputStream extends InputStream {
@@ -246,6 +246,10 @@
* @return string the String representation of this.
*/
public String toString() {
- return getClass().getName() + "[inputStream=" + m_inputStream + ",
contentLen=" + m_contentLen + "bytesRead=" + m_bytesRead + "]";
+ return new StringBuffer(getClass().getName())
+ .append("[inputStream=").append(m_inputStream)
+ .append(", contentLen=").append(m_contentLen)
+ .append("bytesRead=").append(m_bytesRead)
+ .append("]").toString();
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
