bloritsch 01/10/25 12:31:25
Modified: src/org/apache/cocoon/acting Tag: cocoon_20_branch
DatabaseAuthenticatorAction.java
src/org/apache/cocoon/caching Tag: cocoon_20_branch
CompositeCacheValidity.java
src/org/apache/cocoon/components/language/generator Tag:
cocoon_20_branch ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup/xsp Tag:
cocoon_20_branch XSPObjectHelper.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: cocoon_20_branch xsp.xsl
src/org/apache/cocoon/components/language/programming Tag:
cocoon_20_branch AbstractProgrammingLanguage.java
CompiledProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
Tag: cocoon_20_branch JavaLanguage.java Javac.java
Jikes.java
src/org/apache/cocoon/components/language/programming/javascript
Tag: cocoon_20_branch JavascriptLanguage.java
src/org/apache/cocoon/components/source Tag:
cocoon_20_branch SitemapSource.java
src/org/apache/cocoon/environment Tag: cocoon_20_branch
AbstractEnvironment.java
src/org/apache/cocoon/environment/commandline Tag:
cocoon_20_branch CommandlineContext.java
src/org/apache/cocoon/generation Tag: cocoon_20_branch
HTMLGenerator.java ImageDirectoryGenerator.java
src/org/apache/cocoon/i18n Tag: cocoon_20_branch
XMLResourceBundle.java
Log:
Optimize critical path
Revision Changes Path
No revision
No revision
1.3.2.12 +4 -4
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java
Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v
retrieving revision 1.3.2.11
retrieving revision 1.3.2.12
diff -u -r1.3.2.11 -r1.3.2.12
--- DatabaseAuthenticatorAction.java 2001/10/11 08:52:03 1.3.2.11
+++ DatabaseAuthenticatorAction.java 2001/10/25 19:31:24 1.3.2.12
@@ -1,4 +1,4 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.11 2001/10/11 08:52:03 cziegeler
Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.12 2001/10/25 19:31:24 bloritsch
Exp $
package org.apache.cocoon.acting;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
@@ -54,7 +54,7 @@
* not verified.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.3.2.11 $ $Date: 2001/10/11 08:52:03 $
+ * @version CVS $Revision: 1.3.2.12 $ $Date: 2001/10/25 19:31:24 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements
ThreadSafe
{
@@ -206,7 +206,7 @@
} else {
if (!first_constraint)
queryBufferEnd.append (" AND ");
- queryBufferEnd.append (dbcol + "='" + request_value + "'");
+ queryBufferEnd.append
(dbcol).append("='").append(request_value).append("'");
first_constraint = false;
}
}
@@ -272,5 +272,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.11 2001/10/11 08:52:03 cziegeler
Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.12 2001/10/25 19:31:24 bloritsch
Exp $
// vim: set et ts=4 sw=4:
No revision
No revision
1.1.1.1.2.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java
Index: CompositeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- CompositeCacheValidity.java 2001/08/20 14:07:26 1.1.1.1.2.1
+++ CompositeCacheValidity.java 2001/10/25 19:31:24 1.1.1.1.2.2
@@ -13,7 +13,7 @@
* A validation object using a Hashmap.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:26 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/25 19:31:24 $
*/
public final class CompositeCacheValidity
implements CacheValidity {
@@ -43,7 +43,7 @@
}
public String toString() {
- return "CompositeCacheValidity: " + v1.toString() + ":" + v2.toString();
+ return new StringBuffer("CompositeCacheValidity:
").append(v1).append(":").append(v2).toString();
}
}
No revision
No revision
1.5.2.18 +3 -2
xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.5.2.17
retrieving revision 1.5.2.18
diff -u -r1.5.2.17 -r1.5.2.18
--- ProgramGeneratorImpl.java 2001/10/11 08:56:06 1.5.2.17
+++ ProgramGeneratorImpl.java 2001/10/25 19:31:24 1.5.2.18
@@ -39,7 +39,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.5.2.17 $ $Date: 2001/10/11 08:56:06 $
+ * @version CVS $Revision: 1.5.2.18 $ $Date: 2001/10/25 19:31:24 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
@@ -314,7 +314,8 @@
code = codeFormatter.format(code, encoding);
}
// Store generated code
- String sourceFilename = normalizedName + "." +
programmingLanguage.getSourceExtension();
+ String sourceFilename = new StringBuffer(normalizedName).append(".")
+
.append(programmingLanguage.getSourceExtension()).toString();
repository.store(sourceFilename, code);
// [Compile]/Load generated program
Class program = programmingLanguage.load(normalizedName, this.workDir,
markupLanguage.getEncoding());
No revision
No revision
1.1.1.1.2.8 +4 -4
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
Index: XSPObjectHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java,v
retrieving revision 1.1.1.1.2.7
retrieving revision 1.1.1.1.2.8
diff -u -r1.1.1.1.2.7 -r1.1.1.1.2.8
--- XSPObjectHelper.java 2001/10/15 13:40:39 1.1.1.1.2.7
+++ XSPObjectHelper.java 2001/10/25 19:31:24 1.1.1.1.2.8
@@ -24,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
* (Cocoon1 <code>xspExpr()</code> methods port)
- * @version CVS $Revision: 1.1.1.1.2.7 $ $Date: 2001/10/15 13:40:39 $
+ * @version CVS $Revision: 1.1.1.1.2.8 $ $Date: 2001/10/25 19:31:24 $
*/
public class XSPObjectHelper {
/**
@@ -85,7 +85,7 @@
)
throws SAXException
{
- contentHandler.startElement(uri, name, prefix + ":" + name, emptyAttr);
+ contentHandler.startElement(uri, name, new
StringBuffer(prefix).append(":").append(name).toString(), emptyAttr);
}
/**
@@ -103,7 +103,7 @@
)
throws SAXException
{
- contentHandler.startElement(uri, name, prefix + ":" + name, attr);
+ contentHandler.startElement(uri, name, new
StringBuffer(prefix).append(":").append(name).toString(), attr);
}
/**
@@ -118,7 +118,7 @@
)
throws SAXException
{
- contentHandler.endElement(uri, name, prefix + ":" + name);
+ contentHandler.endElement(uri, name, new
StringBuffer(prefix).append(":").append(name).toString());
}
/**
No revision
No revision
1.2.2.8 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- xsp.xsl 2001/09/19 14:46:57 1.2.2.7
+++ xsp.xsl 2001/10/25 19:31:24 1.2.2.8
@@ -12,7 +12,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.2.2.7 $ $Date: 2001/09/19 14:46:57 $
+ * @version CVS $Revision: 1.2.2.8 $ $Date: 2001/10/25 19:31:24 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -190,7 +190,7 @@
<xsl:copy-of select="$name"/>
</xsl:when>
<xsl:otherwise>
- <xsl:copy-of select="$prefix"/> + ":" + <xsl:copy-of select="$name"/>
+ new StringBuffer(<xsl:copy-of
select="$prefix"/>).append(":").append(<xsl:copy-of select="$name"/>).toString()
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -279,7 +279,7 @@
<xsl:copy-of select="$name"/>
</xsl:when>
<xsl:otherwise>
- <xsl:copy-of select="$prefix"/> + ":" + <xsl:copy-of select="$name"/>
+ new StringBuffer(<xsl:copy-of
select="$prefix"/>).append(":").append(<xsl:copy-of select="$name"/>).toString()
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
No revision
No revision
1.1.1.1.2.4 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- AbstractProgrammingLanguage.java 2001/10/11 08:56:07 1.1.1.1.2.3
+++ AbstractProgrammingLanguage.java 2001/10/25 19:31:24 1.1.1.1.2.4
@@ -23,7 +23,7 @@
* unloading.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:07 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/25 19:31:24 $
*/
public abstract class AbstractProgrammingLanguage extends AbstractLoggable
implements ProgrammingLanguage, Configurable
@@ -102,7 +102,7 @@
throws LanguageException
{
File file = new File (
- baseDirectory, filename + "." + this.getSourceExtension()
+ baseDirectory, new
StringBuffer(filename).append(".").append(this.getSourceExtension()).toString()
);
file.delete();
1.1.1.1.2.8 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java,v
retrieving revision 1.1.1.1.2.7
retrieving revision 1.1.1.1.2.8
diff -u -r1.1.1.1.2.7 -r1.1.1.1.2.8
--- CompiledProgrammingLanguage.java 2001/10/11 08:56:07 1.1.1.1.2.7
+++ CompiledProgrammingLanguage.java 2001/10/25 19:31:24 1.1.1.1.2.8
@@ -22,7 +22,7 @@
* A compiled programming language. This class extends
<code>AbstractProgrammingLanguage</code> adding support for compilation
* and object program files
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.1.1.2.7 $ $Date: 2001/10/11 08:56:07 $
+ * @version CVS $Revision: 1.1.1.1.2.8 $ $Date: 2001/10/25 19:31:24 $
*/
public abstract class CompiledProgrammingLanguage extends
AbstractProgrammingLanguage implements Contextualizable {
/** The compiler */
@@ -122,12 +122,12 @@
*/
public Class load(String filename, File baseDirectory, String encoding) throws
LanguageException {
// Does object file exist? Load and return instance
- File objectFile = new File(baseDirectory, filename + "." +
this.getObjectExtension());
+ File objectFile = new File(baseDirectory, new
StringBuffer(filename).append(".").append(this.getObjectExtension()).toString());
if (objectFile.exists() && objectFile.isFile() && objectFile.canRead()) {
return this.loadProgram(filename, baseDirectory);
}
// Does source file exist?
- File sourceFile = new File(baseDirectory, filename + "." +
this.getSourceExtension());
+ File sourceFile = new File(baseDirectory, new
StringBuffer(filename).append(".").append(this.getSourceExtension()).toString());
if (!sourceFile.exists()) {
throw new LanguageException("Can't load program - File doesn't exist: "
+ IOUtils.getFullFilename(sourceFile));
}
No revision
No revision
1.2.2.9 +4 -3
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -r1.2.2.8 -r1.2.2.9
--- JavaLanguage.java 2001/10/11 08:56:07 1.2.2.8
+++ JavaLanguage.java 2001/10/25 19:31:24 1.2.2.9
@@ -31,7 +31,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.2.2.8 $ $Date: 2001/10/11 08:56:07 $
+ * @version CVS $Revision: 1.2.2.9 $ $Date: 2001/10/25 19:31:24 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
@@ -149,8 +149,9 @@
String pathname =
baseDirectory.getCanonicalPath() + File.separator +
name.substring(0, pos).replace(File.separatorChar, '/');
- String filename_abs =
- pathname + File.separator + filename + "." + this.getSourceExtension();
+ String filename_abs =
+ new StringBuffer(pathname).append(File.separator).append(filename)
+ .append(".").append(this.getSourceExtension()).toString();
compiler.setFile(filename_abs);
1.2.2.8 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- Javac.java 2001/10/10 09:30:24 1.2.2.7
+++ Javac.java 2001/10/25 19:31:24 1.2.2.8
@@ -22,7 +22,7 @@
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.2.2.7 $ $Date: 2001/10/10 09:30:24 $
+ * @version $Revision: 1.2.2.8 $ $Date: 2001/10/25 19:31:24 $
* @since 2.0
*/
@@ -130,7 +130,7 @@
StringTokenizer tokens = new StringTokenizer(error, ":");
try {
String file = tokens.nextToken();
- if (file.length() == 1) file += ":" + tokens.nextToken();
+ if (file.length() == 1) file = new
StringBuffer(file).append(":").append(tokens.nextToken()).toString();
int line = Integer.parseInt(tokens.nextToken());
String message = tokens.nextToken("\n").substring(1);
@@ -191,7 +191,7 @@
StringTokenizer tokens = new StringTokenizer(error, ":");
try {
String file = tokens.nextToken();
- if (file.length() == 1) file += ":" + tokens.nextToken();
+ if (file.length() == 1) file = new
StringBuffer(file).append(":").append(tokens.nextToken()).toString();
int line = Integer.parseInt(tokens.nextToken());
String last = tokens.nextToken();
1.1.1.1.2.8 +9 -9
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java,v
retrieving revision 1.1.1.1.2.7
retrieving revision 1.1.1.1.2.8
diff -u -r1.1.1.1.2.7 -r1.1.1.1.2.8
--- Jikes.java 2001/10/11 08:56:07 1.1.1.1.2.7
+++ Jikes.java 2001/10/25 19:31:25 1.1.1.1.2.8
@@ -19,7 +19,7 @@
* This class wraps IBM's <i>Jikes</i> Java compiler
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.1.1.1.2.7 $ $Date: 2001/10/11 08:56:07 $
+ * @version $Revision: 1.1.1.1.2.8 $ $Date: 2001/10/25 19:31:25 $
* @since 2.0
*/
@@ -197,8 +197,8 @@
private CompilerError parseError(String error) {
StringTokenizer tokens = new StringTokenizer(error, ":");
String file = tokens.nextToken();
- if (file.length() == 1) file += ":" + tokens.nextToken();
- String message = "";
+ if (file.length() == 1) file = new
StringBuffer(file).append(":").append(tokens.nextToken()).toString();
+ StringBuffer message = new StringBuffer();
String type = "";
int startline = 0;
int startcolumn = 0;
@@ -212,20 +212,20 @@
endcolumn = Integer.parseInt(tokens.nextToken());
} catch (Exception e) {
// FIXME: VG: This is not needed anymore?
- message = "Please ensure that you have your JDK's rt.jar listed in your
classpath. Jikes needs it to operate.";
+ message.append("Please ensure that you have your JDK's rt.jar listed in
your classpath. Jikes needs it to operate.");
type="error";
- getLogger().error(message, e);
+ getLogger().error(message.toString(), e);
}
- if ("".equals(message)) {
+ if ("".equals(message.toString())) {
type = tokens.nextToken().trim().toLowerCase();
- message = tokens.nextToken("\n").substring(1).trim();
+ message.append(tokens.nextToken("\n").substring(1).trim());
while (tokens.hasMoreTokens())
- message += "\n" + tokens.nextToken();
+ message.append("\n").append(tokens.nextToken());
}
- return new CompilerError(file, type.equals("error"), startline,
startcolumn, endline, endcolumn, message);
+ return new CompilerError(file, type.equals("error"), startline,
startcolumn, endline, endcolumn, message.toString());
}
public String toString() {
No revision
No revision
1.1.1.1.2.4 +3 -2
xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java
Index: JavascriptLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- JavascriptLanguage.java 2001/10/11 08:56:07 1.1.1.1.2.3
+++ JavascriptLanguage.java 2001/10/25 19:31:25 1.1.1.1.2.4
@@ -17,7 +17,7 @@
* The compiled Javascript (Rhino) programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:07 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/25 19:31:25 $
*/
public class JavascriptLanguage extends JavaLanguage
{
@@ -68,7 +68,8 @@
"-nosource",
"-O", "9",
"-package", packageName,
- pathname + File.separator + filename + "." + this.getSourceExtension()
+ new StringBuffer(pathname).append(File.separator)
+
.append(filename).append(".").append(this.getSourceExtension()).toString()
};
compiler.main(args);
No revision
No revision
1.1.2.23 +9 -5
xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- SitemapSource.java 2001/10/11 08:56:09 1.1.2.22
+++ SitemapSource.java 2001/10/25 19:31:25 1.1.2.23
@@ -46,7 +46,7 @@
* Description of a source which is defined by a pipeline.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/10/11 08:56:09 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/10/25 19:31:25 $
*/
public final class SitemapSource
@@ -135,10 +135,14 @@
}
Request request=
(Request)env.getObjectModel().get(Constants.REQUEST_OBJECT);
boolean isDefaultPort = "http".equalsIgnoreCase(request.getScheme()) && 80
== request.getServerPort();
- this.systemId = request.getScheme() + "://" +
- request.getServerName() +
- (isDefaultPort ? "" : ":" + request.getServerPort()) +
- request.getContextPath() + '/' + requestURI;
+ StringBuffer sysID = new StringBuffer(request.getScheme()).append("://")
+ .append(request.getServerName());
+
+ if ( ! isDefaultPort ) {
+ sysID.append(":").append(request.getServerPort());
+ }
+ sysID.append(request.getContextPath()).append('/').append(requestURI);
+ this.systemId = sysID.toString();
this.environment = new EnvironmentWrapper(env, requestURI, queryString,
logger);
queryStringPos = uri.indexOf('?');
if (queryStringPos != -1) {
No revision
No revision
1.6.2.15 +5 -3
xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -u -r1.6.2.14 -r1.6.2.15
--- AbstractEnvironment.java 2001/10/11 08:56:10 1.6.2.14
+++ AbstractEnvironment.java 2001/10/25 19:31:25 1.6.2.15
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.6.2.14 $ $Date: 2001/10/11 08:56:10 $
+ * @version CVS $Revision: 1.6.2.15 $ $Date: 2001/10/25 19:31:25 $
*/
public abstract class AbstractEnvironment extends AbstractLoggable implements
Environment {
@@ -274,10 +274,12 @@
} else if (systemId.indexOf(":") > 1) {
source = this.sourceHandler.getSource(this, systemId);
} else if (systemId.charAt(0) == '/') {
- source = this.sourceHandler.getSource(this, this.context.getProtocol()
+ ":" + systemId);
+ source = this.sourceHandler.getSource(this, new
StringBuffer(this.context.getProtocol())
+
.append(":").append(systemId).toString());
// windows: absolute paths can start with drive letter
} else if (systemId.length() > 1 && systemId.charAt(1) == ':') {
- source = this.sourceHandler.getSource(this, this.context.getProtocol()
+ ":/" + systemId);
+ source = this.sourceHandler.getSource(this, new
StringBuffer(this.context.getProtocol())
+
.append(":/").append(systemId).toString());
} else {
source = this.sourceHandler.getSource(this, this.context, systemId);
}
No revision
No revision
1.1.2.6 +1 -1
xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java
Index: CommandlineContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- CommandlineContext.java 2001/10/17 09:07:38 1.1.2.5
+++ CommandlineContext.java 2001/10/25 19:31:25 1.1.2.6
@@ -61,7 +61,7 @@
public URL getResource(String path) throws MalformedURLException {
getLogger().debug("CommandlineContext: getResource=" + path);
//return servletContext.getResource(path);
- return new URL("file:" + this.contextDir + path);
+ return new URL(new
StringBuffer("file:").append(this.contextDir).append(path).toString());
}
public String getRealPath(String path) {
No revision
No revision
1.4.2.11 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -u -r1.4.2.10 -r1.4.2.11
--- HTMLGenerator.java 2001/10/11 08:56:12 1.4.2.10
+++ HTMLGenerator.java 2001/10/25 19:31:25 1.4.2.11
@@ -39,7 +39,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4.2.10 $ $Date: 2001/10/11 08:56:12 $
+ * @version CVS $Revision: 1.4.2.11 $ $Date: 2001/10/25 19:31:25 $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable,
Recyclable {
@@ -88,7 +88,7 @@
}
if (query.length() > 0) {
- super.source += "?" + query.substring( 0, query.length() - 1 );
+ super.source = new
StringBuffer(super.source).append("?").append(query.substring( 0, query.length() - 1
)).toString();
}
}
1.4.2.7 +3 -3
xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- ImageDirectoryGenerator.java 2001/10/11 08:56:12 1.4.2.6
+++ ImageDirectoryGenerator.java 2001/10/25 19:31:25 1.4.2.7
@@ -17,7 +17,7 @@
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald A. Ball Jr.</a>
- * @version $Revision: 1.4.2.6 $ $Date: 2001/10/11 08:56:12 $
+ * @version $Revision: 1.4.2.7 $ $Date: 2001/10/25 19:31:25 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator {
@@ -37,8 +37,8 @@
try {
int dim[] = getSize(path);
getLogger().debug("getSize(path) = " + dim);
-
attributes.addAttribute("",IMAGE_WIDTH_ATTR_NAME,IMAGE_WIDTH_ATTR_NAME,"CDATA",""+dim[0]);
-
attributes.addAttribute("",IMAGE_HEIGHT_ATTR_NAME,IMAGE_HEIGHT_ATTR_NAME,"CDATA",""+dim[1]);
+
attributes.addAttribute("",IMAGE_WIDTH_ATTR_NAME,IMAGE_WIDTH_ATTR_NAME,"CDATA",String.valueOf(dim[0]));
+
attributes.addAttribute("",IMAGE_HEIGHT_ATTR_NAME,IMAGE_HEIGHT_ATTR_NAME,"CDATA",String.valueOf(dim[1]));
} catch (RuntimeException e) {
getLogger().debug("ImageDirectoryGenerator.setNodeAttributes", e);
} catch (Exception e) {
No revision
No revision
1.2.2.4 +5 -5 xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java
Index: XMLResourceBundle.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- XMLResourceBundle.java 2001/10/11 08:56:12 1.2.2.3
+++ XMLResourceBundle.java 2001/10/25 19:31:25 1.2.2.4
@@ -29,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Engelhart</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Oleg Podolsky</a>
- * @version $Id: XMLResourceBundle.java,v 1.2.2.3 2001/10/11 08:56:12 cziegeler Exp
$
+ * @version $Id: XMLResourceBundle.java,v 1.2.2.4 2001/10/25 19:31:25 bloritsch Exp
$
*/
public class XMLResourceBundle
extends ResourceBundle
@@ -208,7 +208,7 @@
if(child.getNodeType() == Node.ELEMENT_NODE)
{
- String pathToChild = pathToParent + '/' + child.getNodeName();
+ StringBuffer pathToChild = new
StringBuffer(pathToParent).append('/').append(child.getNodeName());
NamedNodeMap attrs = child.getAttributes();
if(attrs != null)
@@ -220,15 +220,15 @@
{
temp = attrs.item(j);
if (!temp.getNodeName().equalsIgnoreCase("xml:lang"))
- pathToChild += "[@" + temp.getNodeName() + "='" +
temp.getNodeValue() + "']";
+
pathToChild.append("[@").append(temp.getNodeName()).append("='").append(temp.getNodeValue())
+ "']";
}
}
String childValue = getTextValue(child);
if(childValue != null)
- cacheKey(pathToChild, childValue);
+ cacheKey(pathToChild.toString(), childValue);
else
- cacheAll(child, pathToChild);
+ cacheAll(child, pathToChild.toString());
}
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
