geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r240479 - in /geronimo/trunk: applications/demo/src/webapp/WEB-INF/ modules/assembly/ modules/assembly/src/izpack/ modules/assembly/src/plan/ modules/assembly/src/var/config/ modules/security/ modules/security/src/java/org/apache/geronimo/s...
Date Sat, 27 Aug 2005 22:39:44 GMT
Author: ammulder
Date: Sat Aug 27 15:39:31 2005
New Revision: 240479

URL: http://svn.apache.org/viewcvs?rev=240479&view=rev
Log:
Update remote login listen port (GERONIMO-929)
 - implements NetworkConnector
 - uses substitution parameter in plan
 - added to default config.xml
 - add to installer
 - update tests
Update installer package (GERONIMO-928)
 - writes to config.xml instead of deploying custom plans
 - Reorganize the user entry screens
 - More descriptive text and stuff
 - Devariablize name of ActiveMQ connector so the host/port substitution
   doesn't cause the config.xml name to not match the GBean name 
Update to RMI naming (GERONIMO-933)
 - Move from system plan to server plan
 - Make it more like NetworkConnector
 - add to default config.xml
Change name of demo security from Secure to SampleSecurityRealm
 - update demo web app

Added:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/cli/
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/cli/AddStartupConfiguration.java   (with props)
Modified:
    geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
    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/izpack/izpack-user-input.xml
    geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/jetty-config.xml
    geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-plan.xml
    geronimo/trunk/modules/assembly/src/var/config/config.xml
    geronimo/trunk/modules/security/project.xml
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java

Modified: geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml Sat Aug 27 15:39:31 2005
@@ -20,7 +20,7 @@
     xmlns="http://geronimo.apache.org/xml/ns/web"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security"
     configId="org/apache/geronimo/Demo"
-    parentId="org/apache/geronimo/Secure">
+    parentId="org/apache/geronimo/SampleSecurityRealm">
 
     <context-root>/demo</context-root>
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Sat Aug 27 15:39:31 2005
@@ -225,16 +225,8 @@
 
         <!-- Preprocess all mungible content using velocity  -->
 
+        <ant:mkdir dir="${basedir}/target/installer" />
         <!-- Copy over the IzPack Installer files -->
-        <ant:mkdir dir="${basedir}/target/installer/wars"/>
-
-        <j:forEach var="artifact" items="${pom.artifacts}">
-            <j:set var="dependency" value="${artifact.dependency}"/>
-            <j:if test="${dependency.getProperty('installer') == 'true'}">
-                <ant:copy todir="${basedir}/target/installer/wars" file="${artifact.path}"/>
-            </j:if>
-        </j:forEach>
-
         <fileScanner var="installFiles">
             <fileset dir="${basedir}/src/izpack">
                 <include name="*.xml"/>
@@ -253,44 +245,32 @@
                 name="${basedir}/target/installer/${installerName}"/>
         </j:forEach>
 
-        <!-- First pass to write out plans with some variables remaining
-             for the benefit of the installer -->
-        <ant:mkdir dir="${basedir}/target/installer/plan-src"/>
-        <fileScanner var="plans">
-            <fileset dir="${basedir}/src/plan">
-                <include name="*-plan.xml"/>
-            </fileset>
-        </fileScanner>
-
-        <j:forEach var="plan" items="${plans.iterator()}">
-            <j:set var="planName" value="${plan.name}"/>
-            <echo>Installer processing ${planName}</echo>
-            <velocity:merge
-                basedir="${basedir}/src/plan"
-                template="${planName}"
-                name="${basedir}/target/installer/plan-src/${planName}"/>
-        </j:forEach>
-        
+        <!-- Write out a copy of config.xml with substitution variables intact -->
         <velocity:merge basedir="${basedir}/src/var/config"
                         template="config.xml"
-                        name="${basedir}/target/installer/plan-src/config.xml" />
+                        name="${basedir}/target/installer/config.xml" />
 
 
-        <!-- Second pass for the default build -->
-
         <!-- Substitution variables for default hostname, ports, etc. -->
         <j:set var="PlanServerHostname" value="localhost" />
+        <j:set var="PlanHTTPPort" value="8080" />
+        <j:set var="PlanHTTPSPort" value="8443" />
+        <j:set var="PlanAJPPort" value="8009" />
         <j:set var="PlanNamingPort" value="1099" />
+        <j:set var="PlanOpenEJBPort" value="4201" />
+        <j:set var="PlanClientAddresses" value="127.0.0.1" />
         <j:set var="PlanIIOPPort" value="9000" />
         <j:set var="PlanORBPort" value="2001" />
         <j:set var="PlanCOSNamingPort" value="1050" />
