Re: svn commit: r700193 - in /geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main: java/org/apache/geronimo/console/internaldb/ resources/ webapp/WEB-INF/view/internaldb/

2009-03-06 Thread Donald Woods 

Yep, I think that was the case.

-Donald

David Jencks wrote:


On Mar 4, 2009, at 12:52 PM, Joe Bohn wrote:



I know this is going way back in time ... but any idea why this change 
deleted the content of dbViewerMaximized.jsp but kept the empty file 
around?


That's easy to do when you run patch -p0 which can empty files but not 
run svn rm on them.



I discovered this when checking for source headers.  This file is 
flagged because it doesn't contain a header - but more than that it 
doesn't contain anything at all.


I presume we can delete the entire file.  Does anybody know of any 
reason why we should not do this?


There are a few other instances of similar files that we need to deal 
with as well.


I expect the *Maximized.jsp were never referenced and the patch author 
deleted them but did not succeed in conveying the need to run svn rm to 
the patch applier.


thanks
david jencks




Joe

dwo...@apache.org wrote:

Author: dwoods
Date: Mon Sep 29 11:09:17 2008
New Revision: 700193
URL: http://svn.apache.org/viewvc?rev=700193&view=rev
Log:
GERONIMO-4225 Allow Run SQL portlet run sql against any configured 
data source.  Thanks to Michal Borowiecki for the patch.

Added:
   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabasesMaximized.jsp   
(with props)
   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTablesMaximized.jsp   
(with props)
   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContentsMaximized.jsp   
(with props)

Modified:
   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java 

   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java 

   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java 

   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java 

   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java 

   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties 

   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerMaximized.jsp 

   
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp 

Modified: 
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java 

URL: 
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java?rev=700193&r1=700192&r2=700193&view=diff 

== 

--- 
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java 
(original)
+++ 
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java 
Mon Sep 29 11:09:17 2008

@@ -18,9 +18,20 @@
package org.apache.geronimo.console.internaldb;
 import java.io.File;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import java.util.Vector;
