You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/05/14 17:10:13 UTC
svn commit: r170141 - in /geronimo/trunk/modules/assembly: maven.xml
src/izpack/geronimo-izpack.xml src/izpack/izpack-user-input.xml
Author: ammulder
Date: Sat May 14 08:10:12 2005
New Revision: 170141
URL: http://svn.apache.org/viewcvs?rev=170141&view=rev
Log:
Include security info in installer package
Spread out the config settings a bit more so they fit on their
allotted screens
Tomcat settings only necessary if Tomcat was selected
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml
geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=170141&r1=170140&r2=170141&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Sat May 14 08:10:12 2005
@@ -296,9 +296,16 @@
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>
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=170141&r1=170140&r2=170141&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml Sat May 14 08:10:12 2005
@@ -27,6 +27,7 @@
<panel classname="PacksPanel"/>
<panel classname="UserInputPanel"/>
<panel classname="UserInputPanel"/>
+ <panel classname="UserInputPanel"/>
<panel classname="InstallPanel"/>
<panel classname="ProcessPanel"/>
<panel classname="InfoPanel"/>
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=170141&r1=170140&r2=170141&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml Sat May 14 08:10:12 2005
@@ -19,17 +19,6 @@
<spec txt="Hostname:" size="50" set="localhost" />
<createForPack name="Server" />
</field>
- <field type="text" variable="PlanClientAddresses">
- <description txt="Client addresses the server should accept connections from" />
- <spec txt="Clients:" size="50" set="127.0.0.1" />
- <createForPack name="Server" />
- </field>
- <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" />
- <validator class="com.izforge.izpack.util.NotEmptyValidator" />
- <createForPack name="Server" />
- </field>
<field type="rule" variable="PlanJettyHTTPPort">
<description txt="The standard network port that the web container should use" />
<spec txt="HTTP Port:" layout="N:5:5" set="0:8080" />
@@ -42,29 +31,28 @@
<validator class="com.izforge.izpack.util.NotEmptyValidator" />
<createForPack name="J2EE Features" />
</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" />
- <validator class="com.izforge.izpack.util.NotEmptyValidator" />
- <createForPack name="J2EE Features" />
- </field>
</panel>
<panel order="1">
- <field type="title" txt="Service Configuration" />
- <field type="staticText" txt="Please configure any supplementary services"/>
+ <field type="title" txt="EJB/IIOP Configuration" />
+ <field type="staticText" txt="Please configure network ports for EJB clients"/>
<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" />
+ <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" />
<validator class="com.izforge.izpack.util.NotEmptyValidator" />
- <createForPack name="J2EE Features" />
+ <createForPack name="Server" />
</field>
- <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" />
+ <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" />
<validator class="com.izforge.izpack.util.NotEmptyValidator" />
<createForPack name="J2EE Features" />
</field>
+ <field type="text" variable="PlanClientAddresses">
+ <description txt="IP addresses the server should accept EJB client connections from" />
+ <spec txt="Clients:" size="50" set="127.0.0.1" />
+ <createForPack name="J2EE Features" />
+ </field>
<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" />
@@ -83,23 +71,40 @@
<validator class="com.izforge.izpack.util.NotEmptyValidator" />
<createForPack name="J2EE Features" />
</field>
+ </panel>
+ <panel order="2">
+ <field type="title" txt="Service Configuration" />
+ <field type="staticText" txt="Please configure additional 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" />
+ <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+ <createForPack name="J2EE Features" />
+ </field>
+ <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" />
+ <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="J2EE Features" />
+ <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="J2EE Features" />
+ <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="J2EE Features" />
+ <createForPack name="Tomcat Web Container" />
</field>
</panel>
</userInput>