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 2005/03/08 11:22:56 UTC
svn commit: r156516 - in cocoon/branches/BRANCH_2_1_X/src:
blocks/mail/java/org/apache/cocoon/mail/
blocks/xmldb/java/org/apache/cocoon/generation/
java/org/apache/cocoon/environment/
java/org/apache/cocoon/environment/wrapper/
Author: cziegeler
Date: Tue Mar 8 02:22:53 2005
New Revision: 156516
URL: http://svn.apache.org/viewcvs?view=rev&rev=156516
Log:
Add some deprecation warnings
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandSelector.java
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandSelector.java?view=diff&r1=156515&r2=156516
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandSelector.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandSelector.java Tue Mar 8 02:22:53 2005
@@ -17,6 +17,7 @@
import java.util.Map;
import org.apache.cocoon.selection.AbstractSwitchSelector;
+import org.apache.cocoon.util.log.DeprecationLogger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -45,58 +46,60 @@
/**
* @deprecated use RequestAttributeSelector, RequestParameterSelector, or ParameterSelector instead.
- * @version CVS $Id: MailCommandSelector.java,v 1.3 2004/03/05 13:02:00 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class MailCommandSelector extends AbstractSwitchSelector {
- public Object getSelectorContext(Map objectModel, Parameters parameters) {
- Request request = ObjectModelHelper.getRequest(objectModel);
- // try to get the command from the request-attribute
- String cmdName = MailContext.MAIL_CURRENT_WORKING_COMMAND_ENTRY;
- String cmd = (String)request.getAttribute( cmdName );
+ public Object getSelectorContext(Map objectModel, Parameters parameters) {
+ Request request = ObjectModelHelper.getRequest(objectModel);
+ // try to get the command from the request-attribute
+ String cmdName = MailContext.MAIL_CURRENT_WORKING_COMMAND_ENTRY;
+ String cmd = (String)request.getAttribute( cmdName );
- // try to get command from the request parameter
- if (cmd == null) {
- cmdName = "cmd";
- cmd = request.getParameter( cmdName );
- }
-
- // try to get command from the session attribute
- if (cmd == null) {
- Session session = request.getSession( false );
- if (session != null) {
- MailContext mailContext = (MailContext)session.getAttribute( MailContext.SESSION_MAIL_CONTEXT );
- if (mailContext != null) {
- try {
- cmd = (String)mailContext.get(MailContext.MAIL_CURRENT_WORKING_COMMAND_ENTRY);
- } catch (ContextException ce) {
- String message = "Cannot get command entry " +
- String.valueOf(MailContext.MAIL_CURRENT_WORKING_COMMAND_ENTRY) + " " +
- "from mailContext from session";
- getLogger().warn( message, ce );
- }
- }
- }
- }
- MailCommandBuilder mcb = new MailCommandBuilder();
- boolean isMapped = mcb.isCommandMapped( cmd );
- if (isMapped) {
- return cmd;
- } else {
- // uup the command is invalid, we will surly be not able to map it to a valid
- // AbstractMailAction
- return null;
- }
- }
+ // try to get command from the request parameter
+ if (cmd == null) {
+ cmdName = "cmd";
+ cmd = request.getParameter( cmdName );
+ }
+
+ // try to get command from the session attribute
+ if (cmd == null) {
+ Session session = request.getSession( false );
+ if (session != null) {
+ MailContext mailContext = (MailContext)session.getAttribute( MailContext.SESSION_MAIL_CONTEXT );
+ if (mailContext != null) {
+ try {
+ cmd = (String)mailContext.get(MailContext.MAIL_CURRENT_WORKING_COMMAND_ENTRY);
+ } catch (ContextException ce) {
+ String message = "Cannot get command entry " +
+ String.valueOf(MailContext.MAIL_CURRENT_WORKING_COMMAND_ENTRY) + " " +
+ "from mailContext from session";
+ getLogger().warn( message, ce );
+ }
+ }
+ }
+ }
+ MailCommandBuilder mcb = new MailCommandBuilder();
+ boolean isMapped = mcb.isCommandMapped( cmd );
+ if (isMapped) {
+ return cmd;
+ } else {
+ // uup the command is invalid, we will surly be not able to map it to a valid
+ // AbstractMailAction
+ return null;
+ }
+ }
- public boolean select(String expression, Object selectorContext) {
- if (selectorContext == null) {
- return false;
- } else {
- String cmd = (String)selectorContext;
- return cmd.equals( expression );
- }
- }
+ public boolean select(String expression, Object selectorContext) {
+ DeprecationLogger.log("The MailCommandSelector is deprecated."
+ + " Use RequestAttributeSelector, RequestParameterSelector, or ParameterSelector instead.");
+ if (selectorContext == null) {
+ return false;
+ } else {
+ String cmd = (String)selectorContext;
+ return cmd.equals( expression );
+ }
+ }
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java?view=diff&r1=156515&r2=156516
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java Tue Mar 8 02:22:53 2005
@@ -25,6 +25,7 @@
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.log.DeprecationLogger;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
@@ -134,7 +135,8 @@
Map objectModel,
String src,
Parameters par)
- throws ProcessingException, SAXException,IOException {
+ throws ProcessingException, SAXException,IOException {
+ DeprecationLogger.log("The XMLDBCollectionGenerator is deprecated. Use the XML:DB pseudo protocol instead");
super.setup(resolver, objectModel, src, par);
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java?view=diff&r1=156515&r2=156516
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java Tue Mar 8 02:22:53 2005
@@ -25,6 +25,7 @@
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.log.DeprecationLogger;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
@@ -127,7 +128,8 @@
Map objectModel,
String src,
Parameters par)
- throws ProcessingException, SAXException,IOException {
+ throws ProcessingException, SAXException,IOException {
+ DeprecationLogger.log("The XMLDBGenerator is deprecated. Use the XML:DB pseudo protocol instead");
super.setup(resolver, objectModel, src, par);
}
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java?view=diff&r1=156515&r2=156516
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java Tue Mar 8 02:22:53 2005
@@ -34,6 +34,7 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.util.BufferedOutputStream;
import org.apache.cocoon.util.ClassUtils;
+import org.apache.cocoon.util.log.DeprecationLogger;
import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.excalibur.source.SourceException;
import org.xml.sax.SAXException;
@@ -369,6 +370,8 @@
*/
public Source resolve(String systemId)
throws ProcessingException, SAXException, IOException {
+ DeprecationLogger.log("The resolve(String) method of the SourceResolver is "
+ + "deprecated. Use resolveURI(String) instead.");
if (!this.initializedComponents) {
initComponents();
}
@@ -465,6 +468,8 @@
* @deprecated Use {@link #getOutputStream(int)} instead.
*/
public OutputStream getOutputStream() throws IOException {
+ DeprecationLogger.log("The getOutputStream() method of the Environment " +
+ "is deprecated. Use getOutputStream(-1) instead.");
// by default we use the complete buffering output stream
return this.getOutputStream(-1);
}
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java?view=diff&r1=156515&r2=156516
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java Tue Mar 8 02:22:53 2005
@@ -31,6 +31,7 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.util.BufferedOutputStream;
+import org.apache.cocoon.util.log.DeprecationLogger;
/**
@@ -297,9 +298,11 @@
*/
public OutputStream getOutputStream()
throws IOException {
- return this.outputStream == null
- ? this.environment.getOutputStream()
- : this.outputStream;
+ DeprecationLogger.log("The getOutputStream() method of the Environment " +
+ "is deprecated. Use getOutputStream(-1) instead.");
+ return this.outputStream == null
+ ? this.environment.getOutputStream()
+ : this.outputStream;
}
/**