geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r699199 - in /geronimo/server/trunk/plugins: connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/ tomcat/geronimo-tom...
Date Fri, 26 Sep 2008 07:19:36 GMT
Author: djencks
Date: Fri Sep 26 00:19:35 2008
New Revision: 699199

URL: http://svn.apache.org/viewvc?rev=699199&view=rev
Log:
GERONIMO-4323 make default plans use 'car' as type

Modified:
    geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=699199&r1=699198&r2=699199&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Fri Sep 26 00:19:35 2008
@@ -294,7 +294,7 @@
                 throw new IllegalStateException("Connector module ID should be fully resolved
(not " + environment.getConfigId() + ")");
             }
         } else {
-            idBuilder.resolve(environment, new File(moduleFile.getName()).getName(), "rar");
+            idBuilder.resolve(environment, new File(moduleFile.getName()).getName(), "car");
         }
 
         AbstractName moduleName;

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?rev=699199&r1=699198&r2=699199&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Fri Sep 26 00:19:35 2008
@@ -265,7 +265,7 @@
         if (warName.lastIndexOf('.') > -1) {
             warName = warName.substring(0, warName.lastIndexOf('.'));
         }
-        idBuilder.resolve(environment, warName, "war");
+        idBuilder.resolve(environment, warName, "car");
 
         AbstractName moduleName;
         if (earName == null) {

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=699199&r1=699198&r2=699199&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Fri Sep 26 00:19:35 2008
@@ -234,7 +234,7 @@
                 //really?
             }
         }
-        idBuilder.resolve(environment, warName, "war");
+        idBuilder.resolve(environment, warName, "car");
 
         AbstractName moduleName;
         if (earName == null) {



Mime
View raw message