geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r225291 - in /geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack: geronimo-izpack.xml izpack-process.xml izpack-user-input.xml
Date Tue, 26 Jul 2005 12:38:13 GMT
Author: jsisson
Date: Tue Jul 26 05:37:56 2005
New Revision: 225291

URL: http://svn.apache.org/viewcvs?rev=225291&view=rev
Log:
GERONIMO-811 Remove Tomcat option from izpack installer for M4 release

Modified:
    geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/geronimo-izpack.xml
    geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-process.xml
    geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-user-input.xml

Modified: geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/geronimo-izpack.xml?rev=225291&r1=225290&r2=225291&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/geronimo-izpack.xml Tue Jul 26
05:37:56 2005
@@ -77,11 +77,6 @@
         <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"
/>

Modified: geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-process.xml?rev=225291&r1=225290&r2=225291&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-process.xml Tue Jul 26
05:37:56 2005
@@ -115,15 +115,6 @@
     </executefile>
     <executeForPack name="J2EE Features" />
   </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>
-    </executefile>
-    <executeForPack name="Tomcat Web Container" />
-  </job>
   <job name="Install JMX Debug Tool Web App Configuration">
     <executefile name="$JAVA_HOME/bin/java">
       <arg>-jar</arg>

Modified: geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-user-input.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-user-input.xml?rev=225291&r1=225290&r2=225291&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-user-input.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/assembly/src/izpack/izpack-user-input.xml Tue Jul
26 05:37:56 2005
@@ -88,23 +88,5 @@
       <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>



Mime
View raw message