Author: jgenender
Date: Tue Mar 28 19:49:33 2006
New Revision: 389664
URL: http://svn.apache.org/viewcvs?rev=389664&view=rev
Log:
GERONIMO-1788 - allow to disable cookies in web application
Modified:
geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Modified: geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=389664&r1=389663&r2=389664&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Tue Mar 28 19:49:33 2006
@@ -459,6 +459,9 @@
if (tomcatWebApp.isSetCrossContext()) {
webModuleData.setAttribute("crossContext", Boolean.TRUE);
}
+ if (tomcatWebApp.isSetDisableCookies()) {
+ webModuleData.setAttribute("disableCookies", Boolean.TRUE);
+ }
if (tomcatWebApp.isSetTomcatRealm()) {
String tomcatRealm = tomcatWebApp.getTomcatRealm().trim();
ObjectName realmName = NameFactory.getComponentName(null, null, null, null,
tomcatRealm, RealmGBean.GBEAN_INFO.getJ2eeType(), moduleJ2eeContext);
Modified: geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd?rev=389664&r1=389663&r2=389664&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd (original)
+++ geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd Tue Mar 28 19:49:33
2006
@@ -47,6 +47,7 @@
<xs:element name="host" type="xs:string" minOccurs="0"/>
<xs:element name="cross-context" type="tomcat:emptyType" minOccurs="0"/>
+ <xs:element name="disable-cookies" type="tomcat:emptyType" minOccurs="0"/>
<xs:element name="valve-chain" type="xs:string" minOccurs="0"/>
<xs:element name="tomcat-realm" type="xs:string" minOccurs="0"/>
<xs:element name="manager" type="xs:string" minOccurs="0"/>
Modified: geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd?rev=389664&r1=389663&r2=389664&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd (original)
+++ geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd Tue Mar
28 19:49:33 2006
@@ -30,6 +30,7 @@
<xs:sequence>
<xs:element name="host" type="xs:string" minOccurs="0"/>
<xs:element name="cross-context" type="tomcat:emptyType" minOccurs="0"/>
+ <xs:element name="disable-cookies" type="tomcat:emptyType" minOccurs="0"/>
<xs:element name="valve-chain" type="xs:string" minOccurs="0"/>
<xs:element name="tomcat-realm" type="xs:string" minOccurs="0"/>
<xs:element name="manager" type="xs:string" minOccurs="0"/>
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=389664&r1=389663&r2=389664&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Tue Mar 28 19:49:33 2006
@@ -172,6 +172,8 @@
this.setCrossContext(ctx.isCrossContext());
+ this.setCookies(!ctx.isDisableCookies());
+
//Set the Dispatch listener
this.addInstanceListener("org.apache.geronimo.tomcat.listener.DispatchListener");
}
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java?rev=389664&r1=389663&r2=389664&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java Tue
Mar 28 19:49:33 2006
@@ -70,5 +70,7 @@
public boolean isCrossContext();
+ public boolean isDisableCookies();
+
public Map getWebServices();
}
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=389664&r1=389663&r2=389664&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Tue Mar 28 19:49:33 2006
@@ -84,6 +84,8 @@
private final Manager manager;
private final boolean crossContext;
+
+ private final boolean disableCookies;
private final Map componentContext;
@@ -134,6 +136,7 @@
CatalinaClusterGBean cluster,
ManagerGBean manager,
boolean crossContext,
+ boolean disableCookies,
Map webServices,
J2EEServer server,
J2EEApplication application,
@@ -211,6 +214,8 @@
this.manager = null;
this.crossContext = crossContext;
+
+ this.disableCookies = disableCookies;
this.webServices = webServices;
@@ -343,6 +348,11 @@
public boolean isCrossContext() {
return crossContext;
}
+
+ public boolean isDisableCookies() {
+ return disableCookies;
+ }
+
public Map getWebServices(){
return webServices;
@@ -459,6 +469,7 @@
infoBuilder.addReference("Cluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
infoBuilder.addReference("Manager", ManagerGBean.class);
infoBuilder.addAttribute("crossContext", boolean.class, true);
+ infoBuilder.addAttribute("disableCookies", boolean.class, true);
infoBuilder.addAttribute("webServices", Map.class, true);
infoBuilder.addReference("J2EEServer", J2EEServer.class);
infoBuilder.addReference("J2EEApplication", J2EEApplication.class);
@@ -489,6 +500,7 @@
"Cluster",
"Manager",
"crossContext",
+ "disableCookies",
"webServices",
"J2EEServer",
"J2EEApplication",
|