geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r574483 [3/3] - in /geronimo/server/trunk: assemblies/ assemblies/geronimo-framework/ assemblies/geronimo-framework/src/main/resources/var/config/ configs/ configs/jetty6/ configs/myfaces-deployer/ configs/myfaces-deployer/src/main/plan/ co...
Date Tue, 11 Sep 2007 06:34:57 GMT
Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Mon Sep 10 23:34:53 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: WebConsole Tomcat</name>
     <packaging>car</packaging>
 
+    <description>Geronimo Administration Console for tomcat.</description>
+
     <dependencies>
 
         <dependency>
@@ -227,6 +229,33 @@
                         <version>${version}</version>
                         <type>ear</type>
                     </module>
+                    <category>Administration</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>tomcat</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Tomcat web container</description>
+                            </prerequisite>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>jasper</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Jasper subsystem</description>
+                            </prerequisite>
+                        </plugin-artifact>
+                    </instance>
+
+
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,583 +13,399 @@
     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$-->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-      <dep:artifactId>webconsole-tomcat</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>org.apache.pluto</dep:groupId>
-        <dep:artifactId>pluto-descriptors</dep:artifactId>
-        <dep:version>1.0.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>connector-deployer</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>commons-io</dep:groupId>
-        <dep:artifactId>commons-io</dep:artifactId>
-        <dep:version>1.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-upgrade</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>commons-digester</dep:groupId>
-        <dep:artifactId>commons-digester</dep:artifactId>
-        <dep:version>1.8</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>portlet-api</dep:groupId>
-        <dep:artifactId>portlet-api</dep:artifactId>
-        <dep:version>1.0</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-management</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>jasper</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-activemq-management</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>commons-fileupload</dep:groupId>
-        <dep:artifactId>commons-fileupload</dep:artifactId>
-        <dep:version>1.1.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>jdom</dep:groupId>
-        <dep:artifactId>jdom</dep:artifactId>
-        <dep:version>1.0</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-deploy-jsr88</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-converter</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>tomcat6-deployer</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-activemq</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.pluto</dep:groupId>
-        <dep:artifactId>pluto-portal</dep:artifactId>
-        <dep:version>1.0.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-server</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>system-database</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.codehaus.castor</dep:groupId>
-        <dep:artifactId>castor</dep:artifactId>
-        <dep:version>1.0.5</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.applications.console</dep:groupId>
-        <dep:artifactId>geronimo-console-core</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>xerces</dep:groupId>
-        <dep:artifactId>xercesImpl</dep:artifactId>
-        <dep:version>2.8.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>dojo-tomcat</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>dwr</dep:groupId>
-        <dep:artifactId>dwr</dep:artifactId>
-        <dep:version>1.1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.pluto</dep:groupId>
-        <dep:artifactId>pluto</dep:artifactId>
-        <dep:version>1.0.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  <module>
-    <web>framework.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-      <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.castor</groupId>
-            <artifactId>castor</artifactId>
-            <type>jar</type>
-          </dependency>
-          <!--Required for Castor-->
-          <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-descriptors</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal</artifactId>
-            <type>jar</type>
-          </dependency>
-        </dependencies>
-        <inverse-classloading/>
-      </environment>
-      <context-root>/console</context-root>
-      <cross-context/>
-      <security-realm-name>geronimo-admin</security-realm-name>
-      <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <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.2">
-        <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.2">
-        <attribute name="portalPathPrefix">/plan-export</attribute>
-        <attribute name="portletContextPath">/console-standard</attribute>
-        <attribute name="portletServletPath">/plan-export</attribute>
-      </gbean>
-    </web-app>
-  </module>
-  <module>
-    <web>standard.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-      <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <dependencies>
-          <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>dwr</groupId>
-            <artifactId>dwr</artifactId>
-            <type>jar</type>
-          </dependency>
-        </dependencies>
-        <inverse-classloading/>
-      </environment>
-      <context-root>/console-standard</context-root>
-      <cross-context/>
-      <security-realm-name>geronimo-admin</security-realm-name>
-      <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
-        <reference name="ServerInfo">
-          <name>ServerInfo</name>
-        </reference>
-        <reference name="LoginModule">
-          <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.2">
-        <attribute name="name">DaffodilDB Embedded</attribute>
-        <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
-        <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">DaffodilDB Server</attribute>
-        <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
-        <attribute name="defaultPort">3456</attribute>
-        <attribute name="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-1.2">
-        <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>
-      </gbean>
-      <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">DB2 (DataDirect)</attribute>
-        <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
-        <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
-        <attribute name="defaultPort">50000</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Derby embedded</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-derby-embed-local//rar</attribute>
-        <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
-      </gbean>
-      <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">Derby network</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-derby-client-local//rar</attribute>
-        <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
-      </gbean>
-      <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">Derby embedded 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-derby-embed-xa//rar</attribute>
-        <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
-      </gbean>
-      <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">Derby network 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-derby-client-xa//rar</attribute>
-        <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
-      </gbean>
-      <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">FrontBase</attribute>
-        <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">HSQLDB embedded</attribute>
-        <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
-        <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-        <attribute name="dependencyFilterStrings">hsqldb///jar</attribute>
-      </gbean>
-      <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">HSQLDB server</attribute>
-        <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-        <attribute name="dependencyFilterStrings">hsqldb/hsqldb//jar</attribute>
-      </gbean>
-      <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">Informix</attribute>
-        <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
-        <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Informix (DataDirect)</attribute>
-        <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
-        <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">InterSystems Cache</attribute>
-        <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
-        <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">JDataStore</attribute>
-        <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
-        <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">JDBC/ODBC Bridge</attribute>
-        <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
-        <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">McKoi embedded</attribute>
-        <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
-        <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-        <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
-      </gbean>
-      <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">McKoi server</attribute>
-        <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
-        <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-        <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
-      </gbean>
-      <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">Mimer</attribute>
-        <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <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="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
-      </gbean>
-      <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">Oracle Thin</attribute>
-        <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
-        <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
-        <attribute name="defaultPort">1521</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Oracle OCI</attribute>
-        <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
-        <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
-        <attribute name="defaultPort">1521</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Oracle (DataDirect)</attribute>
-        <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
-        <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
-        <attribute name="defaultPort">1521</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Pervasive</attribute>
-        <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Pointbase server</attribute>
-        <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <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="dependencyFilterStrings">postgresql/postgresql-7.3//jar,postgresql/postgresql-7.4//jar,postgresql/postgresql-8.0//jar,postgresql/postgresql-8.1//jar</attribute>
-      </gbean>
-      <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">Progress</attribute>
-        <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
-        <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">MaxDB</attribute>
-        <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-        <attribute name="dependencyFilterStrings">maxdb/sapdbc//jar</attribute>
-      </gbean>
-      <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">SQL Server</attribute>
-        <attribute name="URLPrototype">jdbc:microsoft:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
-        <attribute name="driverClassName">com.microsoft.jdbc.sqlserver.SQLServerDriver</attribute>
-        <attribute name="defaultPort">1433</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">SQL Server (jTDS)</attribute>
-        <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
-        <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
-        <attribute name="defaultPort">1433</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-        <attribute name="dependencyFilterStrings">jtds/jtds//jar</attribute>
-      </gbean>
-      <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <attribute name="name">SQL Server (DataDirect)</attribute>
-        <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
-        <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
-        <attribute name="defaultPort">1433</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Sybase ASE</attribute>
-        <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
-        <attribute name="defaultPort">2048</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Sybase ASA</attribute>
-        <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
-        <attribute name="defaultPort">2638</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Sybase (DataDirect)</attribute>
-        <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
-        <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="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-1.2">
-        <attribute name="name">Other</attribute>
-        <attribute name="URLPrototype"/>
-        <attribute name="driverClassName"/>
-        <attribute name="defaultPort">0</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-      </gbean>
-    </web-app>
-  </module>
-  <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
-    <!--<default-subject>-->
-    <!--<realm>geronimo-admin</realm>-->
-    <!--<id>system</id>-->
-    <!--</default-subject>-->
-    <role-mappings>
-      <role role-name="admin">
-        <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
-      </role>
-    </role-mappings>
-  </security>
-  <!--Console specific server info-->
-  <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
-  <!--<reference name="ServerInfo">-->
-  <!--<name>ServerInfo</name>-->
-  <!--</reference>-->
-  <!--<reference name="LoginModule">-->
-  <!--<name>properties-login</name>-->
-  <!--</reference>-->
-  <!--</gbean>-->
-  <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel"/>
-</application>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
+
+    <module>
+        <web>framework.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+              <inverse-classloading/>
+            </environment>
+
+            <context-root>/console</context-root>
+            <cross-context/>
+            <security-realm-name>geronimo-admin</security-realm-name>
+            <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-${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-${geronimoSchemaVersion}">
+                <attribute name="portalPathPrefix">/plan-export</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/plan-export</attribute>
+            </gbean>
+        </web-app>
+    </module>
+
+    <module>
+        <web>standard.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+              <dependencies>
+                <dependency>
+                    <groupId>commons-digester</groupId>
+                    <artifactId>commons-digester</artifactId>
+                    <type>jar</type>
+                </dependency>
+                <dependency>
+                    <groupId>commons-fileupload</groupId>
+                    <artifactId>commons-fileupload</artifactId>
+                    <type>jar</type>
+                </dependency>
+                <dependency>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                    <type>jar</type>
+                </dependency>
+                <dependency>
+                    <groupId>dwr</groupId>
+                    <artifactId>dwr</artifactId>
+                    <type>jar</type>
+                </dependency>
+              </dependencies>
+              <inverse-classloading/>
+            </environment>
+
+            <context-root>/console-standard</context-root>
+            <cross-context/>
+            <security-realm-name>geronimo-admin</security-realm-name>
+            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+                <reference name="ServerInfo">
+                    <name>ServerInfo</name>
+                </reference>
+                <reference name="LoginModule">
+                    <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}">
+                <attribute name="name">DaffodilDB Embedded</attribute>
+                <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
+                <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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}">
+                <attribute name="name">DaffodilDB Server</attribute>
+                <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
+                <attribute name="defaultPort">3456</attribute>
+                <attribute name="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}">
+                <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>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">50000</attribute>
+                <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}">
+                <attribute name="name">Derby embedded</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-derby-embed-local//rar</attribute>
+                <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
+            </gbean>
+            <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">null</attribute>
+                <attribute name="driverClassName">null</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-derby-client-local//rar</attribute>
+                <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
+                <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">true</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
+                <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <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}">
+                <attribute name="name">HSQLDB embedded</attribute>
+                <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
+                <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="dependencyFilterStrings">hsqldb///jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="dependencyFilterStrings">hsqldb/hsqldb//jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <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}">
+                <attribute name="name">Informix (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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}">
+                <attribute name="name">InterSystems Cache</attribute>
+                <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
+                <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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}">
+                <attribute name="name">JDataStore</attribute>
+                <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
+                <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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}">
+                <attribute name="name">JDBC/ODBC Bridge</attribute>
+                <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
+                <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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}">
+                <attribute name="name">McKoi embedded</attribute>
+                <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
+                <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <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}">
+                <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="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">1521</attribute>
+                <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}">
+                <attribute name="name">Oracle OCI</attribute>
+                <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
+                <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="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}">
+                <attribute name="name">Oracle (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
+                <attribute name="defaultPort">1521</attribute>
+                <attribute name="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}">
+                <attribute name="name">Pervasive</attribute>
+                <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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}">
+                <attribute name="name">Pointbase server</attribute>
+                <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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>
+                <attribute name="dependencyFilterStrings">postgresql/postgresql-7.3//jar,postgresql/postgresql-7.4//jar,postgresql/postgresql-8.0//jar,postgresql/postgresql-8.1//jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">0</attribute>
+                <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}">
+                <attribute name="name">MaxDB</attribute>
+                <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="dependencyFilterStrings">maxdb/sapdbc//jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">1433</attribute>
+                <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}">
+                <attribute name="name">SQL Server (jTDS)</attribute>
+                <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
+                <attribute name="defaultPort">1433</attribute>
+                <attribute name="specific">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+                <attribute name="dependencyFilterStrings">jtds/jtds//jar</attribute>
+            </gbean>
+            <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>
+                <attribute name="defaultPort">1433</attribute>
+                <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}">
+                <attribute name="name">Sybase ASE</attribute>
+                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
+                <attribute name="defaultPort">2048</attribute>
+                <attribute name="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}">
+                <attribute name="name">Sybase ASA</attribute>
+                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
+                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
+                <attribute name="defaultPort">2638</attribute>
+                <attribute name="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}">
+                <attribute name="name">Sybase (DataDirect)</attribute>
+                <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
+                <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="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}">
+                <attribute name="name">Other</attribute>
+                <attribute name="URLPrototype"></attribute>
+                <attribute name="driverClassName"></attribute>
+                <attribute name="defaultPort">0</attribute>
+                <attribute name="specific">false</attribute>
+                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+            </gbean>
+        </web-app>
+    </module>
+
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
+        <!--<default-subject>-->
+            <!--<realm>geronimo-admin</realm>-->
+            <!--<id>system</id>-->
+        <!--</default-subject>-->
+    	<role-mappings>
+    		<role role-name="admin">
+    				<principal
+    					class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+    					name="admin"/>
+    		</role>
+    	</role-mappings>
+    </security>
+    <!-- Console specific server info -->
+    <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
+        <!--<reference name="ServerInfo">-->
+            <!--<name>ServerInfo</name>-->
+        <!--</reference>-->
+        <!--<reference name="LoginModule">-->
+            <!--<name>properties-login</name>-->
+        <!--</reference>-->
+    <!--</gbean>-->
+
+    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
+
+</application>

