geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r437798 - /geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
Date Mon, 28 Aug 2006 19:38:32 GMT
Author: djencks
Date: Mon Aug 28 12:38:31 2006
New Revision: 437798

URL: http://svn.apache.org/viewvc?rev=437798&view=rev
Log:
GERONIMO-2326 Fix tranql-connector version, use rars for derby local tx

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java?rev=437798&r1=437797&r2=437798&view=diff
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
Mon Aug 28 12:38:31 2006
@@ -30,47 +30,49 @@
     /**
      * todo: EVIL!!!  Should be replaced with something, somehow!
      */
-    private final static String TRANQL_RAR_NAME = "tranql/tranql-connector/1.1/rar";
-    private final static String DERBY_EMBEDDED_RAR_NAME = "tranql/tranql-connector-derby-embed-xa/1.1/rar";
-    private final static String DERBY_NETWORK_RAR_NAME = "tranql/tranql-connector-derby-client-xa/1.1/rar";
+    private final static String TRANQL_RAR_NAME = "tranql/tranql-connector/1.2/rar";
+    private final static String DERBY_EMBEDDED_LOCAL_RAR_NAME = "tranql/tranql-connector-derby-embed-local/1.1/rar";
+    private final static String DERBY_NETWORK_LOCAL_RAR_NAME = "tranql/tranql-connector-derby-client-local/1.1/rar";
+    private final static String DERBY_EMBEDDED_XA_RAR_NAME = "tranql/tranql-connector-derby-embed-xa/1.1/rar";
+    private final static String DERBY_NETWORK_XA_RAR_NAME = "tranql/tranql-connector-derby-client-xa/1.1/rar";
 
     //todo: Load this from a config file or something
     public static final DatabaseInfo[] ALL_DATABASES = new DatabaseInfo[]{
-        new DatabaseInfo("DaffodilDB Embedded","jdbc:daffodilDB_embedded:<Database>","in.co.daffodil.db.jdbc.DaffodilDBDriver"),
-        new DatabaseInfo("DaffodilDB Server","jdbc:daffodilDB://<Host>:<Port>/<Database>","in.co.daffodil.db.rmi.RmiDaffodilDBDriver",
3456),
-        new DatabaseInfo("DB2","jdbc:db2://<Host>:<Port>/<Database>","com.ibm.db2.jcc.DB2Driver",
50000),
-        new DatabaseInfo("DB2 (DataDirect)","jdbc:datadirect:db2://<Host>:<Port>;DatabaseName=<Database>","com.ddtek.jdbc.db2.DB2Driver",
50000),
-        new DatabaseInfo("Derby embedded","jdbc:derby:<Database>","org.apache.derby.jdbc.EmbeddedDriver"),
-        new DatabaseInfo("Derby network","jdbc:derby://<Host>:<Port>/<Database>","org.apache.derby.jdbc.ClientDriver",
1527),
-        new DatabaseInfo("Derby embedded XA", DERBY_EMBEDDED_RAR_NAME),
-        new DatabaseInfo("Derby network XA", DERBY_NETWORK_RAR_NAME),
-        new DatabaseInfo("FrontBase","jdbc:FrontBase://<Host>:<Port>/<Database>","com.frontbase.jdbc.FBJDriver"),
-        new DatabaseInfo("HSQLDB embedded","jdbc:hsqldb:<Database>","org.hsqldb.jdbcDriver"),
-        new DatabaseInfo("HSQLDB server","jdbc:hsqldb:hsql://<Host>:<Port>/<Database>","org.hsqldb.jdbcDriver"),
-        new DatabaseInfo("Informix","jdbc:informix-sqli://<Host>:<Port>/<Database>:informixserver=<dbservername>","com.informix.jdbc.IfxDriver"),
-        new DatabaseInfo("Informix (DataDirect)","jdbc:datadirect:informix://<Host>:<Port>;informixServer=<dbservername>;DatabaseName=<Database>","com.ddtek.jdbc.informix.InformixDriver"),
-        new DatabaseInfo("InterSystems Cache","jdbc:Cache://<Host>:<Port>/<namespace>","com.intersys.jdbc.CacheDriver"),
-        new DatabaseInfo("JDataStore","jdbc:borland:dslocal:<file>","com.borland.datastore.jdbc.DataStoreDriver"),
-        new DatabaseInfo("JDBC/ODBC Bridge","jdbc:odbc:<datasource>","sun.jdbc.odbc.JdbcOdbcDriver"),
-        new DatabaseInfo("McKoi embedded","jdbc:mckoi:local://<ConfigPath>/<Schema>/","com.mckoi.JDBCDriver"),
-        new DatabaseInfo("McKoi server","jdbc:mckoi://<Host>:<Port>/<Schema>/","com.mckoi.JDBCDriver"),
-        new DatabaseInfo("Mimer","jdbc:mimer://<Host>:<Port>/<Database>","com.mimer.jdbc.Driver"),
-        new DatabaseInfo("MySQL","jdbc:mysql://<Host>:<Port>/<Database>","com.mysql.jdbc.Driver",
3306),
-        new DatabaseInfo("Oracle Thin","jdbc:oracle:thin:@<Host>:<Port>:<SID>","oracle.jdbc.OracleDriver",
1521),
-        new DatabaseInfo("Oracle OCI","jdbc:oracle:oci:@<Host>:<Port>:<SID>","oracle.jdbc.OracleDriver",
1521),
-        new DatabaseInfo("Oracle (DataDirect)","jdbc:datadirect:oracle://<Host>:<Port>;ServiceName=<SID>","com.ddtek.jdbc.oracle.OracleDriver",
1521),
-        new DatabaseInfo("Pervasive","jdbc:pervasive://<Host>:<Port>/<Database>","com.pervasive.jdbc.v2.Driver"),
-        new DatabaseInfo("Pointbase server","jdbc:pointbase:server://<Host>:<Port>/<Database>","com.pointbase.jdbc.jdbcUniversalDriver"),
-        new DatabaseInfo("PostgreSQL","jdbc:postgresql://<Host>:<Port>/<Database>","org.postgresql.Driver",
5432),
-        new DatabaseInfo("Progress","jdbc:jdbcProgress:T:<Host>:<Port>:<Database>","com.progress.sql.jdbc.JdbcProgressDriver"),
-        new DatabaseInfo("MaxDB","jdbc:sapdb://<Host>:<Port>/<Database>","com.sap.dbtech.jdbc.DriverSapDB"),
-        new DatabaseInfo("SQL Server","jdbc:microsoft:sqlserver://<Host>:<Port>;DatabaseName=<Database>","com.microsoft.jdbc.sqlserver.SQLServerDriver",
1433),
-        new DatabaseInfo("SQL Server (jTDS)","jdbc:jtds:sqlserver://<Host>:<Port>;DatabaseName=<Database>","net.sourceforge.jtds.jdbc.Driver",
1433),
-        new DatabaseInfo("SQL Server (DataDirect)","jdbc:datadirect:sqlserver://<Host>:<Port>;DatabaseName=<Database>","com.ddtek.jdbc.sqlserver.SQLServerDriver",
1433),
-        new DatabaseInfo("Sybase ASE","jdbc:sybase:Tds:<Host>:<Port>/<Database>","com.sybase.jdbc3.jdbc.SybDriver",
2048),
-        new DatabaseInfo("Sybase ASA","jdbc:sybase:Tds:<Host>:<Port>/<Database>","com.sybase.jdbc3.jdbc.SybDriver",
2638),
-        new DatabaseInfo("Sybase (DataDirect)","jdbc:datadirect:sybase://<Host>:<Port>;DatabaseName=<Database>","com.ddtek.jdbc.sybase.SybaseDriver"),
-        new DatabaseInfo("Other","",""),
+            new DatabaseInfo("DaffodilDB Embedded", "jdbc:daffodilDB_embedded:<Database>",
"in.co.daffodil.db.jdbc.DaffodilDBDriver"),
+            new DatabaseInfo("DaffodilDB Server", "jdbc:daffodilDB://<Host>:<Port>/<Database>",
"in.co.daffodil.db.rmi.RmiDaffodilDBDriver", 3456),
+            new DatabaseInfo("DB2", "jdbc:db2://<Host>:<Port>/<Database>",
"com.ibm.db2.jcc.DB2Driver", 50000),
+            new DatabaseInfo("DB2 (DataDirect)", "jdbc:datadirect:db2://<Host>:<Port>;DatabaseName=<Database>",
"com.ddtek.jdbc.db2.DB2Driver", 50000),
+            new DatabaseInfo("Derby embedded", DERBY_EMBEDDED_LOCAL_RAR_NAME),
+            new DatabaseInfo("Derby network", DERBY_NETWORK_LOCAL_RAR_NAME),
+            new DatabaseInfo("Derby embedded XA", DERBY_EMBEDDED_XA_RAR_NAME),
+            new DatabaseInfo("Derby network XA", DERBY_NETWORK_XA_RAR_NAME),
+            new DatabaseInfo("FrontBase", "jdbc:FrontBase://<Host>:<Port>/<Database>",
"com.frontbase.jdbc.FBJDriver"),
+            new DatabaseInfo("HSQLDB embedded", "jdbc:hsqldb:<Database>", "org.hsqldb.jdbcDriver"),
+            new DatabaseInfo("HSQLDB server", "jdbc:hsqldb:hsql://<Host>:<Port>/<Database>",
"org.hsqldb.jdbcDriver"),
+            new DatabaseInfo("Informix", "jdbc:informix-sqli://<Host>:<Port>/<Database>:informixserver=<dbservername>",
"com.informix.jdbc.IfxDriver"),
+            new DatabaseInfo("Informix (DataDirect)", "jdbc:datadirect:informix://<Host>:<Port>;informixServer=<dbservername>;DatabaseName=<Database>",
"com.ddtek.jdbc.informix.InformixDriver"),
+            new DatabaseInfo("InterSystems Cache", "jdbc:Cache://<Host>:<Port>/<namespace>",
"com.intersys.jdbc.CacheDriver"),
+            new DatabaseInfo("JDataStore", "jdbc:borland:dslocal:<file>", "com.borland.datastore.jdbc.DataStoreDriver"),
+            new DatabaseInfo("JDBC/ODBC Bridge", "jdbc:odbc:<datasource>", "sun.jdbc.odbc.JdbcOdbcDriver"),
+            new DatabaseInfo("McKoi embedded", "jdbc:mckoi:local://<ConfigPath>/<Schema>/",
"com.mckoi.JDBCDriver"),
+            new DatabaseInfo("McKoi server", "jdbc:mckoi://<Host>:<Port>/<Schema>/",
"com.mckoi.JDBCDriver"),
+            new DatabaseInfo("Mimer", "jdbc:mimer://<Host>:<Port>/<Database>",
"com.mimer.jdbc.Driver"),
+            new DatabaseInfo("MySQL", "jdbc:mysql://<Host>:<Port>/<Database>",
"com.mysql.jdbc.Driver", 3306),
+            new DatabaseInfo("Oracle Thin", "jdbc:oracle:thin:@<Host>:<Port>:<SID>",
"oracle.jdbc.OracleDriver", 1521),
+            new DatabaseInfo("Oracle OCI", "jdbc:oracle:oci:@<Host>:<Port>:<SID>",
"oracle.jdbc.OracleDriver", 1521),
+            new DatabaseInfo("Oracle (DataDirect)", "jdbc:datadirect:oracle://<Host>:<Port>;ServiceName=<SID>",
"com.ddtek.jdbc.oracle.OracleDriver", 1521),
+            new DatabaseInfo("Pervasive", "jdbc:pervasive://<Host>:<Port>/<Database>",
"com.pervasive.jdbc.v2.Driver"),
+            new DatabaseInfo("Pointbase server", "jdbc:pointbase:server://<Host>:<Port>/<Database>",
"com.pointbase.jdbc.jdbcUniversalDriver"),
+            new DatabaseInfo("PostgreSQL", "jdbc:postgresql://<Host>:<Port>/<Database>",
"org.postgresql.Driver", 5432),
+            new DatabaseInfo("Progress", "jdbc:jdbcProgress:T:<Host>:<Port>:<Database>",
"com.progress.sql.jdbc.JdbcProgressDriver"),
+            new DatabaseInfo("MaxDB", "jdbc:sapdb://<Host>:<Port>/<Database>",
"com.sap.dbtech.jdbc.DriverSapDB"),
+            new DatabaseInfo("SQL Server", "jdbc:microsoft:sqlserver://<Host>:<Port>;DatabaseName=<Database>",
"com.microsoft.jdbc.sqlserver.SQLServerDriver", 1433),
+            new DatabaseInfo("SQL Server (jTDS)", "jdbc:jtds:sqlserver://<Host>:<Port>;DatabaseName=<Database>",
"net.sourceforge.jtds.jdbc.Driver", 1433),
+            new DatabaseInfo("SQL Server (DataDirect)", "jdbc:datadirect:sqlserver://<Host>:<Port>;DatabaseName=<Database>",
"com.ddtek.jdbc.sqlserver.SQLServerDriver", 1433),
+            new DatabaseInfo("Sybase ASE", "jdbc:sybase:Tds:<Host>:<Port>/<Database>",
"com.sybase.jdbc3.jdbc.SybDriver", 2048),
+            new DatabaseInfo("Sybase ASA", "jdbc:sybase:Tds:<Host>:<Port>/<Database>",
"com.sybase.jdbc3.jdbc.SybDriver", 2638),
+            new DatabaseInfo("Sybase (DataDirect)", "jdbc:datadirect:sybase://<Host>:<Port>;DatabaseName=<Database>",
"com.ddtek.jdbc.sybase.SybaseDriver"),
+            new DatabaseInfo("Other", "", ""),
     };
     private final static Pattern PARAM_PATTERN = Pattern.compile("<.+?>");
 
@@ -131,8 +133,8 @@
     public String[] getUrlParameters() {
         Matcher m = PARAM_PATTERN.matcher(url);
         List list = new ArrayList();
-        while(m.find()) {
-            list.add(url.substring(m.start()+1, m.end()-1));
+        while (m.find()) {
+            list.add(url.substring(m.start() + 1, m.end() - 1));
         }
         return (String[]) list.toArray(new String[list.size()]);
     }



Mime
View raw message