Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 384161
Collapse All | Expand All

(-)a/build/build.xml (-4 / +55 lines)
Lines 98-113 examples: Link Here
98
      <echo message="ant.java.hasjsse=${ant.java.hasjsse}" />
98
      <echo message="ant.java.hasjsse=${ant.java.hasjsse}" />
99
   </target>
99
   </target>
100
100
101
   <target name="javaversion6">
101
   <target name="javaversion7" unless="ant.java.iscjavaset">
102
      <available classname="java.util.Objects" property="ant.java.iscjava17"/>
103
      <available classname="java.util.Objects" property="ant.java.iscjavaset"/>
104
   </target>
105
106
   <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjavaset">
102
      <available classname="java.net.IDN" property="ant.java.iscjava16"/>
107
      <available classname="java.net.IDN" property="ant.java.iscjava16"/>
108
      <available classname="java.net.IDN" property="ant.java.iscjavaset"/>
103
   </target>
109
   </target>
104
110
105
   <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjava16">
111
   <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjavaset">
106
      <available classname="java.nio.Buffer" property="ant.java.iscjava14"/>
112
      <available classname="java.nio.Buffer" property="ant.java.iscjava14"/>
113
      <available classname="java.nio.Buffer" property="ant.java.iscjavaset"/>
107
   </target>
114
   </target>
108
115
109
   <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjava14">
116
   <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjavaset">
110
      <available classname="java.lang.ref.Reference" property="ant.java.iscjava12"/>
117
      <available classname="java.lang.ref.Reference" property="ant.java.iscjava12"/>
118
      <available classname="java.lang.ref.Reference" property="ant.java.iscjavaset"/>
111
   </target>
119
   </target>
112
120
113
   <target name="-prepare" depends="init,javaversion2">
121
   <target name="-prepare" depends="init,javaversion2">
Lines 166-171 examples: Link Here
166
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
174
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
167
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
175
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
168
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
176
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
177
        <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
169
        <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
178
        <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
170
        <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
179
        <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
171
        <arg file="${src}/org/hsqldb/persist/Logger.java"/>
180
        <arg file="${src}/org/hsqldb/persist/Logger.java"/>
Lines 183-188 examples: Link Here
183
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
192
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
184
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
193
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
185
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
194
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
195
        <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
186
        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
196
        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
187
        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
197
        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
188
        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
198
        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
Lines 210-215 examples: Link Here
210
        <arg value="+JAVA2FULL"/>
220
        <arg value="+JAVA2FULL"/>
211
        <arg value="-JAVA4"/>
221
        <arg value="-JAVA4"/>
212
        <arg value="-JAVA6"/>
222
        <arg value="-JAVA6"/>
223
        <arg value="-JAVA7"/>
213
       </java>
224
       </java>
214
    </target>
225
    </target>
215
226
Lines 218-223 examples: Link Here
218
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
229
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
219
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
230
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
220
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
231
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
232
        <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
221
        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
233
        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
222
        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
234
        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
223
        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
235
        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
Lines 244-249 examples: Link Here
244
        <arg value="+JAVA2FULL"/>
256
        <arg value="+JAVA2FULL"/>
245
        <arg value="+JAVA4"/>
257
        <arg value="+JAVA4"/>
246
        <arg value="-JAVA6"/>
258
        <arg value="-JAVA6"/>
259
        <arg value="-JAVA7"/>
247
       </java>
260
       </java>
248
    </target>
261
    </target>
249
262
Lines 253-258 examples: Link Here
253
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
266
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
254
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
267
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
255
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
268
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
269
        <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
270
        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
271
        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
272
        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
273
        <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/>
274
        <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/>
275
        <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/>
276
        <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
277
        <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/>
278
        <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/>
279
        <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/>
280
        <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
281
        <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
282
        <arg file="${src}/org/hsqldb/persist/Logger.java"/>
283
        <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/>
284
        <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
285
        <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/>
286
        <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/>
287
        <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
