geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r369138 - in /geronimo/branches/1.0: assemblies/j2ee-installer/ assemblies/j2ee-installer/src/izpack/ assemblies/j2ee-installer/src/var/config/ modules/installer-processing/ modules/installer-processing/src/ modules/installer-processing/src...
Date Sun, 15 Jan 2006 00:46:56 GMT
Author: djencks
Date: Sat Jan 14 16:46:39 2006
New Revision: 369138

URL: http://svn.apache.org/viewcvs?rev=369138&view=rev
Log:
GERONIMO-1194 fix the installer

Added:
    geronimo/branches/1.0/modules/installer-processing/
      - copied from r369099, geronimo/trunk/modules/installer-processing/
    geronimo/branches/1.0/modules/installer-processing/LICENSE.txt
      - copied unchanged from r369099, geronimo/trunk/modules/installer-processing/LICENSE.txt
    geronimo/branches/1.0/modules/installer-processing/NOTICE.txt
      - copied unchanged from r369099, geronimo/trunk/modules/installer-processing/NOTICE.txt
    geronimo/branches/1.0/modules/installer-processing/maven.xml
      - copied unchanged from r369099, geronimo/trunk/modules/installer-processing/maven.xml
    geronimo/branches/1.0/modules/installer-processing/project.properties
      - copied unchanged from r369099, geronimo/trunk/modules/installer-processing/project.properties
    geronimo/branches/1.0/modules/installer-processing/project.xml
      - copied unchanged from r369099, geronimo/trunk/modules/installer-processing/project.xml
    geronimo/branches/1.0/modules/installer-processing/src/
      - copied from r369099, geronimo/trunk/modules/installer-processing/src/
    geronimo/branches/1.0/modules/installer-processing/src/java/
      - copied from r369099, geronimo/trunk/modules/installer-processing/src/java/
    geronimo/branches/1.0/modules/installer-processing/src/java/org/
      - copied from r369099, geronimo/trunk/modules/installer-processing/src/java/org/
    geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/
      - copied from r369099, geronimo/trunk/modules/installer-processing/src/java/org/apache/
    geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/
      - copied from r369099, geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/
    geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/
      - copied from r369099, geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/
    geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/
      - copied from r369099, geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/
    geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
    geronimo/branches/1.0/modules/installer-support/
      - copied from r369099, geronimo/trunk/modules/installer-support/
    geronimo/branches/1.0/modules/installer-support/LICENSE.txt
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/LICENSE.txt
    geronimo/branches/1.0/modules/installer-support/NOTICE.txt
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/NOTICE.txt
    geronimo/branches/1.0/modules/installer-support/maven.xml
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/maven.xml
    geronimo/branches/1.0/modules/installer-support/project.properties
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/project.properties
    geronimo/branches/1.0/modules/installer-support/project.xml
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/project.xml
    geronimo/branches/1.0/modules/installer-support/src/
      - copied from r369099, geronimo/trunk/modules/installer-support/src/
    geronimo/branches/1.0/modules/installer-support/src/java/
      - copied from r369099, geronimo/trunk/modules/installer-support/src/java/
    geronimo/branches/1.0/modules/installer-support/src/java/com/
      - copied from r369099, geronimo/trunk/modules/installer-support/src/java/com/
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/
      - copied from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/
      - copied from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/
      - copied from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
      - copied unchanged from r369099, geronimo/trunk/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
Modified:
    geronimo/branches/1.0/assemblies/j2ee-installer/maven.xml
    geronimo/branches/1.0/assemblies/j2ee-installer/project.xml
    geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
    geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-process.xml
    geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml
    geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
    geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.jelly
    geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/maven.xml?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/maven.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/maven.xml Sat Jan 14 16:46:39 2006
@@ -25,10 +25,12 @@
 
     <!-- replace the assemble:install goal with jelly code to build the installer -->
     <goal name="assemble:install">
-<!-- this will assemble but put the cars in the repository instead of the config-store-->
-        <!--attainGoal name="assemble:assemble-to-repo"/-->
-<!-- for now we just assemble a normal geronimo server with the cars installed into the config-store -->
-        <attainGoal name="assemble:assemble"/>
+        <!-- assemble-to-repo will assemble but put the cars -->
+        <!--    in the repository instead of the config-store-->
+        <attainGoal name="assemble:assemble-to-repo"/>
+        <!-- assemble:assemble will assemble a normal geronimo server -->
+        <!-- with the cars installed into the config-store -->
+        <!--attainGoal name="assemble:assemble"/-->
         <!-- build the izpack installer here -->
         <attainGoal name="izpack:izpack-installer-build"/>
     </goal>

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/project.xml?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/project.xml Sat Jan 14 16:46:39 2006
@@ -20,11 +20,17 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>geronimo-installer</id>
+    <id>geronimo-installer-assembly</id>
     <name>Geronimo Assembly for an IZPack Installer</name>
     <description>An assembly of Geronimo for the IZPack installer</description>
 
     <dependencies>
