You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ho...@apache.org on 2006/01/20 23:20:52 UTC

svn commit: r370912 - /geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java

Author: hogstrom
Date: Fri Jan 20 14:20:50 2006
New Revision: 370912

URL: http://svn.apache.org/viewcvs?rev=370912&view=rev
Log:
GERONIMO-1506 Database portlet version issue

Modified:
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java?rev=370912&r1=370911&r2=370912&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java Fri Jan 20 14:20:50 2006
@@ -24,6 +24,7 @@
 import javax.management.ObjectName;
 import javax.sql.DataSource;
 
+import org.apache.geronimo.console.GeronimoVersion;
 import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 
@@ -53,7 +54,7 @@
     private static final String EMPTY_PROPS = "";
 
     private static final ObjectName SYSTEM_DATASOURCE_NAME = JMXUtil
-            .getObjectName("geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/system-database/1.0/car,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource");
+            .getObjectName("geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/system-database/"+GeronimoVersion.GERONIMO_VERSION+"/car,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource");
 
     /**
      * Get database connection.