Modified: geronimo/server/trunk/configs/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webservices-common/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/configs/webservices-common/pom.xml Mon Sep 10 23:34:53 2007
@@ -32,6 +32,8 @@
     <artifactId>webservices-common</artifactId>
     <name>Geronimo Configs :: WebServices Common</name>
     <packaging>car</packaging>
+
+    <description>Common classes for all web services provider integrations.</description>
     
     <dependencies>
 
@@ -92,5 +94,21 @@
         </dependency>
 
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+  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
@@ -12,75 +13,8 @@
   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.-->
+  limitations under the License.
+-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-      <dep:artifactId>webservices-common</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>woodstox</dep:groupId>
-        <dep:artifactId>wstx-asl</dep:artifactId>
-        <dep:version>3.2.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-jaxws</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>wsdl4j</dep:groupId>
-        <dep:artifactId>wsdl4j</dep:artifactId>
-        <dep:version>1.6.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>xmlbeans</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-server</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>com.sun.xml.bind</dep:groupId>
-        <dep:artifactId>jaxb-impl</dep:artifactId>
-        <dep:version>2.0.5</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>com.sun.xml.messaging.saaj</dep:groupId>
-        <dep:artifactId>saaj-impl</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-security</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-webservices</dep:artifactId>
-        <dep:version>2.1-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-</module>
\ No newline at end of file
+
+</module>