+        <!-- IzPack extension dependency (modules/installer-support) -->
+        <dependency>
+           <groupId>geronimo</groupId>
+           <artifactId>geronimo-installer-support</artifactId>
+           <version>${pom.currentVersion}</version>
+        </dependency>
         <!-- plugin we use -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -48,6 +54,7 @@
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
                 <geronimo.assemble.executable>bin/server.jar</geronimo.assemble.executable>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -57,6 +64,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -66,6 +74,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -74,7 +83,8 @@
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
-                <geronimo.assemble>install</geronimo.assemble>
+              <geronimo.assemble>install</geronimo.assemble>
+              <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -84,6 +94,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>CORBA.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -93,6 +104,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Jetty.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -102,6 +114,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Tomcat.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -111,15 +124,27 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>LDAP.Server</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>ldap-realm</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>LDAP.Server</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>system-database</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Sample.Database.Pool</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -129,6 +154,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>JMS.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -138,6 +164,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>JMS.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -147,6 +174,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Server</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -156,6 +184,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -165,6 +194,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -174,6 +204,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Jetty.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -183,26 +214,29 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Jetty.Welcome.Application</geronimo.pack>
             </properties>
         </dependency>
-	<dependency>
-		<groupId>geronimo</groupId>
-		<artifactId>servlets-examples-jetty</artifactId>
-		<type>car</type>
-		<version>${pom.currentVersion}</version>
-		<properties>
-			<geronimo.assemble>install</geronimo.assemble>
-		</properties>
-	</dependency>
-	<dependency>
-		<groupId>geronimo</groupId>
-		<artifactId>jsp-examples-jetty</artifactId>
-		<type>car</type>
-		<version>${pom.currentVersion}</version>
-		<properties>
-			<geronimo.assemble>install</geronimo.assemble>
-		</properties>
-	</dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>servlets-examples-jetty</artifactId>
+        <type>car</type>
+        <version>${pom.currentVersion}</version>
+        <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Jetty.Sample.Applications</geronimo.pack>
+        </properties>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>jsp-examples-jetty</artifactId>
+        <type>car</type>
+        <version>${pom.currentVersion}</version>
+        <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Jetty.Sample.Applications</geronimo.pack>
+        </properties>
+    </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>webconsole-jetty</artifactId>
@@ -210,6 +244,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Jetty.Web.Management.Console</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -219,6 +254,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Jetty.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -228,6 +264,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Jetty.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -237,6 +274,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Jetty.UDDI.Server</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -246,24 +284,67 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Tomcat.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>ldap-demo-tomcat</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Tomcat.Sample.Applications</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>ldap-demo-jetty</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Jetty.Sample.Applications</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>welcome-tomcat</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Tomcat.Welcome.Application</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>servlets-examples-tomcat</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Tomcat.Sample.Applications</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>jsp-examples-tomcat</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Tomcat.Sample.Applications</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>webconsole-tomcat</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Tomcat.Web.Management.Console</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -273,6 +354,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Tomcat.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -282,6 +364,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Tomcat.Web.Container</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -291,9 +374,51 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>Tomcat.UDDI.Server</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>daytrader-derby-jetty</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Daytrader.for.Jetty</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Daytrader.for.Jetty</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>daytrader-derby-tomcat</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Daytrader.for.Tomcat</geronimo.pack>
+          </properties>
+        </dependency>
+        <dependency>
+          <groupId>geronimo</groupId>
+          <artifactId>daytrader-derby-tomcat-streamer-client</artifactId>
+          <type>car</type>
+          <version>${pom.currentVersion}</version>
+          <properties>
+            <geronimo.assemble>install</geronimo.assemble>
+            <geronimo.pack>Daytrader.for.Tomcat</geronimo.pack>
+          </properties>
+        </dependency>
+
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>client-system</artifactId>
             <type>car</type>
@@ -301,6 +426,7 @@
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
                 <geronimo.assemble.executable>bin/client.jar</geronimo.assemble.executable>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -310,6 +436,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -319,6 +446,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
         <dependency>
@@ -328,6 +456,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.pack>CORBA.Features</geronimo.pack>
             </properties>
         </dependency>
 
@@ -482,6 +611,7 @@
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
                 <geronimo.assemble.executable>bin/deployer.jar</geronimo.assemble.executable>
+                <geronimo.pack>J2EE.Features</geronimo.pack>
             </properties>
         </dependency>
 
@@ -529,6 +659,7 @@
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
                 <geronimo.assemble.executable>bin/shutdown.jar</geronimo.assemble.executable>
+                <geronimo.pack>Server</geronimo.pack>
             </properties>
         </dependency>
 

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml Sat Jan 14 16:46:39 2006
@@ -8,59 +8,69 @@
         <javaversion>1.4</javaversion>
     </info>
     <variables>
+       <variable name="pom.currentVersion"  value="${pom.currentVersion}" />
+       <variable name="xercesVersion" value="${xerces_version}" />
+       <variable name="xmlParserApisVersion" value="${xml_parser_apis_version}" />
+       <variable name="TOMCAT_WEB_SERVER_NAME"  value="Tomcat" />
+       <variable name="JETTY_WEB_SERVER_NAME"  value="Jetty" />
+       <variable name="NO_WEB_SERVER_NAME"  value="JettyORTomcat" />
+       <variable name="JETTY_WEBBUILDER_NAMESPACE" value="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" />
+       <variable name="TOMCAT_WEBBUILDER_NAMESPACE" value="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" />
+       <variable name="NO_WEBBUILDER_NAMESPACE" value="http://geronimo.apache.org/xml/ns/j2ee/web/jettyORtomcat-1.0" />
     </variables>
     <guiprefs width="640" height="480" resizable="yes">
-	    <laf name="liquid">
-		    <os family="unix"/>
-	    </laf>
+       <laf name="liquid">
+          <os family="unix"/>
+       </laf>
     </guiprefs>
     <locale>
         <langpack iso3="eng"/>
     </locale>
     <resources>
-	<res id="Installer.image" src="${InstallSource}/izpack/geronimo_banner_vert.gif" />
+        <res id="Installer.image" src="${InstallSource}/izpack/geronimo_banner_vert.gif" />
         <res id="LicencePanel.licence" src="${InstallSource}/LICENSE.txt"/>
