You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/04/14 01:14:26 UTC
svn commit: r393970 - in /geronimo/branches/1.1:
assemblies/j2ee-tomcat-server/src/var/config/config.xml
modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Author: dain
Date: Thu Apr 13 16:14:24 2006
New Revision: 393970
URL: http://svn.apache.org/viewcvs?rev=393970&view=rev
Log:
Commited fix to GERONIMO-1843 Error attempting to deploy web applications to tomcat without a geronimo plan
Modified:
geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=393970&r1=393969&r2=393970&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml Thu Apr 13 16:14:24 2006
@@ -83,7 +83,7 @@
<configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
<configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
<gbean name="WebBuilder">
- <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
+ <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
</gbean>
<gbean name="EJBBuilder">
<attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
Modified: geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=393970&r1=393969&r2=393970&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Thu Apr 13 16:14:24 2006
@@ -162,7 +162,10 @@
EnvironmentType environmentType = tomcatWebApp.getEnvironment();
Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
- if (!standAlone && environment.getConfigId() == null) {
+ if (standAlone && environment.getConfigId() == null) {
+ if (contextRoot.startsWith("/")) {
+ contextRoot = contextRoot.substring(1);
+ }
Artifact configID = new Artifact(Artifact.DEFAULT_GROUP_ID, contextRoot, "1", "car");
environment.setConfigId(configID);
}