svn commit: r153821 - cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java

[cziegeler]

Author: cziegeler
Date: Mon Feb 14 10:22:39 2005
New Revision: 153821

URL: http://svn.apache.org/viewcvs?view=rev&rev=153821
Log:
Always log on usage

Modified:
    
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java

Modified: 
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
URL: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java?view=diff&r1=153820&r2=153821
==============================================================================
--- 
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
 (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
 Mon Feb 14 10:22:39 2005
@@ -127,6 +127,7 @@
         vars.addDeprecatedVariable("request");
         vars.addDeprecatedVariable("session");
         vars.addDeprecatedVariable("parameters");
+        jxpc.setVariables(vars);
 
         Locale localeParameter = null;
         String localeStr = parameters.getParameter("locale", null);
@@ -351,9 +352,9 @@
          */
         public Object getVariable(String name) {
             Object value = this.vars.get(name);
-            if ( value != null && deprecatedNames.contains(name) ) {
+            if ( deprecatedNames.contains(name) ) {
                 DeprecationLogger.log("CForms: usage of the variable '" + name 
+ "' is deprecated."+ 
-                                      "Please use 'cocoon." + name + "' 
instead. The usage of just '"+
+                                      "Please use 'cocoon/" + name + "' 
instead. The usage of just '"+
                                       name+"' will be removed in Cocoon 2.2.");
             }
             return value;