-	<res id="InfoPanel.info" src="${InstallSource}/RELEASE-NOTES-1.0.txt"/>
-	<res id="userInputSpec.xml" src="${InstallSource}/izpack-user-input.xml" />
-<!--	<res id="ProcessPanel.Spec.xml" src="${InstallSource}/izpack-process.xml" /> -->
-	<res id="ImgPacksPanel.img.0" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.1" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.2" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.3" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.4" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.5" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.6" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.7" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.8" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.9" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.10" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.11" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.12" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.13" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.14" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.15" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.16" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.17" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.18" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.19" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
-	<res id="ImgPacksPanel.img.20" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="InfoPanel.info" src="${InstallSource}/RELEASE-NOTES-${ReleaseNotesVersion}.txt"/>
+        <res id="userInputSpec.xml" src="${InstallSource}/izpack-user-input.xml" />
+        <res id="ProcessPanel.Spec.xml" src="${InstallSource}/izpack-process.xml" />
+        <res id="ImgPacksPanel.img.0" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.1" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.2" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.3" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.4" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.5" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.6" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.7" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.8" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.9" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.10" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.11" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.12" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.13" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.14" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.15" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.16" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.17" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.18" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.19" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
+        <res id="ImgPacksPanel.img.20" src="${InstallSource}/izpack/geronimo_med_vert.gif" />
     </resources>
     <panels>
         <panel classname="HelloPanel"/>
         <panel classname="LicencePanel"/>
         <panel classname="TargetPanel"/>
         <panel classname="ImgPacksPanel"/>
-        <panel classname="UserInputPanel"/>
-        <panel classname="UserInputPanel"/>
-        <panel classname="UserInputPanel"/>
-        <panel classname="UserInputPanel"/>
-        <panel classname="UserInputPanel"/>
-        <panel classname="UserInputPanel"/>
-        <panel classname="UserInputPanel"/>
-        <panel classname="UserInputPanel"/>
-	<panel classname="UserInputPanel"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
+        <panel classname="ValidatePackSelections"/>
         <panel classname="InstallPanel"/>
-<!--        <panel classname="ProcessPanel"/> -->
+        <panel classname="ProcessPanel"/>
         <panel classname="InfoPanel"/>
         <panel classname="FinishPanel"/>
     </panels>
@@ -68,20 +78,21 @@
         <pack name="Server" required="yes">
             <!-- 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="${InstallSource}/BUILDING.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/LICENSE.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/README.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/RELEASE-NOTES-1.0.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/bin" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/lib" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/config-store" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/repository" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/schema" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/var" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/BUILDING.txt" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/LICENSE.txt" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/README.txt" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/RELEASE-NOTES-${ReleaseNotesVersion}.txt" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/bin" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/lib" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/config-store" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/repository" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/schema" targetdir="$INSTALL_PATH"/>
+            <file src="${InstallSource}/var" targetdir="$INSTALL_PATH"/>
             <!--singlefile src="var/config/config.izpack.list" target="$INSTALL_PATH/var/config/config.list"/-->
             <parsable targetfile="$INSTALL_PATH/var/security/users.properties" type="javaprop"/>
             <parsable targetfile="$INSTALL_PATH/var/security/groups.properties" type="javaprop"/>
             <parsable targetfile="$INSTALL_PATH/var/config/config.xml" type="xml"/>
+            <parsable targetfile="$INSTALL_PATH/var/config/configure.xml" type="xml"/>
             <executable targetfile="$INSTALL_PATH/bin/deploy.sh" type="bin" stage="never" />
             <executable targetfile="$INSTALL_PATH/bin/geronimo.sh" type="bin" stage="never" />
             <executable targetfile="$INSTALL_PATH/bin/setjavaenv.sh" type="bin" stage="never" />
@@ -93,7 +104,7 @@
             <!-- o/o/g/Server -->
             <!-- o/o/g/RuntimeDeployer -->
             <!-- o/o/g/SystemDatabase -->
-            <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>
+            <description>If selected, basic features for J2EE support will be enabled. Enabling J2EE support is required before selecting a J2EE Web container, a JMS broker, an EJB server, an embedded Derby database, an administrative security realm, etc.  If not selected, these additional features may be installed, but will not be active in the configuration.</description>
             <depends packname="Server" />
         </pack>
 
@@ -114,7 +125,7 @@
         <pack name="Jetty Web Container" required="no" preselected="yes">
             <!-- o/o/g/Jetty -->
             <!-- o/o/g/JettyRuntimeDeployer -->
-            <description>The Jetty Web Container</description>
+            <description>The Jetty Web Container.  Either the Jetty or Tomcat web container may be selected, but not both.</description>
             <depends packname="J2EE Features" />
         </pack>
         <pack name="Jetty Welcome Application" required="no" preselected="yes">
@@ -132,20 +143,27 @@
             <description>A UDDI server that runs in Geronimo, using the jUDDI package.</description>
             <depends packname="Jetty Web Container" />
         </pack>
-
+        <pack name="Jetty Sample Applications" required="no" preselected="yes" >
+            <description>Sample applications for Jetty</description>
+            <depends packname="Jetty Web Container" />
+        </pack>
+        <pack name="Daytrader for Jetty" required="no" preselected="yes" >
+          <description>Daytrader sample application for Jetty</description>
+          <depends packname="Jetty Web Container" />
+        </pack>
         <!-- TOMCAT-->
