cziegeler 01/10/23 04:40:24
Modified: src/org/apache/cocoon Main.java
src/org/apache/cocoon/serialization SVGSerializer.java
src/org/apache/cocoon/servlet CocoonServlet.java
Removed: src/META-INF/services
org.apache.batik.util.ParsedURLProtocolHandler
Log:
Cleaned up code for batik protocols
Revision Changes Path
1.27 +1 -3 xml-cocoon2/src/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Main.java 2001/10/22 09:09:55 1.26
+++ Main.java 2001/10/23 11:40:24 1.27
@@ -24,7 +24,6 @@
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.MIMEUtils;
import org.apache.cocoon.util.NetUtils;
-import org.apache.cocoon.components.url.ParsedContextURLProtocolHandler;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import org.apache.log.Priority;
@@ -36,7 +35,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.26 $ $Date: 2001/10/22 09:09:55 $
+ * @version CVS $Revision: 1.27 $ $Date: 2001/10/23 11:40:24 $
*/
public class Main {
@@ -262,7 +261,6 @@
CommandlineContext clContext = new CommandlineContext(contextDir);
clContext.setLogger(log);
appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, clContext);
- ParsedContextURLProtocolHandler.setContext(clContext);
DefaultLogKitManager logKitManager = null;
if(logKit != null) {
final FileInputStream fis = new FileInputStream(logKit);
1.7 +12 -4
xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGSerializer.java 2001/10/23 11:10:02 1.6
+++ SVGSerializer.java 2001/10/23 11:40:24 1.7
@@ -14,11 +14,15 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.batik.transcoder.Transcoder;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.TranscodingHints;
import org.apache.batik.util.ParsedURL;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
@@ -44,13 +48,17 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ross Burton</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/10/23 11:10:02 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/23 11:40:24 $
*/
public class SVGSerializer extends SVGBuilder
-implements Composable, Serializer, Configurable, Poolable, Cacheable {
+implements Composable, Serializer, Configurable, Poolable, Cacheable,
Contextualizable {
- // add cocoon specific protocols
- static {
+ /**
+ * Get the context
+ */
+ public void contextualize(Context context) throws ContextException {
+ ParsedContextURLProtocolHandler.setContext(
+
(org.apache.cocoon.environment.Context)context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT));
ParsedURL.registerHandler(new ParsedContextURLProtocolHandler());
ParsedURL.registerHandler(new ParsedResourceURLProtocolHandler());
}
1.45 +2 -6 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- CocoonServlet.java 2001/10/11 14:34:44 1.44
+++ CocoonServlet.java 2001/10/23 11:40:24 1.45
@@ -17,7 +17,6 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.*;
import org.apache.cocoon.components.classloader.RepositoryClassLoader;
-import org.apache.cocoon.components.url.ParsedContextURLProtocolHandler;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.http.HttpContext;
import org.apache.cocoon.environment.http.HttpEnvironment;
@@ -59,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Revision: 1.44 $ $Date: 2001/10/11 14:34:44 $
+ * @version CVS $Revision: 1.45 $ $Date: 2001/10/23 11:40:24 $
*/
public class CocoonServlet extends HttpServlet {
@@ -124,10 +123,7 @@
String value;
this.servletContext = conf.getServletContext();
- HttpContext envContext = new HttpContext(this.servletContext);
- this.appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, envContext);
- ParsedContextURLProtocolHandler.setContext(envContext);
-
+ this.appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, new
HttpContext(this.servletContext);
this.initLogger();
this.forceLoadParameter = conf.getInitParameter("load-class");
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