-        <j:set var="PlanClientAddresses" value="127.0.0.1" />
-        <j:set var="PlanHTTPPort" value="8080" />
-        <j:set var="PlanHTTPSPort" value="8443" />
-        <j:set var="PlanOpenEJBPort" value="4201" />
-        <j:set var="PlanAJPPort" value="8009" />
         <j:set var="PlanActiveMQPort" value="61616" />
         <j:set var="PlanDerbyPort" value="1527" />
+        <j:set var="PlanRemoteLoginPort" value="4242" />
+        
+        <fileScanner var="plans">
+            <fileset dir="${basedir}/src/plan">
+                <include name="*-plan.xml"/>
+            </fileset>
+        </fileScanner>
 
         <!-- Prepare the web container -->
         <ant:mkdir dir="${basedir}/target/tmp"/>
@@ -354,17 +334,6 @@
             deploymentFactory="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl"
             />
 
-        <!-- The installer works off a Geronimo distribution at this point:
-             The deployer has been built but nothing else has been configured yet -->
-        <ant:copy todir="${basedir}/target/installer">
-          <ant:fileset dir="${distDir}" />
-        </ant:copy>
-        <ant:echo file="${basedir}/target/installer/var/security/users.properties">$${SecurityDefaultUser}=$${SecurityDefaultPassword}
-</ant:echo>
-        <ant:echo file="${basedir}/target/installer/var/security/groups.properties">admin=$${SecurityDefaultUser}
-</ant:echo>
-
-
         <!-- build the system configuration and server.jar -->
         <ant:echo>Building server.jar</ant:echo>
         <ant:mkdir dir="${distDir}/bin"/>
@@ -611,6 +580,20 @@
                 </ant:copy>
             </j:if>
         </j:if>
+ 
+        <!-- Prepare the Installer directory -->       
+        <ant:copy todir="${basedir}/target/installer">
+          <ant:fileset dir="${distDir}" />
+        </ant:copy>
+        <ant:echo file="${basedir}/target/installer/var/security/users.properties">$${SecurityDefaultUser}=$${SecurityDefaultPassword}
+</ant:echo>
+        <ant:echo file="${basedir}/target/installer/var/security/groups.properties">admin=$${SecurityDefaultUser}
+</ant:echo>
+        <ant:echo file="${basedir}/target/installer/var/config/config.list">org/apache/geronimo/System
+</ant:echo>
+        <ant:move file="${basedir}/target/installer/config.xml"
+                  tofile="${basedir}/target/installer/var/config/config.xml" />
+
     </goal>
 
     <goal name="init-database">

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=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml Sat Aug 27 15:39:31 2005
@@ -28,6 +28,7 @@
         <panel classname="UserInputPanel"/>
         <panel classname="UserInputPanel"/>
         <panel classname="UserInputPanel"/>
+        <panel classname="UserInputPanel"/>
         <panel classname="InstallPanel"/>
         <panel classname="ProcessPanel"/>
         <panel classname="InfoPanel"/>
@@ -35,7 +36,8 @@
     </panels>
     <packs>
         <pack name="Server" required="yes">
-            <description>Core Geronimo installation</description>
+            <!-- o/a/g/System -->
+            <description>Core Geronimo installation.  This includes the code and libraries necessary for all the features described below.  The subsequent options simply let you select what should be run by default when the server is started.  Anything not selected on this screen could be manually enabled later.</description>
             <file src="BUILDING.txt" targetdir="$INSTALL_PATH"/>
             <file src="LICENSE.txt" targetdir="$INSTALL_PATH"/>
             <file src="README.txt" targetdir="$INSTALL_PATH"/>
@@ -51,57 +53,48 @@
             <file src="var" targetdir="$INSTALL_PATH"/>
             <parsable targetfile="$INSTALL_PATH/var/security/users.properties" type="javaprop"/>
             <parsable targetfile="$INSTALL_PATH/var/security/groups.properties" type="javaprop"/>
