geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r395759 - in /geronimo/branches/1.1/configs: j2ee-server/src/plan/plan.xml rmi-naming/src/plan/plan.xml
Date Fri, 21 Apr 2006 02:27:26 GMT
Author: ammulder
Date: Thu Apr 20 19:27:25 2006
New Revision: 395759

URL: http://svn.apache.org/viewcvs?rev=395759&view=rev
Log:
Move the config installer from j2ee-server to rmi-naming so it can
  update j2ee-server if asked to
Comment out the SSL system properties since we really don't want
  passwords in the system props for every bit of code in the server
  to see (will remove if this doesn't cause breakage)

Modified:
    geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml

Modified: geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=395759&r1=395758&r2=395759&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Thu Apr 20 19:27:25 2006
@@ -31,12 +31,6 @@
 
         >
 
-    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
-        <attribute name="keepAliveTime">5000</attribute>
-        <attribute name="poolSize">300</attribute>
-        <attribute name="poolName">DefaultThreadPool</attribute>
-    </gbean>
-
     <gbean name="ConnectionTracker"
            class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
     </gbean>
@@ -60,25 +54,6 @@
         <reference name="TransactionContextManager">
             <name>TransactionContextManager</name>
         </reference>
-    </gbean>
-
-    <!-- Configuration Installer -->
-    <gbean name="ConfigurationInstaller" class="org.apache.geronimo.system.configuration.ConfigInstallerGBean">
-      <reference name="Repository">
-        <name>Repository</name>
-      </reference>
-      <reference name="ConfigStore">
-        <name>Local</name>
-      </reference>
-      <reference name="ConfigManager">
-        <name>ConfigurationManager</name>
-      </reference>
-      <reference name="ServerInfo">
-        <name>ServerInfo</name>
-      </reference>
-      <reference name="ThreadPool">
-        <name>DefaultThreadPool</name>
-      </reference>
     </gbean>
 
     <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">

Modified: geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml?rev=395759&r1=395758&r2=395759&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml Thu Apr 20 19:27:25 2006
@@ -40,6 +40,9 @@
     </gbean>
 
     <gbean name="SystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+        <attribute name="systemProperties" />
+        <attribute name="systemPathProperties" />
+<!-- Can we get by without this?
         <attribute name="systemProperties">
             javax.net.ssl.keyStorePassword=secret
             javax.net.ssl.trustStorePassword=secret
@@ -48,6 +51,7 @@
             javax.net.ssl.keyStore=var/security/keystores/geronimo-default
             javax.net.ssl.trustStore=var/security/keystores/geronimo-default
         </attribute>
+-->
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
@@ -59,6 +63,31 @@
     <gbean name="MBeanServerKernelBridge" class="org.apache.geronimo.system.jmx.MBeanServerKernelBridge">
       <reference name="MBeanServerReference">
         <name>MBeanServerReference</name>
+      </reference>
+    </gbean>
+
+    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+        <attribute name="keepAliveTime">5000</attribute>
+        <attribute name="poolSize">300</attribute>
+        <attribute name="poolName">DefaultThreadPool</attribute>
+    </gbean>
+
+    <!-- Configuration Installer -->
+    <gbean name="ConfigurationInstaller" class="org.apache.geronimo.system.configuration.ConfigInstallerGBean">
+      <reference name="Repository">
+        <name>Repository</name>
+      </reference>
+      <reference name="ConfigStore">
+        <name>Local</name>
+      </reference>
+      <reference name="ConfigManager">
+        <name>ConfigurationManager</name>
+      </reference>
+      <reference name="ServerInfo">
+        <name>ServerInfo</name>
+      </reference>
+      <reference name="ThreadPool">
+        <name>DefaultThreadPool</name>
       </reference>
     </gbean>
 </configuration>



Mime
View raw message