288
        <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
289
        <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
290
        <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
291
        <arg file="${src}/org/hsqldb/HsqlDateTime.java"/>
292
        <arg value="+JAVA2"/>
293
        <arg value="+JAVA2FULL"/>
294
        <arg value="+JAVA4"/>
295
        <arg value="+JAVA6"/>
296
        <arg value="-JAVA7"/>
297
      </java>
298
    </target>
299
300
    <target name="switchtojdk17" depends="switchtojdk16"
301
            description="self explanatory" if="ant.java.iscjava17">
302
      <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
303
        <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
304
        <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
305
        <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
256
        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
306
        <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
257
        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
307
        <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
258
        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
308
        <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
Lines 279-288 examples: Link Here
279
        <arg value="+JAVA2FULL"/>
329
        <arg value="+JAVA2FULL"/>
280
        <arg value="+JAVA4"/>
330
        <arg value="+JAVA4"/>
281
        <arg value="+JAVA6"/>
331
        <arg value="+JAVA6"/>
332
        <arg value="+JAVA7"/>
282
      </java>
333
      </java>
283
    </target>
334
    </target>
284
335
285
    <target name="store" depends="switchtojdk16"
336
    <target name="store" depends="switchtojdk17"
286
            description="compiles the /store folder">
337
            description="compiles the /store folder">
287
      <javac srcdir="${src}"
338
      <javac srcdir="${src}"
288
             destdir="classes"
339
             destdir="classes"
