|
From: <man...@us...> - 2010-08-01 21:38:16
|
Revision: 5756
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5756&view=rev
Author: manningr
Date: 2010-08-01 21:38:10 +0000 (Sun, 01 Aug 2010)
Log Message:
-----------
Fixed duplicate DBDiff plugin izpack configuration which was causing the installer to fail (while maven install didn't expose this problem). Added an integration test to test that the installer is working correctly.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
Added Paths:
-----------
trunk/sql12/installer/squirrelsql-macosx-installer/src/test/
trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/
trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-08-01 20:05:32 UTC (rev 5755)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-08-01 21:38:10 UTC (rev 5756)
@@ -425,6 +425,18 @@
<outputDirectory>${staging.dir}/lib</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>unpack-update-site</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>squirrelsql-update-site</includeArtifactIds>
+ <!-- <includes>*.jar</includes>-->
+ <outputDirectory>${staging.dir}/update-site</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -452,6 +464,27 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-jar</argument>
+ <argument>target/squirrelsql-macosx-installer-${project.version}-standard.jar</argument>
+ <argument>src/test/resources/auto-install.xml</argument>
+ </arguments>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2010-08-01 20:05:32 UTC (rev 5755)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2010-08-01 21:38:10 UTC (rev 5756)
@@ -48,7 +48,7 @@
<panel
classname="InstallPanel" />
<panel
- classname="SimpleFinishPanel" />
+ classname="FinishPanel" />
</panels>
<packs>
<pack
@@ -68,19 +68,16 @@
<singlefile target="$INSTALL_PATH/Contents/Resources/Java/plugins/readme.txt"
src="launcher/plugins/readme.txt" />
-<!-- <singlefile-->
-<!-- target="$INSTALL_PATH/Contents/Resources/Java/update/release.xml"-->
-<!-- src="../../squirrel-sql-dist/release/release.xml" />-->
+ <singlefile target="$INSTALL_PATH/Contents/Resources/Java/update/release.xml"
+ src="update-site/release.xml" />
<file targetdir="$INSTALL_PATH/Contents/Resources/Java" src="doc" />
-<!-- <file targetdir="$INSTALL_PATH/Contents/Resources/Java/doc" src="../../sql12/web-site/faq.html" />-->
-
-<!-- <fileset-->
-<!-- targetdir="$INSTALL_PATH/Contents/Resources/Java/doc/images"-->
-<!-- dir="../../sql12/web-site/images">-->
-<!-- <include-->
-<!-- name="*.*" />-->
+<!-- <file targetdir="$INSTALL_PATH/Contents/Resources/Java/doc" -->
+<!-- src="../../sql12/web-site/faq.html" />-->
+<!-- -->
+<!-- <fileset targetdir="$INSTALL_PATH/Contents/Resources/Java/doc/images" dir="doc/images">-->
+<!-- <include name="*.*" />-->
<!-- </fileset>-->
<file targetdir="$INSTALL_PATH/Contents/Resources" src="classes/acorn.icns" />
@@ -187,22 +184,9 @@
installGroups="OptionalPlugins"
name="Optional Plugin - DBDiff">
<description>This optional plugin lets you compare table structure from one database session to another</description>
- <file
- targetdir="$INSTALL_PATH/Contents/Resources/Java/plugins"
- src="plugins/dbdiff" />
- <file
- targetdir="$INSTALL_PATH/Contents/Resources/Java/plugins"
- src="plugins/dbdiff.jar" />
- </pack>
- <pack
- required="no"
- preselected="no"
- installGroups="OptionalPlugins"
- name="Optional Plugin - DBDiff">
- <description>This optional plugin lets you compare table structure from one database session to another</description>
<file targetdir="$INSTALL_PATH/Contents/Resources/Java/plugins" src="plugins/dbdiff" />
<file targetdir="$INSTALL_PATH/Contents/Resources/Java/plugins" src="plugins/dbdiff.jar" />
- </pack>
+ </pack>
<pack
required="no"
preselected="no"
Added: trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml (rev 0)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml 2010-08-01 21:38:10 UTC (rev 5756)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
+<com.izforge.izpack.panels.HTMLInfoPanel id="UNKNOWN (com.izforge.izpack.panels.HTMLInfoPanel)"/>
+<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
+<installpath>target/squirrel-install-from-maven</installpath>
+</com.izforge.izpack.panels.TargetPanel>
+<com.izforge.izpack.panels.PacksPanel id="UNKNOWN (com.izforge.izpack.panels.PacksPanel)">
+<pack index="0" name="Base" selected="true"/>
+<pack index="1" name="Standard" selected="true"/>
+<pack index="2" name="Optional Plugin - Data import" selected="true"/>
+<pack index="3" name="Optional Plugin - DBCopy" selected="true"/>
+<pack index="4" name="Optional Plugin - DBDiff" selected="true"/>
+<pack index="5" name="Optional Plugin - DB2" selected="true"/>
+<pack index="6" name="Optional Plugin - Derby" selected="true"/>
+<pack index="7" name="Optional Plugin - Firebird " selected="true"/>
+<pack index="8" name="Optional Plugin - Hibernate" selected="true"/>
+<pack index="9" name="Optional Plugin - H2 " selected="true"/>
+<pack index="10" name="Optional Plugin - Informix " selected="true"/>
+<pack index="11" name="Optional Plugin - Microsoft SQL Server " selected="true"/>
+<pack index="12" name="Optional Plugin - MySQL " selected="true"/>
+<pack index="13" name="Optional Plugin - Netezza " selected="true"/>
+<pack index="14" name="Optional Plugin - Oracle" selected="true"/>
+<pack index="15" name="Optional Plugin - PostgreSQL " selected="true"/>
+<pack index="16" name="Optional Plugin - Refactoring" selected="true"/>
+<pack index="17" name="Optional Plugin - Session Scripts" selected="true"/>
+<pack index="18" name="Optional Plugin - Smart Tools " selected="true"/>
+<pack index="19" name="Optional Plugin - SQL Parametrisation " selected="true"/>
+<pack index="20" name="Optional Plugin - SQL Replace " selected="true"/>
+<pack index="21" name="Optional Plugin - SQL Validator " selected="true"/>
+<pack index="22" name="Optional Plugin - Sybase " selected="true"/>
+<pack index="23" name="Optional Plugin - Internationalization " selected="true"/>
+<pack index="24" name="Optional Translation - Brazilian Portuguese" selected="true"/>
+<pack index="25" name="Optional Translation - Bulgarian" selected="true"/>
+<pack index="26" name="Optional Translation - Czech" selected="true"/>
+<pack index="27" name="Optional Translation - Simplified Chinese" selected="true"/>
+<pack index="28" name="Optional Translation - French" selected="true"/>
+<pack index="29" name="Optional Translation - German" selected="true"/>
+<pack index="30" name="Optional Translation - Italian" selected="true"/>
+<pack index="31" name="Optional Translation - Korean" selected="true"/>
+<pack index="32" name="Optional Translation - Polish" selected="true"/>
+<pack index="33" name="Optional Translation - Russian" selected="true"/>
+<pack index="34" name="Optional Translation - Spanish" selected="true"/>
+</com.izforge.izpack.panels.PacksPanel>
+<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
+<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
+</AutomatedInstallation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
