You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2008/04/19 00:54:20 UTC
svn commit: r649720 - in /cocoon/branches/BRANCH_2_1_X: ./
src/blocks/portal/java/org/apache/cocoon/environment/portlet/
src/blocks/taglib/java/org/apache/cocoon/jxpath/
src/java/org/apache/cocoon/environment/
src/java/org/apache/cocoon/environment/com...
Author: anathaniel
Date: Fri Apr 18 15:54:17 2008
New Revision: 649720
URL: http://svn.apache.org/viewvc?rev=649720&view=rev
Log:
In Cocoon 2.2 the org.apache.cocoon.environment.Session interface
is deprecated, and the return type of getSession() changes to
vanilla javax.servlet.HttpRequest.
For migrating from Cocoon 2.1 to 2.2, replace in your custom code
all calls to getSession() by getCocoonSession(). That allows for
a common codebase usable on both version.
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletRequest.java
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Request.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpRequest.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java
cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/environment/mock/MockRequest.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletRequest.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletRequest.java?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletRequest.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletRequest.java Fri Apr 18 15:54:17 2008
@@ -295,6 +295,14 @@
return this.getSession(true);
}
+ public Session getCocoonSession(boolean create) {
+ return this.getSession(create);
+ }
+
+ public Session getCocoonSession() {
+ return this.getSession(true);
+ }
+
public boolean isRequestedSessionIdValid() {
return this.request.isRequestedSessionIdValid();
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java Fri Apr 18 15:54:17 2008
@@ -330,6 +330,14 @@
return this.delegate.getSession();
}
+ public Session getCocoonSession(boolean create) {
+ return this.getSession(create);
+ }
+
+ public Session getCocoonSession() {
+ return this.getSession(true);
+ }
+
public boolean isRequestedSessionIdValid() {
return this.delegate.isRequestedSessionIdValid();
}
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Request.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Request.java?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Request.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Request.java Fri Apr 18 15:54:17 2008
@@ -767,6 +767,26 @@
Session getSession();
+ /**
+ * In Cocoon 2.2 the org.apache.cocoon.environment.Session interface
+ * is deprecated, and the return type of getSession() changes to
+ * vanilla javax.servlet.HttpRequest.
+ * <p>
+ * For migrating from Cocoon 2.1 to 2.2, replace in your custom code
+ * all calls to getSession() by getCocoonSession(). That allows for
+ * a common codebase usable on both version.
+ *
+ * @see #getSession()
+ */
+
+ Session getCocoonSession(boolean create);
+
+ /**
+ * @see #getSession(boolean)
+ */
+
+ Session getCocoonSession();
+
/**
*
* Checks whether the requested session ID is still valid.
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java Fri Apr 18 15:54:17 2008
@@ -273,6 +273,14 @@
return CommandLineSession.getSession(create);
}
+ public Session getCocoonSession(boolean create) {
+ return this.getSession(create);
+ }
+
+ public Session getCocoonSession() {
+ return this.getSession(true);
+ }
+
/**
* Returns the session ID specified by the client. This may
* not be the same as the ID of the actual session in use.
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpRequest.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpRequest.java?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpRequest.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpRequest.java Fri Apr 18 15:54:17 2008
@@ -252,6 +252,14 @@
return this.getSession(true);
}
+ public Session getCocoonSession(boolean create) {
+ return this.getSession(create);
+ }
+
+ public Session getCocoonSession() {
+ return this.getSession(true);
+ }
+
public boolean isRequestedSessionIdValid() {
return this.req.isRequestedSessionIdValid();
}
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java Fri Apr 18 15:54:17 2008
@@ -294,6 +294,14 @@
return this.req.getSession();
}
+ public Session getCocoonSession(boolean create) {
+ return this.getSession(create);
+ }
+
+ public Session getCocoonSession() {
+ return this.getSession(true);
+ }
+
public boolean isRequestedSessionIdValid() {
return this.req.isRequestedSessionIdValid();
}
Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/environment/mock/MockRequest.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/environment/mock/MockRequest.java?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/environment/mock/MockRequest.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/environment/mock/MockRequest.java Fri Apr 18 15:54:17 2008
@@ -296,6 +296,14 @@
return getSession(true);
}
+ public Session getCocoonSession(boolean create) {
+ return this.getSession(create);
+ }
+
+ public Session getCocoonSession() {
+ return this.getSession(true);
+ }
+
public boolean isRequestedSessionIdValid() {
if (session != null) {
try {
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=649720&r1=649719&r2=649720&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Fri Apr 18 15:54:17 2008
@@ -182,6 +182,14 @@
<changes>
<release version="2.1.12" date="TBD">
+ <action dev="AN" type="add">
+ Core: In Cocoon 2.2 the org.apache.cocoon.environment.Session interface
+ is deprecated, and the return type of getSession() changes to
+ vanilla javax.servlet.HttpRequest.
+ For migrating from Cocoon 2.1 to 2.2, replace in your custom code
+ all calls to getSession() by getCocoonSession(). That allows for
+ a common codebase usable on both version.
+ </action>
<action dev="JH" type="add">
Core: Allow multiple file uploads of the same field name. If there are multiple file uploads Request.get(String)
will return a Vector. If there is only one file upload it will return the Part as it did before. This is now the