You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/07 21:38:09 UTC
svn commit: r354848 - in /geronimo/trunk: assemblies/j2ee-installer/
assemblies/j2ee-installer/src/izpack/
assemblies/j2ee-installer/src/var/config/ plugins/geronimo-assembly-plugin/
plugins/geronimo-izpack-plugin/
Author: djencks
Date: Wed Dec 7 12:38:03 2005
New Revision: 354848
URL: http://svn.apache.org/viewcvs?rev=354848&view=rev
Log:
GERONIMO-1193. Applied patch with slight modifications. Improves assembly and izpack plugins, and the izpack config files in the installer assembly
Modified:
geronimo/trunk/assemblies/j2ee-installer/maven.xml
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
geronimo/trunk/assemblies/j2ee-installer/src/izpack/izpack-process.xml
geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly
Modified: geronimo/trunk/assemblies/j2ee-installer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/maven.xml?rev=354848&r1=354847&r2=354848&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/maven.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/maven.xml Wed Dec 7 12:38:03 2005
@@ -25,7 +25,10 @@
<!-- replace the assemble:install goal with jelly code to build the installer -->
<goal name="assemble:install">
- <attainGoal name="assemble:assemble-to-repo"/>
+<!-- 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"/>
<!-- build the izpack installer here -->
<attainGoal name="izpack:izpack-installer-build"/>
</goal>
Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=354848&r1=354847&r2=354848&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Wed Dec 7 12:38:03 2005
@@ -170,6 +170,24 @@
<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>
+ </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>webconsole-jetty</artifactId>
Modified: geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml?rev=354848&r1=354847&r2=354848&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml Wed Dec 7 12:38:03 2005
@@ -86,6 +86,9 @@
<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"/>
+ <executable targetfile="$INSTALL_PATH/bin/startup.sh" type="bin" stage="never" />
+ <executable targetfile="$INSTALL_PATH/bin/shutdown.sh" type="bin" stage="never" />
+ <executable targetfile="$INSTALL_PATH/bin/deploy.sh" type="bin" stage="never" />
</pack>
<pack name="J2EE Features" required="no" preselected="yes">
<!-- o/o/g/RMINaming -->
Modified: geronimo/trunk/assemblies/j2ee-installer/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/izpack/izpack-process.xml?rev=354848&r1=354847&r2=354848&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/izpack/izpack-process.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/izpack/izpack-process.xml Wed Dec 7 12:38:03 2005
@@ -1,6 +1,17 @@
<?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"/>
+ </job>
+ <!-- old processing
<job name="Activating RMI naming configuration">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -52,7 +63,7 @@
<executeForPack name="J2EE Features"/>
</job>
- <!-- corba -->
+ <xx !-- corba --xx>
<job name="Activating base J2EE configuration">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -64,7 +75,7 @@
<executeForPack name="CORBA Features"/>
</job>
- <!-- jms -->
+ <xx!-- jms --xx>
<job name="Activating JMS broker">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -86,7 +97,7 @@
<executeForPack name="JMS Features"/>
</job>
- <!-- Jetty -->
+ <xx!-- Jetty --xx>
<job name="Activating Jetty Web Container">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -108,7 +119,7 @@
<executeForPack name="Jetty Web Container"/>
</job>
- <!-- Jetty Welcome app -->
+ <xx!-- Jetty Welcome app --xx>
<job name="Activating Jetty Welcome Application">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -120,7 +131,7 @@
<executeForPack name="Jetty Welcome Application"/>
</job>
- <!-- Jetty Web Management Console -->
+ <xx!-- Jetty Web Management Console --xx>
<job name="Activating Jetty Web management console">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -132,7 +143,7 @@
<executeForPack name="Jetty Web Management Console"/>
</job>
- <!-- Jetty UDDI Server -->
+ <xx!-- Jetty UDDI Server --xx>
<job name="Activating Jetty UDDI server">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -144,7 +155,7 @@
<executeForPack name="Jetty UDDI Server"/>
</job>
- <!-- Tomcat -->
+ <xx!-- Tomcat --xx>
<job name="Activating Tomcat Web Container">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -166,7 +177,7 @@
<executeForPack name="Tomcat Web Container"/>
</job>
- <!-- Tomcat Welcome app -->
+ <xx!-- Tomcat Welcome app --xx>
<job name="Activating Tomcat Welcome Application">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -178,7 +189,7 @@
<executeForPack name="Tomcat Welcome Application"/>
</job>
- <!-- Tomcat Web Management Console -->
+ <xx!-- Tomcat Web Management Console --xx>
<job name="Activating Tomcat Web management console">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -190,7 +201,7 @@
<executeForPack name="Tomcat Web Management Console"/>
</job>
- <!-- Tomcat UDDI Server -->
+ <xx!-- Tomcat UDDI Server --xx>
<job name="Activating Tomcat UDDI server">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -202,7 +213,7 @@
<executeForPack name="Tomcat UDDI Server"/>
</job>
- <!-- LDAP Server -->
+ <xx!-- LDAP Server --xx>
<job name="Activating LDAP server">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -214,7 +225,7 @@
<executeForPack name="LDAP Server"/>
</job>
- <!-- Sample Database Pool -->
+ <xx!-- Sample Database Pool --xx>
<job name="Activating sample database pool">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -226,7 +237,7 @@
<executeForPack name="Sample Database Pool"/>
</job>
- <!-- Spring Integration -->
+ <xx!-- Spring Integration --xx>
<job name="Activating Spring integration">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -249,7 +260,7 @@
<executeForPack name="Spring Integration"/>
</job>
- <!-- JMX Debug Web Application -->
+ <xx!-- JMX Debug Web Application --xx>
<job name="Activating JMX debug application">
<executefile name="$JAVA_HOME/bin/java">
<arg>-classpath</arg>
@@ -260,6 +271,7 @@
</executefile>
<executeForPack name="JMX Debug Web Application"/>
</job>
+ -->
<!-- Demo Web Application -->
<!-- <job name="Activating sample security realm">-->
Modified: geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml?rev=354848&r1=354847&r2=354848&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml Wed Dec 7 12:38:03 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
- <configuration name="geronimo/cars/rmi-naming-${pom.currentVersion}.car">
+ <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
<gbean name="RMIRegistry">
<attribute name="port">${PlanNamingPort}</attribute>
</gbean>
@@ -10,13 +10,13 @@
<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/j2ee-server-${pom.currentVersion}.car">
+ <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
<gbean name="openejb:type=NetworkService,name=EJB">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanOpenEJBPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/j2ee-security-${pom.currentVersion}.car">
+ <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
<gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -25,7 +25,7 @@
<attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/j2ee-corba-${pom.currentVersion}.car" load="false">
+ <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
<gbean name="NameServer">
<attribute name="dbDir">var/cosnaming.db</attribute>
<attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -37,26 +37,26 @@
<attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/activemq-broker-${pom.currentVersion}.car">
+ <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
<gbean name="ActiveMQ.tcp.default">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanActiveMQPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/activemq-${pom.currentVersion}.car"/>
- <configuration name="geronimo/cars/system-database-${pom.currentVersion}.car">
+ <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/system-database/${pom.currentVersion}/car">
<gbean name="DerbyNetwork">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanDerbyPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/directory-${pom.currentVersion}.car">
+ <configuration name="geronimo/directory/${pom.currentVersion}/car">
<gbean name="geronimo.server:name=DirectoryService">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanLdapPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/jetty-${pom.currentVersion}.car">
+ <configuration name="geronimo/jetty/${pom.currentVersion}/car">
<gbean name="JettyWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -67,8 +67,8 @@
<attribute name="port">${PlanHTTPSPortPrimary}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"/>
- <configuration name="geronimo/cars/j2ee-deployer-${pom.currentVersion}.car">
+ <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
<gbean name="WebBuilder">
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
</gbean>
@@ -76,8 +76,10 @@
<attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/jetty-deployer-${pom.currentVersion}.car"/>
- <configuration name="geronimo/cars/welcome-jetty-${pom.currentVersion}.car"/>
- <configuration name="geronimo/cars/webconsole-jetty-${pom.currentVersion}.car"/>
- <configuration name="geronimo/cars/uddi-jetty-${pom.currentVersion}.car"/>
+ <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
+ <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"/>
</attributes>
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=354848&r1=354847&r2=354848&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Wed Dec 7 12:38:03 2005
@@ -221,7 +221,9 @@
<goal name="assemble:assemble-to-repo" prereqs="assemble:assemble-prepare" description="Assemble a Geronimo installation">
<attainGoal name="assemble:assemble-repository"/>
<attainGoal name="assemble:assemble-lib"/>
+ <attainGoal name="assemble:assemble-unpack"/>
<attainGoal name="assemble:assemble-configurations-to-repo"/>
+ <attainGoal name="assemble:assemble-schemas"/>
</goal>
<goal name="assemble:jar-assembly" prereqs="assemble:assemble">
Modified: geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly?rev=354848&r1=354847&r2=354848&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly Wed Dec 7 12:38:03 2005
@@ -62,78 +62,6 @@
</ant:fileset>
</ant:copy>
- <!-- Add XML schemas -->
- <ant:mkdir dir="${geronimo.assembly.dest}/schema"/>
- <ant:copy todir="${geronimo.assembly.dest}/schema" flatten="true">
- <ant:fileset dir="${project.root}/modules/j2ee-schema">
- <ant:include name="src/j2ee_1_4schema/*.xsd"/>
- <ant:include name="src/j2ee_1_3dtd/*.dtd"/>
- <ant:include name="src/j2ee_1_2dtd/*.dtd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/deployment">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/j2ee-builder">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/web-builder">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/jetty-builder">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/tomcat-builder">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/connector-builder">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/naming-builder">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/security-builder">
- <ant:include name="src/schema/geronimo*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/service-builder">
- <ant:include name="src/schema/geronimo*.xsd"/>
- </ant:fileset>
- <ant:fileset dir="${project.root}/modules/client-builder">
- <ant:include name="src/schema/*.xsd"/>
- </ant:fileset>
- <!--ant:fileset dir="src/etc"/-->
- </ant:copy>
-
- <!-- extract XML schemas from OpenEJB jars -->
- <ant:unzip src="${maven.repo.local}/openejb/jars/openejb-pkgen-builder-${openejb_version}.jar"
- dest="${geronimo.assembly.dest}">
- <ant:patternset>
- <ant:include name="META-INF/schema/openejb-pkgen*.xsd"/>
- </ant:patternset>
- </ant:unzip>
- <ant:unzip src="${maven.repo.local}/openejb/jars/openejb-builder-${openejb_version}.jar"
- dest="${geronimo.assembly.dir}">
- <ant:patternset>
- <ant:include name="META-INF/schema/openejb-jar*.xsd"/>
- <ant:include name="META-INF/schema/corba-css-config*.xsd"/>
- <ant:include name="META-INF/schema/corba-tss-config*.xsd"/>
- </ant:patternset>
- </ant:unzip>
- <ant:move todir="${geronimo.assembly.dest}/schema">
- <ant:fileset dir="${geronimo.assembly.dest}/META-INF/schema">
- <ant:include name="*.xsd"/>
- </ant:fileset>
- </ant:move>
- <ant:delete dir="${geronimo.assembly.dest}/META-INF"/>
-
- <!-- Write out a copy of config.xml with substitution variables intact -->
- <!--
- <velocity:merge basedir="${basedir}/src/var/config"
- template="config.xml"
- name="${geronimo.assembly.dest}/var/config/config.xml"/>
-
- <ant:echo file="${geronimo.assembly.dest}/var/security/users.properties" message="$${SecurityDefaultUser}=$${SecurityDefaultPassword}"/>
- <ant:echo file="${geronimo.assembly.dest}/var/security/groups.properties" message="admin=$${SecurityDefaultUser}"/>
- -->
</goal>