geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r477594 - in /geronimo/server/trunk/configs: webconsole-jetty/src/plan/plan.xml webconsole-tomcat/src/plan/plan.xml
Date Tue, 21 Nov 2006 09:32:40 GMT
Author: vamsic007
Date: Tue Nov 21 01:32:39 2006
New Revision: 477594

URL: http://svn.apache.org/viewvc?view=rev&rev=477594
Log:
Fix geronimoSchemaVersion.  Merging rev 477590 from branches\1.2

Modified:
    geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml

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=477594&r1=477593&r2=477594
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml Tue Nov 21 01:32:39 2006
@@ -51,17 +51,17 @@
 
             <context-root>/console</context-root>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
-            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="portalPathPrefix">/car-export</attribute>
                 <attribute name="portletContextPath">/console-standard</attribute>
                 <attribute name="portletServletPath">/car-export</attribute>
             </gbean>
-            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="portalPathPrefix">/graphs</attribute>
                 <attribute name="portletContextPath">/console-standard</attribute>
                 <attribute name="portletServletPath">/graphs</attribute>
             </gbean>
-            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="portalPathPrefix">/plan-export</attribute>
                 <attribute name="portletContextPath">/console-standard</attribute>
                 <attribute name="portletServletPath">/plan-export</attribute>
@@ -123,7 +123,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-1.1">
+            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">DaffodilDB Embedded</attribute>
                 <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
                 <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
@@ -131,7 +131,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -139,7 +139,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">DB2</attribute>
                 <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
@@ -147,7 +147,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -155,7 +155,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby embedded</attribute>
                 <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
@@ -163,7 +163,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby network</attribute>
                 <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
@@ -171,7 +171,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby embedded XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -179,7 +179,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby network XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -187,7 +187,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">FrontBase</attribute>
                 <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
@@ -195,7 +195,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">HSQLDB embedded</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -203,7 +203,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">HSQLDB server</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -211,7 +211,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -219,7 +219,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -227,7 +227,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">InterSystems Cache</attribute>
                 <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
                 <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
@@ -235,7 +235,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">JDataStore</attribute>
                 <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
                 <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
@@ -243,7 +243,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">JDBC/ODBC Bridge</attribute>
                 <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
                 <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
@@ -251,7 +251,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">McKoi embedded</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -259,7 +259,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">McKoi server</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -267,7 +267,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Mimer</attribute>
                 <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
@@ -275,7 +275,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">MySQL</attribute>
                 <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
@@ -283,7 +283,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Oracle Thin</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -291,7 +291,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Oracle OCI</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -299,7 +299,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -307,7 +307,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Pervasive</attribute>
                 <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
@@ -315,7 +315,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Pointbase server</attribute>
                 <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
@@ -323,7 +323,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <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>
@@ -331,7 +331,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Progress</attribute>
                 <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
                 <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
@@ -339,7 +339,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">MaxDB</attribute>
                 <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
@@ -347,7 +347,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -355,7 +355,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -363,7 +363,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -371,7 +371,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -379,7 +379,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -387,7 +387,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -395,7 +395,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Other</attribute>
                 <attribute name="URLPrototype"></attribute>
                 <attribute name="driverClassName"></attribute>
@@ -406,7 +406,7 @@
         </web-app>
     </module>
 
-    <security xmlns="http://geronimo.apache.org/xml/ns/security-1.1">
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
         <default-principal>
             <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
         </default-principal>
@@ -429,7 +429,7 @@
     <!--</gbean>-->
 
     <!-- Keystore configuration -->
-    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
         <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
         <attribute name="keyStoreType">PKCS12</attribute>
         <attribute name="keyStorePassword">password</attribute>

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=477594&r1=477593&r2=477594
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Tue Nov 21 01:32:39 2006
@@ -52,17 +52,17 @@
             <context-root>/console</context-root>
             <cross-context/>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
-            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="portalPathPrefix">/car-export</attribute>
                 <attribute name="portletContextPath">/console-standard</attribute>
                 <attribute name="portletServletPath">/car-export</attribute>
             </gbean>
-            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="portalPathPrefix">/graphs</attribute>
                 <attribute name="portletContextPath">/console-standard</attribute>
                 <attribute name="portletServletPath">/graphs</attribute>
             </gbean>
-            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="portalPathPrefix">/plan-export</attribute>
                 <attribute name="portletContextPath">/console-standard</attribute>
                 <attribute name="portletServletPath">/plan-export</attribute>
@@ -125,7 +125,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-1.1">
+            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">DaffodilDB Embedded</attribute>
                 <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
                 <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
@@ -133,7 +133,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -141,7 +141,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">DB2</attribute>
                 <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
@@ -149,7 +149,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -157,7 +157,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby embedded</attribute>
                 <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
@@ -165,7 +165,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby network</attribute>
                 <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
@@ -173,7 +173,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby embedded XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -181,7 +181,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Derby network XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -189,7 +189,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">FrontBase</attribute>
                 <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
@@ -197,7 +197,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">HSQLDB embedded</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -205,7 +205,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">HSQLDB server</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -213,7 +213,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -221,7 +221,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -229,7 +229,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">InterSystems Cache</attribute>
                 <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
                 <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
@@ -237,7 +237,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">JDataStore</attribute>
                 <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
                 <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
@@ -245,7 +245,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">JDBC/ODBC Bridge</attribute>
                 <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
                 <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
@@ -253,7 +253,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">McKoi embedded</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -261,7 +261,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">McKoi server</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -269,7 +269,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Mimer</attribute>
                 <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
@@ -277,7 +277,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">MySQL</attribute>
                 <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
@@ -285,7 +285,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Oracle Thin</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -293,7 +293,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Oracle OCI</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -301,7 +301,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -309,7 +309,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Pervasive</attribute>
                 <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
@@ -317,7 +317,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Pointbase server</attribute>
                 <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
@@ -325,7 +325,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <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>
@@ -333,7 +333,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Progress</attribute>
                 <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
                 <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
@@ -341,7 +341,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">MaxDB</attribute>
                 <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
@@ -349,7 +349,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -357,7 +357,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -365,7 +365,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -373,7 +373,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -381,7 +381,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -389,7 +389,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <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>
@@ -397,7 +397,7 @@
                 <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" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <attribute name="name">Other</attribute>
                 <attribute name="URLPrototype"></attribute>
                 <attribute name="driverClassName"></attribute>
@@ -408,7 +408,7 @@
         </web-app>
     </module>
 
-    <security xmlns="http://geronimo.apache.org/xml/ns/security-1.1">
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
     	<default-principal>
     		<principal
     			class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
@@ -433,7 +433,7 @@
     <!--</gbean>-->
 
     <!-- Keystore configuration -->
-    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
         <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
         <attribute name="keyStoreType">PKCS12</attribute>
         <attribute name="keyStorePassword">password</attribute>



Mime
View raw message