-        <pack name="Tomcat Web Container" required="no" preselected="yes">
+        <pack name="Tomcat Web Container" required="no" preselected="no">
             <!-- o/o/g/Tomcat -->
             <!-- o/o/g/TomcatRuntimeDeployer -->
-            <description>The Tomcat Web Container</description>
+            <description>The Tomcat Web Container. Either the Tomcat or the Jetty web container may be selected, but not both.</description>
             <depends packname="J2EE Features" />
         </pack>
-        <pack name="Tomcat Welcome Application" required="no" preselected="yes">
+        <pack name="Tomcat Welcome Application" required="no" preselected="no">
              <!-- o/o/g/Console/Tomcat -->
             <description>Simple welcome application normally at localhost:8080/</description>
              <depends packname="Tomcat Web Container" />
          </pack>
-         <pack name="Tomcat Web Management Console" required="no" preselected="yes">
+         <pack name="Tomcat Web Management Console" required="no" preselected="no">
              <!-- o/o/g/Console/Tomcat -->
              <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="Tomcat Web Container" />
@@ -155,31 +173,46 @@
              <description>A UDDI server that runs in Geronimo, using the jUDDI package.</description>
              <depends packname="Tomcat Web Container" />
          </pack>
+         <pack name="Tomcat Sample Applications"  required="no" preselected="no" >
+            <description>Sample applications for Tomcat</description>
+            <depends packname="Tomcat Web Container" />
+        </pack>
+        <pack name="Daytrader for Tomcat" required="no" preselected="no" >
+          <description>Daytrader sample application for Tomcat</description>
+          <depends packname="Tomcat Web Container" />
+        </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="SMTP Transport" required="no" preselected="no">
+          <!-- o/o/g/Directory -->
+          <description>Select the SMTP Transport functionality to enable JavaMail applications in Geronimo.  Outbound JavaMail is sent through the SMTP Transport to a specified mail host.</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="Spring Integration" required="no" preselected="no">
+        <!-- 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>
+            <!--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">
+        </pack-->
+        <!--pack name="Documentation" required="no" preselected="yes">
+            <description>Geronimo documentation.</description>
+            <file src="${InstallSource}/docs" targetdir="$INSTALL_PATH"/>
+        </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="Jetty Web Container" />
         </pack>
-	<pack name="Geronimo Sample Applications" required="no" preselected="yes">
-		<description>Install sample Tomcat and Jetty applications</description>
-		<depends packname="Server" />
-	</pack>
+-->
     </packs>
 </installation>

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-process.xml?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-process.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-process.xml Sat Jan 14 16:46:39 2006
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <processing>
-    <!-- J2EE Features -->
-    <job name="Success!">
-	    <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"/>
+    <!-- Server Features -->
+    <job name="Installing Configurations">
+        <executefile name="$JAVA_HOME/bin/java">
+          <arg>-classpath</arg>
+          <arg>${INSTALL_PATH}/repository/xerces/jars/xmlParserAPIs-${xmlParserApisVersion}.jar${CPES}${INSTALL_PATH}/repository/xerces/jars/xercesImpl-${xercesVersion}.jar${CPES}${INSTALL_PATH}/var/temp/geronimo-installer-processing-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.installer.processing.ConfigInstaller</arg>
+            <arg>$INSTALL_PATH</arg>
+            <arg>var/config/configure.xml</arg>
+            <arg>TRACE=${TRACE}</arg>
+        </executefile>
+        <executeForPack name="Server"/>
     </job>
     <!-- old processing
     <job name="Activating RMI naming configuration">

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml Sat Jan 14 16:46:39 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <userInput>
     <panel order="0">
-        <field type="title" txt="Security Configuration"/>
+        <field type="title" txt="Base Configuration"/>
         <field type="staticText" txt="Please select security options for Geronimo"/>
         <divider/>
         <field type="text" variable="SecurityDefaultUser">
@@ -14,13 +14,25 @@
         </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"/>
+            <spec txt="Remote Login Port [4242]:" layout="N:5:5" set="0:4242"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
             <createForPack name="J2EE Features"/>
         </field>
-        <createForPack name="Server"/>
+    <field type="check" variable="J2EE.Features.enable">
+          <description txt="Active at runtime"/>
+        <!--description align="left" txt="Enable J2EE features"
+            id="J2EE.Features.enable.desc" /-->
+        <spec txt="J2EE Features" id="J2EE.Features.enable.field"
+              true="true" false="false" set="true" />
+        <createForPack name="J2EE Features"/>
+    </field>
+    <field type="staticText" txt="Disabling J2EE Features disables dependent runtime features as well.">
+        <createForPack name="J2EE Features"/>
+    </field>
+    <createForPack name="Server"/>
     </panel>
     <panel order="1">
+        <createForPack name="Jetty Web Container"/>
         <field type="title" txt="Jetty Web Configuration"/>
         <field type="staticText" txt="Please select Jetty Web server configuration options for Geronimo"/>
         <divider/>
@@ -29,62 +41,127 @@
             <spec txt="Hostname:" size="50" set="0.0.0.0"/>
         </field>
         <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"/>
+            <!--description txt="The standard network port that the web container should use"/-->
+            <spec txt="HTTP (standard) Port [8080]:" layout="N:5:5" set="0:8080"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
         <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"/>
