geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r355014 - in /geronimo/trunk: assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml assemblies/j2ee-installer/src/var/config/config.xml plugins/geronimo-izpack-plugin/plugin.jelly
Date Thu, 08 Dec 2005 06:50:53 GMT
Author: djencks
Date: Wed Dec  7 22:50:45 2005
New Revision: 355014

URL: http://svn.apache.org/viewcvs?rev=355014&view=rev
Log:
GERONIMO-1192 Some fixes for the izpack plugin and installer assembly

Modified:
    geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
    geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
    geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly

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=355014&r1=355013&r2=355014&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 22:50:45
2005
@@ -22,7 +22,7 @@
         <res id="LicencePanel.licence" src="${InstallSource}/LICENSE.txt"/>
 	<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="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" />
@@ -60,7 +60,7 @@
         <panel classname="UserInputPanel"/>
 	<panel classname="UserInputPanel"/>
         <panel classname="InstallPanel"/>
-        <panel classname="ProcessPanel"/>
+<!--        <panel classname="ProcessPanel"/> -->
         <panel classname="InfoPanel"/>
         <panel classname="FinishPanel"/>
     </panels>

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=355014&r1=355013&r2=355014&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 22:50:45
2005
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car" load="true">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -73,6 +73,12 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
+    <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"/>
     <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
@@ -82,10 +88,28 @@
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
-    <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"/>
+    <configuration name="geronimo/tomcat/${pom.currentVersion}/car" load="false">
+        <gbean name="TomcatResources"/>
+        <gbean name="TomcatWebConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+        <gbean name="TomcatAJPConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanAJPPortPrimary}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+        <gbean name="TomcatWebSSLConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="false"/>
+    <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"/>
+
 </attributes>

Modified: geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly?rev=355014&r1=355013&r2=355014&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly Wed Dec  7 22:50:45 2005
@@ -72,8 +72,10 @@
               fork="true" >
            <arg value="${geronimo.assembly.dest}/geronimo-izpack.xml" />
            <arg value="-o" />
-           <arg value="${geronimo.assembly.dest}/geronimo-installer.jar" />
+           <arg value="${maven.build.dir}/geronimo-installer-${pom.currentVersion}.jar"
/>
         </ant:java>
-
+        <ant:copy file="${maven.build.dir}/geronimo-installer-${pom.currentVersion}.jar"
todir="${maven.repo.local}/${pom.groupId}/distributions" />
+        <checksum file="${maven.repo.local}/${pom.groupId}/distributions/geronimo-installer-${pom.currentVersion}.jar"
algorithm="MD5" />
+        <checksum file="${maven.repo.local}/${pom.groupId}/distributions/geronimo-installer-${pom.currentVersion}.jar"
algorithm="SHA" />
     </goal>
 </project>



Mime
View raw message