You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/11/12 04:45:41 UTC
svn commit: r1034264 -
/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
Author: genspring
Date: Fri Nov 12 03:45:40 2010
New Revision: 1034264
URL: http://svn.apache.org/viewvc?rev=1034264&view=rev
Log:
GERONIMO-5679 disable user authentication option for embedded derb, patch from Viola
Modified:
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.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/DerbyConnectionUtil.java?rev=1034264&r1=1034263&r2=1034264&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java Fri Nov 12 03:45:40 2010
@@ -144,10 +144,15 @@ public class DerbyConnectionUtil {
if (SYSTEM_DB.equalsIgnoreCase(dbName)) {
return getSystemDBConnection();
} else {
- String userName = getDerbyConnectionUsername();
+ if ("false".equals(System.getProperty("derby.connection.requireAuthentication"))){
+ return DriverManager.getConnection(protocol + dbName + properties);
+ } else{
+ String userName = getDerbyConnectionUsername();
String password = getDerbyConnectionUserPassword();
return DriverManager.getConnection(protocol + dbName + properties + ";user=" + userName + ";password="
- + password);
+ + password);
+ }
+
}
}