vgritsenko 2003/07/02 19:10:01
Modified: . changes.xml
src/java/org/apache/cocoon/components/language/markup/sitemap/java
sitemap.xsl
src/java/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
CachingEventPipeline.java EventPipeline.java
Removed: src/java/org/apache/cocoon Notificable.java Notifier.java
Notification.java
src/java/org/apache/cocoon/sitemap ErrorNotifier.java
Log:
Removed deprecated notification classes (deprecated 1.5 years ago)
Revision Changes Path
1.28 +22 -13 cocoon-2.0/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/cocoon-2.0/changes.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- changes.xml 3 Jul 2003 01:16:07 -0000 1.27
+++ changes.xml 3 Jul 2003 02:10:01 -0000 1.28
@@ -43,29 +43,38 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="remove">
+ Removed deprecated notification classes in org.apache.cocoon and in
+ org.apache.cocoon.sitemap packages. Removed deprecated methods in
+ EventPipeline and in org.apache.cocoon.components.notification.Notifier.
+ </action>
<action dev="VG" type="update">
- Decouple core XSP logicsheet from database classes to allow XSP
deployment without excalibur
- datasource JAR file. If your XSP pages use datasources directly (and not
through ESQL logicsheet),
- add xsp:include.
+ Decouple core XSP logicsheet from database classes to allow XSP
deployment
+ without excalibur datasource JAR file. If your XSP pages use datasources
+ directly (and not through ESQL logicsheet), add xsp:include.
</action>
<action dev="VG" type="update">
- Build script updated: build properties extracted into build.properties
file, database.properties
- file removed. Override build.properties with local.build.properties or
with ~/cocoon.build.properties
+ Build script updated: build properties extracted into build.properties
+ file, database.properties file removed. Override build.properties with
+ local.build.properties or with ~/cocoon.build.properties
</action>
<action dev="JH" type="fix" fixes-bug="20682" due-to="Wolfgang
Kowarschick" due-to-email="[EMAIL PROTECTED]">
- Fixed return of different DirValidity objects on multiple calls on
getValidity() in the DirectoryGenerator.
+ Fixed return of different DirValidity objects on multiple calls on
+ getValidity() in the DirectoryGenerator.
</action>
<action dev="JH" type="update" fixes-bug="20911" due-to="Jorg Heymans"
due-to-email="[EMAIL PROTECTED]">
- Backported the caching from Cocoon 2.1, fixed cache key generation,
fixed the root pattern handling
- (if not matching directory found leave out the ancestors), fixed empty
src attribute handling.
+ Backported the caching from Cocoon 2.1, fixed cache key generation, fixed
+ the root pattern handling (if not matching directory found leave out the
+ ancestors), fixed empty src attribute handling.
</action>
<action dev="JH" type="fix" fixes-bug="15365" due-to="Maciek Kaminski"
due-to-email="[EMAIL PROTECTED]">
- Added/fixed internationalization support for HSSFSerializer by setting
the output encoding
- hardcoded to UTF-16. It's obviously only a hack, but so it's at least
usable for more people.
+ Added/fixed internationalization support for HSSFSerializer by setting
the
+ output encoding hardcoded to UTF-16. It's obviously only a hack, but so
+ it's at least usable for more people.
</action>
<action dev="JH" type="fix" fixes-bug="20658" due-to="Alfred Nathaniel"
due-to-email="[EMAIL PROTECTED]">
- Fixed usage of deprecated(?)/possibly removed method XSPUtil.include()
in ESQL logicsheet
- <esql:get-xml/> by usage of convenience methods (bug 20658).
+ Fixed usage of deprecated(?)/possibly removed method XSPUtil.include() in
+ ESQL logicsheet <esql:get-xml/> by usage of convenience methods
(bug 20658).
</action>
<action dev="JH" type="fix" fixes-bug="14977" due-to="Tony Culshaw"
due-to-email="[EMAIL PROTECTED]">
Fixed NPE in SQLTransformer.serializeData().
1.2 +3 -6
cocoon-2.0/src/java/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xsl 9 Mar 2003 00:01:55 -0000 1.1
+++ sitemap.xsl 3 Jul 2003 02:10:01 -0000 1.2
@@ -791,13 +791,10 @@
final boolean debug_enabled = getLogger().isDebugEnabled();
// Create a Notifying out of this exception and stick it in
the object model Constants.NOTIFYING_OBJECTS
- if (debug_enabled) getLogger().debug("Starting to build
Notifying");
NotifyingBuilder notifyingBuilder=
(NotifyingBuilder)this.manager.lookup(NotifyingBuilder.ROLE);
- if (debug_enabled) getLogger().debug("Got " +
notifyingBuilder);
Notifying currentNotifying = notifyingBuilder.build(this, e);
- if (debug_enabled) getLogger().debug("Built " +
currentNotifying);
objectModel.put(Constants.NOTIFYING_OBJECT, currentNotifying );
- if (debug_enabled) getLogger().debug("Added to objectModel" +
currentNotifying);
+ if (debug_enabled) getLogger().debug("Added NOTIFYING to
objectModel: " + currentNotifying);
eventPipeline.setGenerator ("<notifier>",
e.getMessage(), Parameters.EMPTY_PARAMETERS);
<xsl:apply-templates/>
1.2 +1 -12
cocoon-2.0/src/java/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractEventPipeline.java 9 Mar 2003 00:02:20 -0000 1.1
+++ AbstractEventPipeline.java 3 Jul 2003 02:10:01 -0000 1.2
@@ -118,17 +118,6 @@
this.newManager = manager;
}
- /**
- * @deprecated The NotifyingGenerator gets the Notificable from the
objectModel
- */
- public void setGenerator (String role, String source, Parameters param,
Exception e)
- throws Exception {
- this.setGenerator (role, source, param);
- if (this.generator instanceof
org.apache.cocoon.sitemap.ErrorNotifier) {
-
((org.apache.cocoon.sitemap.ErrorNotifier)this.generator).setThrowable(e);
- }
- }
-
public void setGenerator (String role, String source, Parameters param)
throws Exception {
if (this.generator != null) {
1.2 +6 -2
cocoon-2.0/src/java/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CachingEventPipeline.java 9 Mar 2003 00:02:21 -0000 1.1
+++ CachingEventPipeline.java 3 Jul 2003 02:10:01 -0000 1.2
@@ -56,7 +56,11 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.*;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.CachedEventObject;
+import org.apache.cocoon.caching.ComponentCacheKey;
+import org.apache.cocoon.caching.PipelineCacheKey;
import org.apache.cocoon.components.sax.XMLDeserializer;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.components.sax.XMLTeePipe;
1.2 +1 -17
cocoon-2.0/src/java/org/apache/cocoon/components/pipeline/EventPipeline.java
Index: EventPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/pipeline/EventPipeline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventPipeline.java 9 Mar 2003 00:02:21 -0000 1.1
+++ EventPipeline.java 3 Jul 2003 02:10:01 -0000 1.2
@@ -94,22 +94,6 @@
void setGenerator (String role, String source, Parameters param) throws
Exception;
/**
- * Same as [EMAIL PROTECTED] #setGenerator(String, String, Parameters)}
with an additional
- * <code>Exception</code> parameter. This is used for setting the special
- * {link org.apache.cocoon.sitemap.ErrorNotifier} generator used to
generate
- * input for error pages.
- *
- * @param role the generator role in the component manager.
- * @param source the source where to produce XML from (e.g. xml file), or
- * <code>null</code> if no source is given.
- * @param param the parameters for the generator.
- * @param e the exception to generate.
- * @throws Exception if the generator couldn't be obtained.
- * @see org.apache.cocoon.sitemap.ErrorNotifier
- */
- void setGenerator (String role, String source, Parameters param,
Exception e) throws Exception;
-
- /**
* Get the generator used by this pipeline. Access to the generator is
needed for
* content aggregation since the aggregation generator is fed by the
pipeline engine
* with the different parts.
