You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@locus.apache.org on 2000/11/29 13:18:31 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/generation DirectoryGenerator.java ImageDirectoryGenerator.java PhpGenerator.java ServerPagesGenerator.java ServletGenerator.java StatusGenerator.java
dims 00/11/29 04:18:27
Modified: src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 log.xsl
src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 AbstractJavaCompiler.java
JavaLanguage.java
src/org/apache/cocoon/components/parser Tag: xml-cocoon2
XercesParser.java
src/org/apache/cocoon/components/store Tag: xml-cocoon2
FilesystemStore.java MemoryStore.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
DirectoryGenerator.java
ImageDirectoryGenerator.java PhpGenerator.java
ServerPagesGenerator.java ServletGenerator.java
StatusGenerator.java
Log:
1. Changes from Paul Russell for Component Optimisation.
2. Fixed log.xsl to check if the "log" is null.
Revision Changes Path
No revision
No revision
1.1.2.2 +11 -6 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/log.xsl
Index: log.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/log.xsl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- log.xsl 2000/11/13 18:17:28 1.1.2.1
+++ log.xsl 2000/11/29 12:17:20 1.1.2.2
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/11/13 18:17:28 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/11/29 12:17:20 $
-->
<!-- XSP Response logicsheet for the Java language -->
@@ -76,31 +76,36 @@
<xsl:template match="log:debug">
<xsp:logic>
- log.debug("<xsl:value-of select="."/>");
+ if(log != null)
+ log.debug("<xsl:value-of select="."/>");
</xsp:logic>
</xsl:template>
<xsl:template match="log:info">
<xsp:logic>
- log.info("<xsl:value-of select="."/>");
+ if(log != null)
+ log.info("<xsl:value-of select="."/>");
</xsp:logic>
</xsl:template>
<xsl:template match="log:warn">
<xsp:logic>
- log.warn("<xsl:value-of select="."/>");
+ if(log != null)
+ log.warn("<xsl:value-of select="."/>");
</xsp:logic>
</xsl:template>
<xsl:template match="log:error">
<xsp:logic>
- log.error("<xsl:value-of select="."/>");
+ if(log != null)
+ log.error("<xsl:value-of select="."/>");
</xsp:logic>
</xsl:template>
<xsl:template match="log:fatal-error">
<xsp:logic>
- log.fatalError("<xsl:value-of select="."/>");
+ if(log != null)
+ log.fatalError("<xsl:value-of select="."/>");
</xsp:logic>
</xsl:template>
No revision
No revision
1.1.2.7 +16 -3 xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java
Index: AbstractJavaCompiler.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AbstractJavaCompiler.java 2000/09/27 16:15:06 1.1.2.6
+++ AbstractJavaCompiler.java 2000/11/29 12:17:29 1.1.2.7
@@ -17,10 +17,10 @@
/**
* This class implements the functionality common to all Java compilers.
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.6 $ $Date: 2000/09/27 16:15:06 $
+ * @version $Revision: 1.1.2.7 $ $Date: 2000/11/29 12:17:29 $
* @since 2.0
*/
-public abstract class AbstractJavaCompiler implements LanguageCompiler {
+public abstract class AbstractJavaCompiler implements LanguageCompiler, Recyclable {
/**
* The source program filename
*/
@@ -169,5 +169,18 @@
args[i] = file;
return args;
- }
+ }
+
+ /** Reset all internal state.
+ * This method is called by the component manager before this
+ * component is return to its pool.
+ */
+ public void recycle() {
+ file = null;
+ srcDir = null;
+ destDir = null;
+ classpath = null;
+ encoding = null;
+ errors = null;
+ }
}
1.1.2.13 +3 -2 xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- JavaLanguage.java 2000/11/26 21:48:04 1.1.2.12
+++ JavaLanguage.java 2000/11/29 12:17:31 1.1.2.13
@@ -18,6 +18,7 @@
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
+import org.apache.avalon.ThreadSafe;
import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
@@ -30,9 +31,9 @@
* The Java programming language processor
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/11/26 21:48:04 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/11/29 12:17:31 $
*/
-public class JavaLanguage extends CompiledProgrammingLanguage {
+public class JavaLanguage extends CompiledProgrammingLanguage implements ThreadSafe {
/** The class loader */
ClassLoaderManager classLoaderManager;
No revision
No revision
1.1.2.9 +3 -2 xml-cocoon/src/org/apache/cocoon/components/parser/Attic/XercesParser.java
Index: XercesParser.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/parser/Attic/XercesParser.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- XercesParser.java 2000/11/06 20:21:29 1.1.2.8
+++ XercesParser.java 2000/11/29 12:17:41 1.1.2.9
@@ -13,6 +13,7 @@
import org.apache.xerces.dom.DocumentImpl;
import org.apache.xerces.dom.DocumentTypeImpl;
import org.apache.xerces.parsers.SAXParser;
+import org.apache.avalon.ThreadSafe;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -24,10 +25,10 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/11/06 20:21:29 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/11/29 12:17:41 $
*/
public class XercesParser extends AbstractXMLProducer
-implements Parser, ErrorHandler, DOMFactory {
+implements Parser, ErrorHandler, DOMFactory, ThreadSafe {
final SAXParser parser;
No revision
No revision
1.1.2.6 +3 -1 xml-cocoon/src/org/apache/cocoon/components/store/Attic/FilesystemStore.java
Index: FilesystemStore.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/FilesystemStore.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FilesystemStore.java 2000/11/10 22:38:54 1.1.2.5
+++ FilesystemStore.java 2000/11/29 12:17:47 1.1.2.6
@@ -8,9 +8,11 @@
import org.apache.log.Logger;
import org.apache.log.LogKit;
+import org.apache.avalon.ThreadSafe;
+
import java.io.IOException;
-public class FilesystemStore implements Store {
+public class FilesystemStore implements Store, ThreadSafe {
/** The directory repository */
protected File directoryFile;
protected volatile String directoryPath;
1.1.2.5 +9 -3 xml-cocoon/src/org/apache/cocoon/components/store/Attic/MemoryStore.java
Index: MemoryStore.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/MemoryStore.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- MemoryStore.java 2000/07/29 18:30:33 1.1.2.4
+++ MemoryStore.java 2000/11/29 12:17:49 1.1.2.5
@@ -10,6 +10,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
import org.apache.avalon.Component;
+import org.apache.avalon.ThreadSafe;
/**
*
@@ -19,9 +20,14 @@
* (Apache Software Foundation)
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/29 18:30:33 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/11/29 12:17:49 $
*/
-public class MemoryStore implements Store {
+public class MemoryStore implements Store, ThreadSafe {
+ /* WARNING: Hashtable is threadsafe, whereas HashMap is not.
+ * Should we move this class over to the Collections API,
+ * use Collections.synchronizedMap(Map map) to ensure
+ * accesses are synchronized.
+ */
/** The shared store */
private static Hashtable table=null;
@@ -75,4 +81,4 @@
public Enumeration keys() {
return(table.keys());
}
-}
\ No newline at end of file
+}
No revision
No revision
1.1.2.12 +3 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- DirectoryGenerator.java 2000/10/19 14:43:47 1.1.2.11
+++ DirectoryGenerator.java 2000/11/29 12:17:56 1.1.2.12
@@ -21,6 +21,7 @@
import org.xml.sax.helpers.AttributesImpl;
import org.apache.avalon.Parameters;
+import org.apache.avalon.Poolable;
/**
* Generates an XML directory listing.
@@ -55,9 +56,9 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/10/19 14:43:47 $ */
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/11/29 12:17:56 $ */
-public class DirectoryGenerator extends ComposerGenerator {
+public class DirectoryGenerator extends ComposerGenerator implements Poolable {
/** The URI of the namespace of this generator. */
protected static final String URI =
1.1.2.4 +4 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ImageDirectoryGenerator.java 2000/07/29 18:30:34 1.1.2.3
+++ ImageDirectoryGenerator.java 2000/11/29 12:17:58 1.1.2.4
@@ -4,14 +4,16 @@
import java.util.*;
import org.xml.sax.SAXException;
+import org.apache.avalon.Poolable;
+
/**
* An extension of DirectoryGenerators that adds extra attributes for image
* files.
*
* @author <a href="mailto:balld@webslingerZ.com">Donald A. Ball Jr.</a>
- * @version $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:34 $
+ * @version $Revision: 1.1.2.4 $ $Date: 2000/11/29 12:17:58 $
*/
-public class ImageDirectoryGenerator extends DirectoryGenerator {
+public class ImageDirectoryGenerator extends DirectoryGenerator implements Poolable {
protected static String IMAGE_WIDTH_ATTR_NAME = "width";
protected static String IMAGE_HEIGHT_ATTR_NAME = "height";
1.1.2.9 +4 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- PhpGenerator.java 2000/10/19 14:43:49 1.1.2.8
+++ PhpGenerator.java 2000/11/29 12:17:59 1.1.2.9
@@ -17,6 +17,8 @@
import org.apache.cocoon.components.parser.Parser;
+import org.apache.avalon.Poolable;
+
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -26,9 +28,9 @@
* results into SAX events.
*
* @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/10/19 14:43:49 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/11/29 12:17:59 $
*/
-public class PhpGenerator extends ServletGenerator {
+public class PhpGenerator extends ServletGenerator, Poolable {
/**
* Stub implementation of Servlet Config
1.1.2.8 +4 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ServerPagesGenerator.java 2000/11/10 22:38:54 1.1.2.7
+++ ServerPagesGenerator.java 2000/11/29 12:18:01 1.1.2.8
@@ -21,6 +21,8 @@
import org.apache.avalon.Composer;
import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Poolable;
+
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import java.io.IOException;
@@ -34,11 +36,11 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/11/10 22:38:54 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/11/29 12:18:01 $
*/
public class ServerPagesGenerator
extends ServletGenerator
- implements ContentHandler, LexicalHandler
+ implements ContentHandler, LexicalHandler, Poolable
{
/**
* The sitemap-defined server pages program generator
1.1.2.5 +3 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ServletGenerator.java 2000/10/19 14:43:51 1.1.2.4
+++ ServletGenerator.java 2000/11/29 12:18:03 1.1.2.5
@@ -16,6 +16,7 @@
import org.apache.avalon.Composer;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Parameters;
+import org.apache.avalon.Poolable;
import org.apache.cocoon.Cocoon;
@@ -24,10 +25,10 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/10/19 14:43:51 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/11/29 12:18:03 $
*/
public abstract class ServletGenerator extends ComposerGenerator
-implements Composer {
+implements Composer, Poolable {
protected HttpServletRequest request=null;
protected HttpServletResponse response=null;
1.1.2.6 +4 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- StatusGenerator.java 2000/11/14 15:08:27 1.1.2.5
+++ StatusGenerator.java 2000/11/29 12:18:05 1.1.2.6
@@ -23,7 +23,9 @@
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
+import org.apache.avalon.Poolable;
+
/** Generates an XML representation of the current status of Cocoon.
* Potted DTD:
*
@@ -50,9 +52,9 @@
*
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a> (Luminas Limited)
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/11/14 15:08:27 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/11/29 12:18:05 $
*/
-public class StatusGenerator extends ComposerGenerator {
+public class StatusGenerator extends ComposerGenerator implements Poolable {
/** The XML namespace for the output document.
*/