Index: ChangeLog
===================================================================
RCS file: /p/cvs/JSPWiki/ChangeLog,v
retrieving revision 1.1051
diff -u -r1.1051 ChangeLog
--- ChangeLog	25 Nov 2007 20:37:58 -0000	1.1051
+++ ChangeLog	30 Nov 2007 18:39:16 -0000
@@ -1,3 +1,13 @@
+2007-11-22  Andrew Jaquith <andrew AT apache DOT org>
+
+        * 2.5.162
+        
+        * Fixed [JSPWIKI-82]. We were failing to properly close JDBC connections
+        in JDBCUserManager and JDBCGroupManager. Credit: Ounce Labs.
+        
+        * Fixed [JSPWIKI-74]. SpamFilter now uses SecureRandom.
+        Credit: Ounce Labs.
+        
 2007-11-25  Janne Jalkanen <jalkanen@ecyrd.com>
 
         * Same version, don't want to bump too many times in one day :)
Index: tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
===================================================================
RCS file: /p/cvs/JSPWiki/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java,v
retrieving revision 1.3
diff -u -r1.3 TestJDBCDataSource.java
--- tests/com/ecyrd/jspwiki/TestJDBCDataSource.java	27 May 2007 01:20:23 -0000	1.3
+++ tests/com/ecyrd/jspwiki/TestJDBCDataSource.java	30 Nov 2007 18:39:16 -0000
@@ -7,9 +7,7 @@
 import java.net.URLClassLoader;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.SQLException;
+import java.sql.*;
 import java.util.Properties;
 
 import javax.sql.DataSource;
@@ -160,5 +158,15 @@
         // Cache the driver
         m_driver = (Driver) driverClass.newInstance();
     }
+    
+	public Object unwrap(java.lang.Class iface) throws java.sql.SQLException {
+	    Wrapper result = null;
+	    return result;
+	}
+    
+    public boolean isWrapperFor(Class iface) throws java.sql.SQLException {
+        boolean result = false;
+        return result;
+    }
 
 }
Index: src/com/ecyrd/management/SimpleMBean.java
===================================================================
RCS file: /p/cvs/JSPWiki/src/com/ecyrd/management/SimpleMBean.java,v
retrieving revision 1.3
diff -u -r1.3 SimpleMBean.java
--- src/com/ecyrd/management/SimpleMBean.java	9 Jun 2007 04:58:17 -0000	1.3
+++ src/com/ecyrd/management/SimpleMBean.java	30 Nov 2007 18:39:16 -0000
@@ -102,7 +102,7 @@
                 {
                     try
                     {
-                        description = (String) descriptor.invoke( this, null );
+                        description = (String) descriptor.invoke( this, (Object)null );
                     }
                     catch( Exception e ) 
                     {
@@ -189,7 +189,7 @@
             m = findGetterSetter( getClass(), mname, null );
 
             if( m == null ) throw new AttributeNotFoundException( name );
-            res = m.invoke( this, null );
+            res = m.invoke( this, (Object)null );
         }
         catch (SecurityException e)
         {
Index: src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
===================================================================
RCS file: /p/cvs/JSPWiki/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java,v
retrieving revision 1.11
diff -u -r1.11 AdminBeanManager.java
--- src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java	23 Sep 2007 19:21:46 -0000	1.11
+++ src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java	30 Nov 2007 18:39:16 -0000
@@ -62,7 +62,10 @@
     {
         if( SystemUtils.isJavaVersionAtLeast(1.5f) )
         {
-            log.info("Using JDK 1.5 Platform MBeanServer");
+            String jreVersion = SystemUtils.JAVA_RUNTIME_VERSION;
+            String jreName    = SystemUtils.JAVA_RUNTIME_NAME;
+            log.info("Using " + jreVersion + " Platform MBeanServer");
+            log.info("Using " + jreName + " Platform ");
             m_mbeanServer = MBeanServerFactory15.getServer();
         }
         else