Return-Path: 
 <dev-return-85782-apmail-geronimo-dev-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-dev-archive@www.apache.org
Received: (qmail 70512 invoked from network); 16 Sep 2010 01:45:09 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 16 Sep 2010 01:45:09 -0000
Received: (qmail 46859 invoked by uid 500); 16 Sep 2010 01:45:09 -0000
Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org
Received: (qmail 46731 invoked by uid 500); 16 Sep 2010 01:45:08 -0000
Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:dev-help@geronimo.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@geronimo.apache.org>
List-Post: <mailto:dev@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <dev.geronimo.apache.org>
Delivered-To: mailing list dev@geronimo.apache.org
Received: (qmail 46724 invoked by uid 99); 16 Sep 2010 01:45:08 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Sep 2010 01:45:08 +0000
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL
X-Spam-Check-By: apache.org
Received-SPF: pass (athena.apache.org: domain of jgawor@gmail.com designates
 209.85.212.54 as permitted sender)
Received: from [209.85.212.54] (HELO mail-vw0-f54.google.com) (209.85.212.54)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Sep 2010 01:45:02 +0000
Received: by vws7 with SMTP id 7so682111vws.13
        for <dev@geronimo.apache.org>; Wed, 15 Sep 2010 18:44:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:mime-version:received:received:date:message-id
         :subject:from:to:content-type:content-transfer-encoding;
        bh=37QhZcNG9n0SiUWg/BIAk7ZA8oiBXKocs5z+GD/6/KE=;
        b=cdwSeYamcxkynzWN7ykEvxP5IwXB8IHJlNbV2DaoOZu+utg173wguSFcQJENpgG2KL
         Uys8kkGhBB3fq5Y40Uh02uLUHpZUkNiXwt4ko71KDf3bj1XVh34DyCEItTk+V4D1RQI/
         O1Msp20+heB1fv+a3owmW+XYYQid1tEBEDdPM=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:date:message-id:subject:from:to:content-type
         :content-transfer-encoding;
        b=cjnPScV3AYlRLbA4HfwiesEuilx1WL9PfCYG3vnBlerBzluTxhgl7Hh2+Oiu8LFikR
         Oy2tLgH3u454tcoUeiAMh1EFEsQyMgmmV5ImEADwwgQpc9TOakjN/zgGxpiRcJuDM2YE
         07HHtgQK8d73PS/mSlEbFPTJJw7z3IE8qZGT4=
MIME-Version: 1.0
Received: by 10.220.124.85 with SMTP id t21mr1429660vcr.5.1284601478209; Wed,
 15 Sep 2010 18:44:38 -0700 (PDT)
Received: by 10.220.195.134 with HTTP; Wed, 15 Sep 2010 18:44:38 -0700 (PDT)
Date: Wed, 15 Sep 2010 21:44:38 -0400
Message-ID: <AANLkTimhdv1wBqKNb7sAMT-PsaYaha7OD-5vh2D1xDz0@mail.gmail.com>
Subject: Re: svn commit: r997240 - in /geronimo/server/trunk:
 plugingroups/console-jetty/ plugingroups/console-jetty/src/main/history/
 plugingroups/console-tomcat/ plugingroups/console-tomcat/src/main/history/
 plugins/system-database/ plugins/system-database/
From: Jarek Gawor <jgawor@gmail.com>
To: dev@geronimo.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Rex,

Please double check your changes before committing. This 1) causes the
server not to startup anymore and 2) relies on a dependency that's not
build right now. Please revert or fix it as soon as you can.

Thanks,
Jarek

