Author: juanpablo
Date: Sun Mar 25 19:12:38 2012
New Revision: 1305096
URL: http://svn.apache.org/viewvc?rev=1305096&view=rev
Log:
fixes JSPWIKI-722: Build broken under jdk 1.7
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/tests/org/apache/wiki/TestJDBCDataSource.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=1305096&r1=1305095&r2=1305096&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sun Mar 25 19:12:38
2012
@@ -1,3 +1,9 @@
+2012-03-25 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.8.5-svn-11
+
+ * fixed JSPWIKI-722 Build broken under jdk 1.7
+
2012-02-22 Harry Metske <[email protected]>
* 2.8.5-svn-10
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=1305096&r1=1305095&r2=1305096&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
Sun Mar 25 19:12:38 2012
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "10";
+ public static final String BUILD = "11";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java?rev=1305096&r1=1305095&r2=1305096&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
Sun Mar 25 19:12:38 2012
@@ -11,6 +11,7 @@ import java.sql.Connection;
import java.sql.Driver;
import java.sql.SQLException;
import java.util.Properties;
+import java.util.logging.Logger;
import javax.sql.DataSource;
@@ -124,6 +125,16 @@ public class TestJDBCDataSource implemen
}
/**
+ * Return the parent Logger of all the Loggers used by this data source.
This should be
+ * the Logger farthest from the root Logger that is still an ancestor of
all of the Loggers used by this data source. Configuring this Logger will
affect all of the log messages generated by the data source. In the worst case,
this may be the root Logger.
+ * @return the parent Logger for this data source
+ */
+ public Logger getParentLogger()
+ {
+ return null;
+ }
+
+ /**
* Initialization method that reads a File, and attempts to locate and load
* the JDBC driver from properties specified therein.
* @param file the file containing the JDBC properties
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1305096&r1=1305095&r2=1305096&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Mar 25 19:12:38 2012
@@ -1,3 +1,9 @@
+2012-03-25 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.9.0-svn-7
+
+ * fixed JSPWIKI-722 Build broken under jdk 1.7
+
2012-02-22 Harry Metske <[email protected]>
* 2.9.0-svn-6
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1305096&r1=1305095&r2=1305096&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Sun Mar 25
19:12:38 2012
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "6";
+ public static final String BUILD = "7";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/TestJDBCDataSource.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/TestJDBCDataSource.java?rev=1305096&r1=1305095&r2=1305096&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/TestJDBCDataSource.java
(original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/TestJDBCDataSource.java Sun
Mar 25 19:12:38 2012
@@ -31,6 +31,7 @@ import java.sql.Connection;
import java.sql.Driver;
import java.sql.SQLException;
import java.util.Properties;
+import java.util.logging.Logger;
import javax.sql.DataSource;
@@ -64,8 +65,8 @@ public class TestJDBCDataSource implemen
protected int m_timeout = 0;
protected PrintWriter m_writer = null;
-
- /**
+
+ /**
* Constructs a new instance of this class, using a supplied properties
* File as the source for JDBC driver properties.
* @param file the properties file containing JDBC properties
@@ -143,6 +144,16 @@ public class TestJDBCDataSource implemen
}
/**
+ * Return the parent Logger of all the Loggers used by this data source.
This should be
+ * the Logger farthest from the root Logger that is still an ancestor of
all of the Loggers used by this data source. Configuring this Logger will
affect all of the log messages generated by the data source. In the worst case,
this may be the root Logger.
+ * @return the parent Logger for this data source
+ */
+ public Logger getParentLogger()
+ {
+ return null;
+ }
+
+ /**
* Initialization method that reads a File, and attempts to locate and load
* the JDBC driver from properties specified therein.
* @param file the file containing the JDBC properties
