svn commit: r1728121 - in /ofbiz/trunk/framework: base/dtd/ofbiz-component.xsd base/src/org/ofbiz/base/component/ComponentConfig.java catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Author: jleroux
Date: Tue Feb  2 14:10:08 2016
New Revision: 1728121

URL: http://svn.apache.org/viewvc?rev=1728121&view=rev
Log:
Gets rid of the session-cookie-accepted feature - https://issues.apache.org/jira/browse/OFBIZ-6871


Since OFBIZ-6867 is now done, it will no longer be used OOTB and anyway should not be needed because we should preferably always use sessionIds in cookies and newer have sessionsIds in URLs.

Modified:
    ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd
    ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Modified: ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd?rev=1728121&r1=1728120&r2=1728121&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd (original)
+++ ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd Tue Feb  2 14:10:08 2016
@@ -233,14 +233,6 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="session-cookie-accepted" default="true">
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="true"/>
-                    <xs:enumeration value="false"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="virtual-host">
         <xs:complexType>

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java?rev=1728121&r1=1728120&r2=1728121&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java Tue Feb  2 14:10:08 2016
@@ -33,8 +33,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.ofbiz.base.container.ContainerConfig;
-import org.ofbiz.base.container.ContainerException;
 import org.ofbiz.base.container.ContainerConfig.Container;
+import org.ofbiz.base.container.ContainerException;
 import org.ofbiz.base.location.FlexibleLocation;
 import org.ofbiz.base.util.Assert;
 import org.ofbiz.base.util.Debug;
@@ -825,7 +825,6 @@ public final class ComponentConfig {
         public final String location;
         public final String[] basePermission;
         public final String position;
-        public final boolean sessionCookieAccepted;
         public final boolean privileged;
         // CatalinaContainer modifies this field.
         private volatile boolean appBarDisplay;
@@ -867,7 +866,6 @@ public final class ComponentConfig {
             }
             this.location = element.getAttribute("location");
             this.appBarDisplay = !"false".equals(element.getAttribute("app-bar-display"));
-            this.sessionCookieAccepted = !"false".equals(element.getAttribute("session-cookie-accepted"));
             this.privileged = !"false".equals(element.getAttribute("privileged"));
             this.accessPermission = element.getAttribute("access-permission");
             String basePermStr = element.getAttribute("base-permission");
@@ -955,10 +953,6 @@ public final class ComponentConfig {
             return virtualHosts;
         }
 
-        public boolean isSessionCookieAccepted() {
-            return sessionCookieAccepted;
-        }
-
         public synchronized void setAppBarDisplay(boolean appBarDisplay) {
             this.appBarDisplay = appBarDisplay;
         }

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1728121&r1=1728120&r2=1728121&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Tue Feb  2 14:10:08 2016
@@ -567,9 +567,6 @@ public class CatalinaContainer implement
         context.setJ2EEServer(J2EE_SERVER);
         context.setLoader(new WebappLoader(Thread.currentThread().getContextClassLoader()));
 
-        context.setCookies(appInfo.isSessionCookieAccepted());
-        context.addParameter("cookies", appInfo.isSessionCookieAccepted() ? "true" : "false");
-
         context.setDisplayName(appInfo.name);
         context.setDocBase(location);
         context.setAllowLinking(true);