geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r373707 - in /geronimo/trunk: assemblies/j2ee-installer/src/izpack/ modules/installer-support/ modules/installer-support/src/images/ modules/installer-support/src/images/img/
Date Tue, 31 Jan 2006 05:04:42 GMT
Author: jsisson
Date: Mon Jan 30 21:04:06 2006
New Revision: 373707

URL: http://svn.apache.org/viewcvs?rev=373707&view=rev
Log:
GERONIMO-1544 - Apply Erik's patch to resolve licensing issues with IzPack components.  Thanks
Erik! (merged from 1.0 branch)

Added:
    geronimo/trunk/modules/installer-support/src/images/
      - copied from r373702, geronimo/branches/1.0/modules/installer-support/src/images/
    geronimo/trunk/modules/installer-support/src/images/img/
      - copied from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/
    geronimo/trunk/modules/installer-support/src/images/img/JFrameIcon.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/JFrameIcon.png
    geronimo/trunk/modules/installer-support/src/images/img/README
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/README
    geronimo/trunk/modules/installer-support/src/images/img/ascii.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/ascii.png
    geronimo/trunk/modules/installer-support/src/images/img/bookmark.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/bookmark.png
    geronimo/trunk/modules/installer-support/src/images/img/check32.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/check32.png
    geronimo/trunk/modules/installer-support/src/images/img/compfile.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/compfile.png
    geronimo/trunk/modules/installer-support/src/images/img/contents.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/contents.png
    geronimo/trunk/modules/installer-support/src/images/img/edit.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/edit.png
    geronimo/trunk/modules/installer-support/src/images/img/empty.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/empty.png
    geronimo/trunk/modules/installer-support/src/images/img/error.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/error.png
    geronimo/trunk/modules/installer-support/src/images/img/exit.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/exit.png
    geronimo/trunk/modules/installer-support/src/images/img/fileopen.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/fileopen.png
    geronimo/trunk/modules/installer-support/src/images/img/flag.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/flag.png
    geronimo/trunk/modules/installer-support/src/images/img/floppy.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/floppy.png
    geronimo/trunk/modules/installer-support/src/images/img/folder.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/folder.png
    geronimo/trunk/modules/installer-support/src/images/img/folder_new.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/folder_new.png
    geronimo/trunk/modules/installer-support/src/images/img/hdd.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/hdd.png
    geronimo/trunk/modules/installer-support/src/images/img/help.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/help.png
    geronimo/trunk/modules/installer-support/src/images/img/home.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/home.png
    geronimo/trunk/modules/installer-support/src/images/img/idea.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/idea.png
    geronimo/trunk/modules/installer-support/src/images/img/info.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/info.png
    geronimo/trunk/modules/installer-support/src/images/img/kcontrol.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/kcontrol.png
    geronimo/trunk/modules/installer-support/src/images/img/leftarrow.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/leftarrow.png
    geronimo/trunk/modules/installer-support/src/images/img/link16x16.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/link16x16.png
    geronimo/trunk/modules/installer-support/src/images/img/messagebox_info.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/messagebox_info.png
    geronimo/trunk/modules/installer-support/src/images/img/messagebox_warning.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/messagebox_warning.png
    geronimo/trunk/modules/installer-support/src/images/img/package.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/package.png
    geronimo/trunk/modules/installer-support/src/images/img/question.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/question.png
    geronimo/trunk/modules/installer-support/src/images/img/rightarrow.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/rightarrow.png
    geronimo/trunk/modules/installer-support/src/images/img/stop.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/stop.png
    geronimo/trunk/modules/installer-support/src/images/img/trash.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/trash.png
    geronimo/trunk/modules/installer-support/src/images/img/uparrow.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/uparrow.png
    geronimo/trunk/modules/installer-support/src/images/img/view_detailed.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/view_detailed.png
    geronimo/trunk/modules/installer-support/src/images/img/view_icon.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/view_icon.png
    geronimo/trunk/modules/installer-support/src/images/img/wizard.png
      - copied unchanged from r373702, geronimo/branches/1.0/modules/installer-support/src/images/img/wizard.png
