geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r151568 - geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
Date Sun, 06 Feb 2005 11:14:24 GMT
Author: jgenender
Date: Sun Feb  6 03:14:21 2005
New Revision: 151568

URL: http://svn.apache.org/viewcvs?view=rev&rev=151568
Log:
Fix for GERONIMO-566.  Updated JSR77 Naming for Tomcat.

Modified:
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml?view=diff&r1=151567&r2=151568
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml Sun Feb  6 03:14:21
2005
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+Copyright 2004 The Apache Software Foundation
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 <!-- $Rev: 111627 $ $Date: 2004-12-12 03:15:11 +0100 (Sun, 12 Dec 2004) $ -->
@@ -91,14 +91,15 @@
         <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
     </dependency>
 
-    <gbean name="geronimo.server:type=WebContainer,container=Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer">
+    <gbean namePart="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
         <attribute name="catalinaHome">var/catalina</attribute>
         <attribute name="endorsedDirs">lib</attribute>
-        <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+        <reference name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
     </gbean>
-    <gbean name="geronimo.server:type=WebConnector,container=Tomcat,port=8090" class="org.apache.geronimo.tomcat.connector.HTTPConnector">
-        <attribute name="port">8090</attribute>
-        <reference name="TomcatContainer">geronimo.server:type=WebContainer,container=Tomcat</reference>
+
+    <gbean namePart="TomcatWebConnector" class="org.apache.geronimo.tomcat.connector.HTTPConnector">
+        <attribute name="port" type="int">8090</attribute>
+        <reference name="TomcatContainer">geronimo.server:name=TomcatWebContainer,*</reference>
     </gbean>
 
 </configuration>



Mime
View raw message