(-)a/src/org/hsqldb/jdbc/jdbcCallableStatement.java (-2 / +14 lines)
Lines 3106-3112 implements CallableStatement { Link Here
3106
    
3106
    
3107
//#endif JAVA4
3107
//#endif JAVA4
3108
//#ifdef JAVA6
3108
//#ifdef JAVA6
3109
/*
3110
    public void setPoolable(boolean poolable) throws SQLException
3109
    public void setPoolable(boolean poolable) throws SQLException
3111
    {
3110
    {
3112
        throw new UnsupportedOperationException("Not supported yet.");
3111
        throw new UnsupportedOperationException("Not supported yet.");
Lines 3376-3382 implements CallableStatement { Link Here
3376
    {
3375
    {
3377
        throw new UnsupportedOperationException("Not supported yet.");
3376
        throw new UnsupportedOperationException("Not supported yet.");
3378
    }
3377
    }
3379
*/
3380
3378
3381
//#endif JAVA6
3379
//#endif JAVA6
3380
3381
//#ifdef JAVA7
3382
    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
3383
    {
3384
        throw new UnsupportedOperationException("Not supported yet.");
3385
    }
3386
3387
    public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException
3388
    {
3389
        throw new UnsupportedOperationException("Not supported yet.");
3390
    }
3391
3392
3393
//#endif JAVA7
3382
}
3394
}
(-)a/src/org/hsqldb/jdbc/jdbcConnection.java (-2 / +33 lines)
Lines 43-55 import java.sql.Connection; Link Here
43
import java.sql.DatabaseMetaData;
43
import java.sql.DatabaseMetaData;
44
44
45
//#ifdef JAVA6
45
//#ifdef JAVA6
46
/*
47
import java.sql.NClob;
46
import java.sql.NClob;
48
import java.sql.SQLClientInfoException;
47
import java.sql.SQLClientInfoException;
49
import java.sql.SQLXML;
48
import java.sql.SQLXML;
50
*/
51
49
52
//#endif JAVA6
50
//#endif JAVA6
51
52
//#ifdef JAVA7
53
import java.util.concurrent.Executor;
54
55
//#endif JAVA7
56
53
import java.sql.PreparedStatement;
57
import java.sql.PreparedStatement;
54
import java.sql.SQLException;
58
import java.sql.SQLException;
55
import java.sql.SQLWarning;
59
import java.sql.SQLWarning;
Lines 2794-2797 public class jdbcConnection implements Connection { Link Here
2794
*/
2798
*/
2795
2799
2796
//#endif JAVA6
2800
//#endif JAVA6
2801
2802
//#ifdef JAVA7
2803
    public int getNetworkTimeout() throws SQLException
2804
    {
2805
        throw new UnsupportedOperationException("Not supported yet.");
2806
    }
2807
2808
    public void setNetworkTimeout(Executor executor, int millis) throws SQLException
2809
    {
2810
        throw new UnsupportedOperationException("Not supported yet.");
2811
    }
2812
2813
    public void abort(Executor executor) throws SQLException
2814
    {
2815
        throw new UnsupportedOperationException("Not supported yet.");
2816
    }
2817
    
2818
    public String getSchema() throws SQLException
2819
    {
2820
        throw new UnsupportedOperationException("Not supported yet.");
2821
    }
2822
2823
    public void setSchema(String schema) throws SQLException
2824
    {
2825
        throw new UnsupportedOperationException("Not supported yet.");
2826
    }
2827
//#endif JAVA7
2797
}
2828
}
(-)a/src/org/hsqldb/jdbc/jdbcDataSource.java (-2 / +13 lines)
Lines 47-52 import javax.sql.DataSource; Link Here
47
//#endif JAVA4
47
//#endif JAVA4
48
import org.hsqldb.jdbcDriver;
48
import org.hsqldb.jdbcDriver;
49
49
50
//#ifdef JAVA7
51
import java.sql.SQLFeatureNotSupportedException;
52
import java.util.logging.Logger;
53
//#endif JAVA7
54
50
// boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
55
// boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
51
56
52
/**
57
/**
Lines 312-318 public class jdbcDataSource implements Serializable { Link Here
312
    }
317
    }
313
318
314
//#ifdef JAVA6
319
//#ifdef JAVA6
315
/*
316
    public <T> T unwrap(Class<T> iface) throws SQLException
320
    public <T> T unwrap(Class<T> iface) throws SQLException
317
    {
321
    {
318
        throw new UnsupportedOperationException("Not supported yet.");
322
        throw new UnsupportedOperationException("Not supported yet.");
Lines 322-328 public class jdbcDataSource implements Serializable { Link Here
322
    {
326
    {
323
        throw new UnsupportedOperationException("Not supported yet.");
327
        throw new UnsupportedOperationException("Not supported yet.");
324
    }
328
    }
325
*/
326
329
327
//#endif JAVA6
330
//#endif JAVA6
331
332
//#ifdef JAVA7
333
    public Logger getParentLogger() throws SQLFeatureNotSupportedException
334
    {
335
        throw new SQLFeatureNotSupportedException("Not supported yet.");
336
    }
337
338
//#endif JAVA7
328
}
339
}
(-)a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java (-2 / +17 lines)
Lines 5650-5656 public class jdbcDatabaseMetaData implements DatabaseMetaData { Link Here
5650
    }
5650
    }
5651
5651
5652
//#ifdef JAVA6
5652
//#ifdef JAVA6
5653
/*
5654
    public RowIdLifetime getRowIdLifetime() throws SQLException
5653
    public RowIdLifetime getRowIdLifetime() throws SQLException
5655
    {
5654
    {
5656
        throw new UnsupportedOperationException("Not supported yet.");
5655
        throw new UnsupportedOperationException("Not supported yet.");
Lines 5694-5700 public class jdbcDatabaseMetaData implements DatabaseMetaData { Link Here
5694
    {
5693
    {
5695
        throw new UnsupportedOperationException("Not supported yet.");
5694
        throw new UnsupportedOperationException("Not supported yet.");
5696
    }
5695
    }
5697
*/
5698
5696
5699
//#endif JAVA6
5697
//#endif JAVA6
5698
5699
5700
//#ifdef JAVA7
5701
    public boolean generatedKeyAlwaysReturned() throws SQLException
5702
    {
5703
        throw new UnsupportedOperationException("Not supported yet.");
5704
    }
