geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r370911 - /geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
Date Fri, 20 Jan 2006 22:20:31 GMT
Author: hogstrom
Date: Fri Jan 20 14:20:27 2006
New Revision: 370911

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

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

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java?rev=370911&r1=370910&r2=370911&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
Fri Jan 20 14:20:27 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.



Mime
View raw message