Modified:
    geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
    geronimo/trunk/modules/installer-support/maven.xml

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=373707&r1=373706&r2=373707&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml Mon Jan 30 21:04:06
2006
@@ -18,10 +18,17 @@
        <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">
+    <guiprefs width="680" height="500" resizable="yes">
+       <modifier key="useButtonIcons" value="no" />
+       <modifier key="useLabelIcons" value="no" />
+       <!--laf name="looks">
           <os family="unix"/>
+          <param name="variant" value="plastic" />
        </laf>
+       <laf name="looks">
+           <os family="windows" />
+           <param name="variant" value="plastic" />
+       </laf-->
     </guiprefs>
     <locale>
         <langpack iso3="eng"/>

Modified: geronimo/trunk/modules/installer-support/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/installer-support/maven.xml?rev=373707&r1=373706&r2=373707&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-support/maven.xml (original)
+++ geronimo/trunk/modules/installer-support/maven.xml Mon Jan 30 21:04:06 2006
@@ -40,13 +40,62 @@
             so it will be ready to receive the ValidatePackSelections.jar
        -->
        <ant:copy file="${maven.repo.local}/izpack/jars/standalone-compiler-${izpack_version}.jar"
tofile="${maven.build.dir}/standalone-compiler-custom-${izpack_version}.jar" />
-       <!-- slip the bin/panels/ValidatePackSelections.jar into
+       <!-- overwrite the icons in the jar with Apache License compliant
+               versions.  These icons are modified versions of the
+               icons shipped with the Apache HTTP server
+               The icons in /img are actually not used, but we write
+               over them anyway
+       -->
+      <ant:jar destfile="${maven.build.dir}/standalone-compiler-custom-${izpack_version}.jar"
+               basedir="${maven.src.dir}/images"
+               includes="**/*"
+               update="true" >
+      </ant:jar>
+      <!-- Continuing the icon licensing saga. extract lib/installer.jar
+           from standalone compiler. Overwrite the icons in that jar too.
+           These are the ones actually used in the installer.
+           Then, put the installer.jar back into the standalone compiler.
+
+           Do the same for uninstaller.jar too.
+
+      -->
+      <ant:unjar
+         src="${maven.build.dir}/standalone-compiler-custom-${izpack_version}.jar"
+         dest="${maven.build.dir}/tmp" >
+         <patternset>
+           <include name="**/installer.jar"/>
+           <include name="**/uninstaller.jar"/>
+         </patternset>
+      </ant:unjar>
+       <!-- overwrite the icons in the installer.jar 
+               with Apache License compliant
+               versions.  These icons are modified versions of the
+               icons shipped with the Apache HTTP server
+               The icons in /img are actually not used
+       -->
+      <ant:jar destfile="${maven.build.dir}/tmp/lib/installer.jar"
+               basedir="${maven.src.dir}/images"
+               includes="**/*"
+               update="true" >
+      </ant:jar>
+       <!-- overwrite the icons in the uninstaller.jar 
+               with Apache License compliant
+               versions.  These icons are modified versions of the
+               icons shipped with the Apache HTTP server
+               The icons in /img are actually not used
+       -->
+      <ant:jar destfile="${maven.build.dir}/tmp/lib/uninstaller.jar"
+               basedir="${maven.src.dir}/images"
+               includes="**/*"
+               update="true" >
+      </ant:jar>
+       <!-- slip the jars into
               the standalone-compiler jar
               don't forget "update" or it's screwed
        -->
        <ant:jar destfile="${maven.build.dir}/standalone-compiler-custom-${izpack_version}.jar"
                 basedir="${maven.build.dir}/tmp"
-                includes="**/ValidatePackSelections.jar"
+                includes="**/*.jar"
                 update="true" >
        </ant:jar>
        <!--



Mime
View raw message