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 2010/01/29 00:23:27 UTC
svn commit: r904300 - in /geronimo/server/trunk:
framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/
plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/
plugins/jetty8/gero...
Author: djencks
Date: Thu Jan 28 23:23:26 2010
New Revision: 904300
URL: http://svn.apache.org/viewvc?rev=904300&view=rev
Log:
web apps no longer have a base url since they are always packed in bundles
Modified:
geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Modified: geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java?rev=904300&r1=904299&r2=904300&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java Thu Jan 28 23:23:26 2010
@@ -40,13 +40,6 @@
* user. This is not guaranteed to be anything in particular.
*/
public String getWARName();
-
- /**
- * Gets the location of the web module "source" (typically an exploded
- * directory). This is where e.g. a web server would look for static
- * content or a user would copy updated JSPs to.
- */
- public URL getWARDirectory();
/**
* Get the first displayName value set in the web.xml
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java?rev=904300&r1=904299&r2=904300&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java Thu Jan 28 23:23:26 2010
@@ -58,14 +58,14 @@
if (app.isRunning()) {
WebModule web = (WebModule) PortletManager.getManagedBean(request, app.getModuleBeanName());
data.setContextRoot(web.getContextPath());
- String path;
- if(web.getWARDirectory().getProtocol().equals("file")) {
- path = web.getWARDirectory().getPath();
- } else {
- path = "WARMustBeUnpacked";
- }
+// String path;
+// if(web.getWARDirectory().getProtocol().equals("file")) {
+// path = web.getWARDirectory().getPath();
+// } else {
+// path = "WARMustBeUnpacked";
+// }
- data.setWebAppDir(path);
+// data.setWebAppDir(path);
}
list.add(data);
}
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java?rev=904300&r1=904299&r2=904300&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java Thu Jan 28 23:23:26 2010
@@ -83,7 +83,6 @@
private final ClassLoader webClassLoader;
private final JettyContainer jettyContainer;
- private final URL configurationBaseURL;
private String displayName;
private final String objectName;
@@ -102,7 +101,6 @@
@ParamAttribute(name = "modulePath") String modulePath,
@ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader classLoader,
@ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle,
- @ParamAttribute(name = "configurationBaseUrl") URL configurationBaseUrl,
@ParamAttribute(name = "workDir") String workDir,
@ParamAttribute(name = "unshareableResources") Set<String> unshareableResources,
@ParamAttribute(name = "applicationManagedSecurityResources") Set<String> applicationManagedSecurityResources,
@@ -140,7 +138,6 @@
assert contextSource != null;
assert classLoader != null;
- assert configurationBaseUrl != null;
assert trackedConnectionAssociator != null;
assert jettyContainer != null;
if (contextPath == null || !contextPath.startsWith("/")) {
@@ -213,19 +210,12 @@
ObjectName myObjectName = ObjectNameUtil.getObjectName(objectName);
verifyObjectName(myObjectName);
}
- this.configurationBaseURL = configurationBaseUrl;
this.jettyContainer = jettyContainer;
this.originalSpecDD = originalSpecDD;
//DONT install the jetty TLD configuration as we find and create all the listeners ourselves
webAppContext.setConfigurationClasses(new String[]{});
- String webAppRoot = null;
- if (configurationBaseUrl != null) {
- webAppRoot = configurationBaseUrl.toString();
- webAppContext.setResourceBase(webAppRoot);
- }
- webAppContext.setWar(webAppRoot);
webClassLoader = classLoader;
webAppContext.setClassLoader(webClassLoader);
@@ -268,7 +258,7 @@
}
public URL getWARDirectory() {
- return configurationBaseURL;
+ throw new RuntimeException("don't call this");
}
public String getWARName() {
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java?rev=904300&r1=904299&r2=904300&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java Thu Jan 28 23:23:26 2010
@@ -152,7 +152,6 @@
null,
cl,
bundle,
- new URL(configurationBaseURL, uriString),
null, null,
null,
"context",
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=904300&r1=904299&r2=904300&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Thu Jan 28 23:23:26 2010
@@ -118,7 +118,6 @@
private final Map webServices;
private final String objectName;
private final String originalSpecDD;
- private final URL configurationBaseURL;
private final String modulePath;
private final Holder holder;
private final RuntimeCustomizer contextCustomizer;
@@ -140,7 +139,6 @@
@ParamSpecial(type = SpecialAttributeType.objectName) String objectName,
@ParamAttribute(name = "contextPath") String contextPath,
@ParamAttribute(name = "deploymentDescriptor") String originalSpecDD,
- @ParamAttribute(name = "configurationBaseUrl") URL configurationBaseUrl,
@ParamAttribute(name = "modulePath") String modulePath,
@ParamAttribute(name = "securityHolder") SecurityHolder securityHolder,
@ParamAttribute(name = "virtualServer") String virtualServer,
@@ -171,7 +169,6 @@
throws Exception {
assert classLoader != null;
assert bundle != null;
- assert configurationBaseUrl != null;
assert modulePath != null;
assert transactionManager != null;
assert trackedConnectionAssociator != null;
@@ -216,8 +213,6 @@
}
- this.configurationBaseURL = configurationBaseUrl;
-
this.holder = holder == null ? new Holder() : holder;
this.contextCustomizer = contextCustomizer;
@@ -335,10 +330,6 @@
return true;
}
- public URL getWARDirectory() {
- return configurationBaseURL;
- }
-
public String getWARName() {
//todo: make this return something more consistent
try {
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=904300&r1=904299&r2=904300&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Thu Jan 28 23:23:26 2010
@@ -89,7 +89,6 @@
null,
"/test",
null,
- locationURI.toURL(),
"",
securityHolder,
null,