+import org.apache.geronimo.console.util.KernelManagementHelper;
+import org.apache.geronimo.console.util.ManagementHelper;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
+
public class DBViewerHelper {
 private static final String SYS_TBL_PREFIX = "SYS.";
@@ -28,6 +39,34 @@
private static final int COUNT_COL = 1;
 /**
+ * List the databases having datasources deployed.
+ *
+ * @param derbySysHome
+ * @return
+ */
+public Collection getDataSourceNames() {
+   
+List databaseNames = new ArrayList();

+
+Kernel kernel = KernelRegistry.getSingleKernel();
+ManagementHelper helper = new KernelManagementHelper(kernel);
+ResourceAdapterModule[] modules = 
helper.getOutboundRAModules(helper.getDomains()[0].getServerInstances()[0], 
"javax.sql.DataSource");

+for (ResourceAdapterModule module : modules) {
+
org.apache.geronimo.manageme

Re: svn commit: r700193 - in /geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main: java/org/apache/geronimo/console/internaldb/ resources/ webapp/WEB-INF/view/internaldb/

2009-03-04 Thread David Jencks 


On Mar 4, 2009, at 12:52 PM, Joe Bohn wrote:



I know this is going way back in time ... but any idea why this  
change deleted the content of dbViewerMaximized.jsp but kept the  
empty file around?


That's easy to do when you run patch -p0 which can empty files but not  
run svn rm on them.



I discovered this when checking for source headers.  This file is  
flagged because it doesn't contain a header - but more than that it  
doesn't contain anything at all.


I presume we can delete the entire file.  Does anybody know of any  
reason why we should not do this?


There are a few other instances of similar files that we need to  
deal with as well.


I expect the *Maximized.jsp were never referenced and the patch author  
deleted them but did not succeed in conveying the need to run svn rm  
to the patch applier.


thanks
david jencks




Joe

dwo...@apache.org wrote:

Author: dwoods
Date: Mon Sep 29 11:09:17 2008
New Revision: 700193
URL: http://svn.apache.org/viewvc?rev=700193&view=rev
Log:
GERONIMO-4225 Allow Run SQL portlet run sql against any configured  
data source.  Thanks to Michal Borowiecki for the patch.

Added:
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/webapp/WEB-INF/view/internaldb/ 
listDatabasesMaximized.jsp   (with props)
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/webapp/WEB-INF/view/internaldb/ 
listTablesMaximized.jsp   (with props)
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/webapp/WEB-INF/view/internaldb/ 
viewTableContentsMaximized.jsp   (with props)

Modified:
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
DBViewerHelper.java
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
DBViewerPortlet.java
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
DerbyConnectionUtil.java
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
RunSQLHelper.java
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
RunSQLPortlet.java
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/resources/systemdatabase.properties
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/webapp/WEB-INF/view/internaldb/ 
dbViewerMaximized.jsp
   geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
Modified: geronimo/server/branches/2.1/plugins/system-database/ 
sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
DBViewerHelper.java

URL: 
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java?rev=700193&r1=700192&r2=700193&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
= 
=
--- geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
DBViewerHelper.java (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb- 
portlets/src/main/java/org/apache/geronimo/console/internaldb/ 
DBViewerHelper.java Mon Sep 29 11:09:17 2008

@@ -18,9 +18,20 @@
package org.apache.geronimo.console.internaldb;
 import java.io.File;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import java.util.Vector;
+import org.apache.geronimo.console.util.KernelManagementHelper;
+import org.apache.geronimo.console.util.ManagementHelper;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import  
org.apache.geronimo.management.geronimo.ResourceAdapterModule;

+
public class DBViewerHelper {
 private static final String SYS_TBL_PREFIX = "SYS.";
@@ -28,6 +39,34 @@
private static final int COUNT_COL = 1;
 /**
+ * List the databases having datasources deployed.
+ *
+ * @param derbySysHome
+ * @return
+ */
+public Collection getDataSourceNames() {
+   
+   List databaseNames = new ArrayList();
+
+Kernel kernel = KernelRegistry.getSingleKernel();
+ManagementHelper helper = new  
KernelManagementHelper(kernel);
+ResourceAdapterModule[] modules =  
helper.getOutboundRAModules(helper.getDomains() 
[0].getServerInstances()[0], "javax.sql.DataSource");

+for (ResourceAdapterModule module : modules) {
+ 
org 
.apache.geronimo.management.geronimo.JCA

Re: svn commit: r700193 - in /geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main: java/org/apache/geronimo/console/internaldb/ resources/ webapp/WEB-INF/view/internaldb/

2009-03-04 Thread Joe Bohn 


I know this is going way back in time ... but any idea why this change 
deleted the content of dbViewerMaximized.jsp but kept the empty file 
around?


I discovered this when checking for source headers.  This file is 
flagged because it doesn't contain a header - but more than that it 
doesn't contain anything at all.


I presume we can delete the entire file.  Does anybody know of any 
reason why we should not do this?


There are a few other instances of similar files that we need to deal 
with as well.


Joe

dwo...@apache.org wrote:

Author: dwoods
Date: Mon Sep 29 11:09:17 2008
New Revision: 700193

URL: http://svn.apache.org/viewvc?rev=700193&view=rev
Log:
GERONIMO-4225 Allow Run SQL portlet run sql against any configured data source. 
 Thanks to Michal Borowiecki for the patch.

Added:

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabasesMaximized.jsp
   (with props)

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTablesMaximized.jsp
   (with props)

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContentsMaximized.jsp
   (with props)
Modified:

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerMaximized.jsp

geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp

Modified: 
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java
URL: 
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java?rev=700193&r1=700192&r2=700193&view=diff
==
--- 
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java
 (original)
+++ 
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java
 Mon Sep 29 11:09:17 2008
@@ -18,9 +18,20 @@
 package org.apache.geronimo.console.internaldb;
 
 import java.io.File;

+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Vector;
 
+import org.apache.geronimo.console.util.KernelManagementHelper;

+import org.apache.geronimo.console.util.ManagementHelper;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
+
 public class DBViewerHelper {
 
 private static final String SYS_TBL_PREFIX = "SYS.";

@@ -28,6 +39,34 @@
 private static final int COUNT_COL = 1;
 
 /**

+ * List the databases having datasources deployed.
+ *
+ * @param derbySysHome
+ * @return
+ */
+public Collection getDataSourceNames() {
+   
+   List databaseNames = new ArrayList();
+
+Kernel kernel = KernelRegistry.getSingleKernel();
+ManagementHelper helper = new KernelManagementHelper(kernel);
+ResourceAdapterModule[] modules = 
helper.getOutboundRAModules(helper.getDomains()[0].getServerInstances()[0], 
"javax.sql.DataSource");
+for (ResourceAdapterModule module : modules) {
+org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory[] 
databases = helper.getOutboundFactories(module, "javax.sql.DataSource");
+for 
(org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory db : 
databases) {
+try {
+AbstractName dbName = kernel.getAbstractNameFor(db);
+String datasourceName = 
(String)dbName.getName().get(