+            <!--description txt="The secure network port that the web container should use"/-->
+            <spec txt="HTTPS (secure) Port [8443]:" layout="N:5:5" set="0:8443"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </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"/>
+            <!--description txt="The Apache AJP network port that the web container should use"/-->
+            <spec txt="Apache AJP Port [8009]:" layout="N:5:5" set="0:8009"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
-        <field type="text" variable="PlanWebServerName">
-            <description txt="Name of web container (do not modify)"/>
-            <spec txt="Web Server (Do not modify)" size="5" set="Jetty"/>
+    <field type="check" variable="Jetty.Web.Container.enable">
+          <description txt="Active at runtime"/>
+          <spec txt="Jetty Web Container" id="Jetty.Web.Container.enable.field"
+              true="true" false="false" set="true" />
+          <depends variable="J2EE.Features.enable"/>
+          <exclusiveOf variable="Tomcat.Web.Container.enable"/>
+        <createForPack name="Jetty Web Container"/>
+    </field>
+    <field type="check" variable="Jetty.Welcome.Application.enable">
+        <spec txt="Jetty Welcome Application" id="Jetty.Welcome.Application.enable.field"
+              true="true" false="false" set="true" />
+                <depends variable="Jetty.Web.Container.enable"/>
+        <createForPack name="Jetty Welcome Application"/>
+    </field>
+        <field type="check" variable="Jetty.Web.Management.Console.enable">
+          <spec txt="Jetty Web Management Console" id="Jetty.Web.Management.Console.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="Jetty.Web.Container.enable"/>
+          <createForPack name="Jetty Web Management Console"/>
+        </field>
+        <field type="check" variable="Jetty.UDDI.Server.enable">
+          <spec txt="Jetty UDDI Server" id="Jetty.UDDI.Server.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="Jetty.Web.Container.enable"/>
+          <createForPack name="Jetty UDDI Server"/>
+        </field>
+        <field type="check" variable="Jetty.Sample.Applications.enable">
+          <spec txt="Jetty Sample Applications" id="Jetty.Sample.Applications.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="Jetty.Web.Container.enable"/>
+          <createForPack name="Jetty Sample Applications"/>
+        </field>
+        <field type="check" variable="Daytrader.for.Jetty.enable">
+          <spec txt="Daytrader for Jetty" id="Daytrader.for.Jetty.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="Jetty.Web.Container.enable"/>
+          <createForPack name="Daytrader for Jetty"/>
         </field>
-        <field type="text" variable="PlanWebBuilderDefaultNamespace">
-            <description txt="Namspace for web plan schema (do not modify)"/>
-            <spec txt="Web plan namespace (Do not modify)" size="53" set="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"/>
+        <field type="staticText" txt="Jetty and Tomcat may not be enabled concurrently from the installer.">
+          <createForPack name="Tomcat Web Container"/>
         </field>
-        <createForPack name="Jetty Web Container"/>
     </panel>
     <panel order="2">
+       <createForPack name="Tomcat Web Container"/>
         <field type="title" txt="Tomcat Web Configuration"/>
         <field type="staticText" txt="Please select Tomcat Web server configuration options for Geronimo"/>
         <divider/>
         <field type="text" variable="PlanServerHostname">
             <description txt="Hostname the server should bind to (usually localhost or 0.0.0.0)"/>
             <spec txt="Hostname:" size="50" set="0.0.0.0"/>
-        </field>
+        </field>        
         <field type="rule" variable="PlanHTTPPort2">
-            <description txt="The standard network port that the web container should use"/>
-            <spec txt="HTTP Port:" layout="N:5:5" set="0:8080"/>
+            <!--description txt="The standard network port that the web container should use"/-->
+            <spec txt="HTTP (standard) Port [8080]:" layout="N:5:5" set="0:8080"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
         <field type="rule" variable="PlanHTTPSPort2">
-            <description txt="The secure network port that the web container should use"/>
-            <spec txt="HTTPS Port:" layout="N:5:5" set="0:8443"/>
+            <!--description txt="The secure network port that the web container should use"/-->
+            <spec txt="HTTPS (secure) Port [8443]:" layout="N:5:5" set="0:8443"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
         <field type="rule" variable="PlanAJPPort2">
-            <description txt="The Apache AJP network port that the web container should use"/>
-            <spec txt="AJP Port:" layout="N:5:5" set="0:8009"/>
+            <!--description txt="The Apache AJP network port that the web container should use"/-->
+            <spec txt="Apache AJP Port [8009]:" layout="N:5:5" set="0:8009"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
-        <field type="text" variable="PlanWebServerName">
-            <description txt="Name of web container (do not modify)"/>
-            <spec txt="Web Server (Do not modify)" size="5" set="Tomcat"/>
+        <field type="check" variable="Tomcat.Web.Container.enable">
+          <description txt="Active at runtime"/>
+          <spec txt="Tomcat Web Container" id="Tomcat.Web.Container.enable.field"
+                true="true" false="false" set="false" />
+          <depends variable="J2EE.Features.enable"/>
+          <exclusiveOf variable="Jetty.Web.Container.enable"/>
+          <createForPack name="Tomcat Web Container"/>
+        </field>
+        <field type="check" variable="Tomcat.Welcome.Application.enable">
+          <spec txt="Tomcat Welcome Application" id="Tomcat.Welcome.Application.enable.field"
+                true="true" false="false" set="false" />
+          <depends variable="Tomcat.Web.Container.enable"/>
+          <createForPack name="Tomcat Welcome Application"/>
+        </field>
+        <field type="check" variable="Tomcat.Web.Management.Console.enable">
+          <spec txt="Tomcat Web Management Console" id="Tomcat.Web.Management.Console.enable.field"
+                true="true" false="false" set="false" />
+          <depends variable="Tomcat.Web.Container.enable"/>
+          <createForPack name="Tomcat Web Management Console"/>
+        </field>
+        <field type="check" variable="Tomcat.UDDI.Server.enable">
+          <spec txt="Tomcat UDDI Server" id="Tomcat.UDDI.Server.enable.field"
+                true="true" false="false" set="false" />
+          <depends variable="Tomcat.Web.Container.enable"/>
+          <createForPack name="Tomcat UDDI Server"/>
+        </field>
+        <field type="check" variable="Tomcat.Sample.Applications.enable">
+          <spec txt="Tomcat Sample Applications" id="Tomcat.Sample.Applications.enable.field"
+                true="true" false="false" set="false" />
+          <depends variable="Tomcat.Web.Container.enable"/>
+          <createForPack name="Tomcat Sample Applications"/>
+        </field>
+        <field type="check" variable="Daytrader.for.Tomcat.enable">
+          <spec txt="Daytrader for Tomcat" id="Daytrader.for.Tomcat.enable.field"
+                true="true" false="false" set="false" />
+          <depends variable="Tomcat.Web.Container.enable"/>
+          <createForPack name="Daytrader for Tomcat"/>
         </field>
