You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/09/28 23:53:55 UTC

svn commit: r580493 - in /geronimo/server/branches/2.0: assemblies/geronimo-boilerplate-jee5/pom.xml configs/webconsole-jetty6/src/plan/plan.xml configs/webconsole-tomcat/src/plan/plan.xml

Author: djencks
Date: Fri Sep 28 14:53:55 2007
New Revision: 580493

URL: http://svn.apache.org/viewvc?rev=580493&view=rev
Log:
GERONIMO-2188 new tranql oracle wrapper and also the other tranql rars

Modified:
    geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-jee5/pom.xml
    geronimo/server/branches/2.0/configs/webconsole-jetty6/src/plan/plan.xml
    geronimo/server/branches/2.0/configs/webconsole-tomcat/src/plan/plan.xml

Modified: geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-jee5/pom.xml?rev=580493&r1=580492&r2=580493&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-jee5/pom.xml Fri Sep 28 14:53:55 2007
@@ -111,6 +111,42 @@
                                     <groupId>org.apache.derby</groupId>
                                     <artifactId>derbytools</artifactId>
                                 </artifact>
+
+                                <artifact>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-db2-xa</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                <artifact>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-mysql-local</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                <artifact>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-mysql-xa</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                <artifact>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-oracle-local</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                <artifact>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-oracle-xa</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                <artifact>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-postgresql-local</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                <artifact>
+                                    <groupId>org.tranql</groupId>
+                                    <artifactId>tranql-connector-postgresql-xa</artifactId>
+                                    <type>rar</type>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>

Modified: geronimo/server/branches/2.0/configs/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/webconsole-jetty6/src/plan/plan.xml?rev=580493&r1=580492&r2=580493&view=diff
==============================================================================
--- geronimo/server/branches/2.0/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/webconsole-jetty6/src/plan/plan.xml Fri Sep 28 14:53:55 2007
@@ -36,7 +36,6 @@
                     <artifactId>xercesImpl</artifactId>
                     <type>jar</type>
                 </dependency>
-        
                 <dependency>
                     <groupId>org.apache.pluto</groupId>
                     <artifactId>pluto-descriptors</artifactId>
@@ -67,7 +66,6 @@
                 <attribute name="portletContextPath">/console-standard</attribute>
                 <attribute name="portletServletPath">/plan-export</attribute>
             </gbean>
-
         </web-app>
     </module>
 
@@ -128,11 +126,11 @@
             </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="specific">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-db2-xa//rar</attribute>
             </gbean>
             <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
                 <attribute name="name">DB2 (DataDirect)</attribute>
@@ -264,11 +262,35 @@
             </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="specific">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-mysql-local//rar</attribute>
+            </gbean>
+            <gbean name="Database19a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">MySQL-XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-mysql-xa//rar</attribute>
+            </gbean>
+            <gbean name="Database20a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle Local</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-oracle-local//rar</attribute>
+            </gbean>
+            <gbean name="Database20b" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-oracle-xa//rar</attribute>
             </gbean>
             <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
                 <attribute name="name">Oracle Thin</attribute>
@@ -311,12 +333,20 @@
                 <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="specific">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="name">PostgreSQL Local</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-postgresql-local//rar</attribute>
+            </gbean>
+            <gbean name="Database25a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">PostgreSQL XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-postgresql-xa//rar</attribute>
             </gbean>
             <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
                 <attribute name="name">Progress</attribute>
@@ -406,7 +436,6 @@
             </role>
         </role-mappings>
     </security>
-
     <!-- Console specific server info -->
     <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
         <!--<reference name="ServerInfo">-->

Modified: geronimo/server/branches/2.0/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/webconsole-tomcat/src/plan/plan.xml?rev=580493&r1=580492&r2=580493&view=diff
==============================================================================
--- geronimo/server/branches/2.0/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/webconsole-tomcat/src/plan/plan.xml Fri Sep 28 14:53:55 2007
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    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
+  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.
+  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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -30,7 +30,7 @@
                     <artifactId>castor</artifactId>
                     <type>jar</type>
                 </dependency>
-                <!-- Required for Castor -->
+                <!-- required for castor -->
                 <dependency>
                     <groupId>xerces</groupId>
                     <artifactId>xercesImpl</artifactId>
@@ -111,7 +111,7 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
-            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -119,7 +119,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -127,15 +127,15 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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="specific">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-db2-xa//rar</attribute>
             </gbean>
-            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -143,7 +143,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
                 <attribute name="name">Derby embedded</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -151,7 +151,7 @@
                 <attribute name="specific">true</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-derby-embed-local//rar</attribute>
             </gbean>
-            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
                 <attribute name="name">Derby network</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -159,7 +159,7 @@
                 <attribute name="specific">true</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-derby-client-local//rar</attribute>
             </gbean>
-            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -167,7 +167,7 @@
                 <attribute name="specific">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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -175,7 +175,7 @@
                 <attribute name="specific">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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -183,7 +183,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -191,7 +191,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -199,7 +199,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -207,7 +207,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -215,7 +215,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -223,7 +223,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -231,7 +231,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -239,7 +239,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -247,7 +247,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -255,7 +255,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -263,15 +263,39 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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="specific">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-mysql-local//rar</attribute>
+            </gbean>
+            <gbean name="Database19a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">MySQL-XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-mysql-xa//rar</attribute>
             </gbean>
-            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database20a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle Local</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-oracle-local//rar</attribute>
+            </gbean>
+            <gbean name="Database20b" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">Oracle XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-oracle-xa//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>
@@ -279,7 +303,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -287,7 +311,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -295,7 +319,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -303,7 +327,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -311,15 +335,23 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <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="specific">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">PostgreSQL Local</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-postgresql-local//rar</attribute>
+            </gbean>
+            <gbean name="Database25a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+                <attribute name="name">PostgreSQL XA</attribute>
+                <attribute name="URLPrototype">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-postgresql-xa//rar</attribute>
             </gbean>
-            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -327,7 +359,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -335,7 +367,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -343,7 +375,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -351,7 +383,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -359,7 +391,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -367,7 +399,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -375,7 +407,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <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>
@@ -383,7 +415,7 @@
                 <attribute name="specific">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
                 <attribute name="name">Other</attribute>
                 <attribute name="URLPrototype"></attribute>
                 <attribute name="driverClassName"></attribute>
@@ -394,18 +426,18 @@
         </web-app>
     </module>
 
-    <security xmlns="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
+    <security>
         <!--<default-subject>-->
             <!--<realm>geronimo-admin</realm>-->
-            <!--<id>system</id>-->
+            <!--<id>default</id>-->
         <!--</default-subject>-->
-    	<role-mappings>
-    		<role role-name="admin">
-    				<principal
-    					class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
-    					name="admin"/>
-    		</role>
-    	</role-mappings>
+        <role-mappings>
+            <role role-name="admin">
+                <realm realm-name="geronimo-admin">
+                    <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
+                </realm>
+            </role>
+        </role-mappings>
     </security>
     <!-- Console specific server info -->
     <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->