geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r472167 - in /geronimo/server/trunk: applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/...
Date Tue, 07 Nov 2006 17:00:20 GMT
Author: pmcmahan
Date: Tue Nov  7 09:00:18 2006
New Revision: 472167

URL: http://svn.apache.org/viewvc?view=rev&rev=472167
Log:
GERONIMO-2553 database pools portlet references non-existent version of tranql.  merging fix from rev 412804 plus adding logic to look up the tranql version number if its not specified in the DatabaseDrivers RAR info

Added:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java   (with props)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java   (with props)
Removed:
    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-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java
    geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ManagementHelper.java
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java?view=diff&rev=472167&r1=472166&r2=472167
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java Tue Nov  7 09:00:18 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.console.util;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -46,6 +47,7 @@
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
 import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.management.AppClientModule;
 import org.apache.geronimo.management.EJB;
@@ -534,6 +536,18 @@
         }
     }
 
+    public Object[] getGBeansImplementing(Class iface) {
+        Set set = kernel.listGBeans(new AbstractNameQuery(iface.getName()));
+        Object[] result = (Object[]) Array.newInstance(iface, set.size());
+        int index = 0;
+        ProxyManager mgr = kernel.getProxyManager();
+        for (Iterator it = set.iterator(); it.hasNext();) {
+            AbstractName name = (AbstractName) it.next();
+            result[index++] = mgr.createProxy(name, iface);
+        }
+        return result;
+    }    
+    
     /**
      * Helper method to connect to a remote kernel.
      */

Modified: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ManagementHelper.java?view=diff&rev=472167&r1=472166&r2=472167
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ManagementHelper.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ManagementHelper.java Tue Nov  7 09:00:18 2006
@@ -122,4 +122,5 @@
      * @return The Module, or null if the configuration is not running.
      */
     J2EEDeployedObject getModuleForConfiguration(Artifact configuration);
+    Object[] getGBeansImplementing(Class iface);
 }