-        <field type="text" variable="PlanWebBuilderDefaultNamespace">
-            <description txt="Namspace for web plan schema (do not modify)"/>
-            <spec txt="Web plan namespace (Do not modify)" size="55" set="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"/>
+        <field type="staticText" txt="Jetty and Tomcat may not be enabled concurrently from the installer.">
+          <createForPack name="Jetty Web Container"/>
         </field>
-        <createForPack name="Tomcat Web Container"/>
     </panel>
     <panel order="3">
         <field type="title" txt="EJB Configuration"/>
@@ -92,13 +169,13 @@
         <divider/>
         <field type="rule" variable="PlanNamingPort">
             <description txt="The network port that the Geronimo naming service should use"/>
-            <spec txt="Naming Port:" layout="N:5:5" set="0:1099"/>
+            <spec txt="Naming Port [1099]:" layout="N:5:5" set="0:1099"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
             <createForPack name="Server"/>
         </field>
         <field type="rule" variable="PlanOpenEJBPort">
             <description txt="The network port that the EJB container should use"/>
-            <spec txt="EJB Port:" layout="N:5:5" set="0:4201"/>
+            <spec txt="EJB Port [4201]:" layout="N:5:5" set="0:4201"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
             <createForPack name="J2EE Features"/>
         </field>
@@ -109,12 +186,13 @@
         </field>
     </panel>
     <panel order="4">
+        <createForPack name="CORBA Features"/>
         <field type="title" txt="CORBA Configuration"/>
         <field type="staticText" txt="Please select CORBA configuration options for Geronimo"/>
         <divider/>
         <field type="rule" variable="PlanIIOPPort">
             <description txt="The network port that the RMI/IIOP listener should use"/>
-            <spec txt="IIOP Port:" layout="N:5:5" set="0:9000"/>
+            <spec txt="IIOP Port [9000]:" layout="N:5:5" set="0:9000"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
         <field type="text" variable="PlanORBSSLHost">
@@ -123,7 +201,7 @@
         </field>
         <field type="rule" variable="PlanORBSSLPort">
             <description txt="The network port that the IIOP ORB should use. Do not change, it cannot be reset from the installer."/>
-            <spec txt="ORB Port:" layout="N:5:5" set="0:2001"/>
+            <spec txt="ORB Port [2001]:" layout="N:5:5" set="0:2001"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
         <field type="text" variable="PlanCOSNamingHost">
@@ -132,63 +210,105 @@
         </field>
         <field type="rule" variable="PlanCOSNamingPort">
             <description txt="The network port that the CORBA Naming Service should use"/>
-            <spec txt="CosNaming Port:" layout="N:5:5" set="0:1050"/>
+            <spec txt="CosNaming Port [1050]:" layout="N:5:5" set="0:1050"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
-        <createForPack name="CORBA Features"/>
+        <field type="check" variable="CORBA.Features.enable">
+          <description txt="Active at runtime"/>
+          <spec txt="CORBA Features" id="CORBA.Features.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="J2EE.Features.enable"/>
+          <createForPack name="CORBA Features"/>
+        </field>
     </panel>
     <panel order="5">
+        <createForPack name="Sample Database Pool"/>
         <field type="title" txt="Derby Configuration"/>
         <field type="staticText" txt="Please configure Derby"/>
         <divider/>
         <field type="rule" variable="PlanDerbyPort">
             <description txt="The network port that the Derby DB should use"/>
-            <spec txt="Derby Port:" layout="N:5:5" set="0:1527"/>
+            <spec txt="Derby Port [1527]:" layout="N:5:5" set="0:1527"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
-            <createForPack name="J2EE Features"/>
+        </field>
+        <field type="check" variable="Sample.Database.Pool.enable">
+          <description txt="Active at runtime"/>
+          <spec txt="Sample Database Pool" id="Sample.Database.Pool.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="J2EE.Features.enable"/>
+          <createForPack name="Sample Database Pool"/>
         </field>
     </panel>
     <panel order="6">
-        <field type="title" txt="Activemq Configuration"/>
+        <createForPack name="JMS Features"/>
+        <field type="title" txt="ActiveMQ Configuration"/>
         <field type="staticText" txt="Please configure activemq services"/>
         <divider/>
         <field type="rule" variable="PlanActiveMQPort">
             <description txt="The network port that the ActiveMQ JMS server should use"/>