-            
-            <file src="plan-src/j2ee-deployer-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <file src="plan-src/deployer-system-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <file src="plan-src/system-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <parsable targetfile="$INSTALL_PATH/installer-temp/system-plan.xml" type="xml"/>
-        </pack>
-        <pack name="J2EE Features" required="yes">
-            <description>Geronimo J2EE Support</description>
-            <file src="plan-src/j2ee-server-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <parsable targetfile="$INSTALL_PATH/installer-temp/j2ee-server-plan.xml" type="xml"/>
-            <file src="plan-src/j2ee-runtime-deployer-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <file src="plan-src/system-database-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <parsable targetfile="$INSTALL_PATH/installer-temp/system-database-plan.xml" type="xml"/>
-            <file src="plan-src/system-activemq-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <parsable targetfile="$INSTALL_PATH/installer-temp/system-activemq-plan.xml" type="xml"/>
-            <file src="plan-src/system-jms-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <parsable targetfile="$INSTALL_PATH/installer-temp/system-jms-plan.xml" type="xml"/>
-            <file src="plan-src/interop-server-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <parsable targetfile="$INSTALL_PATH/installer-temp/interop-server-plan.xml" type="xml"/>
-            <file src="plan-src/j2ee-secure-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <file src="plan-src/client-system-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-            <file src="plan-src/j2ee-client-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
-        </pack>
-        <pack name="Jetty Web Container" required="yes">
-            <description>Geronimo uses the Jetty web container by default.  It is currently required for J2EE configurations.</description>
-        </pack>
-        <pack name="Tomcat Web Container" required="no" preselected="no">
-            <description>Geronimo uses the Jetty web container by default.  If you'd like Tomcat to be available as well, select this package.  It is currently in addition to Jetty, not instead of Jetty.</description>
-            <file src="plan-src/j2ee-server-tomcat-plan.xml" targetdir="$INSTALL_PATH/installer-temp" />
-            <parsable targetfile="$INSTALL_PATH/installer-temp/j2ee-server-tomcat-plan.xml" type="xml"/>
-        </pack>
-        <pack name="Spring Integration" required="no">
-            <description>Features to run Spring applications in Geronimo without any additional J2EE packaging</description>
-            <file src="plan-src/spring-runtime-plan.xml" targetdir="$INSTALL_PATH/installer-temp" />
-            <file src="plan-src/spring-deployer-plan.xml" targetdir="$INSTALL_PATH/installer-temp" />
-        </pack>
-        <pack name="JMX Debug Tool Web App" required="no">
-            <description>A web application that lets you display the JMX data from a running Geronimo server.</description>
-            <file src="wars/geronimo-jmxdebug-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/installer-temp"/>
-        </pack>
-        <pack name="Demo Web Application" required="no">
-            <description>A sample web app that runs in Geronimo</description>
-            <file src="wars/geronimo-demo-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/installer-temp"/>
+            <parsable targetfile="$INSTALL_PATH/var/config/config.xml" type="xml"/>
         </pack>
-        <pack name="UDDI Server" required="no" preselected="no">
-            <description>A UDDI server that runs in Geronimo</description>
-            <file src="wars/geronimo-uddi-server-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/installer-temp"/>
+        <pack name="J2EE Features" required="no" preselected="yes">
+            <!-- o/o/g/Server -->
+            <!-- o/o/g/RuntimeDeployer -->
+            <!-- o/o/g/SystemDatabase -->
+            <!-- o/o/g/ActiveMQServer -->
+            <!-- o/o/g/SystemJMS -->
+            <description>If selected, basic features for J2EE support will be enabled, including a J2EE Web container, a JMS broker, an EJB server, an embedded Derby database, an administrative security realm, etc.  If not selected, these features will be installed but would need to be manually activated later.</description>
+            <depends packname="Server" />
+        </pack>
+        <pack name="Web Management Console" required="no" preselected="yes">
+            <!-- o/o/g/Console -->
+            <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="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>
+            <depends packname="J2EE Features" />
         </pack>