Modified: geronimo/server/trunk/configs/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/xmlbeans/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/xmlbeans/pom.xml (original)
+++ geronimo/server/trunk/configs/xmlbeans/pom.xml Mon Sep 10 23:34:53 2007
@@ -32,6 +32,8 @@
     <artifactId>xmlbeans</artifactId>
     <name>Geronimo Configs :: XMLBeans</name>
     <packaging>car</packaging>
+
+    <description>Geronimo module that supplies the xmlbeans framework in a single classloader.</description>
     
     <dependencies>
 
@@ -68,6 +70,11 @@
                         <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
                     </deploymentConfigs>
                     <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Geronimo Core</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml Mon Sep 10 23:34:53 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,31 +13,11 @@
     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$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>xmlbeans</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jee-specs</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <version>2.3.0</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+</module>

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Mon Sep 10 23:34:53 2007
@@ -30,6 +30,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1108,7 +1109,12 @@
             if (monitor != null) {
                 monitor.setTotalBytes(-1); // Just to be sure
             }
-            URL repository = new URL(list.removeFirst());
+            String repo = list.removeFirst();
+            URL repository = PluginRepositoryDownloader.resolveRepository(repo);
+            if (repository == null) {
+                log.info("Failed to resolve repository: " + repo);
+                continue;
+            }
             URL url = artifact == null ? repository : getURL(artifact, repository);
             if (artifact != null)
                 log.info("Attempting to download " + artifact + " from " + url);
