geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r573015 [1/2] - in /geronimo/plugins/system-database/trunk: ./ system-database-ear/ system-database-jetty/ system-database-jetty/src/main/plan/ system-database-jetty/src/main/resources/ system-database-jetty/src/plan/ system-database-portle...
Date Wed, 05 Sep 2007 18:00:53 GMT
Author: pmcmahan
Date: Wed Sep  5 11:00:51 2007
New Revision: 573015

URL: http://svn.apache.org/viewvc?rev=573015&view=rev
Log:
GERONIMO-3413 bundling the system-database config with the portlets in an ear was evil.  instead
use a <dependency> and let the plugin installer download and install the system-database config
as a separate component.
use the car maven plugin to generate the geronimo-plugin.xml for the system-database portlets

Added:
    geronimo/plugins/system-database/trunk/system-database-jetty/src/main/plan/
      - copied from r570301, geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/
    geronimo/plugins/system-database/trunk/system-database-jetty/src/main/plan/plan.xml
      - copied, changed from r573014, geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/
      - copied from r571292, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/
      - copied from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/databasemanager/wizard/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/
      - copied from r571292, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/basicParams.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/basicParams.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
      - copied unchanged from r573014, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
    geronimo/plugins/system-database/trunk/system-database-tomcat/src/main/plan/
      - copied from r570429, geronimo/plugins/system-database/trunk/system-database-tomcat/src/plan/
    geronimo/plugins/system-database/trunk/system-database-tomcat/src/main/plan/plan.xml
      - copied, changed from r573014, geronimo/plugins/system-database/trunk/system-database-tomcat/src/plan/plan.xml
Removed:
    geronimo/plugins/system-database/trunk/system-database-ear/
    geronimo/plugins/system-database/trunk/system-database-jetty/src/main/resources/
    geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/
    geronimo/plugins/system-database/trunk/system-database-tomcat/src/main/resources/
    geronimo/plugins/system-database/trunk/system-database-tomcat/src/plan/
Modified:
    geronimo/plugins/system-database/trunk/pom.xml
    geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml

Modified: geronimo/plugins/system-database/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/pom.xml?rev=573015&r1=573014&r2=573015&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/pom.xml Wed Sep  5 11:00:51 2007
@@ -81,6 +81,26 @@
             </dependency>
 
             <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql-connector-derby-embed-local</artifactId>
+                <version>${tranqlVersion}</version>
+                <type>rar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                <version>${tranqlVersion}</version>
+                <type>rar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-test-ddbean</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>geronimo-gbean-deployer</artifactId>
                 <version>${geronimoVersion}</version>
@@ -88,6 +108,20 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jsr88-rar-configurer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>system-database</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
                 <groupId>javax.portlet</groupId>
                 <artifactId>portlet-api</artifactId>
                 <version>1.0</version>
@@ -162,13 +196,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.tranql</groupId>
-                <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                <version>${tranqlVersion}</version>
-                <type>rar</type>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-connector-builder</artifactId>
                 <version>${geronimoVersion}</version>
@@ -370,7 +397,6 @@
 
             <modules>
                 <module>system-database-portlets</module>
-                <module>system-database-ear</module>
                 <module>system-database-tomcat</module>
                 <module>system-database-jetty</module>
             </modules>

Modified: geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml?rev=573015&r1=573014&r2=573015&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml Wed Sep  5 11:00:51 2007
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -21,49 +21,45 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
+    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>system-database-jetty</artifactId>
-    <name>Geronimo System Database :: Jetty Plugin</name>
+    <name>System Database :: Configuration for Jetty</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-                
-        <dependency>    
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <type>car</type>
-        </dependency>   
-                        
-        <dependency>    
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-derby</artifactId>
-        </dependency>
-    
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-timer</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>system-database-portlets</artifactId>
+            <version>${version}</version>
+            <type>war</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-rar-configurer</artifactId>
+            <type>car</type>
         </dependency>
 
         <dependency>
