You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Jarek Gawor <jg...@gmail.com> on 2010/09/16 03:44:38 UTC
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/
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, <rw...@apache.org> wrote:
> Author: rwonly
> Date: Wed Sep 15 09:42:30 2010
> New Revision: 997240
>
> URL: http://svn.apache.org/viewvc?rev=997240&view=rev
> Log:
> GERONIMO-5597 make system db portlets compile with server
>
> Modified:
> geronimo/server/trunk/plugingroups/console-jetty/pom.xml
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/system-database/pom.xml
> geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
> geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml
>
> Modified: geronimo/server/trunk/plugingroups/console-jetty/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/pom.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugingroups/console-jetty/pom.xml (original)
> +++ geronimo/server/trunk/plugingroups/console-jetty/pom.xml Wed Sep 15 09:42:30 2010
> @@ -58,7 +58,16 @@
> <version>${project.version}</version>
> <type>car</type>
> </dependency>
> -
> +
> + <!--
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>osgi-console-jetty</artifactId>
> + <version>${project.version}</version>
> + <type>car</type>
> + </dependency>
> + -->
> +
> <!--<dependency>-->
> <!--<groupId>org.apache.geronimo.configs</groupId>-->
> <!--<artifactId>ca-helper-jetty</artifactId>-->
> @@ -94,12 +103,12 @@
> <!--<type>car</type>-->
> <!--</dependency>-->
>
> - <!--<dependency>-->
> - <!--<groupId>org.apache.geronimo.plugins</groupId>-->
> - <!--<artifactId>sysdb-console-jetty</artifactId>-->
> - <!--<version>${project.version}</version>-->
> - <!--<type>car</type>-->
> - <!--</dependency>-->
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>sysdb-console-jetty</artifactId>
> + <version>${project.version}</version>
> + <type>car</type>
> + </dependency>
>
> <!--<dependency>-->
> <!--<groupId>org.apache.geronimo.plugins</groupId>-->
>
> Modified: geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml Wed Sep 15 09:42:30 2010
> @@ -21,4 +21,9 @@
> <artifactId>plugin-console-jetty</artifactId>
> <type>car</type>
> </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>sysdb-console-jetty</artifactId>
> + <type>car</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/pom.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- 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 @@
> <type>car</type>
> </dependency>
>
> + <!--
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>osgi-console-tomcat</artifactId>
> + <version>${project.version}</version>
> + <type>car</type>
> + </dependency>
> + -->
> +
> <!--<dependency>-->
> <!--<groupId>org.apache.geronimo.configs</groupId>-->
> <!--<artifactId>ca-helper-tomcat</artifactId>-->
> @@ -94,12 +103,12 @@
> <!--<type>car</type>-->
> <!--</dependency>-->
>
> - <!--<dependency>-->
> - <!--<groupId>org.apache.geronimo.plugins</groupId>-->
> - <!--<artifactId>sysdb-console-tomcat</artifactId>-->
> - <!--<version>${project.version}</version>-->
> - <!--<type>car</type>-->
> - <!--</dependency>-->
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>sysdb-console-tomcat</artifactId>
> + <version>${project.version}</version>
> + <type>car</type>
> + </dependency>
>
> <!--<dependency>-->
> <!--<groupId>org.apache.geronimo.plugins</groupId>-->
>
> Modified: geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml Wed Sep 15 09:42:30 2010
> @@ -21,4 +21,9 @@
> <artifactId>plugin-console-tomcat</artifactId>
> <type>car</type>
> </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>sysdb-console-tomcat</artifactId>
> + <type>car</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/system-database/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/system-database/pom.xml (original)
> +++ geronimo/server/trunk/plugins/system-database/pom.xml Wed Sep 15 09:42:30 2010
> @@ -39,9 +39,9 @@
> <modules>
> <module>geronimo-derby</module>
> <module>system-database</module>
> - <!--<module>sysdb-portlets</module>-->
> - <!--<module>sysdb-console-jetty</module>-->
> - <!--<module>sysdb-console-tomcat</module>-->
> + <module>sysdb-portlets</module>
> + <module>sysdb-console-jetty</module>
> + <module>sysdb-console-tomcat</module>
> </modules>
>
> <dependencyManagement>
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- 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 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>db-connectors</artifactId>
> + <type>car</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>system-database</artifactId>
> <type>car</type>
> </dependency>
> @@ -51,84 +56,4 @@
> <artifactId>org.apache.servicemix.bundles.ant</artifactId>
> <type>jar</type>
> </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-db2-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-derby-client-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-derby-client-xa</artifactId>
> - <type>rar</type>
> - </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>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-informix-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-mysql-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-mysql-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-oracle-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-oracle-rac-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-oracle-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-postgresql-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-postgresql-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-ra</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml Wed Sep 15 09:42:30 2010
> @@ -13,6 +13,11 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>db-connectors</artifactId>
> + <type>car</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>system-database</artifactId>
> <type>car</type>
> </dependency>
> @@ -46,89 +51,4 @@
> <artifactId>console-tomcat</artifactId>
> <type>car</type>
> </dependency>
> - <dependency>
> - <groupId>org.apache.servicemix.bundles</groupId>
> - <artifactId>org.apache.servicemix.bundles.ant</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-db2-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-derby-client-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-derby-client-xa</artifactId>
> - <type>rar</type>
> - </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>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-informix-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-mysql-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-mysql-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-oracle-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-oracle-rac-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-oracle-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-postgresql-local</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-postgresql-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-ra</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.tranql</groupId>
> - <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
> - <type>rar</type>
> - </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
> +++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Wed Sep 15 09:42:30 2010
> @@ -692,11 +692,13 @@ public class DatabasePoolPortlet extends
> log.error("Unable to look up connection property", e);
> }
> //todo: push the lookup into ManagementHelper
> + /*
> PoolingAttributes pool = (PoolingAttributes) factory.getConnectionManagerContainer();
> data.minSize = Integer.toString(pool.getPartitionMinSize());
> data.maxSize = Integer.toString(pool.getPartitionMaxSize());
> data.blockingTimeout = Integer.toString(pool.getBlockingTimeoutMilliseconds());
> data.idleTimeout = Integer.toString(pool.getIdleTimeoutMinutes());
> + */
>
> }
>
> @@ -1148,6 +1150,7 @@ public class DatabasePoolPortlet extends
> }
> }
> //todo: push the lookup into ManagementHelper
> + /*
> PoolingAttributes pool = (PoolingAttributes) factory.getConnectionManagerContainer();
> pool.setPartitionMinSize(
> data.minSize == null || data.minSize.equals("") ? 0 : Integer.parseInt(data.minSize));
> @@ -1159,6 +1162,7 @@ public class DatabasePoolPortlet extends
> pool.setIdleTimeoutMinutes(
> data.idleTimeout == null || data.idleTimeout.equals("") ? 15 : Integer.parseInt(
> data.idleTimeout));
> + */
> } catch (Exception e) {
> log.error("Unable to save connection pool", e);
> }
>
> Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml?rev=997240&r1=997239&r2=997240&view=diff
> ==============================================================================
> --- 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.
> <servlet>
> <display-name>Pluto Wrapper for Internal DB Portlet</display-name>
> <servlet-name>InternalDB</servlet-name>
> - <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
> + <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
> <init-param>
> <param-name>portlet-name</param-name>
> <param-value>InternalDB</param-value>
> @@ -49,7 +49,7 @@ limitations under the License.
> <servlet>
> <display-name>Pluto Wrapper for DB Viewer Portlet</display-name>
> <servlet-name>DBViewer</servlet-name>
> - <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
> + <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
> <init-param>
> <param-name>portlet-name</param-name>
> <param-value>DBViewer</param-value>
> @@ -59,7 +59,7 @@ limitations under the License.
> <servlet>
> <display-name>Pluto Wrapper for Run SQL Portlet</display-name>
> <servlet-name>RunSQL</servlet-name>
> - <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
> + <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
> <init-param>
> <param-name>portlet-name</param-name>
> <param-value>RunSQL</param-value>
> @@ -69,7 +69,7 @@ limitations under the License.
> <servlet>
> <display-name>Pluto Wrapper for DataSource Run SQL Portlet</display-name>
> <servlet-name>RunSQLDS</servlet-name>
> - <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
> + <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
> <init-param>
> <param-name>portlet-name</param-name>
> <param-value>RunSQLDS</param-value>
> @@ -79,7 +79,7 @@ limitations under the License.
> <servlet>
> <display-name>Pluto Wrapper for Derby Log Viewer Portlet</display-name>
> <servlet-name>DerbyLogViewer</servlet-name>
> - <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
> + <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
> <init-param>
> <param-name>portlet-name</param-name>
> <param-value>DerbyLogViewer</param-value>
> @@ -89,7 +89,7 @@ limitations under the License.
> <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>
> + <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
> <init-param>
> <param-name>portlet-name</param-name>
> <param-value>DBWizard</param-value>
>
>
>