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...@apache.org on 2001/04/23 19:53:23 UTC
cvs commit: xml-cocoon/webapp/docs/samples/slides view-source.xsp
dims 01/04/23 10:53:21
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
SendmailAction.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/programming Tag:
xml-cocoon2 AbstractProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 AbstractJavaCompiler.java
JavaLanguage.java Jikes.java JstyleFormatter.java
src/org/apache/cocoon/components/language/programming/javascript
Tag: xml-cocoon2 JavascriptLanguage.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
ServerPagesGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2
RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2 Handler.java
Manager.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
SQLTransformer.java
webapp/docs/samples/slides Tag: xml-cocoon2 view-source.xsp
Log:
- Extend classes from AbstractLoggable wherever possible.
- Fix view-source.xsp
Revision Changes Path
No revision
No revision
1.1.2.6 +0 -1 xml-cocoon/src/org/apache/cocoon/acting/Attic/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SendmailAction.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SendmailAction.java 2001/04/20 20:49:45 1.1.2.5
+++ SendmailAction.java 2001/04/23 17:52:07 1.1.2.6
@@ -22,7 +22,6 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.Loggable;
import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
No revision
No revision
1.1.2.49 +1 -8 xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.48
retrieving revision 1.1.2.49
diff -u -r1.1.2.48 -r1.1.2.49
--- ProgramGeneratorImpl.java 2001/04/20 20:49:50 1.1.2.48
+++ ProgramGeneratorImpl.java 2001/04/23 17:52:14 1.1.2.49
@@ -20,8 +20,6 @@
import org.apache.avalon.context.Context;
import org.apache.avalon.context.Contextualizable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.Modifiable;
import org.apache.avalon.thread.ThreadSafe;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.configuration.Configurable;
@@ -48,7 +46,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.48 $ $Date: 2001/04/20 20:49:50 $
+ * @version CVS $Revision: 1.1.2.49 $ $Date: 2001/04/23 17:52:14 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
@@ -79,11 +77,6 @@
/** The root package */
protected String rootPackage;
-
- /** Set the Cache's logger */
- public void setLogger(Logger log) {
- super.setLogger(log);
- }
/** Contextualize this class */
public void contextualize(Context context) {
No revision
No revision
1.1.2.14 +8 -17 xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- AbstractProgrammingLanguage.java 2001/04/20 20:49:57 1.1.2.13
+++ AbstractProgrammingLanguage.java 2001/04/23 17:52:19 1.1.2.14
@@ -18,8 +18,7 @@
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.components.language.LanguageException;
-import org.apache.log.Logger;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* Base implementation of <code>ProgrammingLanguage</code>. This class sets the
@@ -27,33 +26,25 @@
* unloading.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 20:49:57 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/23 17:52:19 $
*/
-public abstract class AbstractProgrammingLanguage
- implements ProgrammingLanguage, Configurable, Loggable
+public abstract class AbstractProgrammingLanguage extends AbstractLoggable
+ implements ProgrammingLanguage, Configurable
{
- protected Logger log;
-
/** The source code formatter */
protected Class codeFormatter;
protected String languageName;
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
-
/**
* Configure the language
*/
public void configure(Configuration conf) throws ConfigurationException {
try {
- log.debug("Setting the parameters");
+ getLogger().debug("Setting the parameters");
this.setParameters( Parameters.fromConfiguration(conf) );
} catch (Exception e) {
- log.error("Could not set Parameters", e);
+ getLogger().error("Could not set Parameters", e);
throw new ConfigurationException("Could not get parameters because: " +
e.getMessage());
}
@@ -74,7 +65,7 @@
this.codeFormatter = ClassUtils.loadClass(className);
}
} catch (Exception e) {
- log.error("Error with \"code-formatter\" parameter", e);
+ getLogger().error("Error with \"code-formatter\" parameter", e);
throw e;
}
}
@@ -90,7 +81,7 @@
try {
return (CodeFormatter) this.codeFormatter.newInstance();
} catch (Exception e) {
- log.error("Error instantiating CodeFormatter", e);
+ getLogger().error("Error instantiating CodeFormatter", e);
}
}
No revision
No revision
1.1.2.12 +3 -14 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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- AbstractJavaCompiler.java 2001/04/20 20:49:58 1.1.2.11
+++ AbstractJavaCompiler.java 2001/04/23 17:52:24 1.1.2.12
@@ -14,24 +14,19 @@
import java.io.InputStreamReader;
import java.io.IOException;
-import org.apache.avalon.logger.Loggable;
import org.apache.excalibur.pool.Recyclable;
import org.apache.cocoon.components.language.programming.*;
-import org.apache.log.Logger;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* 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.11 $ $Date: 2001/04/20 20:49:58 $
+ * @version $Revision: 1.1.2.12 $ $Date: 2001/04/23 17:52:24 $
* @since 2.0
*/
-public abstract class AbstractJavaCompiler implements LanguageCompiler, Recyclable, Loggable {
- /**
- * The logger
- */
- protected Logger log;
+public abstract class AbstractJavaCompiler extends AbstractLoggable implements LanguageCompiler, Recyclable {
/**
* The source program filename
@@ -91,12 +86,6 @@
public void setDestination(String destDir) {
this.destDir = destDir;
}
-
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
/**
* Set the classpath to be used for this compilation
1.1.2.27 +10 -10 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.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- JavaLanguage.java 2001/04/20 20:49:59 1.1.2.26
+++ JavaLanguage.java 2001/04/23 17:52:27 1.1.2.27
@@ -34,7 +34,7 @@
* The Java programming language processor
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/20 20:49:59 $
+ * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/23 17:52:27 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements ThreadSafe, Composable, Disposable {
@@ -98,11 +98,11 @@
this.manager = manager;
if (this.classLoaderManager == null) {
try {
- log.debug("Looking up " + Roles.CLASS_LOADER);
+ getLogger().debug("Looking up " + Roles.CLASS_LOADER);
this.classLoaderManager =
(ClassLoaderManager) manager.lookup(Roles.CLASS_LOADER);
} catch (Exception e) {
- log.error("Could not find component", e);
+ getLogger().error("Could not find component", e);
}
}
}
@@ -123,7 +123,7 @@
return
this.classLoaderManager.loadClass(name.replace(File.separatorChar, '.'));
} catch (Exception e) {
- log.warn("Could not load class for program '" + name + "'", e);
+ getLogger().warn("Could not load class for program '" + name + "'", e);
throw new LanguageException("Could not load class for program '" + name + "' due to a " + e.getClass().getName() + ": " + e.getMessage());
}
}
@@ -145,7 +145,7 @@
AbstractJavaCompiler compiler = (AbstractJavaCompiler) this.compilerClass.newInstance();
if (compiler instanceof Loggable) {
- ((Loggable) compiler).setLogger(this.log);
+ ((Loggable) compiler).setLogger(getLogger());
}
int pos = name.lastIndexOf(File.separatorChar);
@@ -170,7 +170,7 @@
try {
systemExtClasspath = expandDirs(systemExtDirs);
} catch (Exception e) {
- log.warn("Could not expand Directory:" + systemExtDirs, e);
+ getLogger().warn("Could not expand Directory:" + systemExtDirs, e);
}
compiler.setClasspath(
@@ -205,13 +205,13 @@
}
} catch (InstantiationException e) {
- log.warn("Could not instantiate the compiler", e);
+ getLogger().warn("Could not instantiate the compiler", e);
throw new LanguageException("Could not instantiate the compiler: " + e.getMessage());
} catch (IllegalAccessException e) {
- log.warn("Could not access the compiler class", e);
+ getLogger().warn("Could not access the compiler class", e);
throw new LanguageException("Could not access the compiler class: " + e.getMessage());
} catch (IOException e) {
- log.warn("Error during compilation", e);
+ getLogger().warn("Error during compilation", e);
throw new LanguageException("Error during compilation: " + e.getMessage());
}
}
@@ -227,7 +227,7 @@
try {
return (CompiledComponent) program.newInstance();
} catch (Exception e) {
- log.warn("Could not instantiate program instance", e);
+ getLogger().warn("Could not instantiate program instance", e);
throw new LanguageException("Could not instantiate program instance due to a " + e.getClass().getName() + ": " + e.getMessage());
}
}
1.1.2.10 +3 -3 xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Jikes.java 2001/01/31 15:48:36 1.1.2.9
+++ Jikes.java 2001/04/23 17:52:30 1.1.2.10
@@ -16,7 +16,7 @@
* This class wraps IBM's <i>Jikes</i> Java compiler
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.9 $ $Date: 2001/01/31 15:48:36 $
+ * @version $Revision: 1.1.2.10 $ $Date: 2001/04/23 17:52:30 $
* @since 2.0
*/
@@ -58,7 +58,7 @@
sleep(SLEEP_TIME);
}
} catch (Exception e) {
- log.warn("Jikes.run()", e);
+ getLogger().warn("Jikes.run()", e);
}
}
}
@@ -131,7 +131,7 @@
this.errors = new ByteArrayInputStream(tmpErr.toByteArray());
} catch (InterruptedException somethingHappened) {
- log.debug("Jikes.compile():SomethingHappened", somethingHappened);
+ getLogger().debug("Jikes.compile():SomethingHappened", somethingHappened);
return false;
}
1.1.2.7 +4 -12 xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java
Index: JstyleFormatter.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- JstyleFormatter.java 2001/04/20 20:49:59 1.1.2.6
+++ JstyleFormatter.java 2001/04/23 17:52:31 1.1.2.7
@@ -18,8 +18,7 @@
import org.apache.cocoon.components.language.programming.*;
-import org.apache.log.Logger;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* This class implements <code>CodeFormatter</code> based on
@@ -27,10 +26,9 @@
* beautifier. This implementation is very improvised...
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:49:59 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/23 17:52:31 $
*/
-public class JstyleFormatter implements CodeFormatter, Loggable {
- protected Logger log;
+public class JstyleFormatter extends AbstractLoggable implements CodeFormatter {
/**
* The default preferred line length. Should be parametrized!
*/
@@ -45,12 +43,6 @@
*/
protected static final int SPACE_INDENTATION = 2;
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
-
/**
* Format and beautify a <code>String</code> containing source code.
* This class has 2 pases: one for beautifying and another one for
@@ -88,7 +80,7 @@
return this.getString(out, encoding);
} catch (Exception e) {
- log.debug("JstyleFormatter.format()", e);
+ getLogger().debug("JstyleFormatter.format()", e);
return code;
}
}
No revision
No revision
1.1.2.6 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java
Index: JavascriptLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- JavascriptLanguage.java 2000/12/08 20:39:27 1.1.2.5
+++ JavascriptLanguage.java 2001/04/23 17:52:39 1.1.2.6
@@ -20,7 +20,7 @@
* The compiled Javascript (Rhino) programming language processor
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/08 20:39:27 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/23 17:52:39 $
*/
public class JavascriptLanguage extends JavaLanguage
{
@@ -76,7 +76,7 @@
compiler.main(args);
} catch (Exception e) {
- log.warn("JavascriptLanguage.compile", e);
+ getLogger().warn("JavascriptLanguage.compile", e);
throw new LanguageException(e.getMessage());
}
}
No revision
No revision
1.1.2.25 +1 -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.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- ServerPagesGenerator.java 2001/04/23 13:28:51 1.1.2.24
+++ ServerPagesGenerator.java 2001/04/23 17:52:44 1.1.2.25
@@ -25,7 +25,6 @@
import org.apache.excalibur.pool.Poolable;
import org.apache.excalibur.pool.Recyclable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.logger.Loggable;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
@@ -44,7 +43,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/23 13:28:51 $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/23 17:52:44 $
*/
public class ServerPagesGenerator
extends ServletGenerator
No revision
No revision
1.1.2.14 +5 -12 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java
Index: RegexpTargetHostMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- RegexpTargetHostMatcherFactory.java 2001/04/20 20:50:08 1.1.2.13
+++ RegexpTargetHostMatcherFactory.java 2001/04/23 17:52:49 1.1.2.14
@@ -17,9 +17,9 @@
import org.w3c.dom.NodeList;
-import org.apache.avalon.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.logger.AbstractLoggable;
+
/**
* This class generates source code which represents a specific pattern matcher
* for request URIs
@@ -27,23 +27,16 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 20:50:08 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/23 17:52:49 $
*/
-public class RegexpTargetHostMatcherFactory implements CodeFactory, Loggable {
- protected Logger log;
+public class RegexpTargetHostMatcherFactory extends AbstractLoggable implements CodeFactory {
public String generateParameterSource (NodeList conf)
throws ConfigurationException {
return "RE";
}
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
-
public String generateClassSource (String prefix, String pattern,
NodeList conf)
throws ConfigurationException {
@@ -78,7 +71,7 @@
.append("));");
return sb.toString();
} catch (RESyntaxException rse) {
- log.warn("Syntax exception while compiling regexp '" + pat + "'.", rse);
+ getLogger().warn("Syntax exception while compiling regexp '" + pat + "'.", rse);
throw new ConfigurationException (rse.getMessage(), rse);
}
}
1.1.2.26 +4 -12 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- RegexpURIMatcherFactory.java 2001/04/20 20:50:08 1.1.2.25
+++ RegexpURIMatcherFactory.java 2001/04/23 17:52:51 1.1.2.26
@@ -17,8 +17,7 @@
import org.w3c.dom.NodeList;
-import org.apache.log.Logger;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* This class generates source code which represents a specific pattern matcher
@@ -26,23 +25,16 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/20 20:50:08 $
+ * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/23 17:52:51 $
*/
-public class RegexpURIMatcherFactory implements CodeFactory, Loggable {
- protected Logger log;
+public class RegexpURIMatcherFactory extends AbstractLoggable implements CodeFactory {
public String generateParameterSource (NodeList conf)
throws ConfigurationException {
return "RE";
}
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
-
public String generateClassSource (String prefix, String pattern,
NodeList conf)
throws ConfigurationException {
@@ -93,7 +85,7 @@
sb.append("}");
return sb.toString();
} catch (RESyntaxException rse) {
- log.debug("RegexpURIMatcherFactory", rse);
+ getLogger().debug("RegexpURIMatcherFactory", rse);
throw new ConfigurationException (rse.getMessage(), rse);
}
}
1.1.2.34 +4 -12 xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- WildcardURIMatcherFactory.java 2001/04/20 20:50:08 1.1.2.33
+++ WildcardURIMatcherFactory.java 2001/04/23 17:52:53 1.1.2.34
@@ -14,8 +14,7 @@
import org.w3c.dom.NodeList;
-import org.apache.log.Logger;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* This class generates source code which represents a specific pattern matcher
@@ -24,11 +23,10 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.33 $ $Date: 2001/04/20 20:50:08 $
+ * @version CVS $Revision: 1.1.2.34 $ $Date: 2001/04/23 17:52:53 $
*/
-public class WildcardURIMatcherFactory implements CodeFactory, Loggable {
- protected Logger log;
+public class WildcardURIMatcherFactory extends AbstractLoggable implements CodeFactory {
/** The int representing '*' in the pattern <code>int []</code>. */
protected static final int MATCH_FILE = -1;
@@ -52,12 +50,6 @@
return "int []";
}
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
-
/**
* Generates the matcher method level source code
*/
@@ -94,7 +86,7 @@
return result.append (sourcePattern[j])
.append ("};\n").toString();
} catch (NullPointerException pe) {
- log.error("WildcardURIMatcherFactory:NULL", pe);
+ getLogger().error("WildcardURIMatcherFactory:NULL", pe);
throw new ConfigurationException (pe.getMessage(), pe);
}
}
No revision
No revision
1.1.2.27 +1 -2 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- Handler.java 2001/04/23 14:45:54 1.1.2.26
+++ Handler.java 2001/04/23 17:53:01 1.1.2.27
@@ -36,14 +36,13 @@
import org.apache.avalon.component.Component;
import org.apache.avalon.Disposable;
import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.logger.Loggable;
/**
* Handles the manageing and stating of one <code>Sitemap</code>
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/23 14:45:54 $
+ * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/23 17:53:01 $
*/
public class Handler extends AbstractLoggable implements Runnable, Configurable, Composable, Contextualizable, Processor, Disposable {
private Context context;
1.1.2.16 +1 -2 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java
Index: Manager.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- Manager.java 2001/04/20 20:50:14 1.1.2.15
+++ Manager.java 2001/04/23 17:53:03 1.1.2.16
@@ -20,7 +20,6 @@
import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.logger.Loggable;
import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cocoon.Constants;
@@ -39,7 +38,7 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:50:14 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/23 17:53:03 $
*/
public class Manager extends AbstractLoggable implements Configurable, Composable, Contextualizable {
No revision
No revision
1.1.2.25 +25 -35 xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- SQLTransformer.java 2001/04/20 20:50:17 1.1.2.24
+++ SQLTransformer.java 2001/04/23 17:53:10 1.1.2.25
@@ -19,8 +19,6 @@
import java.util.Map;
import java.util.Enumeration;
-import org.apache.log.Logger;
-import org.apache.avalon.logger.Loggable;
import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.ComponentException;
@@ -50,13 +48,11 @@
* @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/20 20:50:17 $ $Author: bloritsch $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/23 17:53:10 $ $Author: dims $
*/
-public class SQLTransformer extends AbstractTransformer implements Composable, Loggable, Poolable, Disposable {
+public class SQLTransformer extends AbstractTransformer implements Composable, Poolable, Disposable {
- private Logger log;
-
/** The SQL namespace **/
public static final String my_uri = "http://apache.org/cocoon/SQL";
public static final String my_name = "SQLTransformer";
@@ -113,13 +109,7 @@
this.manager = manager;
this.dbSelector = (ComponentSelector) manager.lookup(Roles.DB_CONNECTION);
} catch (ComponentException cme) {
- this.log.warn("Could not get the DataSource Selector", cme);
- }
- }
-
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
+ getLogger().warn("Could not get the DataSource Selector", cme);
}
}
@@ -133,7 +123,7 @@
// Check for connection
String parameter = parameters.getParameter(SQLTransformer.MAGIC_CONNECTION, null);
if (parameter != null) {
- log.debug("CONNECTION: "+parameter);
+ getLogger().debug("CONNECTION: "+parameter);
default_properties.setProperty(SQLTransformer.MAGIC_CONNECTION, parameter);
} else {
@@ -141,7 +131,7 @@
// Check the dburl
parameter = parameters.getParameter(SQLTransformer.MAGIC_DBURL,null);
if (parameter != null) {
- log.debug("DBURL: "+parameter);
+ getLogger().debug("DBURL: "+parameter);
default_properties.setProperty(SQLTransformer.MAGIC_DBURL,parameter);
}
@@ -149,7 +139,7 @@
// Check the username
parameter = parameters.getParameter(SQLTransformer.MAGIC_USERNAME,null);
if (parameter != null) {
- log.debug("USERNAME: "+parameter);
+ getLogger().debug("USERNAME: "+parameter);
default_properties.setProperty(SQLTransformer.MAGIC_USERNAME,parameter);
}
@@ -177,7 +167,7 @@
try {
query.execute();
} catch (SQLException e) {
- log.debug("SQLTransformer.executeQuery()", e);
+ getLogger().debug("SQLTransformer.executeQuery()", e);
throw new SAXException(e);
}
this.start(query.rowset_name, attr);
@@ -191,7 +181,7 @@
this.end(query.row_name);
}
} catch (SQLException e) {
- log.debug("SQLTransformer.executeQuery()", e);
+ getLogger().debug("SQLTransformer.executeQuery()", e);
throw new SAXException(e);
}
this.end(query.rowset_name);
@@ -250,7 +240,7 @@
if (current_value.length() > 0) {
getCurrentQuery().addQueryPart(
current_value.toString());
- log.debug("QUERY IS \""+
+ getLogger().debug("QUERY IS \""+
current_value.toString() + "\"");
current_value.setLength(0);
@@ -267,7 +257,7 @@
case SQLTransformer.STATE_INSIDE_VALUE_ELEMENT:
getCurrentQuery().setParameter(current_name,
current_value.toString());
- log.debug("SETTING VALUE ELEMENT name {"+
+ getLogger().debug("SETTING VALUE ELEMENT name {"+
current_name + "} value {"+
current_value.toString() + "}");
@@ -303,7 +293,7 @@
level = Integer.parseInt( attributes.getValue(my_uri,
SQLTransformer.MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE));
} catch (Exception e) {
- log.debug("SQLTransformer", e);
+ getLogger().debug("SQLTransformer", e);
throwIllegalStateException("Ancestor value elements must have a "+
SQLTransformer.MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE + " attribute");
}
@@ -314,12 +304,12 @@
SQLTransformer.MAGIC_ANCESTOR_VALUE_NAME_ATTRIBUTE + " attribute");
}
AncestorValue av = new AncestorValue(level, name);
- log.debug("ANCESTOR VALUE "+level + " "+name);
+ getLogger().debug("ANCESTOR VALUE "+level + " "+name);
if (current_value.length() > 0) {
getCurrentQuery().addQueryPart(
current_value.toString());
- log.debug("QUERY IS \""+
+ getLogger().debug("QUERY IS \""+
current_value.toString() + "\"");
current_value.setLength(0);
@@ -349,8 +339,8 @@
/** BEGIN SAX ContentHandler handlers **/
public void setDocumentLocator(Locator locator) {
- log.info("PUBLIC ID"+locator.getPublicId());
- log.info("SYSTEM ID"+locator.getSystemId());
+ getLogger().info("PUBLIC ID"+locator.getPublicId());
+ getLogger().info("SYSTEM ID"+locator.getSystemId());
if (super.contentHandler != null)
super.contentHandler.setDocumentLocator(locator);
}
@@ -361,7 +351,7 @@
super.startElement(uri, name, raw, attributes);
return;
}
- log.debug("RECEIVED START ELEMENT "+name);
+ getLogger().debug("RECEIVED START ELEMENT "+name);
if (name.equals(SQLTransformer.MAGIC_EXECUTE_QUERY)) {
startExecuteQueryElement();
@@ -380,7 +370,7 @@
super.endElement(uri, name, raw);
return;
}
- log.debug("RECEIVED END ELEMENT "+name + "("+uri +
+ getLogger().debug("RECEIVED END ELEMENT "+name + "("+uri +
")");
if (name.equals(SQLTransformer.MAGIC_EXECUTE_QUERY)) {
@@ -402,7 +392,7 @@
current_state != SQLTransformer.STATE_INSIDE_QUERY_ELEMENT) {
super.characters(ary, start, length);
}
- log.debug("RECEIVED CHARACTERS: "+
+ getLogger().debug("RECEIVED CHARACTERS: "+
new String(ary, start, length));
current_value.append(ary, start, length);
@@ -514,7 +504,7 @@
try {
sb.append(query.getColumnValue(av.name));
} catch (SQLException e) {
- log.debug("SQLTransformer", e);
+ getLogger().debug("SQLTransformer", e);
close();
throw e;
}
@@ -542,10 +532,10 @@
md = rs.getMetaData();
}
} catch (SQLException e) {
- log.error("Caught a SQLException", e);
+ getLogger().error("Caught a SQLException", e);
throw e;
} catch (ComponentException cme) {
- log.error("Could not use connection: " + connection, cme);
+ getLogger().error("Could not use connection: " + connection, cme);
} finally {
conn.close();
if (datasource != null) dbSelector.release(datasource);
@@ -556,7 +546,7 @@
try {
return transformer.getStringValue(rs.getObject(i));
} catch (SQLException e) {
- log.debug("SQLTransformer", e);
+ getLogger().debug("SQLTransformer", e);
close();
throw e;
}
@@ -566,7 +556,7 @@
try {
return transformer.getStringValue(rs.getObject(name));
} catch (SQLException e) {
- log.debug("SQLTransformer", e);
+ getLogger().debug("SQLTransformer", e);
close();
throw e;
}
@@ -584,7 +574,7 @@
}
return true;
} catch (SQLException e) {
- log.debug("SQLTransformer", e);
+ getLogger().debug("SQLTransformer", e);
close();
throw e;
}
@@ -613,7 +603,7 @@
try {
transformer.data(getColumnValue(i));
} catch (SQLException e) {
- log.debug("SQLTransformer", e);
+ getLogger().debug("SQLTransformer", e);
close();
throw e;
}
No revision
No revision
1.1.2.8 +1 -0 xml-cocoon/webapp/docs/samples/slides/Attic/view-source.xsp
Index: view-source.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/slides/Attic/view-source.xsp,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- view-source.xsp 2001/04/16 17:59:44 1.1.2.7
+++ view-source.xsp 2001/04/23 17:53:16 1.1.2.8
@@ -12,6 +12,7 @@
<xsp:structure>
<xsp:include>java.net.*</xsp:include>
+ <xsp:include>org.w3c.dom.*</xsp:include>
<xsp:include>org.apache.cocoon.xml.dom.DOMStreamer</xsp:include>
<xsp:include>org.apache.cocoon.xml.dom.DOMBuilder</xsp:include>
<xsp:include>org.apache.cocoon.components.parser.Parser</xsp:include>
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org