Author: jgenender
Date: Fri Aug 12 09:33:29 2005
New Revision: 232329
URL: http://svn.apache.org/viewcvs?rev=232329&view=rev
Log:
Added CrossContext parameter
Modified:
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/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=232329&r1=232328&r2=232329&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 Fri Aug 12 09:33:29 2005
@@ -139,6 +139,8 @@
}
this.webServiceMap = ctx.getWebServices();
+
+ this.setCrossContext(ctx.isCrossContext());
}
public synchronized void start() throws LifecycleException {
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=232329&r1=232328&r2=232329&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 Fri Aug 12 09:33:29 2005
@@ -62,5 +62,7 @@
public List getValveChain();
+ public boolean isCrossContext();
+
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=232329&r1=232328&r2=232329&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 Fri Aug 12 09:33:29 2005
@@ -75,6 +75,8 @@
private final Realm realm;
private final List valveChain;
+
+ private final boolean crossContext;
private final Map componentContext;
@@ -122,6 +124,7 @@
RoleDesignateSource roleDesignateSource,
ObjectRetriever tomcatRealm,
ValveGBean tomcatValveChain,
+ boolean crossContext,
Map webServices,
J2EEServer server,
J2EEApplication application,
@@ -178,6 +181,8 @@
} else {
valveChain = null;
}
+
+ this.crossContext = crossContext;
this.webServices = webServices;
@@ -301,6 +306,10 @@
return valveChain;
}
+ public boolean isCrossContext() {
+ return crossContext;
+ }
+
public Map getWebServices(){
return webServices;
}
@@ -414,6 +423,7 @@
RoleDesignateSource.class, NameFactory.JACC_MANAGER);
infoBuilder.addReference("TomcatRealm", ObjectRetriever.class);
infoBuilder.addReference("TomcatValveChain", ValveGBean.class);
+ infoBuilder.addAttribute("crossContext", boolean.class, true);
infoBuilder.addAttribute("webServices", Map.class, true);
infoBuilder.addReference("J2EEServer", J2EEServer.class);
infoBuilder.addReference("J2EEApplication",
J2EEApplication.class);
@@ -441,6 +451,7 @@
"RoleDesignateSource",
"TomcatRealm",
"TomcatValveChain",
+ "crossContext",
"webServices",
"J2EEServer",
"J2EEApplication",