-        <pack name="Sample Axion Database" required="no" preselected="no">
-            <description>A sample embedded database, using the Axion RDBMS</description>
-            <file src="plan-src/default-database-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+        <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>
+            <depends packname="J2EE Features" />
+        </pack>
+        <pack name="Spring Integration" required="no" preselected="no">
+            <!-- o/o/g/SpringRuntime -->
+            <!-- o/o/g/SpringDeployer -->
+            <description>Features to run Spring applications in Geronimo without any additional J2EE packaging.  This is currently working but not being actively developed.  If not selected, these features will be installed but would need to be manually activated later.</description>
+            <depends packname="J2EE Features" />
+        </pack>
+        <pack name="JMX Debug Web Application" required="no" preselected="yes">
+            <!-- o/o/g/DebugConsole -->
+            <description>A web application that lets you display the JMX data from a running Geronimo server.  This can be useful to see exactly what features are enabled in Geronimo and to help resolve resource mapping failures.  However, it is not very user-friendly compared to, for example, the web management console.  The debug application can typically be reached at http://localhost:8080/debug-tool/ though the default port may be changed on the web configuration screen.  If not selected, the JMX debug application will be installed but would need to be manually activated later.</description>
+            <depends packname="J2EE Features" />
+        </pack>
+        <pack name="Demo Web Application" required="no" preselected="no">
+            <!-- o/o/g/Demo -->
+            <!-- o/o/g/SampleSecurityRealm -->
+            <description>A sample web application that runs in Geronimo.  The demo application can typically be reached at http://localhost:8080/demo/ though the default port may be changed on the web configuration screen.  If not selected, the demo application will be installed but would need to be manually activated later.</description>
+            <depends packname="J2EE Features" />
         </pack>
     </packs>
 </installation>

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=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml Sat Aug 27 15:39:31 2005
@@ -1,156 +1,154 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <processing>
-  <job name="Construct Server Executable">
+  <!-- J2EE Features -->
+  <job name="Activating base J2EE configuration">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>package</arg>
-      <arg>--classPath</arg>
-      <arg>$SERVER_CLASSPATH</arg>
-      <arg>--mainClass</arg>
-      <arg>org.apache.geronimo.system.main.Daemon</arg>
-      <arg>--endorsedDirs</arg>
-      <arg>lib/endorsed</arg>
-      <arg>--install</arg>
-      <arg>$INSTALL_PATH/installer-temp/system-plan.xml</arg>
-      <arg>$INSTALL_PATH/bin/server.jar</arg>
-    </executefile>
-    <executeForPack name="Server" />
-  </job>
-  <job name="Install Base J2EE 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/j2ee-server-plan.xml</arg>
+      <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/System</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
-  <job name="Install Deployer Configuration">
+  <job name="Activating J2EE deployer">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/j2ee-runtime-deployer-plan.xml</arg>
+      <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/RuntimeDeployer</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
-  <job name="Construct Client Container Executable">
+  <job name="Activating embedded database">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>package</arg>
-      <arg>--classPath</arg>
-      <arg>$CLIENT_CLASSPATH</arg>
-      <arg>--mainClass</arg>
-      <arg>org.apache.geronimo.system.main.ClientCommandLine</arg>
-      <arg>--install</arg>
-      <arg>$INSTALL_PATH/installer-temp/client-system-plan.xml</arg>
-      <arg>$INSTALL_PATH/bin/client.jar</arg>
-    </executefile>
-    <executeForPack name="Server" />
-  </job>
-  <job name="Install Required 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/system-database-plan.xml</arg>
-      <arg>$INSTALL_PATH/repository/tranql/rar/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar</arg>
+      <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/SystemDatabase</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
-  <job name="Install JMS Server Configuration">
+  <job name="Activating JMS broker">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/system-activemq-plan.xml</arg>
+      <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/ActiveMQServer</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
-  <job name="Install Required JMS Queue Configuration">
+  <job name="Activating system JMS destinations">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/system-jms-plan.xml</arg>
-      <arg>$INSTALL_PATH/repository/activemq/rars/activemq-ra-${activemq_version}.rar</arg>
+      <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/SystemJMS</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
-  <job name="Install Spring Configuration">
+
+  <!-- Web Management Console -->
+  <job name="Activating Web management console">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/spring-runtime-plan.xml</arg>
+      <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/Console</arg>
     </executefile>
-    <executeForPack name="Spring Integration" />
+    <executeForPack name="Web Management Console" />
   </job>
-  <job name="Install Spring Deployer">
+  
+  <!-- Sample Database Pool -->
+  <job name="Activating sample database pool">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/spring-deployer-plan.xml</arg>
+      <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/DefaultDatabase</arg>
     </executefile>
-    <executeForPack name="Spring Integration" />
-  </job>
-  <job name="Install Web Security 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/j2ee-secure-plan.xml</arg>
-    </executefile>
-    <executeForPack name="J2EE Features" />
+    <executeForPack name="Sample Database Pool" />
   </job>
-  <job name="Install Client Configuration">
+  
+  <!-- UDDI Server -->
+  <job name="Activating UDDI server">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/j2ee-client-plan.xml</arg>
+      <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/juddiServer/1.0-SNAPSHOT</arg>
     </executefile>
-    <executeForPack name="J2EE Features" />
+    <executeForPack name="UDDI Server" />
   </job>
-  <job name="Install Tomcat 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/j2ee-server-tomcat-plan.xml</arg>
+  
+  <!-- Spring Integration -->
+  <job name="Activating Spring integration">
+    <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/SpringRuntime</arg>
     </executefile>
-    <executeForPack name="J2EE Features" />
+    <executeForPack name="Spring Integration" />
   </job>
-  <job name="Install JMX Debug Tool Web App Configuration">
+  
+  <job name="Activating Spring module deployer">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/geronimo-jmxdebug-${GeronimoVersion}.war</arg>
+      <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/SpringDeployer</arg>
     </executefile>
-    <executeForPack name="JMX Debug Tool Web App" />
+    <executeForPack name="Spring Integration" />
   </job>
-  <job name="Install Demo Web App 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/geronimo-demo-${GeronimoVersion}.war</arg>
+  
+  <!-- JMX Debug Web Application -->
+  <job name="Activating JMX debug application">
+    <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/DebugConsole</arg>
+    </executefile>
+    <executeForPack name="JMX Debug Web Application" />
+  </job>
+  
+  <!-- Demo Web Application -->
+  <job name="Activating sample security realm">
+    <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/SampleSecurityRealm</arg>
     </executefile>
     <executeForPack name="Demo Web Application" />
   </job>
