You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/10/19 18:21:28 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper EnvironmentWrapper.java MutableEnvironmentFacade.java
cziegeler 2003/10/19 09:21:28
Modified: src/java/org/apache/cocoon/components/source/impl
SitemapSource.java SitemapSourceFactory.java
src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java
MutableEnvironmentFacade.java
Log:
Changing to Serviceable
Revision Changes Path
1.14 +10 -10 cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SitemapSource.java 15 Oct 2003 20:15:29 -0000 1.13
+++ SitemapSource.java 19 Oct 2003 16:21:28 -0000 1.14
@@ -58,10 +58,10 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Processor;
import org.apache.cocoon.ResourceNotFoundException;
@@ -107,8 +107,8 @@
/** The uri */
// private String uri;
- /** The current ComponentManager */
- private ComponentManager manager;
+ /** The current ServiceManager */
+ private ServiceManager manager;
/** The processor */
private Processor processor;
@@ -149,10 +149,10 @@
/**
* Construct a new object
*/
- public SitemapSource(ComponentManager manager,
- String uri,
- Map parameters,
- Logger logger)
+ public SitemapSource(ServiceManager manager,
+ String uri,
+ Map parameters,
+ Logger logger)
throws MalformedURLException {
Environment env = CocoonComponentManager.getCurrentEnvironment();
@@ -188,7 +188,7 @@
position += 2;
try {
this.processor = (Processor)this.manager.lookup(Processor.ROLE);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new MalformedURLException("Cannot get Processor instance");
}
prefix = ""; // start at the root
1.3 +8 -7 cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java
Index: SitemapSourceFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SitemapSourceFactory.java 7 Jun 2003 21:19:36 -0000 1.2
+++ SitemapSourceFactory.java 19 Oct 2003 16:21:28 -0000 1.3
@@ -54,9 +54,10 @@
import java.net.MalformedURLException;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.source.Source;
@@ -74,15 +75,15 @@
*/
public final class SitemapSourceFactory
extends AbstractLogEnabled
- implements SourceFactory, ThreadSafe, Composable, URIAbsolutizer
+ implements SourceFactory, ThreadSafe, Serviceable, URIAbsolutizer
{
- /** The <code>ComponentManager</code> */
- private ComponentManager manager;
+ /** The <code>ServiceManager</code> */
+ private ServiceManager manager;
/**
* Composable
*/
- public void compose(ComponentManager manager) {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
1.12 +12 -23 cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EnvironmentWrapper.java 16 Aug 2003 13:30:04 -0000 1.11
+++ EnvironmentWrapper.java 19 Oct 2003 16:21:28 -0000 1.12
@@ -57,8 +57,8 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Environment;
@@ -137,7 +137,7 @@
String requestURI,
String queryString,
Logger logger,
- ComponentManager manager,
+ ServiceManager manager,
boolean rawMode)
throws MalformedURLException {
this(env, requestURI, queryString, logger, null, rawMode,env.getView());
@@ -151,7 +151,7 @@
String requestURI,
String queryString,
Logger logger,
- ComponentManager manager,
+ ServiceManager manager,
boolean rawMode,
String view)
throws MalformedURLException {
@@ -163,7 +163,7 @@
String requestURI,
String queryString,
Logger logger,
- ComponentManager manager,
+ ServiceManager manager,
boolean rawMode,
String view)
throws MalformedURLException {
@@ -197,7 +197,7 @@
this.objectModel.put(ObjectModelHelper.REQUEST_OBJECT, this.request);
}
- public EnvironmentWrapper(Environment env, ComponentManager manager, String uri, Logger logger) throws MalformedURLException {
+ public EnvironmentWrapper(Environment env, ServiceManager manager, String uri, Logger logger) throws MalformedURLException {
super(env.getURI(), env.getView(), env.getContext(), env.getAction());
// FIXME(SW): code stolen from SitemapSource. Factorize somewhere...
@@ -309,17 +309,6 @@
/**
* Get the output stream
- * @deprecated use {@link #getOutputStream(int)} instead.
- */
- public OutputStream getOutputStream()
- throws IOException {
- return this.outputStream == null
- ? this.environment.getOutputStream()
- : this.outputStream;
- }
-
- /**
- * Get the output stream
*/
public OutputStream getOutputStream(int bufferSize)
throws IOException {
@@ -345,9 +334,9 @@
*/
public boolean tryResetResponse()
throws IOException {
- if (getOutputStream() != null
- && getOutputStream() instanceof BufferedOutputStream) {
- ((BufferedOutputStream)getOutputStream()).clearBuffer();
+ if (getOutputStream(0) != null
+ && getOutputStream(0) instanceof BufferedOutputStream) {
+ ((BufferedOutputStream)getOutputStream(0)).clearBuffer();
return true;
}
else
@@ -359,9 +348,9 @@
*/
public void commitResponse()
throws IOException {
- if (getOutputStream() != null
- && getOutputStream() instanceof BufferedOutputStream) {
- ((BufferedOutputStream)getOutputStream()).realFlush();
+ if (getOutputStream(0) != null
+ && getOutputStream(0) instanceof BufferedOutputStream) {
+ ((BufferedOutputStream)getOutputStream(0)).realFlush();
}
else
super.commitResponse();
1.4 +1 -8 cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java
Index: MutableEnvironmentFacade.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MutableEnvironmentFacade.java 15 Oct 2003 19:25:47 -0000 1.3
+++ MutableEnvironmentFacade.java 19 Oct 2003 16:21:28 -0000 1.4
@@ -215,13 +215,6 @@
}
/* (non-Javadoc)
- * @see org.apache.cocoon.environment.Environment#getOutputStream()
- */
- public OutputStream getOutputStream() throws IOException {
- return env.getOutputStream();
- }
-
- /* (non-Javadoc)
* @see org.apache.cocoon.environment.Environment#getOutputStream(int)
*/
public OutputStream getOutputStream(int bufferSize) throws IOException {