@@ -1212,7 +1218,12 @@
         Artifact result = null;
         for (String repo : repos) {
             try {
-                result = findArtifact(query, new URL(repo), username, password, monitor);
+                URL repoUrl = PluginRepositoryDownloader.resolveRepository(repo);
+                if (repoUrl != null) {
+                    result = findArtifact(query, repoUrl, username, password, monitor);
+                } else {
+                    log.warn("could not resolve repo: " + repo);
+                }
             } catch (Exception e) {
                 log.warn("Unable to read from " + repo, e);
             }

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java Mon Sep 10 23:34:53 2007
@@ -22,8 +22,8 @@
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -86,29 +86,36 @@
         }
         for (String userRepository : userRepositories) {
             userRepository = userRepository.trim();
-            try {
-                URI uri = new URI(userRepository);
-                if (uri.getScheme() == null) {
-                    if (uri.isAbsolute()) {
-                        URL url = new URI("file", userRepository, null).toURL();
-                        list.add(url);
-                    } else if (userRepository.startsWith("~")) {
-                        userRepository = userRepository.substring(2);
-                        URI fullUri = new File(System.getProperty("user.home")).getAbsoluteFile().toURI().resolve(userRepository);
-                        list.add(fullUri.toURL());
-                    } else {
-                        log.error("Can't interpret path: " + userRepository);
-                    }
+            URL url = resolveRepository(userRepository);
+            if (url != null) {
+                list.add(url);
+            }
+        }
+        return list.toArray(new URL[list.size()]);
+    }
+
+    static URL resolveRepository(String userRepository) {
+        URL url = null;
+        try {
+            URI uri = new URI(userRepository);
+            if (uri.getScheme() == null) {
+                if (uri.isAbsolute()) {
+                    url = new URI("file", userRepository, null).toURL();
+                } else if (userRepository.startsWith("~")) {
+                    URI fullUri = new File(System.getProperty("user.home")).getAbsoluteFile().toURI().resolve(userRepository.substring(2));
+                    url = fullUri.toURL();
                 } else {
-                    list.add(uri.toURL());
+                    log.error("Can't interpret path: " + userRepository);
                 }
-            } catch (MalformedURLException e) {
-                log.error("Unable to format plugin repository URL " + userRepository, e);
-            } catch (URISyntaxException e) {
-                log.error("Unable to format plugin repository URL " + userRepository, e);
+            } else {
+                url = uri.toURL();
             }
+        } catch (MalformedURLException e) {
+            log.error("Unable to format plugin repository URL " + userRepository, e);
+        } catch (URISyntaxException e) {
+            log.error("Unable to format plugin repository URL " + userRepository, e);
         }
-        return list.toArray(new URL[list.size()]);
+        return url;
     }
 
     /**

Modified: geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java Mon Sep 10 23:34:53 2007
@@ -22,11 +22,14 @@
 
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
+import java.io.Reader;
+import java.io.StringReader;
 import java.util.List;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.system.plugin.model.PluginType;
 import org.apache.geronimo.system.plugin.model.GbeanType;
+import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 import org.apache.geronimo.system.configuration.GBeanOverride;
 import org.apache.geronimo.system.configuration.condition.JexlExpressionParser;
 
@@ -123,5 +126,23 @@
         String attributeValue = override.getAttribute("defaultEnvironment");
         assertEquals(ATTRIBUTE_VALUE, attributeValue);
 
+    }
+
+    private static final String INSTANCE = "                        <plugin-artifact>\n" +
+            "                            <copy-file relative-to=\"server\" dest-dir=\"var/directory\">META-INF/server.xml</copy-file>\n" +
+            "                            <config-xml-content>\n" +
+            "                                <gbean name=\"DirectoryService\">\n" +
+            "                                    <attribute name=\"configFile\">var/directory/server.xml</attribute>\n" +
+            "                                    <attribute name=\"workingDir\">var/directory</attribute>\n" +
+            "                                    <attribute name=\"providerURL\">#{providerURL}</attribute>\n" +
+            "                                </gbean>\n" +
+            "                            </config-xml-content>\n" +
+            "                            <config-substitution key=\"providerURL\">ou=system</config-substitution>\n" +
+            "                        </plugin-artifact>";
+    
+    public void testReadNoNS() throws Exception {
+        Reader in = new StringReader(INSTANCE);
+        PluginArtifactType instance = PluginInstallerGBean.loadPluginArtifactMetadata(in);
+        assertEquals("DirectoryService", instance.getConfigXmlContent().getGbean().get(0).getName());
     }
 }



Mime
View raw message