[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6221] trunk/sql12/installer/ squirrelsql-other-installer

[<man...@us...>]

Revision: 6221
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6221&view=rev
Author:   manningr
Date:     2011-03-28 23:52:08 +0000 (Mon, 28 Mar 2011)

Log Message:
-----------
Give the installer test a little more time to connect to derby for connection test.  Removed firebird driver configuration from test aliases file since firebirdmanager plugin requires the firebird driver to be found using the system classloader.

Modified Paths:
--------------
    trunk/sql12/installer/squirrelsql-other-installer/pom.xml
    trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/user-settings-dir/SQLDrivers.xml

Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml	2011-03-28 20:42:37 UTC (rev 6220)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml	2011-03-28 23:52:08 UTC (rev 6221)
@@ -557,7 +557,7 @@
 										<argument>-userdir</argument>
 										<argument>${project.build.directory}/test-classes/user-settings-dir</argument>
 										<argument>-s</argument>
-										<argument>20</argument>
+										<argument>60</argument>
 									</arguments>
 								</configuration>
 								<phase>integration-test</phase>

Modified: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/user-settings-dir/SQLDrivers.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/user-settings-dir/SQLDrivers.xml	2011-03-28 20:42:37 UTC (rev 6220)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/user-settings-dir/SQLDrivers.xml	2011-03-28 23:52:08 UTC (rev 6221)
@@ -14,22 +14,4 @@
         <url>jdbc:derby:&lt;database&gt;[;create=true]</url>
         <websiteUrl>http://db.apache.org/derby</websiteUrl>
     </Bean>
-    <Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
-        <driverClassName>org.firebirdsql.jdbc.FBDriver</driverClassName>
-        <identifier Class="net.sourceforge.squirrel_sql.fw.id.UidIdentifier">
-            <string>-28</string>
-        </identifier>
-        <jarFileName/>
-        <jarFileNames Indexed="true">
-            <Bean Class="net.sourceforge.squirrel_sql.fw.util.beanwrapper.StringWrapper">
-                <string>${project.build.directory}/firebird-driver/jaybird-jdk16.jar</string>
-            </Bean>
-            <Bean Class="net.sourceforge.squirrel_sql.fw.util.beanwrapper.StringWrapper">
-                <string>${project.build.directory}/firebird-driver/geronimo-spec-j2ee-connector.jar</string>
-            </Bean>            
-        </jarFileNames>
-        <name>Firebird JayBird</name>
-        <url>jdbc:firebirdsql:[//host[:port]/]&lt;database&gt;</url>
-        <websiteUrl>http://www.firebirdsql.org</websiteUrl>
-    </Bean>    
 </Beans>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.