-  <job name="Install UDDI Server">
+  
+  <job name="Activating demo web application">
     <executefile name="$JAVA_HOME/bin/java">
-      <arg>-jar</arg>
-      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
-      <arg>distribute</arg>
-      <arg>$INSTALL_PATH/installer-temp/geronimo-uddi-server-${GeronimoVersion}.war</arg>
+      <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/Demo</arg>
     </executefile>
-    <executeForPack name="UDDI Server" />
+    <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>
@@ -162,4 +160,5 @@
     <executeForPack name="Sample Derby Database" />
   </job>
   <job name="Finished" />
+>>>>>>> .r240468
 </processing>

Modified: geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml Sat Aug 27 15:39:31 2005
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <userInput>
   <panel order="0">
-    <field type="title" txt="Basic Configuration" />
-    <field type="staticText" txt="Please select basic configuration options for Geronimo"/>
+    <field type="title" txt="Security Configuration" />
+    <field type="staticText" txt="Please select security options for Geronimo"/>
     <divider />
     <field type="text" variable="SecurityDefaultUser">
       <description txt="User name used to manage and deploy to the Geronimo server" />
@@ -14,27 +14,44 @@
       <spec txt="Password:" size="15" set="manager" />
       <createForPack name="Server" />
     </field>
+    <field type="rule" variable="PlanRemoteLoginPort">
+      <description txt="The network port that should be used to listen for remote login attempts" />
+      <spec txt="Remote Login Port:" layout="N:5:5" set="0:4242" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+  </panel>
+  <panel order="1">
+    <field type="title" txt="Web Configuration" />
+    <field type="staticText" txt="Please select Web server configuration options for Geronimo"/>
+    <divider />
     <field type="text" variable="PlanServerHostname">
-      <description txt="Hostname the server should bind to when starting" />
+      <description txt="Hostname the server should bind to (usually localhost or 0.0.0.0)" />
       <spec txt="Hostname:" size="50" set="localhost" />
       <createForPack name="Server" />
     </field>
-    <field type="rule" variable="PlanJettyHTTPPort">
+    <field type="rule" variable="PlanHTTPPort">
       <description txt="The standard network port that the web container should use" />
       <spec txt="HTTP Port:" layout="N:5:5" set="0:8080" />
       <validator class="com.izforge.izpack.util.NotEmptyValidator" />
       <createForPack name="J2EE Features" />
     </field>
-    <field type="rule" variable="PlanJettyHTTPSPort">
+    <field type="rule" variable="PlanHTTPSPort">
       <description txt="The secure network port that the web container should use" />
       <spec txt="HTTPS Port:" layout="N:5:5" set="0:8443" />
       <validator class="com.izforge.izpack.util.NotEmptyValidator" />
       <createForPack name="J2EE Features" />
     </field>
+    <field type="rule" variable="PlanAJPPort">
+      <description txt="The Apache AJP network port that the web container should use" />
+      <spec txt="AJP Port:" layout="N:5:5" set="0:8009" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
   </panel>
-  <panel order="1">
+  <panel order="2">
     <field type="title" txt="EJB/IIOP Configuration" />
-    <field type="staticText" txt="Please configure network ports for EJB clients"/>
+    <field type="staticText" txt="Please select EJB server configuration options for Geronimo"/>
     <divider />
     <field type="rule" variable="PlanNamingPort">
       <description txt="The network port that the Geronimo naming service should use" />
@@ -72,7 +89,7 @@
       <createForPack name="J2EE Features" />
     </field>
   </panel>
-  <panel order="2">
+  <panel order="3">
     <field type="title" txt="Service Configuration" />
     <field type="staticText" txt="Please configure additional services"/>
     <divider />
@@ -87,24 +104,6 @@
       <spec txt="Derby Port:" layout="N:5:5" set="0:1527" />
       <validator class="com.izforge.izpack.util.NotEmptyValidator" />
       <createForPack name="J2EE Features" />
-    </field>
-    <field type="rule" variable="PlanTomcatHTTPPort">
-      <description txt="The standard network port that Tomcat should use" />
-      <spec txt="Tomcat Port:" layout="N:5:5" set="0:8090" />
-      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
-      <createForPack name="Tomcat Web Container" />
-    </field>
-    <field type="rule" variable="PlanTomcatHTTPSPort">
-      <description txt="The secure network port that Tomcat should use" />
-      <spec txt="Tomcat Secure Port:" layout="N:5:5" set="0:8453" />
-      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
-      <createForPack name="Tomcat Web Container" />
-    </field>
-    <field type="rule" variable="PlanTomcatAJPPort">
-      <description txt="The network port that the Tomcat/Apache connector should use" />
-      <spec txt="Tomcat Apache Port:" layout="N:5:5" set="0:8009" />
-      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
-      <createForPack name="Tomcat Web Container" />
     </field>
   </panel>
 </userInput>

Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml Sat Aug 27 15:39:31 2005
@@ -63,11 +63,10 @@
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </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>
+    <!-- User-editable attribute service -->
+    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <attribute name="configFile">var/config/config.xml</attribute>
     </gbean>
 
 </configuration>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Sat Aug 27 15:39:31 2005
