kimptoc 02/05/14 09:25:17
Modified: src/java/org/apache/jetspeed/modules/actions/portlets/browser
DatabaseBrowserAction.java
webapp/WEB-INF/conf demo-portlets.xreg
Log:
enable the db browser to use alternate torque pool connection
Revision Changes Path
1.20 +11 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java
Index: DatabaseBrowserAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DatabaseBrowserAction.java 14 May 2002 06:32:58 -0000 1.19
+++ DatabaseBrowserAction.java 14 May 2002 16:25:17 -0000 1.20
@@ -113,11 +113,12 @@
* according to the quey speciified by the user.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: DatabaseBrowserAction.java,v 1.19 2002/05/14 06:32:58 taylor Exp $
+ * @version $Id: DatabaseBrowserAction.java,v 1.20 2002/05/14 16:25:17 kimptoc Exp $
*/
public class DatabaseBrowserAction extends VelocityPortletAction implements
BrowserQuery
{
private static final String SQL = "sql";
+ private static final String POOLNAME = "poolname";
private static final String START = "start";
private static final String CUSTOMIZE_TEMPLATE = "customizeTemplate";
private static final String WINDOW_SIZE = "windowSize";
@@ -328,7 +329,15 @@
ResultSet rs = null;
try
{
- dbConn = Torque.getConnection();
+ String poolname =
getParameterUsingFallback(portlet,rundata,POOLNAME,null);
+ if (poolname==null || poolname.length()==0)
+ {
+ dbConn = Torque.getConnection();
+ }
+ else
+ {
+ dbConn = Torque.getConnection(poolname);
+ }
Connection con = dbConn.getConnection();
selectStmt = con.prepareStatement(sql);
Iterator it = sqlParameters.iterator();
1.14 +2 -0 jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg
Index: demo-portlets.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- demo-portlets.xreg 14 May 2002 06:32:59 -0000 1.13
+++ demo-portlets.xreg 14 May 2002 16:25:17 -0000 1.14
@@ -201,6 +201,8 @@
<parameter name="customizeTemplate" value="database-browser-customize"
hidden="false"/>
<parameter name="action" value="portlets.browser.DatabaseBrowserAction"
hidden="false"/>
<parameter name="sql" value="select * from coffees" hidden="false"/>
+ <!-- to use an alternate torque pool, set this parameter -->
+ <!-- parameter name="poolname" value="otherpool" hidden="false"/-->
<parameter name="windowSize" value="5" hidden="false"/>
<media-type ref="html"/>
</portlet-entry>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