-            <spec txt="JMS Port:" layout="N:5:5" set="0:61616"/>
+            <spec txt="JMS Port [61616]:" layout="N:5:5" set="0:61616"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
-        <createForPack name="JMS Features"/>
+        <field type="check" variable="JMS.Features.enable">
+          <description txt="Active at runtime"/>
+          <spec txt="JMS Features" id="JMS.Features.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="J2EE.Features.enable"/>
+          <createForPack name="JMS Features"/>
+        </field>
     </panel>
     <panel order="7">
+        <createForPack name="LDAP Server"/>
         <field type="title" txt="Directory (LDAP) Configuration"/>
         <field type="staticText" txt="Please configure Directory services"/>
         <divider/>
         <field type="rule" variable="PlanLdapPort">
             <description txt="The network port that the directory server should use"/>
-            <spec txt="Directory Port:" layout="N:5:5" set="0:1389"/>
+            <spec txt="Directory Port [1389]:" layout="N:5:5" set="0:1389"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
         </field>
-        <createForPack name="LDAP Server"/>
+        <field type="check" variable="LDAP.Server.enable">
+          <description txt="Active at runtime"/>
+          <spec txt="LDAP Server" id="LDAP.Server.enable.field"
+                true="true" false="false" set="true" />
+          <depends variable="J2EE.Features.enable"/>
+          <createForPack name="LDAP Server"/>
+        </field>
     </panel>
     <panel order="8">
-	    <field type="title" txt="Samples Configuration"/>
-	    <field type="staticText" txt="Select samples to install" />
-	    <divider/>
-	    <field type="check" variable="jettySamples.1">
-		    <Description align="left"
-				 txt="Jetty Samples"
-				 id="jettySamplesDesc.1"/>
-		    <spec txt="Jetty Samples"
-			  id="jettySamples.label.1" true="on" false="off"
-			  set="false"/>
-	    </field>
-	    <field type="check" variable="tomcatSamples.1">
-		    <Description align="left"
-				 txt="Tomcat Samples"
-				 id="tomcatSamplesDesc.1"/>
-		    <spec txt="Tomcat Samples"
-			  id="tomcatSamples.label.1" true="on" false="off"
-			  set="false"/>
-	    </field>
+      <createForPack name="SMTP Transport"/>
+      <field type="title" txt="SMTP Transport Configuration"/>
+      <field type="staticText" txt="Configure the SMTP Transport"/>
+      <divider/>
+      <field type="text" variable="PlanSMTPHost">
+        <description txt="The network host to use for outgoing SMTP connections"/>
+        <spec txt="SMTP Host:" size="50" set="localhost"/>
+      </field>
+      <field type="rule" variable="PlanSMTPPort">
+        <description txt="The network port to use for outgoing SMTP connections"/>
+        <spec txt="SMTP Port [25]:" layout="N:5:5" set="0:25"/>
+        <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
+      </field>
+      <field type="check" variable="SMTP.Transport.enable">
+        <description txt="Active at runtime"/>
+        <spec txt="SMTP Transport" id="SMTP.Transport.enable.field"
+              true="true" false="false" set="true" />
+        <depends variable="J2EE.Features.enable"/>
+        <createForPack name="SMTP Transport"/>
+      </field>
+    </panel>
+    <panel order="9">
+            <field type="title" txt="Configuration Checkpoint"/>
+            <field type="staticText" txt="Congratulations!"/>
+            <field type="staticText" txt="        Geronimo configuration is complete." />
+            <divider/>
+            <field type="staticText" txt="Press 'Next' to continue with file installation or" />
+            <field type="staticText" txt="press 'Previous' to back up and change options." />
+            <field type="staticText" txt=".." />
+            <field type="staticText" txt=".." />
+            <field type="staticText" txt=".." />
+            <field type="staticText" txt=".." />
+            <field type="staticText" txt=".." />
+            <field type="staticText" txt=".." />
     </panel>
 </userInput>

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml Sat Jan 14 16:46:39 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car" load="true">
+    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -16,13 +16,13 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
+    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <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">
+    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -31,7 +31,7 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
+    <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="${CORBA.Features.enable}">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -43,26 +43,27 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
+    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car" load="${JMS.Features.enable}">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/system-database/${pom.currentVersion}/car">
+    <configuration name="geronimo/activemq/${pom.currentVersion}/car" load="${JMS.Features.enable}"/>
+    <configuration name="geronimo/system-database/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/directory/${pom.currentVersion}/car">
+    <configuration name="geronimo/directory/${pom.currentVersion}/car" load="${LDAP.Server.enable}">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/jetty/${pom.currentVersion}/car">
+    <configuration name="geronimo/ldap-realm/${pom.currentVersion}/car" load="${LDAP.Server.enable}"/>
+    <configuration name="geronimo/jetty/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -73,54 +74,58 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/tomcat/${pom.currentVersion}/car" load="false">
+    <configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car" load="${Jetty.Welcome.Application.enable}"/>
+    <configuration name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
+    <configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
+    <configuration name="geronimo/ldap-demo-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
+    <configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car" load="${Jetty.Web.Management.Console.enable}"/>
+    <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car" load="${Jetty.UDDI.Server.enable}"/>
+    <configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}"/>
+    <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}"/>
+    <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car" load="${Daytrader.for.Jetty.enable}"/>
+    <configuration name="geronimo/tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanHTTPPort2}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
         </gbean>
         <gbean name="TomcatAJPConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanAJPPortPrimary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanAJPPort2}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
         </gbean>
         <gbean name="TomcatWebSSLConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanHTTPSPort2}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/javamail/1.0/car" load="false">