@@ -114,6 +114,14 @@
 <!--        <uri>jdom/jars/jdom-1.0.jar</uri>-->
 <!--    </dependency>-->
 <!---->
+
+    <!-- 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>
+    
     <!--client connector support-->
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
         <attribute name="keepAliveTime">5000</attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml Sat Aug 27 15:39:31 2005
@@ -19,14 +19,14 @@
 <!-- $Rev$ $Date$ -->
 
 <!--
-Configuration for the main ring of a Geronimo server.
+A security realm available to be used by sample applications.
 
-This configuration should contain those services normally provided
-by the server.
+The core Geronimo configuration does not use this, but the demo
+web application, for example, does.
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    configId="org/apache/geronimo/Secure"
+    configId="org/apache/geronimo/SampleSecurityRealm"
     parentId="org/apache/geronimo/Server"
     >
 

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=240479&r1=240478&r2=240479&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 15:39:31 2005
@@ -134,6 +134,19 @@
  
     ${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"
         class="org.apache.geronimo.security.jaas.LoginModuleGBean">
@@ -189,7 +202,9 @@
     </gbean>
 
     <gbean gbeanName="geronimo.remoting:target=JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
-        <attribute name="bindURI">tcp://0.0.0.0:4242</attribute>
+        <attribute name="protocol">tcp</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanRemoteLoginPort}</attribute>
         <reference name="LoginService"><name>JaasLoginService</name></reference>
     </gbean>
 

Modified: geronimo/trunk/modules/assembly/src/plan/jetty-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/jetty-config.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-config.xml Sat Aug 27 15:39:31 2005
@@ -43,6 +43,7 @@
     </gbean>
 
     <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
+        <attribute name="host">${PlanServerHostname}"</attribute>
         <attribute name="port">${PlanHTTPPort}</attribute>
         <reference name="JettyContainer"><name>WebContainer</name></reference>
         <attribute name="maxThreads">50</attribute>
@@ -50,6 +51,7 @@
     </gbean>
 
     <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
+        <attribute name="host">${PlanServerHostname}"</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
         <attribute name="keystoreFileName">var/security/keystore</attribute>
         <attribute name="keystoreType">JKS</attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml Sat Aug 27 15:39:31 2005
@@ -60,7 +60,7 @@
         <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
     </gbean>
 
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.${PlanServerHostname}.${PlanActiveMQPort}" class="org.activemq.gbean.ActiveMQConnectorGBean">
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
         <attribute name="protocol">tcp</attribute>
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanActiveMQPort}</attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml Sat Aug 27 15:39:31 2005
@@ -75,16 +75,4 @@
         <attribute name="refreshPeriodSeconds">60</attribute>
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
-
-    <!-- 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>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.xml Sat Aug 27 15:39:31 2005
@@ -2,6 +2,13 @@
 
 <attributes>
   <configuration name="org/apache/geronimo/Server">
+    <gbean name="RMIRegistry">
+      <attribute name="port">${PlanNamingPort}</attribute>
+    </gbean>
+    <gbean name="NamingProperties">
+      <!-- Check whether this really works if host name is 0.0.0.0 -->
+      <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+    </gbean>
     <gbean name="JettyWebConnector">
       <attribute name="host">${PlanServerHostname}</attribute>
       <attribute name="port">${PlanHTTPPort}</attribute>
@@ -29,9 +36,14 @@
       <attribute name="host">${PlanServerHostname}</attribute>
       <attribute name="port">${PlanOpenEJBPort}</attribute>
     </gbean>
+    <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+      <attribute name="host">${PlanServerHostname}</attribute>
+      <attribute name="port">${PlanRemoteLoginPort}</attribute>
+    </gbean>
+    <!-- Add CORBA settings PlanIIOPPort, PlanORBPort, PlanCOSNamingPort -->
   </configuration>
   <configuration name="org/apache/geronimo/ActiveMQServer">
-    <gbean name="ActiveMQ.tcp.${PlanServerHostname}.${PlanActiveMQPort}">
+    <gbean name="ActiveMQ.tcp.default">
       <attribute name="host">${PlanServerHostname}</attribute>
       <attribute name="port">${PlanActiveMQPort}</attribute>
     </gbean>

