vgritsenko 02/03/29 12:24:02
Modified: src/java/org/apache/cocoon/sitemap Handler.java
XSLTFactoryLoader.java
Log:
remove obsolete hack
Revision Changes Path
1.13 +1 -8 xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Handler.java 23 Feb 2002 21:15:46 -0000 1.12
+++ Handler.java 29 Mar 2002 20:24:02 -0000 1.13
@@ -84,7 +84,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 $Id: Handler.java,v 1.12 2002/02/23 21:15:46 dims Exp $
+ * @version CVS $Id: Handler.java,v 1.13 2002/03/29 20:24:02 vgritsenko Exp $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
@@ -259,13 +259,6 @@
String programmingLanguage = "java";
ProgramGenerator programGenerator = null;
try {
- /* FIXME: Workaround -- set the logger XSLTFactoryLoader used to
generate source
- * within the sitemap generation phase.
- * Needed because we never have the opportunity to handle the lifecycle
of the
- * XSLTFactoryLoader, since it is created by the Xalan engine.
- */
- XSLTFactoryLoader.setLogger(getLogger());
-
programGenerator =
(ProgramGenerator)this.manager.lookup(ProgramGenerator.ROLE);
smap = (Sitemap)programGenerator.load(this.manager,
this.sourceFileName, markupLanguage,
programmingLanguage, this);
1.6 +1 -13
xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java
Index: XSLTFactoryLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTFactoryLoader.java 22 Feb 2002 07:03:55 -0000 1.5
+++ XSLTFactoryLoader.java 29 Mar 2002 20:24:02 -0000 1.6
@@ -50,9 +50,7 @@
*/
package org.apache.cocoon.sitemap;
-import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.log.Logger;
import org.w3c.dom.NodeList;
import java.util.HashMap;
@@ -62,27 +60,17 @@
* generation stylesheet to load <code>MatcherFactory</code>s or
* <code>SelectorFactory</code>s to get the generated source code.
*
- * <strong>Note:</strong> This class uses a static log instance to
- * set up the instances it creates. This is suboptimal.
- *
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Id: XSLTFactoryLoader.java,v 1.5 2002/02/22 07:03:55 cziegeler Exp
$
+ * @version CVS $Id: XSLTFactoryLoader.java,v 1.6 2002/03/29 20:24:02 vgritsenko
Exp $
*/
public class XSLTFactoryLoader {
- protected static Logger log;
private HashMap obj = new HashMap();
public String getClassSource(String className, String prefix, String pattern,
NodeList conf) throws ClassNotFoundException,
InstantiationException, IllegalAccessException, Exception {
throw new UnsupportedOperationException("CodeFactory is no longer
supported.");
- }
-
- public static void setLogger(Logger logger) {
- if (log == null) {
- log = logger;
- }
}
public String getParameterSource(String className, NodeList conf) throws
ClassNotFoundException, InstantiationException,
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
