nicolaken 2002/10/14 07:31:27 Modified: . changes.xml src/java/org/apache/cocoon/components/notification Notifier.java src/java/org/apache/cocoon/sitemap NotifyingGenerator.java Log: <action dev="NKB" type="update"> Removed deprecated notification classes in org.apache.cocoon.* and in org.apache.cocoon.sitemap.* and the deprecated methods in org.apache.cocoon.components.notification.Notifier. </action> Revision Changes Path 1.265 +6 -1 xml-cocoon2/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/changes.xml,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- changes.xml 12 Oct 2002 05:11:39 -0000 1.264 +++ changes.xml 14 Oct 2002 14:31:27 -0000 1.265 @@ -40,6 +40,11 @@ </devs> <release version="@version@" date="@date@"> + <action dev="NKB" type="update"> + Removed deprecated notification classes in org.apache.cocoon.* and in + org.apache.cocoon.sitemap.* and the deprecated methods in + org.apache.cocoon.components.notification.Notifier. + </action> <action dev="TC" type="add"> Added support for sitemap variable anchors {#name:variable}. This introduces a new "name" attribute for matchers and actions 1.12 +7 -5 xml-cocoon2/src/java/org/apache/cocoon/components/notification/Notifier.java Index: Notifier.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/notification/Notifier.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Notifier.java 28 Jun 2002 13:17:38 -0000 1.11 +++ Notifier.java 14 Oct 2002 14:31:27 -0000 1.12 @@ -79,12 +79,13 @@ * This could be <code>null</code>. * @deprecated There is no way in which this method could understand what mime/type to use. Instead use void notify(Notifying n, OutputStream outputStream, String mimetype), where the mime/type is requested. * @see #notify(Notifying n, OutputStream, String) - */ + public static String notify(Notifying n, OutputStream outputStream) throws IOException { notify(n, outputStream, "text/html") ; return "text/html"; } - + */ + /** * Generate notification information as a response. * The notification is directly written to the OutputStream. @@ -145,11 +146,12 @@ * Generate notification information in XML format. * @deprecated Using a ContentHandler doesn't mean that a mimetype cannot be specified; it could be svg or * @see #notify(Notifying, ContentHandler, String) - */ + public static void notify(Notifying n, ContentHandler ch) throws SAXException { notify(n, ch, "text/xml"); } - + */ + /** * Generate notification information in XML format. */ 1.6 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java Index: NotifyingGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NotifyingGenerator.java 15 Jul 2002 14:52:40 -0000 1.5 +++ NotifyingGenerator.java 14 Oct 2002 14:31:27 -0000 1.6 @@ -98,7 +98,7 @@ * output SAX events. */ public void generate() throws SAXException { - Notifier.notify(notification, this.contentHandler); + Notifier.notify(notification, this.contentHandler, "text/xml"); } /**
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]