+    <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car" load="${Tomcat.Welcome.Application.enable}"/>
+    <configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
+    <configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
+    <configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
+    <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Management.Console.enable}"/>
+    <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="${Tomcat.UDDI.Server.enable}"/>
+    <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}"/>
+    <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}"/>
+    <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car" load="${Daytrader.for.Tomcat.enable}"/>
+    <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false"><!-- load="${SMTP.Transport.enable}"-->
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car" load="${Server.enable}"/>
+    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
+            <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
+    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}"/>
+    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}"/>
+    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" load="${J2EE.Features.enable}"/>
 
 </attributes>

Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly Sat Jan 14 16:46:39 2006
@@ -228,7 +228,56 @@
         <attainGoal name="assemble:assemble-lib"/>
         <attainGoal name="assemble:assemble-unpack"/>
         <attainGoal name="assemble:assemble-configurations-to-repo"/>
+        <attainGoal name="assemble:assemble-installer-helpers"/>
         <attainGoal name="assemble:assemble-schemas"/>
+    </goal>
+    <goal name="assemble:assemble-installer-helpers">
+        <ant:copy todir="${geronimo.assembly.dest}/var/temp" >
+           <ant:fileset file="${maven.repo.local}/geronimo/plugins/geronimo-assembly-plugin*.jar"/>
+        </ant:copy>
+        <ant:copy todir="${geronimo.assembly.dest}/var/temp" >
+           <ant:fileset file="${maven.repo.local}/geronimo/jars/geronimo-installer-processing-${pom.currentVersion}.jar"/>
+        </ant:copy>
+        <j:set var="configStoreDir" value="${geronimo.assembly.dest}/config-store"/>
+        <!--        <ant:delete dir="${configStoreDir}"/>-->
+        <ant:mkdir dir="${configStoreDir}"/>
+        <ant:mkdir dir="${geronimo.assembly.dest}/var/config"/>
+        <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="false" outputMode="xml" escapeText="false" trim="false">
+           &lt;!-- used only for install. This file may be removed. --&gt;
+           &lt;configurations&gt;
+        </j:file>
+        <j:set var="DS" value="$" />
+        <j:set var="LB" value="{" />
+        <j:set var="RB" value="}" />
+        <j:forEach var="artifact" items="${pom.artifacts}">
+            <j:set var="dependency" value="${artifact.dependency}"/>
+            <j:if test="${dependency.type == 'car'}">
+                <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">            
+                    &lt;configuration&gt;
+                </j:file> 
+                <j:if test="${dependency.getProperty('geronimo.assemble') == 'install'}">
+                    <j:set var="PACK" value="${dependency.getProperty('geronimo.pack')}"/>
+                    <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">            
+                      &lt;artifact&gt;${dependency.getGroupId()}/${dependency.getArtifactId()}/${dependency.getVersion()}/${dependency.getType()} &lt;/artifact&gt;
+                      &lt;selected&gt;${DS}${LB}${PACK}${RB}&lt;/selected&gt;
+                    </j:file>
+                </j:if>
+
+                <!-- handle executable configs -->
+                <j:if test="${dependency.getProperty('geronimo.assemble.executable') != null}">
+                    <j:set var="exe" value="${dependency.getProperty('geronimo.assemble.executable')}"/>
+                    <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">            
+                      &lt;executable&gt;${exe}&lt;/executable&gt;
+                    </j:file>
+                </j:if>
+                <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">
+                    &lt;/configuration&gt;
+                </j:file> 
+            </j:if>
+        </j:forEach>
+        <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" escapeText="false" trim="false" omitXmlDeclaration="true">
+           &lt;/configurations&gt;
+        </j:file>
     </goal>
 
     <goal name="assemble:jar-assembly" prereqs="assemble:assemble">

Modified: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.jelly?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.jelly (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.jelly Sat Jan 14 16:46:39 2006
@@ -43,7 +43,7 @@
         </fileScanner>
         <j:set var="GeronimoVersion" value="${geronimo_version}"/>
         <j:set var="InstallSource" value="${geronimo.assembly.dest}"/>
-        <j:set var="ReleaseNotesVersion" value="1.0-M5"/>
+        <j:set var="ReleaseNotesVersion" value="${release_notes_version}"/>
         <j:forEach var="installer" items="${installFiles.iterator()}">
             <j:set var="installerName" value="${installer.name}"/>
             <echo>Processing installer file ${installerName}</echo>
@@ -61,14 +61,15 @@
                 <ant:include name="STATUS"/>
             </ant:fileset>
         </ant:copy>
-
+        <!-- this dir is needed after install -->
+        <ant:mkdir dir="${geronimo.assembly.dest}/var/temp"/>
     </goal>
 
 
     <goal name="izpack:izpack-installer-build" prereqs="izpack:izpack-prepare" >
         <echo>IZPack installer build is running.</echo>
         <echo>IZPack Version is ${izpack_version}</echo>
-        <ant:java jar="${maven.repo.local}/izpack/jars/standalone-compiler-${izpack_version}.jar"
+        <ant:java jar="${maven.repo.local}/geronimo/jars/standalone-compiler-custom-${izpack_version}.jar"
               fork="true" >
            <arg value="${geronimo.assembly.dest}/geronimo-izpack.xml" />
            <arg value="-o" />

Modified: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml?rev=369138&r1=369137&r2=369138&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml Sat Jan 14 16:46:39 2006
@@ -37,8 +37,8 @@
             <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>izpack</groupId>
-            <artifactId>standalone-compiler</artifactId>
+            <groupId>geronimo</groupId>
+            <artifactId>standalone-compiler-custom</artifactId>
             <version>3.8.0</version>
         </dependency>
     </dependencies>



Mime
View raw message