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/10 14:15:21 UTC
svn commit: r1033453 - in
/geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src:
main/java/org/apache/geronimo/derby/DerbySystemGBean.java
test/java/org/apache/geronimo/derby/DerbySystemGBeanTest.java
Author: genspring
Date: Wed Nov 10 13:15:21 2010
New Revision: 1033453
URL: http://svn.apache.org/viewvc?rev=1033453&view=rev
Log:
GERONIMO-5679 , fix broken unit testing.
Modified:
geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java
geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/test/java/org/apache/geronimo/derby/DerbySystemGBeanTest.java
Modified: geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java?rev=1033453&r1=1033452&r2=1033453&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java (original)
+++ geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java Wed Nov 10 13:15:21 2010
@@ -92,6 +92,9 @@ public class DerbySystemGBean implements
System.setProperty("derby.authentication.provider", "org.apache.geronimo.derby.DerbyUserAuthenticator");
}else if ("false".equals(System.getProperty("derby.connection.requireAuthentication"))){
disableAuthentication = true;
+ }else {
+ System.setProperty("derby.connection.requireAuthentication", "true");
+ System.setProperty("derby.authentication.provider", "org.apache.geronimo.derby.DerbyUserAuthenticator");
}
// load the Embedded driver to initialize the home
Modified: geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/test/java/org/apache/geronimo/derby/DerbySystemGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/test/java/org/apache/geronimo/derby/DerbySystemGBeanTest.java?rev=1033453&r1=1033452&r2=1033453&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/test/java/org/apache/geronimo/derby/DerbySystemGBeanTest.java (original)
+++ geronimo/server/branches/2.2/plugins/derby/geronimo-derby/src/test/java/org/apache/geronimo/derby/DerbySystemGBeanTest.java Wed Nov 10 13:15:21 2010
@@ -38,7 +38,7 @@ public class DerbySystemGBeanTest extend
public void testCreateSystemUsingServerInfo() throws Exception {
- System.setProperty("derby.connection.requireAuthentication", "true");
+ System.setProperty("derby.connection.requireAuthentication", "false");
ServerInfo serverInfo = new BasicServerInfo(systemDir.toString());
String derbyDir = "var/dbderby";