You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/12/04 08:12:59 UTC
svn commit: r109789 - /geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java /geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
Author: djencks
Date: Fri Dec 3 23:12:59 2004
New Revision: 109789
URL: http://svn.apache.org/viewcvs?view=rev&rev=109789
Log:
put all attributes in as constructor arguments
Modified:
geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?view=diff&rev=109789&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java&r1=109788&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java&r2=109789
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java Fri Dec 3 23:12:59 2004
@@ -87,9 +87,23 @@
URL configurationBaseUrl,
Set unshareableResources,
Set applicationManagedSecurityResources,
+
+ String displayName,
+ Map contextParamMap,
+ Collection listenerClassNames,
+ boolean distributable,
+ Map mimeMap,
+ String[] welcomeFiles,
+ Map localeEncodingMapping,
+ Map errorPages,
+ Authenticator authenticator,
+ String realmName,
+ Map tagLibMap,
+ int sessionTimeoutSeconds,
+
TransactionContextManager transactionContextManager,
TrackedConnectionAssociator trackedConnectionAssociator,
- JettyContainer jettyContainer) throws MalformedURLException {
+ JettyContainer jettyContainer) throws MalformedURLException, IllegalAccessException, InstantiationException, ClassNotFoundException {
assert uri != null;
assert componentContext != null;
@@ -122,6 +136,21 @@
userTransaction.setUp(transactionContextManager, trackedConnectionAssociator);
+ //stuff from spec dd
+ setDisplayName(displayName);
+ setContextParamMap(contextParamMap);
+ setListenerClassNames(listenerClassNames);
+ setDistributable(distributable);
+ setMimeMap(mimeMap);
+ setWelcomeFiles(welcomeFiles);
+ setLocaleEncodingMapping(localeEncodingMapping);
+ setErrorPages(errorPages);
+ setAuthenticator(authenticator);
+ setRealmName(realmName);
+ setTagLibMap(tagLibMap);
+ setSessionTimeoutSeconds(sessionTimeoutSeconds);
+
+
int index = 0;
BeforeAfter interceptor = new InstanceContextBeforeAfter(null, index++, unshareableResources, applicationManagedSecurityResources, trackedConnectionAssociator);
interceptor = new TransactionContextBeforeAfter(interceptor, index++, index++, transactionContextManager);
@@ -327,6 +356,20 @@
"configurationBaseUrl",
"unshareableResources",
"applicationManagedSecurityResources",
+
+ "displayName",
+ "contextParamMap",
+ "listenerClassNames",
+ "distributable",
+ "mimeMap",
+ "welcomeFiles",
+ "localeEncodingMapping",
+ "errorPages",
+ "authenticator",
+ "realmName",
+ "tagLibMap",
+ "sessionTimeoutSeconds",
+
"TransactionContextManager",
"TrackedConnectionAssociator",
"JettyContainer"
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java?view=diff&rev=109789&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java&r1=109788&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java&r2=109789
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java Fri Dec 3 23:12:59 2004
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Collection;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.security.auth.Subject;
@@ -119,7 +120,6 @@
this.excludedPermissions = null;
this.uncheckedPermissions = null;
this.rolePermissions = null;
-// this.allSet = null;
}
public JettyWebAppJACCContext(URI uri,
@@ -131,8 +131,21 @@
URL configurationBaseUrl,
Set unshareableResources,
Set applicationManagedSecurityResources,
- String policyContextID,
+
+ String displayName,
+ Map contextParamMap,
+ Collection listenerClassNames,
+ boolean distributable,
+ Map mimeMap,
+ String[] welcomeFiles,
+ Map localeEncodingMapping,
+ Map errorPages,
+ Authenticator authenticator,
String realmName,
+ Map tagLibMap,
+ int sessionTimeoutSeconds,
+
+ String policyContextID,
String loginDomainName,
Security securityConfig,
//from jettyxmlconfig
@@ -140,12 +153,11 @@
Set uncheckedPermissions,
Set excludedPermissions,
Map rolePermissions,
-// Set allSet,
TransactionContextManager transactionContextManager,
TrackedConnectionAssociator trackedConnectionAssociator,
JettyContainer jettyContainer,
- Kernel kernel) throws MalformedURLException {
+ Kernel kernel) throws MalformedURLException, IllegalAccessException, ClassNotFoundException, InstantiationException {
super(uri,
componentContext,
@@ -156,6 +168,20 @@
configurationBaseUrl,
unshareableResources,
applicationManagedSecurityResources,
+
+ displayName,
+ contextParamMap,
+ listenerClassNames,
+ distributable,
+ mimeMap,
+ welcomeFiles,
+ localeEncodingMapping,
+ errorPages,
+ authenticator,
+ realmName,
+ tagLibMap,
+ sessionTimeoutSeconds,
+
transactionContextManager,
trackedConnectionAssociator,
jettyContainer);
@@ -174,7 +200,6 @@
this.uncheckedPermissions = uncheckedPermissions;
this.excludedPermissions = excludedPermissions;
this.rolePermissions = rolePermissions;
-// this.allSet = allSet;
this.defaultPrincipal = generateDefaultPrincipal(securityConfig, loginDomainName);
@@ -645,7 +670,6 @@
GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder("Jetty JACC WebApplication Context", JettyWebAppJACCContext.class, JettyWebAppContext.GBEAN_INFO);
infoBuilder.addAttribute("policyContextID", String.class, true);
-// infoBuilder.addAttribute("userRealmName", String.class, true);
infoBuilder.addAttribute("loginDomainName", String.class, true);
infoBuilder.addAttribute("securityConfig", Security.class, true);
@@ -666,8 +690,21 @@
"configurationBaseUrl",
"unshareableResources",
"applicationManagedSecurityResources",
- "policyContextID",
+
+ "displayName",
+ "contextParamMap",
+ "listenerClassNames",
+ "distributable",
+ "mimeMap",
+ "welcomeFiles",
+ "localeEncodingMapping",
+ "errorPages",
+ "authenticator",
"realmName",
+ "tagLibMap",
+ "sessionTimeoutSeconds",
+
+ "policyContextID",
"loginDomainName",
"securityConfig",