Package: jenkins-winstone / 0.9.10-jenkins-37+dfsg-2

java7-compat.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
Description: Add stubbed out methods to support compilation under
 Java 7
Author: James Page <james.page@ubuntu.com>
Forwarded: https://github.com/jenkinsci/winstone/pull/4

Index: jenkins-winstone/pom.xml
===================================================================
--- jenkins-winstone.orig/pom.xml	2012-06-21 20:25:25.000000000 +0100
+++ jenkins-winstone/pom.xml	2012-06-21 20:28:22.549686595 +0100
@@ -126,7 +126,7 @@
                   <configuration>
                     <rules>
                       <requireJavaVersion>
-                        <version>(1.6,1.7)</version>
+                        <version>1.6,</version>
                       </requireJavaVersion>
                     </rules>
                   </configuration>
Index: jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
===================================================================
--- jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java	2012-06-21 20:25:25.000000000 +0100
+++ jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java	2012-06-21 20:28:22.549686595 +0100
@@ -24,6 +24,7 @@
 import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.Executor;
 
 import winstone.Logger;
 
@@ -305,4 +306,25 @@
 		// TODO Auto-generated method stub
 		
 	}
+
+	public void abort(Executor executor) throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
+	public int getNetworkTimeout() throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
+	public String getSchema() throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
+	public void setNetworkTimeout(Executor executor, int milliseconds)
+			throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
+	public void setSchema(String schema) throws SQLException {
+		throw new SQLFeatureNotSupportedException();		
+	}
 }
Index: jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
===================================================================
--- jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java	2012-06-21 20:25:25.000000000 +0100
+++ jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java	2012-06-21 20:28:22.549686595 +0100
@@ -11,6 +11,7 @@
 import java.sql.Driver;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -480,4 +481,9 @@
 		// TODO Auto-generated method stub
 		return false;
 	}
+
+	public java.util.logging.Logger getParentLogger()
+			throws SQLFeatureNotSupportedException {
+		throw new SQLFeatureNotSupportedException();
+	}
 }