geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1071478 - in /geronimo/server/branches/3.0-M2: plugingroups/console-jetty/ plugingroups/console-jetty/src/main/history/ plugingroups/console-tomcat/ plugingroups/console-tomcat/src/main/history/ plugins/system-database/ plugins/system-data...
Date Thu, 17 Feb 2011 02:15:03 GMT
Author: rwonly
Date: Thu Feb 17 02:15:03 2011
New Revision: 1071478

URL: http://svn.apache.org/viewvc?rev=1071478&view=rev
Log:
GERONIMO-5597 Reenable database-related admin console portlets (thanks Fang Sheng Hao for
the patch!)

Modified:
    geronimo/server/branches/3.0-M2/plugingroups/console-jetty/pom.xml
    geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/pom.xml
    geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/plugins/system-database/pom.xml
    geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
    geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/branches/3.0-M2/plugingroups/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugingroups/console-jetty/pom.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugingroups/console-jetty/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/plugingroups/console-jetty/pom.xml Thu Feb 17 02:15:03
2011
@@ -101,14 +101,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>

Modified: geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
Thu Feb 17 02:15:03 2011
@@ -31,4 +31,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/branches/3.0-M2/plugingroups/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/pom.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/pom.xml Thu Feb 17 02:15:03
2011
@@ -101,14 +101,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>

Modified: geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
Thu Feb 17 02:15:03 2011
@@ -31,4 +31,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/branches/3.0-M2/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/system-database/pom.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/system-database/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/system-database/pom.xml Thu Feb 17 02:15:03 2011
@@ -39,11 +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>
--->
     </modules>
         
     <profiles>

Modified: geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
Thu Feb 17 02:15:03 2011
@@ -18,6 +18,12 @@ limitations under the License.
 -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
     
+    <environment>
+        <import-package>
+            !org.apache.geronimo.console.databasemanager.wizard
+        </import-package>
+    </environment>
+    
     <!-- This is where the files are accessed from. (aka - portletContext) -->
     <context-root>/system-database</context-root>
 

Modified: geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Thu Feb 17 02:15:03 2011
@@ -18,6 +18,12 @@ limitations under the License.
 -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
     
+    <environment>
+        <import-package>
+            !org.apache.geronimo.console.databasemanager.wizard
+        </import-package>
+    </environment>
+    
     <!-- This is where the files are accessed from. (aka - portletContext) -->
     <context-root>/system-database</context-root>
 

Modified: geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Thu Feb 17 02:15:03 2011
@@ -781,7 +781,7 @@ public class DatabasePoolPortlet extends
             for (JCAManagedConnectionFactory db : databases) {
                 AbstractName dbName = PortletManager.getManagementHelper(renderRequest).getNameFor(db);
                 list.add(new ConnectionPool(moduleName, dbName, (String) dbName.getName().get(NameFactory.J2EE_NAME),
-                        ((GeronimoManagedBean) db).getState()));
+                        PortletManager.getManagedBean(renderRequest, dbName).getState()));
             }
         }
         Collections.sort(list);

Modified: geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
Thu Feb 17 02:15:03 2011
@@ -34,7 +34,7 @@ import org.apache.geronimo.gbean.Abstrac
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.management.JCAManagedConnectionFactory;
+import org.apache.geronimo.naming.ResourceSource;
 import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
 
 /**
@@ -73,7 +73,7 @@ public class DerbyConnectionUtil {
             log.debug("Looking up system datasource name...");
 
             // cache the name for the system data source
-            AbstractNameQuery query = new AbstractNameQuery(JCAManagedConnectionFactory.class.getName());
+            AbstractNameQuery query = new AbstractNameQuery(ResourceSource.class.getName());
             Set<AbstractName> names = KernelRegistry.getSingleKernel().listGBeans(query);
             for (AbstractName name : names) {
                 String nameProperty = name.getNameProperty("name");

Modified: geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml?rev=1071478&r1=1071477&r2=1071478&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml
Thu Feb 17 02:15:03 2011
@@ -44,6 +44,7 @@ limitations under the License.
             <param-name>portlet-name</param-name>
             <param-value>InternalDB</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet>
@@ -54,6 +55,7 @@ limitations under the License.
             <param-name>portlet-name</param-name>
             <param-value>DBViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet>
@@ -64,6 +66,7 @@ limitations under the License.
             <param-name>portlet-name</param-name>
             <param-value>RunSQL</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet>
@@ -74,6 +77,7 @@ limitations under the License.
             <param-name>portlet-name</param-name>
             <param-value>RunSQLDS</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
    <servlet>
@@ -84,6 +88,7 @@ limitations under the License.
             <param-name>portlet-name</param-name>
             <param-value>DerbyLogViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet>
@@ -94,6 +99,7 @@ limitations under the License.
             <param-name>portlet-name</param-name>
             <param-value>DBWizard</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet-mapping>



Mime
View raw message