Added: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java?view=auto&rev=472167
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java (added)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java Tue Nov  7 09:00:18 2006
@@ -0,0 +1,36 @@
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.databasemanager.wizard;
+
+import org.apache.geronimo.kernel.repository.Artifact;
+
+/**
+ * Interface for GBeans that provide information about a database driver
+ * and the associated deployment procedure.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface DatabaseDriver {
+    String getName();
+    String getURLPrototype();
+    String[] getURLParameters();
+    String getDriverClassName();
+    int getDefaultPort();
+    boolean isXA();
+    Artifact getRAR();
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java?view=auto&rev=472167
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java (added)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java Tue Nov  7 09:00:18 2006
@@ -0,0 +1,121 @@
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.databasemanager.wizard;
+
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Implementation of DatabaseDriver that contains database driver information
+ * contained in the console's deployment plan.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DatabaseDriverGBean implements DatabaseDriver {
+    private final static Pattern PARAM_PATTERN = Pattern.compile("\\{.+?\\}");
+    private String name;
+    private String URLPrototype;
+    private String driverClassName;
+    private int defaultPort;
+    private boolean XA;
+    private Artifact RAR;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getURLPrototype() {
+        return URLPrototype;
+    }
+
+    public void setURLPrototype(String URLPrototype) {
+        this.URLPrototype = URLPrototype;
+    }
+
+    public String getDriverClassName() {
+        return driverClassName;
+    }
+
+    public void setDriverClassName(String driverClassName) {
+        this.driverClassName = driverClassName;
+    }
+
+    public int getDefaultPort() {
+        return defaultPort;
+    }
+
+    public void setDefaultPort(int defaultPort) {
+        this.defaultPort = defaultPort;
+    }
+
+    public boolean isXA() {
+        return XA;
+    }
+
+    public void setXA(boolean XA) {
+        this.XA = XA;
+    }
+
+    public Artifact getRAR() {
+        return RAR;
+    }
+
+    public void setRARName(String name) {
+        RAR = Artifact.create(name);
+    }
+
+    public String[] getURLParameters() {
+        Matcher m = PARAM_PATTERN.matcher(URLPrototype);
+        List list = new ArrayList();
+        while(m.find()) {
+            list.add(URLPrototype.substring(m.start()+1, m.end()-1));
+        }
+        return (String[]) list.toArray(new String[list.size()]);
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Database Driver Info", DatabaseDriverGBean.class);
+        infoFactory.addAttribute("name", String.class, true, true);
+        infoFactory.addAttribute("URLPrototype", String.class, true, true);
+        infoFactory.addAttribute("driverClassName", String.class, true, true);
+        infoFactory.addAttribute("defaultPort", int.class, true, true);
+        infoFactory.addAttribute("XA", boolean.class, true, true);
+        infoFactory.addAttribute("RARName", String.class, true, true);
+        infoFactory.addInterface(DatabaseDriver.class);
+
+        infoFactory.setConstructor(new String[0]);
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?view=diff&rev=472167&r1=472166&r2=472167
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Tue Nov  7 09:00:18 2006
@@ -38,7 +38,9 @@
 import java.sql.Driver;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -94,7 +96,6 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 import org.apache.geronimo.kernel.repository.ListableRepository;
-import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
 import org.apache.geronimo.kernel.util.XmlUtil;
 import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
@@ -250,10 +251,10 @@
         PoolData data = new PoolData();
         data.load(actionRequest);
         if(mode.equals("process-"+SELECT_RDBMS_MODE)) {
-            DatabaseInfo info = null;
-            info = getDatabaseInfo(data);
+            DatabaseDriver info = null;
+            info = getDatabaseInfo(actionRequest, data);
             if(info != null) {
-                data.rarPath = info.getRarPath();
+                data.rarPath = info.getRAR().toString();
                 if(info.isXA()) {
                     data.adapterDisplayName="Unknown"; // will pick these up when we process the RA type in the render request
                     data.adapterDescription="Unknown";
@@ -262,8 +263,8 @@
                     if(data.getDbtype().equals("Other")) {
                         actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
                     } else {
-                        data.driverClass = info.getDriverClass();
-                        data.urlPrototype = info.getUrl();
+                        data.driverClass = info.getDriverClassName();
+                        data.urlPrototype = info.getURLPrototype();
                         actionResponse.setRenderParameter(MODE_KEY, BASIC_PARAMS_MODE);
                     }
                 }
@@ -301,10 +302,10 @@
                 actionResponse.setRenderParameter(MODE_KEY, BASIC_PARAMS_MODE);
             }
         } else if(mode.equals("process-"+BASIC_PARAMS_MODE)) {
-            DatabaseInfo info = null;
-            info = getDatabaseInfo(data);
+            DatabaseDriver info = null;
+            info = getDatabaseInfo(actionRequest, data);
             if(info != null) {
-                data.url = populateURL(info.getUrl(), info.getUrlParameters(), data.getUrlProperties());
+                data.url = populateURL(info.getURLPrototype(), info.getURLParameters(), data.getUrlProperties());
             }
             if(attemptDriverLoad(actionRequest, data) != null) {
                 actionResponse.setRenderParameter(MODE_KEY, CONFIRM_URL_MODE);
@@ -368,7 +369,7 @@
             ImportStatus status = getImportStatus(actionRequest);
             int index = Integer.parseInt(actionRequest.getParameter("importIndex"));
             status.setCurrentPoolIndex(index);
-            loadImportedData(data, status.getCurrentPool());
+            loadImportedData(actionRequest, data, status.getCurrentPool());
             actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
         } else if(mode.equals(IMPORT_COMPLETE_MODE)) {
             ImportStatus status = getImportStatus(actionRequest);
@@ -429,8 +430,7 @@
         }
     }
 
-    private void loadImportedData(PoolData data, ImportStatus.PoolProgress progress) {
-        if(!progress.getType().equals(ImportStatus.PoolProgress.TYPE_XA)) {
+    private void loadImportedData(PortletRequest request, PoolData data, ImportStatus.PoolProgress progress) throws PortletException {        if(!progress.getType().equals(ImportStatus.PoolProgress.TYPE_XA)) {
             JDBCPool pool = (JDBCPool) progress.getPool();
             data.dbtype = "Other";
             data.adapterDisplayName = "TranQL Generic JDBC Resource Adapter";
@@ -444,13 +444,12 @@
             data.url = pool.getJdbcURL();
             data.user = pool.getUsername();
             if(pool.getDriverClass() != null) {
-                DatabaseInfo info = getDatabaseInfoFromDriver(data);
+                DatabaseDriver info = getDatabaseInfoFromDriver(request, data);
                 if(info != null) {
-                    data.rarPath = info.getRarPath();
-                    data.urlPrototype = info.getUrl();
+                    data.rarPath = info.getRAR().toString();
+                    data.urlPrototype = info.getURLPrototype();
                 } else {
-                    log.warn("Don't recognize database driver "+data.driverClass+"; Using default RAR file");
-                    data.rarPath = DatabaseInfo.getDefaultRARPath();
+                    throw new PortletException("Don't recognize database driver "+data.driverClass+"!");
                 }
             }
         } else {
@@ -755,7 +754,7 @@
     }
 
     private void renderSelectRDBMS(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
-        renderRequest.setAttribute("databases", DatabaseInfo.ALL_DATABASES);
+        renderRequest.setAttribute("databases", getAllDrivers(renderRequest));
         selectRDBMSView.include(renderRequest, renderResponse);
     }
 
@@ -771,9 +770,9 @@
     private void renderBasicParams(RenderRequest renderRequest, RenderResponse renderResponse, PoolData data) throws IOException, PortletException {
         loadDriverJARList(renderRequest);
         // Make sure all properties available for the DB are listed
-        DatabaseInfo info = getDatabaseInfo(data);
+        DatabaseDriver info = getDatabaseInfo(renderRequest, data);
         if(info != null) {
-            String[] params = info.getUrlParameters();
+            String[] params = info.getURLParameters();
             for (int i = 0; i < params.length; i++) {
                 String param = params[i];
                 final String key = "urlproperty-"+param;
@@ -809,7 +808,7 @@
                 }
                 list.add(test);
             }
-    }
+        }
         Collections.sort(list);
         renderRequest.setAttribute("availableJars", list);
     }
@@ -1037,9 +1036,16 @@
 
     private static File getRAR(PortletRequest request, String rarPath) {
         org.apache.geronimo.kernel.repository.Artifact artifact = org.apache.geronimo.kernel.repository.Artifact.create(rarPath);
-        Repository[] repos = PortletManager.getCurrentServer(request).getRepositories();
+        ListableRepository[] repos = PortletManager.getCurrentServer(request).getRepositories();
         for (int i = 0; i < repos.length; i++) {
-            Repository repo = repos[i];
+            ListableRepository repo = repos[i];
+            // if the artifact is not fully resolved then try to resolve it
+            if (!artifact.isResolved()) {
+                SortedSet results = repo.list(artifact);
+                if (!results.isEmpty()) {
+                    artifact = (org.apache.geronimo.kernel.repository.Artifact) results.first();
+                }
+            }
             File url = repo.getLocation(artifact);
             if (url != null) {
                 if (url.exists() && url.canRead() && !url.isDirectory()) {
@@ -1057,19 +1063,19 @@
     private static Class attemptDriverLoad(PortletRequest request, PoolData data) {
         List list = new ArrayList();
         try {
-        	String[] jars = data.getJars();
+            String[] jars = data.getJars();
             ListableRepository[] repos = PortletManager.getCurrentServer(request).getRepositories();
-        	
-        	for (int i=0; i<jars.length; i++) {
-        		org.apache.geronimo.kernel.repository.Artifact artifact = org.apache.geronimo.kernel.repository.Artifact.create(jars[i]);
-        		for (int j=0; j<repos.length; j++) {
+
+            for (int i = 0; i < jars.length; i++) {
+                org.apache.geronimo.kernel.repository.Artifact artifact = org.apache.geronimo.kernel.repository.Artifact.create(jars[i]);
+                for (int j = 0; j < repos.length; j++) {
                     ListableRepository repo = repos[j];
                     File url = repo.getLocation(artifact);
                     if (url != null) {
-                    	list.add(url.toURL());
+                        list.add(url.toURL());
                     }
-        		}
-        	}
+                }
+            }
             URLClassLoader loader = new URLClassLoader((URL[]) list.toArray(new URL[list.size()]), DatabasePoolPortlet.class.getClassLoader());
             try {
                 return loader.loadClass(data.driverClass);
@@ -1087,7 +1093,7 @@
             String key = keys[i];
             String value = (String) properties.get("urlproperty-"+key);
             if(value == null || value.equals("")) {
-                int begin = url.indexOf("<"+key+">");
+                int begin = url.indexOf("{"+key+"}");
                 int end = begin + key.length() + 2;
                 for(int j=begin-1; j>=0; j--) {
                     char c = url.charAt(j);
@@ -1103,17 +1109,33 @@
                 }
                 url = url.substring(0, begin)+url.substring(end);
             } else {
-                url = url.replaceAll("<"+key+">", value);
+                url = url.replaceAll("\\{"+key+"\\}", value);
             }
         }
         return url;
     }
 
-    private static DatabaseInfo getDatabaseInfo(PoolData data) {
-        DatabaseInfo info = null;
-        for (int i = 0; i < DatabaseInfo.ALL_DATABASES.length; i++) {
-            DatabaseInfo next = DatabaseInfo.ALL_DATABASES[i];
-            if(next.getName().equals(data.getDbtype())) {
+    
+    private static DatabaseDriver[] getAllDrivers(PortletRequest request) {
+        DatabaseDriver[] result = (DatabaseDriver[]) PortletManager.getGBeansImplementing(request, DatabaseDriver.class);
+        Arrays.sort(result, new Comparator() {
+            public int compare(Object o1, Object o2) {
+                String name1 = ((DatabaseDriver) o1).getName();
+                String name2 = ((DatabaseDriver) o2).getName();
+                if (name1.equals("Other")) name1 = "zzzOther";
+                if (name2.equals("Other")) name2 = "zzzOther";
+                return name1.compareTo(name2);
+            }
+        });
+        return result;
+    }
+        
+    private static DatabaseDriver getDatabaseInfo(PortletRequest request, PoolData data) {
+        DatabaseDriver info = null;
+        DatabaseDriver[] all = getAllDrivers(request);
+        for (int i = 0; i < all.length; i++) {
+            DatabaseDriver next = all[i];
+            if (next.getName().equals(data.getDbtype())) {
                 info = next;
                 break;
             }
@@ -1121,11 +1143,12 @@
         return info;
     }
 
-    private static DatabaseInfo getDatabaseInfoFromDriver(PoolData data) {
-        DatabaseInfo info = null;
-        for (int i = 0; i < DatabaseInfo.ALL_DATABASES.length; i++) {
-            DatabaseInfo next = DatabaseInfo.ALL_DATABASES[i];
-            if(next.getDriverClass() != null && next.getDriverClass().equals(data.getDriverClass())) {
+    private static DatabaseDriver getDatabaseInfoFromDriver(PortletRequest request, PoolData data) {
+        DatabaseDriver info = null;
+        DatabaseDriver[] all = getAllDrivers(request);
+        for (int i = 0; i < all.length; i++) {
+            DatabaseDriver next = all[i];
+            if (next.getDriverClassName()!=null && next.getDriverClassName().equals(data.getDriverClass())) {
                 info = next;
                 break;
             }

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java?view=diff&rev=472167&r1=472166&r2=472167
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java Tue Nov  7 09:00:18 2006
@@ -382,6 +382,11 @@
         ManagementHelper helper = getManagementHelper(request);
         return helper.getConfigurations(type, includeChildModules);
     }
+    
+    public static Object[] getGBeansImplementing(PortletRequest request, Class iface) {
+        ManagementHelper helper = getManagementHelper(request);
+        return helper.getGBeansImplementing(iface);
+    }    
 
     /**
      * Looks up the context prefix used by the portal, even if the thing running

Modified: geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml?view=diff&rev=472167&r1=472166&r2=472167
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml Tue Nov  7 09:00:18 2006
@@ -41,6 +41,286 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
+            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DaffodilDB Embedded</attribute>
+                <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
+                <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DaffodilDB Server</attribute>
+                <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
+                <attribute name="defaultPort">3456</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DB2</attribute>
+                <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
+                <attribute name="defaultPort">50000</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DB2 (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
+                <attribute name="defaultPort">50000</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby embedded</attribute>
+                <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
+                <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby network</attribute>
+                <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
+                <attribute name="defaultPort">1527</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby embedded XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
+            </gbean>
+            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby network XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
+            </gbean>
+            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">FrontBase</attribute>
+                <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">HSQLDB embedded</attribute>
+                <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
+                <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">HSQLDB server</attribute>
+                <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Informix</attribute>
+                <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
+                <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Informix (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">InterSystems Cache</attribute>
+                <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
+                <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">JDataStore</attribute>
+                <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
+                <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">JDBC/ODBC Bridge</attribute>
+                <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
+                <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">McKoi embedded</attribute>
+                <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
+                <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">McKoi server</attribute>
+                <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
+                <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Mimer</attribute>
+                <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">MySQL</attribute>
+                <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
+                <attribute name="defaultPort">3306</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle Thin</attribute>
+                <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
+                <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle OCI</attribute>
+                <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
+                <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Pervasive</attribute>
+                <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Pointbase server</attribute>
+                <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">PostgreSQL</attribute>
+                <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">org.postgresql.Driver</attribute>
+                <attribute name="defaultPort">5432</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Progress</attribute>
+                <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
+                <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">MaxDB</attribute>
+                <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">SQL Server</attribute>
+                <attribute name="URLPrototype">jdbc:microsoft:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.microsoft.jdbc.sqlserver.SQLServerDriver</attribute>
+                <attribute name="defaultPort">1433</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">SQL Server (jTDS)</attribute>
+                <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
+                <attribute name="defaultPort">1433</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">SQL Server (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
+                <attribute name="defaultPort">1433</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Sybase ASE</attribute>
+                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
+                <attribute name="defaultPort">2048</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Sybase ASA</attribute>
+                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
+                <attribute name="defaultPort">2638</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Sybase (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Other</attribute>
+                <attribute name="URLPrototype"></attribute>
+                <attribute name="driverClassName"></attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
         </web-app>
     </module>
 

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=472167&r1=472166&r2=472167
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Tue Nov  7 09:00:18 2006
@@ -43,6 +43,286 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
+            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DaffodilDB Embedded</attribute>
+                <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
+                <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DaffodilDB Server</attribute>
+                <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
+                <attribute name="defaultPort">3456</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DB2</attribute>
+                <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
+                <attribute name="defaultPort">50000</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">DB2 (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
+                <attribute name="defaultPort">50000</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby embedded</attribute>
+                <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
+                <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby network</attribute>
+                <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
+                <attribute name="defaultPort">1527</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby embedded XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
+            </gbean>
+            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Derby network XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
+            </gbean>
+            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">FrontBase</attribute>
+                <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">HSQLDB embedded</attribute>
+                <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
+                <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">HSQLDB server</attribute>
+                <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Informix</attribute>
+                <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
+                <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Informix (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">InterSystems Cache</attribute>
+                <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
+                <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">JDataStore</attribute>
+                <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
+                <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">JDBC/ODBC Bridge</attribute>
+                <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
+                <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">McKoi embedded</attribute>
+                <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
+                <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">McKoi server</attribute>
+                <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
+                <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Mimer</attribute>
+                <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">MySQL</attribute>
+                <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
+                <attribute name="defaultPort">3306</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle Thin</attribute>
+                <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
+                <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle OCI</attribute>
+                <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
+                <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Pervasive</attribute>
+                <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Pointbase server</attribute>
+                <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">PostgreSQL</attribute>
+                <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">org.postgresql.Driver</attribute>
+                <attribute name="defaultPort">5432</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Progress</attribute>
+                <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
+                <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">MaxDB</attribute>
+                <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">SQL Server</attribute>
+                <attribute name="URLPrototype">jdbc:microsoft:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.microsoft.jdbc.sqlserver.SQLServerDriver</attribute>
+                <attribute name="defaultPort">1433</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">SQL Server (jTDS)</attribute>
+                <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
+                <attribute name="defaultPort">1433</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">SQL Server (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
+                <attribute name="defaultPort">1433</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Sybase ASE</attribute>
+                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
+                <attribute name="defaultPort">2048</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Sybase ASA</attribute>
+                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
+                <attribute name="defaultPort">2638</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Sybase (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Other</attribute>
+                <attribute name="URLPrototype"></attribute>
+                <attribute name="driverClassName"></attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="XA">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
         </web-app>
     </module>
 



Mime
View raw message