cziegeler 2002/06/04 02:27:22
Modified: src/java/org/apache/cocoon/components
CocoonComponentManager.java
RequestLifecycleComponent.java
SitemapConfigurable.java
src/java/org/apache/cocoon/components/crawler
SimpleCocoonCrawlerImpl.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPUtil.java
src/java/org/apache/cocoon/components/source
DelayedRefreshSourceWrapper.java SourceFactory.java
URLSource.java
src/java/org/apache/cocoon/environment ModifiableSource.java
Source.java WriteableSource.java
src/java/org/apache/cocoon/environment/http HttpRequest.java
src/java/org/apache/cocoon/util HashUtil.java
src/java/org/apache/cocoon/util/log CocoonTargetFactory.java
src/java/org/apache/cocoon/xml IncludeXMLConsumer.java
LoggingContentHandler.java
Log:
Deprecated some classes and fixed some mailto: infos
Revision Changes Path
1.26 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- CocoonComponentManager.java 4 Jun 2002 08:31:18 -0000 1.25
+++ CocoonComponentManager.java 4 Jun 2002 09:27:20 -0000 1.26
@@ -81,8 +81,8 @@
* by a special lifecycle handling for a RequestLifecycleComponent
* and by handling the lookup of the <code>SourceResolver</code> (in development)
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CocoonComponentManager.java,v 1.25 2002/06/04 08:31:18
cziegeler Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
+ * @version CVS $Id: CocoonComponentManager.java,v 1.26 2002/06/04 09:27:20
cziegeler Exp $
*/
public final class CocoonComponentManager
extends ExcaliburComponentManager
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/RequestLifecycleComponent.java
Index: RequestLifecycleComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/RequestLifecycleComponent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestLifecycleComponent.java 22 Feb 2002 07:00:06 -0000 1.4
+++ RequestLifecycleComponent.java 4 Jun 2002 09:27:20 -0000 1.5
@@ -65,8 +65,8 @@
* In addition, the first time this object is looked up during a request,
* the setup() method is called
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: RequestLifecycleComponent.java,v 1.4 2002/02/22 07:00:06
cziegeler Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
+ * @version CVS $Id: RequestLifecycleComponent.java,v 1.5 2002/06/04 09:27:20
cziegeler Exp $
*/
public interface RequestLifecycleComponent extends Component {
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/SitemapConfigurable.java
Index: SitemapConfigurable.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/SitemapConfigurable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SitemapConfigurable.java 29 May 2002 12:50:20 -0000 1.2
+++ SitemapConfigurable.java 4 Jun 2002 09:27:20 -0000 1.3
@@ -59,8 +59,8 @@
* are looked up.
*
* @since @next-version@
- * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SitemapConfigurable.java,v 1.2 2002/05/29 12:50:20 cziegeler
Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
+ * @version CVS $Id: SitemapConfigurable.java,v 1.3 2002/06/04 09:27:20 cziegeler
Exp $
*/
public interface SitemapConfigurable
extends RequestLifecycleComponent {
1.10 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java
Index: SimpleCocoonCrawlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleCocoonCrawlerImpl.java 28 Feb 2002 14:11:42 -0000 1.9
+++ SimpleCocoonCrawlerImpl.java 4 Jun 2002 09:27:20 -0000 1.10
@@ -82,7 +82,7 @@
* A simple cocoon crawler.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Bernhard Huber</a>
- * @version CVS $Id: SimpleCocoonCrawlerImpl.java,v 1.9 2002/02/28 14:11:42
vgritsenko Exp $
+ * @version CVS $Id: SimpleCocoonCrawlerImpl.java,v 1.10 2002/06/04 09:27:20
cziegeler Exp $
*/
public class SimpleCocoonCrawlerImpl extends AbstractLoggable
implements CocoonCrawler, Configurable, Disposable, Recyclable
@@ -597,8 +597,8 @@
* before returning in the next() method.
* </p>
*
- * @author <a href="mailto:[EMAIL PROTECTED]>Bernhard Huber</a>
- * @version $Id: SimpleCocoonCrawlerImpl.java,v 1.9 2002/02/28 14:11:42
vgritsenko Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Bernhard Huber</a>
+ * @version $Id: SimpleCocoonCrawlerImpl.java,v 1.10 2002/06/04 09:27:20
cziegeler Exp $
*/
public static class CocoonCrawlerIterator implements Iterator
{
1.8 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSPUtil.java 22 May 2002 16:02:29 -0000 1.7
+++ XSPUtil.java 4 Jun 2002 09:27:20 -0000 1.8
@@ -77,8 +77,8 @@
/**
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version CVS $Id: XSPUtil.java,v 1.7 2002/05/22 16:02:29 haul Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
+ * @version CVS $Id: XSPUtil.java,v 1.8 2002/06/04 09:27:20 cziegeler Exp $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
@@ -301,9 +301,9 @@
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
} finally {
- if ( stream != null )
+ if ( stream != null )
try {stream.close();} catch (Exception ase) { throw new
RuntimeException(ase.getMessage()); }
- }
+ }
return result.toString();
}
1.5 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/components/source/DelayedRefreshSourceWrapper.java
Index: DelayedRefreshSourceWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/DelayedRefreshSourceWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DelayedRefreshSourceWrapper.java 22 Feb 2002 07:00:13 -0000 1.4
+++ DelayedRefreshSourceWrapper.java 4 Jun 2002 09:27:20 -0000 1.5
@@ -65,8 +65,9 @@
* A wrapper around a <code>Source</code> that reduces the number of calls to
* <code>Source.getLastModified()</code> which can be a costly operation.
*
+ * @deprecarted by the Avalon Exalibur Source Resolving
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version $Id: DelayedRefreshSourceWrapper.java,v 1.4 2002/02/22 07:00:13
cziegeler Exp $
+ * @version $Id: DelayedRefreshSourceWrapper.java,v 1.5 2002/06/04 09:27:20
cziegeler Exp $
*/
public final class DelayedRefreshSourceWrapper implements Source, ModifiableSource,
XMLizable {
1.4 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceFactory.java
Index: SourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SourceFactory.java 22 Feb 2002 07:00:13 -0000 1.3
+++ SourceFactory.java 4 Jun 2002 09:27:20 -0000 1.4
@@ -60,8 +60,9 @@
import java.net.URL;
/**
+ * @deprecarted by the Avalon Exalibur Source Resolving
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: SourceFactory.java,v 1.3 2002/02/22 07:00:13 cziegeler Exp $
+ * @version $Id: SourceFactory.java,v 1.4 2002/06/04 09:27:20 cziegeler Exp $
*/
public interface SourceFactory extends ThreadSafe {
1.18 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java
Index: URLSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- URLSource.java 27 Apr 2002 18:32:45 -0000 1.17
+++ URLSource.java 4 Jun 2002 09:27:21 -0000 1.18
@@ -74,8 +74,9 @@
/**
* Description of a source which is described by an URL.
*
+ * @deprecarted by the Avalon Exalibur Source Resolving
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: URLSource.java,v 1.17 2002/04/27 18:32:45 vgritsenko Exp $
+ * @version CVS $Id: URLSource.java,v 1.18 2002/06/04 09:27:21 cziegeler Exp $
*/
public class URLSource extends AbstractStreamSource {
1.4 +1 -0
xml-cocoon2/src/java/org/apache/cocoon/environment/ModifiableSource.java
Index: ModifiableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/ModifiableSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ModifiableSource.java 22 Feb 2002 07:03:49 -0000 1.3
+++ ModifiableSource.java 4 Jun 2002 09:27:21 -0000 1.4
@@ -53,6 +53,7 @@
/**
* Describes a {@link Source} object whose data content can change.
*
+ * @deprecated Use the {@link org.apache.excalibur.source.Source} interface instead
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
*/
public interface ModifiableSource extends Source
1.5 +2 -1 xml-cocoon2/src/java/org/apache/cocoon/environment/Source.java
Index: Source.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/Source.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Source.java 22 Feb 2002 07:03:49 -0000 1.4
+++ Source.java 4 Jun 2002 09:27:21 -0000 1.5
@@ -65,9 +65,10 @@
* have a data source that can change its content and you want it to
* reflect in Cocoon, use a {@link ModifiableSource} object instead.
*
+ * @deprecated Use the {@link org.apache.excalibur.source.Source} interface instead
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Id: Source.java,v 1.4 2002/02/22 07:03:49 cziegeler Exp $
+ * @version CVS $Id: Source.java,v 1.5 2002/06/04 09:27:21 cziegeler Exp $
*/
public interface Source extends Recyclable, XMLizable {
1.4 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/WriteableSource.java
Index: WriteableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/WriteableSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WriteableSource.java 13 May 2002 16:06:52 -0000 1.3
+++ WriteableSource.java 4 Jun 2002 09:27:21 -0000 1.4
@@ -74,8 +74,9 @@
* implementation (such as file), can use a serializer to convert
* SAX events to a byte stream.
*
+ * @deprecated Use the {@link org.apache.cocoon.components.source.WriteableSource}
interface instead
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: WriteableSource.java,v 1.3 2002/05/13 16:06:52 crossley Exp $
+ * @version CVS $Id: WriteableSource.java,v 1.4 2002/06/04 09:27:21 cziegeler Exp $
*/
public interface WriteableSource extends ModifiableSource {
@@ -107,11 +108,11 @@
* is not restricted to a serialized XML document.
*
* @return a stream to write to
- */
+ */
OutputStream getOutputStream() throws IOException, ProcessingException;
/**
- * Can the data sent to a <code>ContentHandler</code> returned by
+ * Can the data sent to a <code>ContentHandler</code> returned by
* {@link #getContentHandler()} be cancelled ?
*
* @return true if the handler can be cancelled
1.8 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java
Index: HttpRequest.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpRequest.java 19 Apr 2002 12:11:50 -0000 1.7
+++ HttpRequest.java 4 Jun 2002 09:27:21 -0000 1.8
@@ -66,8 +66,8 @@
* Implements the {@link javax.servlet.http.HttpServletRequest} interface
* to provide request information for HTTP servlets.
*
- * @author <a href="mailto:giacomo@apache,org";>Giacomo Pati</a>
- * @version CVS $Id: HttpRequest.java,v 1.7 2002/04/19 12:11:50 cziegeler Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
+ * @version CVS $Id: HttpRequest.java,v 1.8 2002/06/04 09:27:21 cziegeler Exp $
*/
public class HttpRequest implements Request {
1.5 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/util/HashUtil.java
Index: HashUtil.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/HashUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HashUtil.java 22 Feb 2002 07:03:57 -0000 1.4
+++ HashUtil.java 4 Jun 2002 09:27:21 -0000 1.5
@@ -58,8 +58,8 @@
* Used with kind permission of the author
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Robert Uzgalis</a>
- * @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Id: HashUtil.java,v 1.4 2002/02/22 07:03:57 cziegeler Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
+ * @version CVS $Id: HashUtil.java,v 1.5 2002/06/04 09:27:21 cziegeler Exp $
*/
public final class HashUtil {
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/util/log/CocoonTargetFactory.java
Index: CocoonTargetFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/log/CocoonTargetFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CocoonTargetFactory.java 22 Feb 2002 07:03:58 -0000 1.4
+++ CocoonTargetFactory.java 4 Jun 2002 09:27:21 -0000 1.5
@@ -123,8 +123,8 @@
* </dd>
* </dl>
*
- * @author <a href="mailto:giacomo@apache,org";>Giacomo Pati</a>
- * @version CVS $Id: CocoonTargetFactory.java,v 1.4 2002/02/22 07:03:58 cziegeler
Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
+ * @version CVS $Id: CocoonTargetFactory.java,v 1.5 2002/06/04 09:27:21 cziegeler
Exp $
*/
public class CocoonTargetFactory
extends FileTargetFactory
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
Index: IncludeXMLConsumer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IncludeXMLConsumer.java 11 Mar 2002 11:15:25 -0000 1.6
+++ IncludeXMLConsumer.java 4 Jun 2002 09:27:21 -0000 1.7
@@ -67,9 +67,9 @@
* </code>endDocument</code>, <code>startDTD</code> and <code>endDTD</code>
* messages.
*
- * @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @author <a href="mailto:[EMAIL PROTECTED]>Carsten Ziegeler</a>
- * @version CVS $Id: IncludeXMLConsumer.java,v 1.6 2002/03/11 11:15:25 cziegeler
Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
+ * @version CVS $Id: IncludeXMLConsumer.java,v 1.7 2002/06/04 09:27:21 cziegeler
Exp $
*/
public class IncludeXMLConsumer implements XMLConsumer {
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingContentHandler.java
Index: LoggingContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingContentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggingContentHandler.java 22 Feb 2002 07:03:58 -0000 1.4
+++ LoggingContentHandler.java 4 Jun 2002 09:27:21 -0000 1.5
@@ -69,8 +69,8 @@
/**
* Logging content handler logs all events going through to the logger.
*
- * @author <a href="mailto:[EMAIL PROTECTED]>Vadim Gritsenko</a>
- * @version CVS $Id: LoggingContentHandler.java,v 1.4 2002/02/22 07:03:58 cziegeler
Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
+ * @version CVS $Id: LoggingContentHandler.java,v 1.5 2002/06/04 09:27:21 cziegeler
Exp $
*/
public class LoggingContentHandler extends AbstractLoggable implements
ContentHandler {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
