geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r395776 - in /geronimo/branches/1.1/assemblies/j2ee-tomcat-server: project.xml src/var/config/config.xml
Date Fri, 21 Apr 2006 04:46:24 GMT
Author: djencks
Date: Thu Apr 20 21:46:23 2006
New Revision: 395776

URL: http://svn.apache.org/viewcvs?rev=395776&view=rev
Log:
GERONIMO-1878 update tomcat server with new configs

Modified:
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml?rev=395776&r1=395775&r2=395776&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml Thu Apr 20 21:46:23 2006
@@ -89,6 +89,15 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
 <!--
         <dependency>
             <groupId>geronimo</groupId>
@@ -196,6 +205,15 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>

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=395776&r1=395775&r2=395776&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
20 21:46:23 2006
@@ -17,10 +17,6 @@
         </gbean>
     </configuration>
     <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
-        <gbean name="geronimo:name=EJB,type=NetworkService">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanOpenEJBPort}</attribute>
-        </gbean>
     </configuration>
     <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
@@ -34,6 +30,12 @@
           <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
+    <configuration name="geronimo/openejb/${pom.currentVersion}/car">
+        <gbean name="EJBNetworkService">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanOpenEJBPort}</attribute>
+        </gbean>
+    </configuration>
     <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
@@ -90,6 +92,8 @@
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         </gbean>
+    </configuration>
+    <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
         </gbean>
@@ -100,6 +104,14 @@
             <attribute name="port">25</attribute>
         </gbean>
     </configuration>
+
+    <configuration name="geronimo/sharedlib/${pom.currentVersion}/car">
+        <gbean name="SharedLib">
+            <attribute name="classesDirs">var/shared/classes</attribute>
+            <attribute name="libDirs">var/shared/lib</attribute>
+        </gbean>
+    </configuration>
+
     <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car" load="false"/>
@@ -111,12 +123,4 @@
     <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" />
     <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
-
-    <configuration name="geronimo/sharedlib/${pom.currentVersion}/car">
-        <gbean name="SharedLib">
-            <attribute name="libDirs">var/shared/lib</attribute>
-            <attribute name="classesDirs">var/shared/classes</attribute>
-        </gbean>
-    </configuration>
-
 </attributes>



Mime
View raw message