@@ -73,28 +69,45 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <type>car</type>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>system-database-ear</artifactId>
-            <version>${version}</version>
-            <type>ear</type>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
-            <type>car</type>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <type>rar</type>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -102,6 +115,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -110,18 +124,139 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>system-database-ear</artifactId>
-                        <type>ear</type>
+                        <artifactId>system-database-portlets</artifactId>
+                        <type>war</type>
                     </module>
+                    <name>System Database -- Jetty</name>
+                    <category>Application</category>
+                    <description>
+                       System Database Views for Jetty
+                    </description>
+                    <url>http://geronimo.apache.org/</url>
+                    <author>The Apache Geronimo development community</author>
+                    <osiApproved>true</osiApproved>
+                    <geronimoVersions>
+                        <value>2.0.1</value>
+                        <value>2.1-SNAPSHOT</value>
+                    </geronimoVersions>
+                    <obsoletes>
+                        <moduleId>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>system-database-jetty</artifactId>
+                        </moduleId>
+                    </obsoletes>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>pluto-support</artifactId>
+                            <version>1.0-SNAPSHOT</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.tranql</groupId>
+                            <artifactId>tranql-connector-derby-embed-local</artifactId>
+                            <version>${tranqlVersion}</version>
+                            <type>rar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.tranql</groupId>
+                            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                            <version>${tranqlVersion}</version>
+                            <type>rar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>system-database</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jsr88-rar-configurer</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>geronimo-gbean-deployer</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-test-ddbean</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-management</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deploy-jsr88</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-derby</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                    </dependencies>
+                    <prerequisites>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.plugins</groupId>
+                                <artifactId>pluto-support</artifactId>
+                            </id>
+                            <resource-type>Portal</resource-type>
+                            <description>Pluto portal cantainer support in Geronimo</description>
+                        </prerequisite>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>jetty6</artifactId>
+                            </id>
+                            <resource-type>Web Container</resource-type>
+                            <description>
+                                This version of the plugin works with the Geronimo/Jetty distribution.
+                                It is not intended to run in the Geronimo/Tomcat distribution.
+                                There is a separate version of this plugin that works with Tomcat.
+                                Please install the version appropriate to your Geronimo distribution.
+                            </description>
+                        </prerequisite>
+                    </prerequisites>
+                    <sourceRepositories>
+                        <value>http://people.apache.org/repo/m2-snapshot-repository/</value>
+                        <value>http://repo1.maven.org/maven2/</value>
+                    </sourceRepositories>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
 </project>

