svn commit: r306580 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context: RequestSessionContext.java StandardSessionContextProvider.java

[cz...@apache.org]

Author: cziegeler
Date: Thu Oct  6 03:33:31 2005
New Revision: 306580

URL: http://svn.apache.org/viewcvs?rev=306580&view=rev
Log:
Log warning instead of writing it to system.err

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java?rev=306580&r1=306579&r2=306580&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java Thu Oct  6 03:33:31 2005
@@ -20,6 +20,7 @@
 import java.util.Enumeration;
 import java.util.Map;
 
+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.ProcessingException;
@@ -123,6 +124,9 @@
     private static final String NAME_ELEMENT       = "cinclude:" + CIncludeTransformer.CINCLUDE_NAME_ELEMENT;
     private static final String VALUE_ELEMENT      = "cinclude:" + CIncludeTransformer.CINCLUDE_VALUE_ELEMENT;
 
+    /** The logger. */
+    protected Logger logger;
+
     /** Name of this context */
     private String    name;
 
@@ -135,6 +139,10 @@
     /** The XPath Processor */
     private XPathProcessor xpathProcessor;
 
+    public RequestSessionContext(Logger logger) {
+        this.logger = logger;
+    }
+
     /**
      * Setup this context
      */
@@ -287,10 +295,10 @@
                 attr = doc.createElementNS(null, attrName);
                 attrElement.appendChild(attr);
                 DOMUtil.valueOf(attr, this.request.getAttribute(attrName));
-            } catch(DOMException de) {
+            } catch (DOMException de) {
                 // Some request attributes have names that are invalid as element names.
                 // Example : "FOM JavaScript GLOBAL SCOPE/file://my/path/to/flow/script.js"
-                System.err.println("Cannot create XML element with name '" + attrName + "' : " + de.getMessage());
+                this.logger.info("RequestSessionContext: Cannot create XML element from request attribute '" + attrName + "' : " + de.getMessage());
             }
         }
     }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java?rev=306580&r1=306579&r2=306580&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java Thu Oct  6 03:33:31 2005
@@ -39,7 +39,7 @@
  *  response context.
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * @version CVS $Id: StandardSessionContextProvider.java,v 1.9 2004/03/19 14:16:55 cziegeler Exp $
+ * @version CVS $Id$
 */
 public final class StandardSessionContextProvider
 extends AbstractLogEnabled
@@ -72,7 +72,7 @@
                 context = new SimpleSessionContext(this.xpathProcessor, this.resolver);
                 context.setup(name, null, null);
             } else if ( name.equals(SessionConstants.REQUEST_CONTEXT) ) {
-                context = new RequestSessionContext();
+                context = new RequestSessionContext(this.getLogger());
                 context.setup(name, null, null);
                 ((RequestSessionContext)context).setup( objectModel, this.manager, this.xpathProcessor );
             }