Modified: geronimo/trunk/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/project.xml?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/security/project.xml (original)
+++ geronimo/trunk/modules/security/project.xml Sat Aug 27 15:39:31 2005
@@ -58,7 +58,13 @@
              <groupId>geronimo</groupId>
              <artifactId>geronimo-j2ee</artifactId>
              <version>${pom.currentVersion}</version>
-         </dependency>
+        </dependency>
+
+        <dependency>
+             <groupId>geronimo</groupId>
+             <artifactId>geronimo-management</artifactId>
+             <version>${pom.currentVersion}</version>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java Sat Aug 27 15:39:31 2005
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.InetSocketAddress;
 import javax.management.ObjectName;
 
 import org.activeio.AcceptListener;
@@ -45,6 +46,7 @@
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.proxy.ReflexiveInterceptor;
 import org.apache.geronimo.security.jaas.JaasLoginServiceMBean;
+import org.apache.geronimo.management.geronimo.NetworkConnector;
 
 
 /**
@@ -54,24 +56,61 @@
  * 
  * @version $Rev: 56022 $ $Date: 2004-10-30 01:16:18 -0400 (Sat, 30 Oct 2004) $
  */
-public class JaasLoginServiceRemotingServer implements GBeanLifecycle {
+public class JaasLoginServiceRemotingServer implements GBeanLifecycle, NetworkConnector {
 
     public static final ObjectName REQUIRED_OBJECT_NAME = JMXUtil.getObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
     
     private static final Log log = LogFactory.getLog(JaasLoginServiceRemotingServer.class);
     private AsynchChannelServer server;
     private JaasLoginServiceMBean loginService;
-    private final URI bindURI;
-
-    public JaasLoginServiceRemotingServer(URI bindURI, JaasLoginServiceMBean loginService) {
-        this.bindURI = bindURI;
+    private String protocol;
+    private String host;
+    private int port;
+
+    public JaasLoginServiceRemotingServer(String protocol, String host, int port, JaasLoginServiceMBean loginService) {
+        this.protocol = protocol;
+        this.host = host;
+        this.port = port;
         this.loginService = loginService;
     }
 
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
     public URI getClientConnectURI() {
         return server.getConnectURI();
     }
-    
+
+    public InetSocketAddress getListenAddress() {
+        if(server != null) {
+            URI uri = server.getBindURI();
+            return new InetSocketAddress(uri.getHost(), uri.getPort());
+        } else {
+            return new InetSocketAddress(host, port);
+        }
+    }
+
     public void doStart() throws Exception {
         final ReflexiveInterceptor loginServiceInterceptor = new ReflexiveInterceptor(loginService);
         
@@ -108,7 +147,7 @@
     
     private AsynchChannelServer createAsynchChannelServer() throws IOException, URISyntaxException {
         SocketSynchChannelFactory factory = new SocketSynchChannelFactory();
-        SynchChannelServer server = factory.bindSynchChannel(bindURI);
+        SynchChannelServer server = factory.bindSynchChannel(new URI(protocol, null, host, port, null, null, null));
         return new SynchToAsynchChannelServerAdapter(server);        
     }
 
@@ -144,11 +183,11 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JaasLoginServiceRemotingServer.class); //has fixed name, j2eeType is irrelevant
-        infoFactory.addAttribute("bindURI", URI.class, true);
-        infoFactory.addAttribute("clientConnectURI", URI.class, false);        
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Remote Login Listener", JaasLoginServiceRemotingServer.class); //has fixed name, j2eeType is irrelevant
+        infoFactory.addAttribute("clientConnectURI", URI.class, false);
         infoFactory.addReference("LoginService", JaasLoginServiceMBean.class, "GBean");
-        infoFactory.setConstructor(new String[]{"bindURI", "LoginService"});
+        infoFactory.addInterface(NetworkConnector.class, new String[]{"host","port","protocol"}, new String[]{"host","port"});
+        infoFactory.setConstructor(new String[]{"protocol", "host", "port", "LoginService"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java (original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java Sat Aug 27 15:39:31 2005
@@ -91,7 +91,9 @@
 
         serverStub = new ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
         gbean = new GBeanData(serverStub, JaasLoginServiceRemotingServer.getGBeanInfo());
-        gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
+        gbean.setAttribute("protocol", "tcp");
+        gbean.setAttribute("host", "0.0.0.0");
+        gbean.setAttribute("port", new Integer(4242));
         gbean.setReferencePattern("LoginService", loginService);
         kernel.loadGBean(gbean, JaasLoginServiceRemotingServer.class.getClassLoader());
 

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Sat Aug 27 15:39:31 2005
@@ -229,7 +229,9 @@
 
         serverStub = new ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
         gbean = new GBeanData(serverStub, JaasLoginServiceRemotingServer.getGBeanInfo());
-        gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
+        gbean.setAttribute("protocol", "tcp");
+        gbean.setAttribute("host", "0.0.0.0");
+        gbean.setAttribute("port", new Integer(4242));
         gbean.setReferencePattern("LoginService", loginService);
         kernel.loadGBean(gbean, JaasLoginServiceRemotingServer.class.getClassLoader());
 

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java (original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java Sat Aug 27 15:39:31 2005
@@ -71,7 +71,9 @@
 
         serverStub = new ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
         gbean = new GBeanData(serverStub, JaasLoginServiceRemotingServer.getGBeanInfo());
-        gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
+        gbean.setAttribute("protocol", "tcp");
+        gbean.setAttribute("host", "0.0.0.0");
+        gbean.setAttribute("port", new Integer(4242));
         gbean.setReferencePattern("LoginService", loginService);
         kernel.loadGBean(gbean, JaasLoginServiceRemotingServer.class.getClassLoader());
 

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java (original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java Sat Aug 27 15:39:31 2005
@@ -134,7 +134,9 @@
 
         serverStub = new ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
         gbean = new GBeanData(serverStub, JaasLoginServiceRemotingServer.getGBeanInfo());
-        gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
+        gbean.setAttribute("protocol", "tcp");
+        gbean.setAttribute("host", "0.0.0.0");
+        gbean.setAttribute("port", new Integer(4242));
         gbean.setReferencePattern("LoginService", loginService);
         kernel.loadGBean(gbean, JaasLoginServiceRemotingServer.class.getClassLoader());
 

Added: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/cli/AddStartupConfiguration.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/cli/AddStartupConfiguration.java?rev=240479&view=auto
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/cli/AddStartupConfiguration.java (added)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/cli/AddStartupConfiguration.java Sat Aug 27 15:39:31 2005
@@ -0,0 +1,55 @@
+/**
+ *
+ * Copyright 2003-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.
+ */
+package org.apache.geronimo.system.configuration.cli;
+
+import java.io.*;
+
+/**
+ * A tool for use by clients who really know what they're doing (such as the
+ * installer).  You point this to a FileConfigurationList file, and give it
+ * a configuration name, and it adds the name to the file.  This should only
+ * be run while the server is down, and will only work if you have previous
+ * knowledge of which PersistentConfigurationList implementation is going to
+ * be used and what file it persists to.  This is NOT a general-purpose
+ * feature for users.
+ *
+ * @version $Rev: 240228 $ $Date: 2005-08-26 08:55:00 -0400 (Fri, 26 Aug 2005) $
+ */
+public class AddStartupConfiguration {
+    public static void main(String[] args) {
+        try {
+            String file = args[0];
+            String configuration = args[1].trim();
+            BufferedReader in = new BufferedReader(new FileReader(file));
+            String line;
+            while((line = in.readLine()) != null) {
+                if(line.trim().equals(configuration)) {
+                    in.close();
+                    System.exit(0);
+                }
+            }
+            in.close();
+
+            PrintWriter out = new PrintWriter(new FileWriter(file, true));
+            out.println(configuration);
+            out.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+}

Propchange: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/cli/AddStartupConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java Sat Aug 27 15:39:31 2005
@@ -50,7 +50,7 @@
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(NamingProperties.class);
         infoFactory.addAttribute("namingFactoryInitial", String.class, true);
         infoFactory.addAttribute("namingFactoryUrlPkgs", String.class, true);
-        infoFactory.addAttribute("namingProviderUrl", String.class, true);
+        infoFactory.addAttribute("namingProviderUrl", String.class, true, true);
 
         infoFactory.setConstructor(new String[] {"namingFactoryInitial", "namingFactoryUrlPkgs", "namingProviderUrl"});
 

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java?rev=240479&r1=240478&r2=240479&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java Sat Aug 27 15:39:31 2005
@@ -45,6 +45,14 @@
         this.port = port;
     }
 
+    public String getHost() {
+        return "0.0.0.0";
+    }
+
+    public String getProtocol() {
+        return "rmi";
+    }
+
     public void doStart() throws Exception {
         System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
         registry = LocateRegistry.createRegistry(port);
@@ -64,16 +72,18 @@
         }
     }
 
-    public InetSocketAddress getAddress() {
-        return new InetSocketAddress("0.0.0.0", getPort());
+    public InetSocketAddress getListenAddress() {
+        return new InetSocketAddress(getHost(), getPort());
     }
 
     public static final GBeanInfo GBEAN_INFO;
 
     static {
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("RMI Naming", RMIRegistryService.class);
-        infoFactory.addAttribute("port", int.class, true);
-        infoFactory.addAttribute("address", InetSocketAddress.class, false);
+        infoFactory.addAttribute("host", String.class, false);
+        infoFactory.addAttribute("protocol", String.class, false);
+        infoFactory.addAttribute("port", int.class, true, true);
+        infoFactory.addAttribute("listenAddress", InetSocketAddress.class, false);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 



Mime
View raw message