On Wed, Sep 15, 2010 at 5:42 AM,  <rwonly@apache.org> wrote:
> Author: rwonly
> Date: Wed Sep 15 09:42:30 2010
> New Revision: 997240
>
> URL: http://svn.apache.org/viewvc?rev=3D997240&view=3Drev
> Log:
> GERONIMO-5597 make system db portlets compile with server
>
> Modified:
> =A0 =A0geronimo/server/trunk/plugingroups/console-jetty/pom.xml
> =A0 =A0geronimo/server/trunk/plugingroups/console-jetty/src/main/history/=
dependencies.xml
> =A0 =A0geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
> =A0 =A0geronimo/server/trunk/plugingroups/console-tomcat/src/main/history=
/dependencies.xml
> =A0 =A0geronimo/server/trunk/plugins/system-database/pom.xml
> =A0 =A0geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/=
src/main/history/dependencies.xml
> =A0 =A0geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat=
/src/main/history/dependencies.xml
> =A0 =A0geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/m=
ain/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPor=
tlet.java
> =A0 =A0geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/m=
ain/webapp/WEB-INF/web.xml
>
> Modified: geronimo/server/trunk/plugingroups/console-jetty/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/cons=
ole-jetty/pom.xml?rev=3D997240&r1=3D997239&r2=3D997240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugingroups/console-jetty/pom.xml (original)
> +++ geronimo/server/trunk/plugingroups/console-jetty/pom.xml Wed Sep 15 0=
9:42:30 2010
> @@ -58,7 +58,16 @@
> =A0 =A0 =A0 =A0 =A0 =A0 <version>${project.version}</version>
> =A0 =A0 =A0 =A0 =A0 =A0 <type>car</type>
> =A0 =A0 =A0 =A0 </dependency>
> -
> +
> + =A0 =A0 =A0 =A0<!--
> + =A0 =A0 =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.plugins</groupId>
> + =A0 =A0 =A0 =A0 =A0 =A0<artifactId>osgi-console-jetty</artifactId>
> + =A0 =A0 =A0 =A0 =A0 =A0<version>${project.version}</version>
> + =A0 =A0 =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0 =A0 =A0</dependency>
> + =A0 =A0 =A0 =A0-->
> +
> =A0 =A0 =A0 =A0 <!--<dependency>-->
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<groupId>org.apache.geronimo.configs</groupId=
>-->
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<artifactId>ca-helper-jetty</artifactId>-->
> @@ -94,12 +103,12 @@
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<type>car</type>-->
> =A0 =A0 =A0 =A0 <!--</dependency>-->
>
> - =A0 =A0 =A0 =A0<!--<dependency>-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<groupId>org.apache.geronimo.plugins</groupI=
d>-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<artifactId>sysdb-console-jetty</artifactId>=
-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<version>${project.version}</version>-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<type>car</type>-->
> - =A0 =A0 =A0 =A0<!--</dependency>-->
> + =A0 =A0 =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.plugins</groupId>
> + =A0 =A0 =A0 =A0 =A0 =A0<artifactId>sysdb-console-jetty</artifactId>
> + =A0 =A0 =A0 =A0 =A0 =A0<version>${project.version}</version>
> + =A0 =A0 =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0 =A0 =A0</dependency>
>
> =A0 =A0 =A0 =A0 <!--<dependency>-->
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<groupId>org.apache.geronimo.plugins</groupId=
>-->
>
> Modified: geronimo/server/trunk/plugingroups/console-jetty/src/main/histo=
ry/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/cons=
ole-jetty/src/main/history/dependencies.xml?rev=3D997240&r1=3D997239&r2=3D9=
97240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dep=
endencies.xml (original)
> +++ geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dep=
endencies.xml Wed Sep 15 09:42:30 2010
> @@ -21,4 +21,9 @@
> =A0 =A0 =A0 =A0 <artifactId>plugin-console-jetty</artifactId>
> =A0 =A0 =A0 =A0 <type>car</type>
> =A0 =A0 </dependency>
> + =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.plugins</groupId>
> + =A0 =A0 =A0 =A0<artifactId>sysdb-console-jetty</artifactId>
> + =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0</dependency>
> =A0</plugin-artifact>
>
> Modified: geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/cons=
ole-tomcat/pom.xml?rev=3D997240&r1=3D997239&r2=3D997240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugingroups/console-tomcat/pom.xml (original)
> +++ geronimo/server/trunk/plugingroups/console-tomcat/pom.xml Wed Sep 15 =
09:42:30 2010
> @@ -59,6 +59,15 @@
> =A0 =A0 =A0 =A0 =A0 =A0 <type>car</type>
> =A0 =A0 =A0 =A0 </dependency>
>
> + =A0 =A0 =A0 =A0<!--
> + =A0 =A0 =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.plugins</groupId>
> + =A0 =A0 =A0 =A0 =A0 =A0<artifactId>osgi-console-tomcat</artifactId>
> + =A0 =A0 =A0 =A0 =A0 =A0<version>${project.version}</version>
> + =A0 =A0 =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0 =A0 =A0</dependency>
> + =A0 =A0 =A0 =A0-->
> +
> =A0 =A0 =A0 =A0 <!--<dependency>-->
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<groupId>org.apache.geronimo.configs</groupId=
>-->
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<artifactId>ca-helper-tomcat</artifactId>-->
> @@ -94,12 +103,12 @@
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<type>car</type>-->
> =A0 =A0 =A0 =A0 <!--</dependency>-->
>
> - =A0 =A0 =A0 =A0<!--<dependency>-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<groupId>org.apache.geronimo.plugins</groupI=
d>-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<artifactId>sysdb-console-tomcat</artifactId=
>-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<version>${project.version}</version>-->
> - =A0 =A0 =A0 =A0 =A0 =A0<!--<type>car</type>-->
> - =A0 =A0 =A0 =A0<!--</dependency>-->
> + =A0 =A0 =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.plugins</groupId>
> + =A0 =A0 =A0 =A0 =A0 =A0<artifactId>sysdb-console-tomcat</artifactId>
> + =A0 =A0 =A0 =A0 =A0 =A0<version>${project.version}</version>
> + =A0 =A0 =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0 =A0 =A0</dependency>
>
> =A0 =A0 =A0 =A0 <!--<dependency>-->
> =A0 =A0 =A0 =A0 =A0 =A0 <!--<groupId>org.apache.geronimo.plugins</groupId=
>-->
>
> Modified: geronimo/server/trunk/plugingroups/console-tomcat/src/main/hist=
ory/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/cons=
ole-tomcat/src/main/history/dependencies.xml?rev=3D997240&r1=3D997239&r2=3D=
997240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/de=
pendencies.xml (original)
> +++ geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/de=
pendencies.xml Wed Sep 15 09:42:30 2010
> @@ -21,4 +21,9 @@
> =A0 =A0 =A0 =A0 <artifactId>plugin-console-tomcat</artifactId>
> =A0 =A0 =A0 =A0 <type>car</type>
> =A0 =A0 </dependency>
> + =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.plugins</groupId>
> + =A0 =A0 =A0 =A0<artifactId>sysdb-console-tomcat</artifactId>
> + =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0</dependency>
> =A0</plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/system-database/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-da=
tabase/pom.xml?rev=3D997240&r1=3D997239&r2=3D997240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugins/system-database/pom.xml (original)
> +++ geronimo/server/trunk/plugins/system-database/pom.xml Wed Sep 15 09:4=
2:30 2010
> @@ -39,9 +39,9 @@
> =A0 =A0 <modules>
> =A0 =A0 =A0 =A0 <module>geronimo-derby</module>
> =A0 =A0 =A0 =A0 <module>system-database</module>
> - =A0 =A0 =A0 =A0<!--<module>sysdb-portlets</module>-->
> - =A0 =A0 =A0 =A0<!--<module>sysdb-console-jetty</module>-->
> - =A0 =A0 =A0 =A0<!--<module>sysdb-console-tomcat</module>-->
> + =A0 =A0 =A0 =A0<module>sysdb-portlets</module>
> + =A0 =A0 =A0 =A0<module>sysdb-console-jetty</module>
> + =A0 =A0 =A0 =A0<module>sysdb-console-tomcat</module>
> =A0 =A0 </modules>
>
> =A0 =A0 <dependencyManagement>
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jet=
ty/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-da=
tabase/sysdb-console-jetty/src/main/history/dependencies.xml?rev=3D997240&r=
1=3D997239&r2=3D997240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src=
/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src=
/main/history/dependencies.xml Wed Sep 15 09:42:30 2010
> @@ -13,6 +13,11 @@
> =A0 =A0 </dependency>
> =A0 =A0 <dependency>
> =A0 =A0 =A0 =A0 <groupId>org.apache.geronimo.configs</groupId>
> + =A0 =A0 =A0 =A0<artifactId>db-connectors</artifactId>
> + =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0</dependency>
> + =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.configs</groupId>
> =A0 =A0 =A0 =A0 <artifactId>system-database</artifactId>
> =A0 =A0 =A0 =A0 <type>car</type>
> =A0 =A0 </dependency>
> @@ -51,84 +56,4 @@
> =A0 =A0 =A0 =A0 <artifactId>org.apache.servicemix.bundles.ant</artifactId=
>
> =A0 =A0 =A0 =A0 <type>jar</type>
> =A0 =A0 </dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-db2-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-client-local</artifac=
tId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-client-xa</artifactId=
>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-embed-local</artifact=
Id>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-embed-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-informix-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-mysql-local</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-mysql-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-oracle-local</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-oracle-rac-local</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-oracle-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-postgresql-local</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-postgresql-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-ra</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-sqlserver2000-xa</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-sqlserver2005-xa</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> =A0</plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tom=
cat/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-da=
tabase/sysdb-console-tomcat/src/main/history/dependencies.xml?rev=3D997240&=
r1=3D997239&r2=3D997240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/sr=
c/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/sr=
c/main/history/dependencies.xml Wed Sep 15 09:42:30 2010
> @@ -13,6 +13,11 @@
> =A0 =A0 </dependency>
> =A0 =A0 <dependency>
> =A0 =A0 =A0 =A0 <groupId>org.apache.geronimo.configs</groupId>
> + =A0 =A0 =A0 =A0<artifactId>db-connectors</artifactId>
> + =A0 =A0 =A0 =A0<type>car</type>
> + =A0 =A0</dependency>
> + =A0 =A0<dependency>
> + =A0 =A0 =A0 =A0<groupId>org.apache.geronimo.configs</groupId>
> =A0 =A0 =A0 =A0 <artifactId>system-database</artifactId>
> =A0 =A0 =A0 =A0 <type>car</type>
> =A0 =A0 </dependency>
> @@ -46,89 +51,4 @@
> =A0 =A0 =A0 =A0 <artifactId>console-tomcat</artifactId>
> =A0 =A0 =A0 =A0 <type>car</type>
> =A0 =A0 </dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.apache.servicemix.bundles</groupId>
> - =A0 =A0 =A0 =A0<artifactId>org.apache.servicemix.bundles.ant</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>jar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-db2-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-client-local</artifac=
tId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-client-xa</artifactId=
>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-embed-local</artifact=
Id>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-derby-embed-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-informix-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-mysql-local</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-mysql-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-oracle-local</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-oracle-rac-local</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-oracle-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-postgresql-local</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-postgresql-xa</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-ra</artifactId>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-sqlserver2000-xa</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> - =A0 =A0<dependency>
> - =A0 =A0 =A0 =A0<groupId>org.tranql</groupId>
> - =A0 =A0 =A0 =A0<artifactId>tranql-connector-sqlserver2005-xa</artifactI=
d>
> - =A0 =A0 =A0 =A0<type>rar</type>
> - =A0 =A0</dependency>
> =A0</plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/sr=
c/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePool=
Portlet.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-da=
tabase/sysdb-portlets/src/main/java/org/apache/geronimo/console/databaseman=
ager/wizard/DatabasePoolPortlet.java?rev=3D997240&r1=3D997239&r2=3D997240&v=
iew=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main=
/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortle=
t.java (original)
> +++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main=
/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortle=
t.java Wed Sep 15 09:42:30 2010
> @@ -692,11 +692,13 @@ public class DatabasePoolPortlet extends
> =A0 =A0 =A0 =A0 =A0 =A0 log.error("Unable to look up connection property"=
, e);
> =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 //todo: push the lookup into ManagementHelper
> + =A0 =A0 =A0 =A0/*
> =A0 =A0 =A0 =A0 PoolingAttributes pool =3D (PoolingAttributes) factory.ge=
tConnectionManagerContainer();
> =A0 =A0 =A0 =A0 data.minSize =3D Integer.toString(pool.getPartitionMinSiz=
e());
> =A0 =A0 =A0 =A0 data.maxSize =3D Integer.toString(pool.getPartitionMaxSiz=
e());
> =A0 =A0 =A0 =A0 data.blockingTimeout =3D Integer.toString(pool.getBlockin=
gTimeoutMilliseconds());
> =A0 =A0 =A0 =A0 data.idleTimeout =3D Integer.toString(pool.getIdleTimeout=
Minutes());
> + =A0 =A0 =A0 =A0*/
>
> =A0 =A0 }
>
> @@ -1148,6 +1150,7 @@ public class DatabasePoolPortlet extends
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 //todo: push the lookup into ManagementHe=
lper
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/*
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 PoolingAttributes pool =3D (PoolingAttrib=
utes) factory.getConnectionManagerContainer();
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pool.setPartitionMinSize(
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 data.minSize =3D=3D null =
|| data.minSize.equals("") ? 0 : Integer.parseInt(data.minSize));
> @@ -1159,6 +1162,7 @@ public class DatabasePoolPortlet extends
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pool.setIdleTimeoutMinutes(
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 data.idleTimeout =3D=3D n=
ull || data.idleTimeout.equals("") ? 15 : Integer.parseInt(
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 data.idle=
Timeout));
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*/
> =A0 =A0 =A0 =A0 =A0 =A0 } catch (Exception e) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 log.error("Unable to save connection pool=
", e);
> =A0 =A0 =A0 =A0 =A0 =A0 }
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/sr=
c/main/webapp/WEB-INF/web.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-da=
tabase/sysdb-portlets/src/main/webapp/WEB-INF/web.xml?rev=3D997240&r1=3D997=
239&r2=3D997240&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main=
/webapp/WEB-INF/web.xml (original)
> +++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main=
/webapp/WEB-INF/web.xml Wed Sep 15 09:42:30 2010
> @@ -39,7 +39,7 @@ limitations under the License.
> =A0 =A0 <servlet>
> =A0 =A0 =A0 =A0 <display-name>Pluto Wrapper for Internal DB Portlet</disp=
lay-name>
> =A0 =A0 =A0 =A0 <servlet-name>InternalDB</servlet-name>
> - =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.core.PortletServlet</ser=
vlet-class>
> + =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.container.driver.Portlet=
Servlet</servlet-class>
> =A0 =A0 =A0 =A0 <init-param>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-name>portlet-name</param-name>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-value>InternalDB</param-value>
> @@ -49,7 +49,7 @@ limitations under the License.
> =A0 =A0 <servlet>
> =A0 =A0 =A0 =A0 <display-name>Pluto Wrapper for DB Viewer Portlet</displa=
y-name>
> =A0 =A0 =A0 =A0 <servlet-name>DBViewer</servlet-name>
> - =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.core.PortletServlet</ser=
vlet-class>
> + =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.container.driver.Portlet=
Servlet</servlet-class>
> =A0 =A0 =A0 =A0 <init-param>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-name>portlet-name</param-name>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-value>DBViewer</param-value>
> @@ -59,7 +59,7 @@ limitations under the License.
> =A0 =A0 <servlet>
> =A0 =A0 =A0 =A0 <display-name>Pluto Wrapper for Run SQL Portlet</display-=
name>
> =A0 =A0 =A0 =A0 <servlet-name>RunSQL</servlet-name>
> - =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.core.PortletServlet</ser=
vlet-class>
> + =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.container.driver.Portlet=
Servlet</servlet-class>
> =A0 =A0 =A0 =A0 <init-param>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-name>portlet-name</param-name>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-value>RunSQL</param-value>
> @@ -69,7 +69,7 @@ limitations under the License.
> =A0 =A0 <servlet>
> =A0 =A0 =A0 =A0 <display-name>Pluto Wrapper for DataSource Run SQL Portle=
t</display-name>
> =A0 =A0 =A0 =A0 <servlet-name>RunSQLDS</servlet-name>
> - =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.core.PortletServlet</ser=
vlet-class>
> + =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.container.driver.Portlet=
Servlet</servlet-class>
> =A0 =A0 =A0 =A0 <init-param>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-name>portlet-name</param-name>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-value>RunSQLDS</param-value>
> @@ -79,7 +79,7 @@ limitations under the License.
> =A0 =A0<servlet>
> =A0 =A0 =A0 =A0 <display-name>Pluto Wrapper for Derby Log Viewer Portlet<=
/display-name>
> =A0 =A0 =A0 =A0 <servlet-name>DerbyLogViewer</servlet-name>
> - =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.core.PortletServlet</ser=
vlet-class>
> + =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.container.driver.Portlet=
Servlet</servlet-class>
> =A0 =A0 =A0 =A0 <init-param>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-name>portlet-name</param-name>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-value>DerbyLogViewer</param-value>
> @@ -89,7 +89,7 @@ limitations under the License.
> =A0 =A0 <servlet>
> =A0 =A0 =A0 =A0 <display-name>Pluto Wrapper for Database Wizard Portlet</=
display-name>
> =A0 =A0 =A0 =A0 <servlet-name>DBWizard</servlet-name>
> - =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.core.PortletServlet</ser=
vlet-class>
> + =A0 =A0 =A0 =A0<servlet-class>org.apache.pluto.container.driver.Portlet=
Servlet</servlet-class>
> =A0 =A0 =A0 =A0 <init-param>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-name>portlet-name</param-name>
> =A0 =A0 =A0 =A0 =A0 =A0 <param-value>DBWizard</param-value>
>
>
>