geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r263024 - in /geronimo/trunk/modules/assembly: maven.xml src/izpack/geronimo-izpack.xml src/izpack/izpack-process.xml src/plan/j2ee-server-plan.xml src/plan/naming-server-plan.xml src/var/config/config.list
Date Sun, 28 Aug 2005 02:24:11 GMT
Author: ammulder
Date: Sat Aug 27 19:24:05 2005
New Revision: 263024

URL: http://svn.apache.org/viewcvs?rev=263024&view=rev
Log:
Split out the naming server into its own plan so it can be started
  after the config db but before the rest of the server
Add the directory service configuration to the installer

Added:
    geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml   (with props)
Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml
    geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
    geronimo/trunk/modules/assembly/src/var/config/config.list

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=263024&r1=263023&r2=263024&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Sat Aug 27 19:24:05 2005
@@ -361,6 +361,14 @@
         <ant:jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
         -->
 
+        <!-- build the RMINaming configuration -->
+        <ant:echo>Building RMI Naming configuration</ant:echo>
+        <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+            <ant:jvmarg value="-ea"/>
+            <ant:arg value="distribute"/>
+            <ant:arg value="target/plan/naming-server-plan.xml"/>
+        </ant:java>
+
         <!-- build the J2EEServer configuration -->
         <ant:echo>Building server configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">

Modified: geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml?rev=263024&r1=263023&r2=263024&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml Sat Aug 27 19:24:05 2005
@@ -56,6 +56,7 @@
             <parsable targetfile="$INSTALL_PATH/var/config/config.xml" type="xml"/>
         </pack>
         <pack name="J2EE Features" required="no" preselected="yes">
+            <!-- o/o/g/RMINaming -->
             <!-- o/o/g/Server -->
             <!-- o/o/g/RuntimeDeployer -->
             <!-- o/o/g/SystemDatabase -->
@@ -69,6 +70,11 @@
             <description>A web-based management console which allows an administrator
to log in and view and customize the Geronimo server configuration (such as network ports,
logging, thread pools, application deployments, etc.).  The console login is the same administrative
login you'll be setting in the next step.  The console can typically be reached at http://localhost:8080/console/
though the default port may be changed on the web configuration screen.  If not selected,
the console will be installed but would need to be manually activated later.</description>
             <depends packname="J2EE Features" />
         </pack>
+        <pack name="LDAP Server" required="no" preselected="no">
+            <!-- o/o/g/Directory -->
+            <description>An LDAP directory server that runs in Geronimo, using the
Apache Directory package.  This runs on the non-standard port of 1389 by default, so the server
can start as a non-root user.  If not selected, this configuration will be available but would
need to be manually activated later.</description>
+            <depends packname="J2EE Features" />
+        </pack>
         <pack name="Sample Database Pool" required="no" preselected="no">
             <!-- o/o/g/DefaultDatabase -->
             <description>A sample embedded database, using the Derby RDBMS.  If selected,
this creates a database pool that connects to the "DefaultDatabase" database running in the
embedded Derby installation.  If not selected, this configuration will be available but would
need to be manually activated later.  The "DefaultDatabase" database will be created the first
time this configuration is run.</description>
@@ -76,7 +82,7 @@
         </pack>
         <pack name="UDDI Server" required="no" preselected="no">
             <!-- o/o/g/juddiServer/1.0-SNAPSHOT -->
-            <description>A UDDI server that runs in Geronimo, using the jUDDI package.
   If not selected, this configuration will be available but would need to be manually activated
later.</description>
+            <description>A UDDI server that runs in Geronimo, using the jUDDI package.
 If not selected, this configuration will be available but would need to be manually activated
later.</description>
             <depends packname="J2EE Features" />
         </pack>
         <pack name="Spring Integration" required="no" preselected="no">

Modified: geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml?rev=263024&r1=263023&r2=263024&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml Sat Aug 27 19:24:05 2005
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <processing>
   <!-- J2EE Features -->
+  <job name="Activating RMI naming configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-classpath</arg>
+      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+      <arg>$INSTALL_PATH/var/config/config.list</arg>
+      <arg>org/apache/geronimo/RMINaming</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
   <job name="Activating base J2EE configuration">
     <executefile name="$JAVA_HOME/bin/java">
       <arg>-classpath</arg>
@@ -64,6 +74,18 @@
     <executeForPack name="Web Management Console" />
   </job>
   
+  <!-- UDDI Server -->
+  <job name="Activating LDAP server">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-classpath</arg>
+      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+      <arg>$INSTALL_PATH/var/config/config.list</arg>
+      <arg>org/apache/geronimo/Directory</arg>
+    </executefile>
+    <executeForPack name="UDDI Server" />
+  </job>
+  
   <!-- Sample Database Pool -->
   <job name="Activating sample database pool">
     <executefile name="$JAVA_HOME/bin/java">
@@ -145,20 +167,5 @@
     </executefile>
     <executeForPack name="Demo Web Application" />
   </job>
-<<<<<<< .mine
-
 <!--  <job name="Finished" /> -->
-=======
-  <job name="Install Derby Database Configuration">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/default-database-plan.xml</arg>
-      <arg>$INSTALL_PATH/repository/tranql/rar/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar</arg>
-    </executefile>
-    <executeForPack name="Sample Derby Database" />
-  </job>
-  <job name="Finished" />
->>>>>>> .r240468
 </processing>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=263024&r1=263023&r2=263024&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Sat Aug 27 19:24:05 2005
@@ -27,7 +27,7 @@
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
     configId="org/apache/geronimo/Server"
-    parentId="org/apache/geronimo/System"
+    parentId="org/apache/geronimo/RMINaming"
     >
 
 
@@ -133,19 +133,6 @@
     </dependency>
  
     ${webcontainer}
-
-
-    <!-- RMI Registry -->
-    <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
-        <attribute name="port">${PlanNamingPort}</attribute>
-    </gbean>
-
-    <!-- Naming properties -->
-    <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
-        <attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
-        <attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
-        <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
-    </gbean>
 
     <!-- Default security realm using properties files -->
     <gbean name="properties-login"

Added: geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml?rev=263024&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml Sat Aug 27 19:24:05 2005
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<!-- $Rev: 239926 $ $Date: 2005-08-24 17:05:38 -0400 (Wed, 24 Aug 2005) $ -->
+
+<!--
+Holds the RMI naming server configuration.  This needs to be started
+after the system GBeans but before the server GBeans.
+-->
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    configId="org/apache/geronimo/RMINaming"
+    parentId="org/apache/geronimo/System"
+    >
+
+    <!-- RMI Registry -->
+    <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
+        <attribute name="port">${PlanNamingPort}</attribute>
+    </gbean>
+
+    <!-- Naming properties -->
+    <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
+        <attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
+        <attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
+        <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+    </gbean>
+</configuration>

Propchange: geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/trunk/modules/assembly/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.list?rev=263024&r1=263023&r2=263024&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.list (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.list Sat Aug 27 19:24:05 2005
@@ -1,4 +1,5 @@
 org/apache/geronimo/System
+org/apache/geronimo/RMINaming
 org/apache/geronimo/Server
 org/apache/geronimo/SystemDatabase
 org/apache/geronimo/SystemJMS



Mime
View raw message