joerg 2003/09/27 06:01:15
Modified: src/java/org/apache/cocoon Constants.java
src/deprecated/java/org/apache/cocoon/selection
SessionStateSelector.java
src/java/org/apache/cocoon/environment
ObjectModelHelper.java
Log:
clean up for constants (is 19 months of deprecation enough?)
Revision Changes Path
1.8 +3 -33 cocoon-2.1/src/java/org/apache/cocoon/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Constants.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Constants.java 4 Jun 2003 14:19:08 -0000 1.7
+++ Constants.java 27 Sep 2003 13:01:15 -0000 1.8
@@ -218,33 +218,6 @@
public static final String LINK_CRAWLING_ROLE = "static";
/**
- * The name of a <code>Request</code> object in the so called
objectModel <code>Map</code>.
- * This constant is also defined in the
org.apache.cocoon.environment.ObjectModelHelper class.
- *
- * FIXME(GP): Shouldn't this definition here be removed?
- * @deprecated Use the [EMAIL PROTECTED]
org.apache.cocoon.environment.ObjectModelHelper#getRequest(java.util.Map)}
instead.
- */
- public static final String REQUEST_OBJECT =
org.apache.cocoon.environment.ObjectModelHelper.REQUEST_OBJECT;
-
- /**
- * The name of a <code>Response</code> object in the so called
objectModel <code>Map</code>.
- * This constant is also defined in the
org.apache.cocoon.environment.ObjectModelHelper class.
- *
- * FIXME(GP): Shouldn't this definition here be removed?
- * @deprecated Use the [EMAIL PROTECTED]
org.apache.cocoon.environment.ObjectModelHelper#getResponse(java.util.Map)}
instead.
- */
- public static final String RESPONSE_OBJECT =
org.apache.cocoon.environment.ObjectModelHelper.RESPONSE_OBJECT;
-
- /**
- *The name of a <code>Context</code> object in the so called objectModel
<code>Map</code>.
- * This constant is also defined in the
org.apache.cocoon.environment.ObjectModelHelper class.
- *
- * FIXME(GP): Shouldn't this definition here be removed?
- * @deprecated Use the [EMAIL PROTECTED]
org.apache.cocoon.environment.ObjectModelHelper#getContext(java.util.Map)}
instead.
- */
- public static final String CONTEXT_OBJECT =
org.apache.cocoon.environment.ObjectModelHelper.CONTEXT_OBJECT;
-
- /**
* Key of the Map of index translation table.
* <p>Presence of this Map in the ObjectModel indicates to the Sitemap
that link
* translation mode has been requested by the environment. Sitemap adds
LinkTranslator
@@ -252,6 +225,8 @@
* the links from this translation table.
* <p>
* TODO(VG): Move this declaration to ObjectModelHelper
+ * comment found at ObjectModelHelper(JH):
+ * LINK_OBJECT should also be moved to CommandLineEnvironment
*/
public static final String LINK_OBJECT = "link";
@@ -325,11 +300,6 @@
* (usually named cocoon.xconf)
*/
public static final String CONTEXT_CONFIG_URL = "config-url";
-
- /**
- * @deprecated used only by deprecated SessionStateSelector
- */
- public static final String SESSION_STATE_ATTRIBUTE =
"org.apache.cocoon.SessionState";
/**
* Should descriptors be reloaded?
1.2 +4 -3
cocoon-2.1/src/deprecated/java/org/apache/cocoon/selection/SessionStateSelector.java
Index: SessionStateSelector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/deprecated/java/org/apache/cocoon/selection/SessionStateSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionStateSelector.java 9 Mar 2003 00:07:15 -0000 1.1
+++ SessionStateSelector.java 27 Sep 2003 13:01:15 -0000 1.2
@@ -52,7 +52,6 @@
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.cocoon.Constants;
/**
* This class generates source code to implement a selector that
@@ -71,8 +70,10 @@
*/
public class SessionStateSelector extends SessionAttributeSelector {
+ public static final String SESSION_STATE_ATTRIBUTE =
"org.apache.cocoon.SessionState";
+
public SessionStateSelector() {
- this.defaultName = Constants.SESSION_STATE_ATTRIBUTE;
+ this.defaultName = SESSION_STATE_ATTRIBUTE;
}
public void configure(Configuration config)
1.4 +1 -4
cocoon-2.1/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
Index: ObjectModelHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/ObjectModelHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ObjectModelHelper.java 1 Apr 2003 21:25:09 -0000 1.3
+++ ObjectModelHelper.java 27 Sep 2003 13:01:15 -0000 1.4
@@ -71,9 +71,6 @@
public final class ObjectModelHelper {
- // FIXME : Constants copied from cocoon.Constants where they should be
deprecated
- // LINK_OBJECT should also be moved to CommandLineEnvironment
-
/** Key for the environment [EMAIL PROTECTED] Request} in the object
model. */
public final static String REQUEST_OBJECT = "request";
