geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r892413 - in /geronimo/server/trunk/plugins: j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/ jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/ tomcat/geronimo-tomcat7-build...
Date Sat, 19 Dec 2009 01:30:35 GMT
Author: djencks
Date: Sat Dec 19 01:30:34 2009
New Revision: 892413

URL: http://svn.apache.org/viewvc?rev=892413&view=rev
Log:
GERONIMO-4989 put common method call in superclass method

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=892413&r1=892412&r2=892413&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Sat Dec 19 01:30:34 2009
@@ -745,6 +745,7 @@
         webModuleData.setAttribute("componentContext", compContext);
         webModuleData.setReferencePattern("TransactionManager", moduleContext.getTransactionManagerName());
         webModuleData.setReferencePattern("TrackedConnectionAssociator", moduleContext.getConnectionTrackerName());
+        webModuleData.setAttribute("modulePath", webModule.isStandAlone() || webModule.getEarContext()
!= webModule.getRootEarContext()? null: webModule.getTargetPath());
     }
 
     private static class InternWrapper implements XMLStreamReader {

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=892413&r1=892412&r2=892413&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
Sat Dec 19 01:30:34 2009
@@ -381,8 +381,6 @@
         GBeanData webModuleData = new GBeanData(moduleName, WebAppContextWrapper.class);
 
         configureBasicWebModuleAttributes(webApp, jettyWebApp, moduleContext, earContext,
webModule, webModuleData);
-        //TODO move to method above
-        webModuleData.setAttribute("modulePath", webModule.isStandAlone() || webModule.getEarContext()
!= webModule.getRootEarContext()? null: webModule.getTargetPath());
 
         // unsharableResources, applicationManagedSecurityResources
         GBeanResourceEnvironmentBuilder rebuilder = new GBeanResourceEnvironmentBuilder(webModuleData);

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=892413&r1=892412&r2=892413&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Sat Dec 19 01:30:34 2009
@@ -351,8 +351,6 @@
 
         GBeanData webModuleData = new GBeanData(moduleName, TomcatWebAppContext.class);
         configureBasicWebModuleAttributes(webApp, tomcatWebApp, moduleContext, earContext,
webModule, webModuleData);
-        //TODO move to method above, also in jetty
-        webModuleData.setAttribute("modulePath", webModule.isStandAlone() || webModule.getEarContext()
!= webModule.getRootEarContext()? null: webModule.getTargetPath());
         String contextPath = webModule.getContextRoot();
         if (!contextPath.startsWith("/")) {
             contextPath = "/" + contextPath;



Mime
View raw message