Copied: geronimo/plugins/system-database/trunk/system-database-jetty/src/main/plan/plan.xml (from r573014, geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-jetty/src/main/plan/plan.xml?p2=geronimo/plugins/system-database/trunk/system-database-jetty/src/main/plan/plan.xml&p1=geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml&r1=573014&r2=573015&rev=573015&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-jetty/src/main/plan/plan.xml Wed Sep  5 11:00:51 2007
@@ -1,127 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
 
-    <module>
-        <web>system-database-portlets.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>system-database-portlets</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/>
-                <dep:hidden-classes />
-                <dep:non-overridable-classes />
-            </dep:environment>
-            <context-root>/system-database</context-root>
-            <security-realm-name>geronimo-admin</security-realm-name>
-        </web-app>
-    </module>
-
-    <module>
-        <connector>tranql-connector-derby-embed-xa-1.3.rar</connector>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-            <resourceadapter>
-                <outbound-resourceadapter>
-                    <connection-definition>
-                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>SystemDatasource</name>
-                            <config-property-setting name="UserName"></config-property-setting>
-                            <config-property-setting name="Password"></config-property-setting>
-                            <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                            <config-property-setting name="CreateDatabase">true</config-property-setting>
-                            <connectionmanager>
-                                <xa-transaction>
-                                    <transaction-caching/>
-                                </xa-transaction>
-                                <single-pool>
-                                    <max-size>100</max-size>
-                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                    <select-one-assume-match/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                        <connectiondefinition-instance>
-                            <name>NoTxDatasource</name>
-                            <config-property-setting name="UserName"></config-property-setting>
-                            <config-property-setting name="Password"></config-property-setting>
-                            <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                            <config-property-setting name="CreateDatabase">true</config-property-setting>
-                            <connectionmanager>
-                                <no-transaction/>
-                                <single-pool>
-                                    <max-size>100</max-size>
-                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                    <select-one-assume-match/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                </outbound-resourceadapter>
-            </resourceadapter>
-
-            <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-                <reference name="ServerInfo"><name>ServerInfo</name></reference>
-                <attribute name="derbySystemHome">var/derby</attribute>
-            </gbean>
-
-            <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
-                <reference name="derbySystem"><name>DerbySystem</name></reference>
-                <attribute name="host">localhost</attribute>
-                <attribute name="port">1527</attribute>
-            </gbean>
-
-            <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
-                <reference name="DerbySystem"><name>DerbySystem</name></reference>
-            </gbean>
-
-            <gbean name="DerbyDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
-                <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
-            </gbean>
-
-            <gbean name="DerbyClientDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
-                <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
-            </gbean>
-
-            <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-                <attribute name="repeatCount">5</attribute>
-                <reference name="TransactionManager"><name>TransactionManager</name></reference>
-                <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-                <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-                <dependency><name>DerbySystem</name></dependency>
-            </gbean>
-
-            <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-                <reference name="TransactionManager"><name>TransactionManager</name></reference>
-                <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-                <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-                <dependency><name>DerbySystem</name></dependency>
-            </gbean>
-        </connector>
-    </module>
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
+    
+    <!-- This is where the files are accessed from. (aka - portletContext) -->
+    <context-root>/system-database</context-root>
 
+    <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
             <role role-name="admin">
@@ -129,6 +29,12 @@
             </role>
         </role-mappings>
     </security>
+    
+    <gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Services/Database Pools</attribute>
+        <attribute name="portletContext">/system-database</attribute>
+        <attribute name="portletList">[DBWizard]</attribute>
+    </gbean>
 
     <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Embedded DB/DB Info</attribute>
@@ -139,7 +45,7 @@
     <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Embedded DB/DB Manager</attribute>
         <attribute name="portletContext">/system-database</attribute>
-        <attribute name="portletList">[DBViewer, RunSQL]</attribute>
+        <attribute name="portletList">[DBViewer,RunSQL]</attribute>
     </gbean>
 
     <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
@@ -148,4 +54,298 @@
         <attribute name="portletList">[DerbyLogViewer]</attribute>
     </gbean>
 
-</application>
+    <!-- database driver definitions -->
+    <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">DaffodilDB Embedded</attribute>
+        <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
+        <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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>

Modified: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=573015&r1=573014&r2=573015&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Sep  5 11:00:51 2007
@@ -98,4 +98,23 @@
         </portlet-info>
     </portlet>
 
+    <portlet>
+        <description>Portlet for managing database pools</description>
+        <portlet-name>DBWizard</portlet-name>
+        <display-name>Database Pool Wizard</display-name>
+        <portlet-class>org.apache.geronimo.console.databasemanager.wizard.DatabasePoolPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Database Pools</title>
+            <short-title>Database Pools</short-title>
+            <keywords>Database Pool Wizard</keywords>
+        </portlet-info>
+    </portlet>
+
 </portlet-app>

Modified: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml?rev=573015&r1=573014&r2=573015&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml Wed Sep  5 11:00:51 2007
@@ -60,6 +60,16 @@
         </init-param>
     </servlet>
 
+    <servlet>
+        <display-name>Pluto Wrapper for Database Wizard Portlet</display-name>
+        <servlet-name>DBWizard</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>DBWizard</param-value>
+        </init-param>
+    </servlet>
+
     <servlet-mapping>
         <servlet-name>InternalDB</servlet-name>
         <url-pattern>/PlutoInvoker/InternalDB/*</url-pattern>
@@ -78,6 +88,11 @@
     <servlet-mapping>
         <servlet-name>DerbyLogViewer</servlet-name>
         <url-pattern>/PlutoInvoker/DerbyLogViewer/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>DBWizard</servlet-name>
+        <url-pattern>/PlutoInvoker/DBWizard/*</url-pattern>
     </servlet-mapping>
 
     <security-constraint>

Modified: geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml?rev=573015&r1=573014&r2=573015&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml Wed Sep  5 11:00:51 2007
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -21,49 +21,45 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
+    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>system-database-tomcat</artifactId>
-    <name>Geronimo System Database :: Tomcat Plugin</name>
+    <name>System Database :: Configuration for Tomcat</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-                
-        <dependency>    
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <type>car</type>
-        </dependency>   
-                        
-        <dependency>    
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-derby</artifactId>
-        </dependency>
-    
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-timer</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>system-database-portlets</artifactId>
+            <version>${version}</version>
+            <type>war</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-rar-configurer</artifactId>
+            <type>car</type>
         </dependency>
 
         <dependency>
@@ -73,28 +69,45 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <type>car</type>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>system-database-ear</artifactId>
-            <version>${version}</version>
-            <type>ear</type>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
-            <type>car</type>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <type>rar</type>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -102,6 +115,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -110,18 +124,139 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>system-database-ear</artifactId>
-                        <type>ear</type>
+                        <artifactId>system-database-portlets</artifactId>
+                        <type>war</type>
                     </module>
+                    <name>System Database -- Tomcat</name>
+                    <category>Application</category>
+                    <description>
+                       System Database Views for Tomcat
+                    </description>
+                    <url>http://geronimo.apache.org/</url>
+                    <author>The Apache Geronimo development community</author>
+                    <osiApproved>true</osiApproved>
+                    <geronimoVersions>
+                        <value>2.0.1</value>
+                        <value>2.1-SNAPSHOT</value>
+                    </geronimoVersions>
+                    <obsoletes>
+                        <moduleId>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>system-database-tomcat</artifactId>
+                        </moduleId>
+                    </obsoletes>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>pluto-support</artifactId>
+                            <version>1.0-SNAPSHOT</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.tranql</groupId>
+                            <artifactId>tranql-connector-derby-embed-local</artifactId>
+                            <version>${tranqlVersion}</version>
+                            <type>rar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.tranql</groupId>
+                            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                            <version>${tranqlVersion}</version>
+                            <type>rar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>system-database</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jsr88-rar-configurer</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>geronimo-gbean-deployer</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-test-ddbean</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-management</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deploy-jsr88</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-derby</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                    </dependencies>
+                    <prerequisites>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.plugins</groupId>
+                                <artifactId>pluto-support</artifactId>
+                            </id>
+                            <resource-type>Portal</resource-type>
+                            <description>Pluto portal cantainer support in Geronimo</description>
+                        </prerequisite>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>tomcat6</artifactId>
+                            </id>
+                            <resource-type>Web Container</resource-type>
+                            <description>
+                                This version of the plugin works with the Geronimo/Tomcat distribution.
+                                It is not intended to run in the Geronimo/Jetty distribution.
+                                There is a separate version of this plugin that works with Jetty.
+                                Please install the version appropriate to your Geronimo distribution.
+                            </description>
+                        </prerequisite>
+                    </prerequisites>
+                    <sourceRepositories>
+                        <value>http://people.apache.org/repo/m2-snapshot-repository/</value>
+                        <value>http://repo1.maven.org/maven2/</value>
+                    </sourceRepositories>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
 </project>



Mime
View raw message