5705
5706
    public ResultSet getPseudoColumns(String catalog, String schemaPattern,
5707
                                      String tableNamePattern, String columnNamePattern) throws SQLException
5708
    {
5709
        throw new UnsupportedOperationException("Not supported yet.");
5710
    }
5711
5712
5713
//#endif JAVA7
5714
5700
}
5715
}
(-)a/src/org/hsqldb/jdbc/jdbcResultSet.java (+15 lines)
Lines 5332-5335 public class jdbcResultSet implements ResultSet { Link Here
5332
*/
5332
*/
5333
5333
5334
//#endif JAVA6
5334
//#endif JAVA6
5335
5336
//#ifdef JAVA7
5337
5338
    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
5339
    {
5340
        throw new UnsupportedOperationException("Not supported yet.");
5341
    }
5342
5343
    public <T> T getObject(int columnNum, Class<T> type) throws SQLException
5344
    {
5345
        throw new UnsupportedOperationException("Not supported yet.");
5346
    }
5347
5348
//#endif JAVA7
5349
5335
}
5350
}
(-)a/src/org/hsqldb/jdbc/jdbcStatement.java (-2 / +12 lines)
Lines 1588-1594 public class jdbcStatement implements Statement { Link Here
1588
        }
1588
        }
1589
    }
1589
    }
1590
//#ifdef JAVA6
1590
//#ifdef JAVA6
1591
/*
1592
    public void setPoolable(boolean poolable) throws SQLException
1591
    public void setPoolable(boolean poolable) throws SQLException
1593
    {
1592
    {
1594
        throw new UnsupportedOperationException("Not supported yet.");
1593
        throw new UnsupportedOperationException("Not supported yet.");
Lines 1608-1613 public class jdbcStatement implements Statement { Link Here
1608
    {
1607
    {
1609
        throw new UnsupportedOperationException("Not supported yet.");
1608
        throw new UnsupportedOperationException("Not supported yet.");
1610
    }
1609
    }
1611
*/
1612
//#endif JAVA6
1610
//#endif JAVA6
1611
1612
//#ifdef JAVA7
1613
    public boolean isCloseOnCompletion() throws SQLException
1614
    {
1615
        throw new UnsupportedOperationException("Not supported yet.");
1616
    }
1617
1618
    public void closeOnCompletion() throws SQLException
1619
    {
1620
        throw new UnsupportedOperationException("Not supported yet.");
1621
    }
1622
//#endif JAVA7
1613
}
1623
}
(-)a/src/org/hsqldb/jdbcDriver.java (+13 lines)
Lines 42-47 import org.hsqldb.jdbc.jdbcConnection; Link Here
42
import org.hsqldb.persist.HsqlDatabaseProperties;
42
import org.hsqldb.persist.HsqlDatabaseProperties;
43
import org.hsqldb.persist.HsqlProperties;
43
import org.hsqldb.persist.HsqlProperties;
44
44
45
//#ifdef JAVA7
46
import java.sql.SQLFeatureNotSupportedException;
47
import java.util.logging.Logger;
48
//#endif JAVA7
49
45
// fredt@users 20011220 - patch 1.7.0 by fredt
50
// fredt@users 20011220 - patch 1.7.0 by fredt
46
// new version numbering scheme
51
// new version numbering scheme
47
// fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
52
// fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
Lines 321-324 public class jdbcDriver implements Driver { Link Here
321
            DriverManager.registerDriver(new jdbcDriver());
326
            DriverManager.registerDriver(new jdbcDriver());
322
        } catch (Exception e) {}
327
        } catch (Exception e) {}
323
    }
328
    }
329
330
//#ifdef JAVA7
331
    public Logger getParentLogger() throws SQLFeatureNotSupportedException
332
    {
333
        throw new SQLFeatureNotSupportedException("Not supported yet.");
334
    }
335
336
//#endif JAVA7
324
}
337
}

Return to bug 384161