[packages/java-derby] up to 10.10.2.0
glen
glen at pld-linux.org
Sat Aug 30 16:06:53 CEST 2014
commit aca75777ed544149805ed5343d3438df93b70aab
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Aug 30 16:31:12 2014 +0300
up to 10.10.2.0
patches from fedora
derby-javacc5.patch | 93 +++++++
derby-net.patch | 13 +
derby.sh | 61 +++++
...erby-JDBC30only-BrokeredCallableStatement.patch | 282 ---------------------
...by-JDBC30only-BrokeredCallableStatement30.patch | 192 --------------
java-derby-JDBC30only-BrokeredConnection.patch | 230 -----------------
java-derby-JDBC30only-BrokeredConnection30.patch | 206 ---------------
...erby-JDBC30only-BrokeredPreparedStatement.patch | 22 --
...derby-JDBC30only-EmbedCallableStatement20.patch | 29 ---
java-derby-JDBC30only-EmbedConnection.patch | 137 ----------
...derby-JDBC30only-EmbedPreparedStatement20.patch | 28 --
java-derby-compilepath_properties.patch | 13 -
java-derby-extrapath_properties.patch | 24 --
java-derby-test.script | 7 -
java-derby.spec | 224 ++++++++--------
15 files changed, 270 insertions(+), 1291 deletions(-)
---
diff --git a/java-derby.spec b/java-derby.spec
index 9fb760b..67ab10d 100644
--- a/java-derby.spec
+++ b/java-derby.spec
@@ -1,46 +1,35 @@
#
# Conditional build:
%bcond_without tests # do not perform tests
-#
+%bcond_without javadoc # don't build javadoc
+
+%define srcname derby
+%include /usr/lib/rpm/macros.java
Summary: Derby DB (ex Cloudscape)
Summary(pl.UTF-8): Derby DB (dawniej Cloudscape)
-Name: java-derby
-Version: 10.1.1.0
+Name: java-%{srcname}
+Version: 10.10.2.0
Release: 0.1
License: Apache v2.0
Group: Applications/Databases
Source0: http://www.apache.org/dist/db/derby/db-derby-%{version}/db-derby-%{version}-src.tar.gz
-# Source0-md5: 122cbf34bf8e637802255baed5cc10ed
-Source1: %{name}-test.script
-Patch0: %{name}-compilepath_properties.patch
-Patch1: %{name}-extrapath_properties.patch
-Patch2: %{name}-JDBC30only-BrokeredConnection.patch
-Patch3: %{name}-JDBC30only-BrokeredCallableStatement.patch
-Patch4: %{name}-JDBC30only-BrokeredPreparedStatement.patch
-Patch5: %{name}-JDBC30only-BrokeredCallableStatement30.patch
-Patch6: %{name}-JDBC30only-BrokeredConnection30.patch
-Patch7: %{name}-JDBC30only-EmbedConnection.patch
-Patch8: %{name}-JDBC30only-EmbedCallableStatement20.patch
-Patch9: %{name}-JDBC30only-EmbedPreparedStatement20.patch
+# Source0-md5: 90227f670d05862a52d2729428786b63
+Source1: derby.sh
+Patch1: derby-javacc5.patch
+Patch2: derby-net.patch
URL: http://db.apache.org/derby/
BuildRequires: ant >= 1.6
-BuildRequires: java(jta)
+#BuildRequires: java-jta
BuildRequires: java-oro
-BuildRequires: java-servletapi5
+BuildRequires: java-servletapi
BuildRequires: java-xalan
-BuildRequires: java-xerces
-BuildRequires: java-xml-commons-apis
+#BuildRequires: java-xerces
+#BuildRequires: java-xml-commons-apis
BuildRequires: javacc
-BuildRequires: jdk >= 0:1.4.2
-BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: rpmbuild(macros) >= 1.300
-Requires: java >= 1.4.2
-Requires: java(jta)
-Requires: java-oro
-Requires: java-servletapi5
-Requires: java-xalan
-Requires: java-xerces
-Requires: java-xml-commons-apis
+BuildRequires: jdk >= 1.6
+BuildRequires: jpackage-utils >= 1.5
+BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.553
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,7 +73,6 @@ Narzędzia bazodanowe:
- dblook - narzędzie do wyciągania schematów dla bazy danych Derby
- sysinfo - narzędzie do wyświetlania numerów wersji i ścieżek klas
-
%package javadoc
Summary: Javadoc for Derby DB
Summary(pl.UTF-8): Dokumentacja javadoc do Derby DB
@@ -120,118 +108,112 @@ Examples for Derby DB.
Przykłady do Derby DB.
%prep
-%setup -q -n db-derby-%{version}-src
+%setup -qc
+
+mv db-derby-%{version}-doc-src doc-src
+mv db-derby-%{version}-src/* .
+
for j in $(find -name '*.jar'); do
mv $j $j.no
done
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
+%undos -f jj,xml
+
+rm java/engine/org/apache/derby/impl/sql/compile/Token.java
+%patch1 -p0
+%patch2 -p0
+
+# Using generics
+find -name build.xml | xargs sed -i -e '
+ s/target="1.4"/target="1.6"/
+ s/source="1.4"/source="1.6"/
+ /Class-Path/d
+'
%build
-required_jars="javacc jta jce servletapi5 oro xalan xerces-j2 xml-commons-apis"
-
-CLASSPATH=$(build-classpath $required_jars)
-export CLASSPATH
-
-export OPT_JAR_LIST="ant/ant-nodeps"
-
-%ant \
- -Dj13lib=$JAVA_HOME/jre/lib \
- -Dj14lib=$JAVA_HOME/jre/lib \
- buildsource testing buildjarsclean javadoc
-
-%if %{with tests}
-mkdir testdir
-install %{SOURCE1} testdir/testderby.sh
-cd testdir
-./testderby.sh
-for f in $(find -name '*.fail'); do
- echo FAILED $f
- cat $f
-done
-%endif
+# tools/ant/properties/extrapath.properties
+ln -sf $(build-classpath javacc) tools/java/javacc.jar
+ln -sf $(build-classpath servlet-api) tools/java/geronimo-spec-servlet-2.4-rc4.jar
+ln -sf $(build-classpath xalan-j2) tools/java/xalan.jar
+ln -sf $(build-classpath xalan-j2-serializer) tools/java/serializer.jar
+ln -sf $(build-classpath oro) tools/java/jakarta-oro-2.0.8.jar
+ln -sf $(build-classpath junit) tools/java/junit.jar
+
+# Fire
+%ant buildsource buildjars %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_javadir}/%{srcname}}
-# jars
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
-
-install -pm 644 jars/sane/derbyclient.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyclient-%{version}.jar
-install -pm 644 jars/sane/derby.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derby-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_de_DE.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_de_DE-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_es.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_es-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_fr.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_fr-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_it.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_it-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_ja_JP.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_ja_JP-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_ko_KR.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_ko_KR-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_pt_BR.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_pt_BR-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_zh_CN.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_zh_CN-%{version}.jar
-install -pm 644 jars/sane/derbyLocale_zh_TW.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyLocale_zh_TW-%{version}.jar
-install -pm 644 jars/sane/derbynet.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbynet-%{version}.jar
-install -pm 644 jars/sane/derbyTesting.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbyTesting-%{version}.jar
-install -pm 644 jars/sane/derbytools.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/derbytools-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 jars/sane/derby.war \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/derby-%{version}.war
-install -pm 644 CHANGES $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 COPYRIGHT $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 LICENSE $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 NOTICE $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 STATUS $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr javadoc/publishedapi $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr javadoc/engine $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-# manual
-install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp -pr javadoc/language $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp -pr javadoc/tools $RPM_BUILD_ROOT%{_docdir}/%{name}
+cp -p jars/sane/*.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}
+
+# Wrapper scripts
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{srcname}-ij
+for P in sysinfo NetworkServerControl startNetworkServer stopNetworkServer; do
+ ln -s %{srcname}-ij $RPM_BUILD_ROOT%{_bindir}/%{srcname}-$P
+done
+
+# Derby home dir
+install -d $RPM_BUILD_ROOT/var/lib/derby
+
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
+%if 0
+%pre
+%groupadd -r derby
+%useradd -r -g derby -d /var/lib/derby -s /sbin/nologin -c "Apache Derby service account" derby
+%endif
+
%post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%files
%defattr(644,root,root,755)
-%{_javadir}/%{name}
-%{_datadir}/%{name}
-
+%doc README NOTICE LICENSE RELEASE-NOTES.html published_api_overview.html
+%attr(755,root,root) %{_bindir}/derby-ij
+%attr(755,root,root) %{_bindir}/derby-sysinfo
+%attr(755,root,root) %{_bindir}/derby-NetworkServerControl
+%attr(755,root,root) %{_bindir}/derby-startNetworkServer
+%attr(755,root,root) %{_bindir}/derby-stopNetworkServer
+%dir %{_javadir}/%{srcname}
+%{_javadir}/%{srcname}/derby.jar
+%{_javadir}/%{srcname}/derbyclient.jar
+%{_javadir}/%{srcname}/derbynet.jar
+%{_javadir}/%{srcname}/derbyrun.jar
+%{_javadir}/%{srcname}/derbytools.jar
+%lang(cs) %{_javadir}/%{srcname}/derbyLocale_cs.jar
+%lang(de_DE) %{_javadir}/%{srcname}/derbyLocale_de_DE.jar
+%lang(es) %{_javadir}/%{srcname}/derbyLocale_es.jar
+%lang(fr) %{_javadir}/%{srcname}/derbyLocale_fr.jar
+%lang(hu) %{_javadir}/%{srcname}/derbyLocale_hu.jar
+%lang(it) %{_javadir}/%{srcname}/derbyLocale_it.jar
+%lang(ja_JP) %{_javadir}/%{srcname}/derbyLocale_ja_JP.jar
+%lang(ko_KR) %{_javadir}/%{srcname}/derbyLocale_ko_KR.jar
+%lang(pl) %{_javadir}/%{srcname}/derbyLocale_pl.jar
+%lang(pt_BR) %{_javadir}/%{srcname}/derbyLocale_pt_BR.jar
+%lang(ru) %{_javadir}/%{srcname}/derbyLocale_ru.jar
+%lang(zh_CN) %{_javadir}/%{srcname}/derbyLocale_zh_CN.jar
+%lang(zh_TW) %{_javadir}/%{srcname}/derbyLocale_zh_TW.jar
+
+%attr(755,derby,derby) /var/lib/derby
+
+%if %{with javadoc}
%files javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
+%if 0
%files manual
%defattr(644,root,root,755)
%{_docdir}/%{name}
+%endif
diff --git a/derby-javacc5.patch b/derby-javacc5.patch
new file mode 100644
index 0000000..35104fb
--- /dev/null
+++ b/derby-javacc5.patch
@@ -0,0 +1,93 @@
+# https://issues.apache.org/jira/browse/DERBY-5125
+--- java/tools/org/apache/derby/impl/tools/ij/ij.jj.orig 2014-06-06 16:32:58.354027890 +0100
++++ java/tools/org/apache/derby/impl/tools/ij/ij.jj 2014-06-06 16:33:20.857663226 +0100
+@@ -28,6 +28,7 @@
+ UNICODE_INPUT = true;
+ IGNORE_CASE = true;
+ CACHE_TOKENS = true;
++ JDK_VERSION = "1.4";
+ }
+
+ PARSER_BEGIN(ij)
+--- java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj.orig 2014-06-06 16:33:35.980418162 +0100
++++ java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj 2014-06-06 16:33:58.603051561 +0100
+@@ -27,6 +27,7 @@
+ IGNORE_CASE = true;
+ CACHE_TOKENS = true;
+ LOOKAHEAD = 1;
++ JDK_VERSION = "1.4";
+ }
+
+ PARSER_BEGIN(mtGrammar)
+--- java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj.orig 2014-06-09 14:41:10.264418950 +0100
++++ java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj 2014-06-09 14:52:52.127080724 +0100
+@@ -11,6 +11,8 @@
+ COMMON_TOKEN_ACTION = true;
+ CACHE_TOKENS = true;
+ UNICODE_INPUT = true;
++ JDK_VERSION = "1.4";
++ TOKEN_EXTENDS = "org.apache.derby.impl.sql.compile.TokenBase";
+ }
+
+ PARSER_BEGIN(SQLParser)
+--- java/engine/org/apache/derby/impl/sql/compile/TokenBase.java.orig 2014-06-09 14:54:14.096762143 +0100
++++ java/engine/org/apache/derby/impl/sql/compile/TokenBase.java 2014-06-09 14:54:58.672044878 +0100
+@@ -0,0 +1,35 @@
++/*
++
++Derby - Class org.apache.derby.impl.sql.compile.Token
++
++Licensed to the Apache Software Foundation (ASF) under one or more
++contributor license agreements. See the NOTICE file distributed with
++this work for additional information regarding copyright ownership.
++The ASF licenses this file to you under the Apache License, Version 2.0
++(the "License"); you may not use this file except in compliance with
++the License. You may obtain a copy of the License at
++
++http://www.apache.org/licenses/LICENSE-2.0
++
++Unless required by applicable law or agreed to in writing, software
++distributed under the License is distributed on an "AS IS" BASIS,
++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++See the License for the specific language governing permissions and
++limitations under the License.
++
++*/
++
++package org.apache.derby.impl.sql.compile;
++
++/**
++ * Base class for the Token class generated by JavaCC.
++ */
++abstract class TokenBase {
++ /**
++ * beginOffset and endOffset are useful for siphoning substrings out of
++ * the Statement so that we can recompile the substrings at upgrade time.
++ * For instance, VIEW definitions and the Restrictions on Published Tables
++ * need to be recompiled at upgrade time.
++ */
++ int beginOffset, endOffset;
++}
+--- java/engine/org/apache/derby/impl/sql/build.xml.orig 2014-06-09 14:54:14.096762143 +0100
++++ java/engine/org/apache/derby/impl/sql/build.xml 2014-06-09 14:54:58.672044878 +0100
+@@ -57,11 +57,10 @@
+ Token.java
+ TokenMgrError.java
+
+- 3 of those files are checked into the codeline:
++ 2 of those files are checked into the codeline:
+
+ CharStream.java
+ ParseException.java
+- Token.java
+
+ We don't want generated code to clash with the checked-in versions. So
+ we delete the conflicting classes here.
+@@ -70,7 +69,6 @@
+ <fileset dir="${generated.src.dir}/${derby.dir}/impl/sql/compile">
+ <include name="CharStream.java"/>
+ <include name="ParseException.java"/>
+- <include name="Token.java"/>
+ </fileset>
+ </delete>
+
diff --git a/derby-net.patch b/derby-net.patch
new file mode 100644
index 0000000..4b7aea0
--- /dev/null
+++ b/derby-net.patch
@@ -0,0 +1,13 @@
+# https://bugzilla.redhat.com/show_bug.cgi?id=830661
+--- build.xml.orig 2014-06-09 15:00:32.294671997 +0100
++++ build.xml 2014-06-09 14:59:42.345476893 +0100
+@@ -1737,6 +1737,9 @@
+ manifest="${derby.jar.dir}/lists/smfnet.mf">
+ <fileset dir="${out.dir}"
+ includes="org/apache/derby/loc/drda/**,
++ org/apache/derby/drda/**,
++ org/apache/derby/mbeans/drda/**,
++ org/apache/derby/impl/drda/**,
+ org/apache/derby/loc/sysinfoMessages.properties,
+ org/apache/derby/info/net.properties,
+ org/apache/derby/drda/server.policy"/>
diff --git a/derby.sh b/derby.sh
new file mode 100755
index 0000000..922b8b8
--- /dev/null
+++ b/derby.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Derby script
+# Lubomir Rintel <lkundrak at v3.sk>
+
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then
+ . /usr/share/java-utils/java-functions
+else
+ echo >&2 "Can't find functions library, aborting"
+ exit 1
+fi
+
+# Configuration
+SCRIPT_PATH=$0
+PROGNAME=$(basename $SCRIPT_PATH |sed 's/^derby-//')
+
+# Wrappers
+[ $PROGNAME = ij ] && MAIN_CLASS=org.apache.derby.tools.ij
+[ $PROGNAME = sysinfo ] && MAIN_CLASS=org.apache.derby.tools.sysinfo
+[ $PROGNAME = NetworkServerControl ] && MAIN_CLASS=org.apache.derby.drda.NetworkServerControl
+[ $PROGNAME = startNetworkServer ] && MAIN_CLASS=org.apache.derby.drda.NetworkServerControl
+[ $PROGNAME = stopNetworkServer ] && MAIN_CLASS=org.apache.derby.drda.NetworkServerControl
+
+# Default parameters
+[ $PROGNAME = startNetworkServer ] && set -- start "$@"
+[ $PROGNAME = stopNetworkServer ] && set -- shutdown "$@"
+
+# Load system-wide configuration
+if [ -f /etc/derby.conf ]; then
+ . /etc/derby.conf
+fi
+
+# Load user configuration
+[ -f "$HOME/.derbyrc" ] && . "$HOME/.derbyrc"
+[ -f "$HOME/.derby/startup" ] && . "$HOME/.derby/startup"
+
+# Bail out if there's nothing to run
+if [ -z "$MAIN_CLASS" ]; then
+ echo >&2 "Can not determine main class for '$PROGNAME'"
+ exit 1
+fi
+
+# Not loading all of derby, so that secure class loader can kick in
+BASE_JARS="$BASE_JARS derby/derby"
+BASE_JARS="$BASE_JARS derby/derbynet"
+BASE_JARS="$BASE_JARS derby/derbytools"
+BASE_JARS="$BASE_JARS derby/derbyclient"
+
+# Set parameters
+set_jvm
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS $DERBY_OPTS
+
+# Add locales in a rather dirty way
+CLASSPATH=$CLASSPATH:$(build-classpath derby |sed 's/:/\n/g' |
+ grep derbyLocale |xargs echo |sed 's/ /:/g')
+
+# Let's start
+run "$@"
diff --git a/java-derby-JDBC30only-BrokeredCallableStatement.patch b/java-derby-JDBC30only-BrokeredCallableStatement.patch
deleted file mode 100644
index 20d1ac0..0000000
--- a/java-derby-JDBC30only-BrokeredCallableStatement.patch
+++ /dev/null
@@ -1,282 +0,0 @@
---- java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java.sav 2004-11-30 20:20:48.000000000 +0100
-+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java 2005-02-09 15:41:29.335685368 +0100
-@@ -38,6 +38,18 @@
- super(control, jdbcLevel, sql);
- }
-
-+ public final void setURL(java.lang.String parameterName, java.net.URL value) throws SQLException {
-+ getCallableStatement().setURL(parameterName, value);
-+ }
-+
-+ public final java.net.URL getURL(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getURL(parameterName);
-+ }
-+
-+ public final java.net.URL getURL(int i) throws SQLException {
-+ return getCallableStatement().getURL(i);
-+ }
-+
- public final void registerOutParameter(int parameterIndex,
- int sqlType)
- throws SQLException
-@@ -53,12 +65,56 @@
- getCallableStatement().registerOutParameter( parameterIndex, sqlType, scale);
- }
-
-+ public final void registerOutParameter(String a, int b, String c) throws SQLException {
-+ getCallableStatement().registerOutParameter(a,b,c);
-+ }
-+
- public final boolean wasNull()
- throws SQLException
- {
- return getCallableStatement().wasNull();
- }
-
-+ public final void registerOutParameter(String a, int b, int c) throws SQLException {
-+ getCallableStatement().registerOutParameter(a,b,c);
-+ }
-+
-+ public final void registerOutParameter(String a, int b) throws SQLException {
-+ getCallableStatement().registerOutParameter(a,b);
-+ }
-+
-+ public final boolean getBoolean(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getBoolean(parameterName);
-+ }
-+
-+ public final byte getByte(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getByte(parameterName);
-+ }
-+
-+ public final short getShort(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getShort(parameterName);
-+ }
-+
-+ public final int getInt(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getInt(parameterName);
-+ }
-+
-+ public final float getFloat(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getFloat(parameterName);
-+ }
-+
-+ public final double getDouble(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getDouble(parameterName);
-+ }
-+
-+ public final long getLong(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getLong(parameterName);
-+ }
-+
-+ public final java.lang.String getString(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getString(parameterName);
-+ }
-+
- public final String getString(int parameterIndex)
- throws SQLException
- {
-@@ -145,6 +201,142 @@
- return getCallableStatement().getTimestamp( parameterIndex);
- }
-
-+ public final void setBigDecimal(java.lang.String parameterName, java.math.BigDecimal value) throws SQLException {
-+ getCallableStatement().setBigDecimal(parameterName, value);
-+ }
-+
-+ public final java.math.BigDecimal getBigDecimal(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getBigDecimal(parameterName);
-+ }
-+
-+ public final void setString(java.lang.String parameterName, java.lang.String value) throws SQLException {
-+ getCallableStatement().setString(parameterName, value);
-+ }
-+
-+ public final void setNull(java.lang.String parameterName, int type) throws SQLException {
-+ getCallableStatement().setNull(parameterName, type);
-+ }
-+
-+ public final void setNull(java.lang.String parameterName, int a, java.lang.String b) throws SQLException {
-+ getCallableStatement().setNull(parameterName, a, b);
-+ }
-+
-+ public final void setObject(java.lang.String parameterName, java.lang.Object value, int a, int b) throws SQLException {
-+ getCallableStatement().setObject(parameterName, value, a, b);
-+ }
-+
-+ public final void setObject(java.lang.String parameterName, java.lang.Object value, int a) throws SQLException {
-+ getCallableStatement().setObject(parameterName, value, a);
-+ }
-+
-+ public final void setObject(java.lang.String parameterName, java.lang.Object value) throws SQLException {
-+ getCallableStatement().setObject(parameterName, value);
-+ }
-+
-+ public final void setCharacterStream(java.lang.String parameterName, java.io.Reader value, int length) throws SQLException {
-+ getCallableStatement().setCharacterStream(parameterName, value, length);
-+ }
-+
-+ public final void setBinaryStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException {
-+ getCallableStatement().setBinaryStream(parameterName, value, length);
-+ }
-+
-+ public final void setAsciiStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException {
-+ getCallableStatement().setAsciiStream(parameterName, value, length);
-+ }
-+
-+ public final void setBytes(java.lang.String parameterName, byte[] value) throws SQLException {
-+ getCallableStatement().setBytes(parameterName, value);
-+ }
-+
-+ public final void setBoolean(java.lang.String parameterName, boolean value) throws SQLException {
-+ getCallableStatement().setBoolean(parameterName, value);
-+ }
-+
-+ public final void setShort(java.lang.String parameterName, short value) throws SQLException {
-+ getCallableStatement().setShort(parameterName, value);
-+ }
-+
-+ public final void setInt(java.lang.String parameterName, int value) throws SQLException {
-+ getCallableStatement().setInt(parameterName, value);
-+ }
-+
-+ public final void setLong(java.lang.String parameterName, long value) throws SQLException {
-+ getCallableStatement().setLong(parameterName, value);
-+ }
-+
-+ public final void setFloat(java.lang.String parameterName, float value) throws SQLException {
-+ getCallableStatement().setFloat(parameterName, value);
-+ }
-+
-+ public final void setDouble(java.lang.String parameterName, double value) throws SQLException {
-+ getCallableStatement().setDouble(parameterName, value);
-+ }
-+
-+ public final void setByte(java.lang.String parameterName, byte value) throws SQLException {
-+ getCallableStatement().setByte(parameterName, value);
-+ }
-+
-+ public final void setDate(java.lang.String parameterName, java.sql.Date value) throws SQLException {
-+ getCallableStatement().setDate(parameterName, value);
-+ }
-+
-+ public final void setDate(java.lang.String parameterName, java.sql.Date value, java.util.Calendar cal) throws SQLException {
-+ getCallableStatement().setDate(parameterName, value, cal);
-+ }
-+
-+ public final void setTime(java.lang.String parameterName, java.sql.Time value) throws SQLException {
-+ getCallableStatement().setTime(parameterName, value);
-+ }
-+
-+ public final void setTime(java.lang.String parameterName, java.sql.Time value, java.util.Calendar cal) throws SQLException {
-+ getCallableStatement().setTime(parameterName, value, cal);
-+ }
-+
-+ public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value) throws SQLException {
-+ getCallableStatement().setTimestamp(parameterName, value);
-+ }
-+
-+ public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value, java.util.Calendar cal) throws SQLException {
-+ getCallableStatement().setTimestamp(parameterName, value, cal);
-+ }
-+
-+ public final java.sql.Timestamp getTimestamp(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getTimestamp(parameterName);
-+ }
-+
-+ public final java.sql.Timestamp getTimestamp(java.lang.String parameterName, java.util.Calendar cal) throws SQLException {
-+ return getCallableStatement().getTimestamp(parameterName, cal);
-+ }
-+
-+ public final java.sql.Time getTime(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getTime(parameterName);
-+ }
-+
-+ public final java.sql.Time getTime(java.lang.String parameterName, java.util.Calendar cal) throws SQLException {
-+ return getCallableStatement().getTime(parameterName, cal);
-+ }
-+
-+ public final byte[] getBytes(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getBytes(parameterName);
-+ }
-+
-+ public final java.sql.Date getDate(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getDate(parameterName);
-+ }
-+
-+ public final java.sql.Date getDate(java.lang.String parameterName, java.util.Calendar cal) throws SQLException {
-+ return getCallableStatement().getDate(parameterName, cal);
-+ }
-+
-+ public final java.lang.Object getObject(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getObject(parameterName);
-+ }
-+
-+ public final java.lang.Object getObject(java.lang.String parameterName, java.util.Map map) throws SQLException {
-+ return getCallableStatement().getObject(parameterName, map);
-+ }
-+
- public final Object getObject(int parameterIndex)
- throws SQLException
- {
-@@ -164,24 +356,40 @@
- return getCallableStatement().getObject( i, map);
- }
-
-+ public final java.sql.Ref getRef(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getRef(parameterName);
-+ }
-+
- public final Ref getRef(int i)
- throws SQLException
- {
- return getCallableStatement().getRef( i);
- }
-
-+ public final java.sql.Blob getBlob(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getBlob(parameterName);
-+ }
-+
- public final Blob getBlob(int i)
- throws SQLException
- {
- return getCallableStatement().getBlob( i);
- }
-
-+ public final java.sql.Clob getClob(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getClob(parameterName);
-+ }
-+
- public final Clob getClob(int i)
- throws SQLException
- {
- return getCallableStatement().getClob( i);
- }
-
-+ public final java.sql.Array getArray(java.lang.String parameterName) throws SQLException {
-+ return getCallableStatement().getArray(parameterName);
-+ }
-+
- public final Array getArray(int i)
- throws SQLException
- {
-@@ -210,6 +418,19 @@
- getCallableStatement().registerOutParameter( paramIndex, sqlType, typeName);
- }
-
-+ public final void setURL(int i, java.net.URL x)
-+ throws SQLException
-+ {
-+ getPreparedStatement().setURL( i, x);
-+ }
-+
-+ public final ParameterMetaData getParameterMetaData()
-+ throws SQLException
-+ {
-+ return getPreparedStatement().getParameterMetaData();
-+ }
-+
-+
- /*
- ** Control methods
- */
diff --git a/java-derby-JDBC30only-BrokeredCallableStatement30.patch b/java-derby-JDBC30only-BrokeredCallableStatement30.patch
deleted file mode 100644
index 9c8a369..0000000
--- a/java-derby-JDBC30only-BrokeredCallableStatement30.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java.sav 2005-02-09 15:56:39.581307000 +0100
-+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java 2005-02-09 15:57:29.065784216 +0100
-@@ -37,189 +37,4 @@
- public BrokeredCallableStatement30(BrokeredStatementControl control, int jdbcLevel, String sql) throws SQLException {
- super(control, jdbcLevel, sql);
- }
-- public final void setURL(java.lang.String parameterName, java.net.URL value) throws SQLException {
-- getCallableStatement().setURL(parameterName, value);
-- }
-- public final void setNull(java.lang.String parameterName, int type) throws SQLException {
-- getCallableStatement().setNull(parameterName, type);
-- }
-- public final void setBoolean(java.lang.String parameterName, boolean value) throws SQLException {
-- getCallableStatement().setBoolean(parameterName, value);
-- }
-- public final void setByte(java.lang.String parameterName, byte value) throws SQLException {
-- getCallableStatement().setByte(parameterName, value);
-- }
-- public final void setShort(java.lang.String parameterName, short value) throws SQLException {
-- getCallableStatement().setShort(parameterName, value);
-- }
-- public final void setInt(java.lang.String parameterName, int value) throws SQLException {
-- getCallableStatement().setInt(parameterName, value);
-- }
-- public final void setLong(java.lang.String parameterName, long value) throws SQLException {
-- getCallableStatement().setLong(parameterName, value);
-- }
-- public final void setFloat(java.lang.String parameterName, float value) throws SQLException {
-- getCallableStatement().setFloat(parameterName, value);
-- }
-- public final void setDouble(java.lang.String parameterName, double value) throws SQLException {
-- getCallableStatement().setDouble(parameterName, value);
-- }
-- public final void setBigDecimal(java.lang.String parameterName, java.math.BigDecimal value) throws SQLException {
-- getCallableStatement().setBigDecimal(parameterName, value);
-- }
-- public final void setString(java.lang.String parameterName, java.lang.String value) throws SQLException {
-- getCallableStatement().setString(parameterName, value);
-- }
-- public final void setBytes(java.lang.String parameterName, byte[] value) throws SQLException {
-- getCallableStatement().setBytes(parameterName, value);
-- }
-- public final void setDate(java.lang.String parameterName, java.sql.Date value) throws SQLException {
-- getCallableStatement().setDate(parameterName, value);
-- }
-- public final void setTime(java.lang.String parameterName, java.sql.Time value) throws SQLException {
-- getCallableStatement().setTime(parameterName, value);
-- }
-- public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value) throws SQLException {
-- getCallableStatement().setTimestamp(parameterName, value);
-- }
-- public final void setAsciiStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException {
-- getCallableStatement().setAsciiStream(parameterName, value, length);
-- }
-- public final void setBinaryStream(java.lang.String parameterName, java.io.InputStream value, int length) throws SQLException {
-- getCallableStatement().setBinaryStream(parameterName, value, length);
-- }
-- public final void setObject(java.lang.String parameterName, java.lang.Object value, int a, int b) throws SQLException {
-- getCallableStatement().setObject(parameterName, value, a, b);
-- }
-- public final void setObject(java.lang.String parameterName, java.lang.Object value, int a) throws SQLException {
-- getCallableStatement().setObject(parameterName, value, a);
-- }
-- public final void setObject(java.lang.String parameterName, java.lang.Object value) throws SQLException {
-- getCallableStatement().setObject(parameterName, value);
-- }
-- public final void setCharacterStream(java.lang.String parameterName, java.io.Reader value, int length) throws SQLException {
-- getCallableStatement().setCharacterStream(parameterName, value, length);
-- }
-- public final void setDate(java.lang.String parameterName, java.sql.Date value, java.util.Calendar cal) throws SQLException {
-- getCallableStatement().setDate(parameterName, value, cal);
-- }
-- public final void setTime(java.lang.String parameterName, java.sql.Time value, java.util.Calendar cal) throws SQLException {
-- getCallableStatement().setTime(parameterName, value, cal);
-- }
-- public final void setTimestamp(java.lang.String parameterName, java.sql.Timestamp value, java.util.Calendar cal) throws SQLException {
-- getCallableStatement().setTimestamp(parameterName, value, cal);
-- }
-- public final void setNull(java.lang.String parameterName, int a, java.lang.String b) throws SQLException {
-- getCallableStatement().setNull(parameterName, a, b);
-- }
-- public final java.lang.String getString(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getString(parameterName);
-- }
-- public final boolean getBoolean(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getBoolean(parameterName);
-- }
-- public final byte getByte(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getByte(parameterName);
-- }
-- public final short getShort(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getShort(parameterName);
-- }
-- public final int getInt(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getInt(parameterName);
-- }
-- public final long getLong(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getLong(parameterName);
-- }
-- public final float getFloat(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getFloat(parameterName);
-- }
-- public final double getDouble(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getDouble(parameterName);
-- }
-- public final byte[] getBytes(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getBytes(parameterName);
-- }
-- public final java.sql.Date getDate(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getDate(parameterName);
-- }
-- public final java.sql.Time getTime(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getTime(parameterName);
-- }
-- public final java.sql.Timestamp getTimestamp(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getTimestamp(parameterName);
-- }
-- public final java.lang.Object getObject(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getObject(parameterName);
-- }
-- public final java.math.BigDecimal getBigDecimal(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getBigDecimal(parameterName);
-- }
-- public final java.lang.Object getObject(java.lang.String parameterName, java.util.Map map) throws SQLException {
-- return getCallableStatement().getObject(parameterName, map);
-- }
-- public final java.sql.Ref getRef(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getRef(parameterName);
-- }
-- public final java.sql.Blob getBlob(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getBlob(parameterName);
-- }
-- public final java.sql.Clob getClob(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getClob(parameterName);
-- }
-- public final java.sql.Array getArray(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getArray(parameterName);
-- }
-- public final java.sql.Date getDate(java.lang.String parameterName, java.util.Calendar cal) throws SQLException {
-- return getCallableStatement().getDate(parameterName, cal);
-- }
-- public final java.sql.Time getTime(java.lang.String parameterName, java.util.Calendar cal) throws SQLException {
-- return getCallableStatement().getTime(parameterName, cal);
-- }
-- public final java.sql.Timestamp getTimestamp(java.lang.String parameterName, java.util.Calendar cal) throws SQLException {
-- return getCallableStatement().getTimestamp(parameterName, cal);
-- }
-- public final java.net.URL getURL(java.lang.String parameterName) throws SQLException {
-- return getCallableStatement().getURL(parameterName);
-- }
-- public final java.net.URL getURL(int i) throws SQLException {
-- return getCallableStatement().getURL(i);
-- }
-- public final void registerOutParameter(String a, int b) throws SQLException {
-- getCallableStatement().registerOutParameter(a,b);
-- }
-- public final void registerOutParameter(String a, int b, int c) throws SQLException {
-- getCallableStatement().registerOutParameter(a,b,c);
-- }
-- public final void registerOutParameter(String a, int b, String c) throws SQLException {
-- getCallableStatement().registerOutParameter(a,b,c);
-- }
-- /*
-- ** JDBC 3.0 PreparedStatement methods
-- */
--
-- public final void setURL(int i, URL x)
-- throws SQLException
-- {
-- getPreparedStatement().setURL( i, x);
-- }
-- public final ParameterMetaData getParameterMetaData()
-- throws SQLException
-- {
-- return getPreparedStatement().getParameterMetaData();
-- }
-- /*
-- ** Control methods
-- */
--
-- /**
-- Create a duplicate CalableStatement to this, including state, from the passed in Connection.
-- */
-- public CallableStatement createDuplicateStatement(Connection conn, CallableStatement oldStatement) throws SQLException {
--
-- CallableStatement newStatement = conn.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
--
-- setStatementState(oldStatement, newStatement);
--
-- return newStatement;
-- }
- }
diff --git a/java-derby-JDBC30only-BrokeredConnection.patch b/java-derby-JDBC30only-BrokeredConnection.patch
deleted file mode 100644
index 0506084..0000000
--- a/java-derby-JDBC30only-BrokeredConnection.patch
+++ /dev/null
@@ -1,230 +0,0 @@
---- java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java.sav 2005-07-02 03:57:43.000000000 +0200
-+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java 2006-09-07 09:53:52.000000000 +0200
-@@ -25,6 +25,7 @@
- import java.sql.PreparedStatement;
- import java.sql.CallableStatement;
- import java.sql.DatabaseMetaData;
-+import java.sql.Savepoint;
- import java.sql.SQLException;
- import java.sql.SQLWarning;
-
-@@ -52,6 +53,7 @@
- protected final BrokeredConnectionControl control;
- private boolean isClosed;
-
-+
- /**
- Maintain state as seen by this Connection handle, not the state
- of the underlying Connection it is attached to.
-@@ -145,6 +147,75 @@
- }
- }
-
-+ public final Savepoint setSavepoint()
-+ throws SQLException
-+ {
-+ try {
-+ control.checkSavepoint();
-+ return getRealConnection().setSavepoint();
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
-+ public final Savepoint setSavepoint(String name)
-+ throws SQLException
-+ {
-+ try {
-+ control.checkSavepoint();
-+ return getRealConnection().setSavepoint(name);
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
-+ public final void setHoldability(int holdability)
-+ throws SQLException
-+ {
-+ try {
-+ control.checkHoldCursors(holdability);
-+ getRealConnection().setHoldability(holdability);
-+ stateHoldability = holdability;
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
-+ public final int getHoldability()
-+ throws SQLException
-+ {
-+ try {
-+ return getRealConnection().getHoldability();
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
-+ public final void releaseSavepoint(Savepoint savepoint)
-+ throws SQLException
-+ {
-+ try {
-+ getRealConnection().releaseSavepoint(savepoint);
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
- public final void rollback() throws SQLException
- {
- try {
-@@ -156,6 +227,20 @@
- }
- }
-
-+ public final void rollback(Savepoint savepoint)
-+ throws SQLException
-+ {
-+ try {
-+ control.checkRollback();
-+ getRealConnection().rollback(savepoint);
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
- public final void close() throws SQLException
- {
- if (isClosed)
-@@ -301,6 +386,20 @@
- }
- }
-
-+ public final Statement createStatement(int resultSetType,
-+ int resultSetConcurrency,
-+ int resultSetHoldability)
-+ throws SQLException {
-+ try {
-+ control.checkHoldCursors(resultSetHoldability);
-+ return control.wrapStatement(getRealConnection().createStatement(resultSetType, resultSetConcurrency, resultSetHoldability));
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-
- public final PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency)
-@@ -318,6 +417,69 @@
- }
- }
-
-+ public final PreparedStatement prepareStatement(
-+ String sql,
-+ String[] columnNames)
-+ throws SQLException
-+ {
-+ try {
-+ return control.wrapStatement(getRealConnection().prepareStatement(sql, columnNames), sql, columnNames);
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
-+ public final PreparedStatement prepareStatement(
-+ String sql,
-+ int[] columnIndexes)
-+ throws SQLException
-+ {
-+ try {
-+ return control.wrapStatement(getRealConnection().prepareStatement(sql, columnIndexes), sql, columnIndexes);
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
-+ public final PreparedStatement prepareStatement(String sql,
-+ int resultSetType,
-+ int resultSetConcurrency,
-+ int resultSetHoldability)
-+
-+ throws SQLException {
-+ try {
-+ control.checkHoldCursors(resultSetHoldability);
-+ return control.wrapStatement(
-+ getRealConnection().prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability), sql, null);
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
-+ public final PreparedStatement prepareStatement(
-+ String sql,
-+ int autoGeneratedKeys)
-+ throws SQLException
-+ {
-+ try {
-+ return control.wrapStatement(getRealConnection().prepareStatement(sql, autoGeneratedKeys), sql, new Integer(autoGeneratedKeys));
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
- public final CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency) throws SQLException
- {
-@@ -333,6 +495,23 @@
- }
- }
-
-+ public final CallableStatement prepareCall(String sql,
-+ int resultSetType,
-+ int resultSetConcurrency,
-+ int resultSetHoldability)
-+ throws SQLException {
-+ try {
-+ control.checkHoldCursors(resultSetHoldability);
-+ return control.wrapStatement(
-+ getRealConnection().prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability), sql);
-+ }
-+ catch (SQLException se)
-+ {
-+ notifyException(se);
-+ throw se;
-+ }
-+ }
-+
- public final java.util.Map getTypeMap() throws SQLException
- {
- try
diff --git a/java-derby-JDBC30only-BrokeredConnection30.patch b/java-derby-JDBC30only-BrokeredConnection30.patch
deleted file mode 100644
index 44faf1c..0000000
--- a/java-derby-JDBC30only-BrokeredConnection30.patch
+++ /dev/null
@@ -1,206 +0,0 @@
---- java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java.sav 2005-07-02 03:57:43.000000000 +0200
-+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java 2006-09-07 10:41:09.000000000 +0200
-@@ -20,13 +20,6 @@
-
- package org.apache.derby.iapi.jdbc;
-
--import java.sql.Statement;
--import java.sql.PreparedStatement;
--import java.sql.CallableStatement;
--import java.sql.SQLException;
--import java.sql.Savepoint;
--import org.apache.derby.iapi.reference.JDBC30Translation;
--
- /**
- Extends BrokeredConnection to provide the JDBC 3.0 connection methods.
- */
-@@ -38,189 +31,4 @@
- super(control);
- }
-
-- public final Statement createStatement(int resultSetType,
-- int resultSetConcurrency,
-- int resultSetHoldability)
-- throws SQLException {
-- try {
-- control.checkHoldCursors(resultSetHoldability);
-- return control.wrapStatement(getRealConnection().createStatement(resultSetType, resultSetConcurrency, resultSetHoldability));
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
-- public final PreparedStatement prepareStatement(String sql,
-- int resultSetType,
-- int resultSetConcurrency,
-- int resultSetHoldability)
-- throws SQLException {
-- try {
-- control.checkHoldCursors(resultSetHoldability);
-- return control.wrapStatement(
-- getRealConnection().prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability), sql, null);
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
-- public final CallableStatement prepareCall(String sql,
-- int resultSetType,
-- int resultSetConcurrency,
-- int resultSetHoldability)
-- throws SQLException {
-- try {
-- control.checkHoldCursors(resultSetHoldability);
-- return control.wrapStatement(
-- getRealConnection().prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability), sql);
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final Savepoint setSavepoint()
-- throws SQLException
-- {
-- try {
-- control.checkSavepoint();
-- return getRealConnection().setSavepoint();
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final Savepoint setSavepoint(String name)
-- throws SQLException
-- {
-- try {
-- control.checkSavepoint();
-- return getRealConnection().setSavepoint(name);
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final void rollback(Savepoint savepoint)
-- throws SQLException
-- {
-- try {
-- control.checkRollback();
-- getRealConnection().rollback(savepoint);
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final void releaseSavepoint(Savepoint savepoint)
-- throws SQLException
-- {
-- try {
-- getRealConnection().releaseSavepoint(savepoint);
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
--
-- public final int getHoldability()
-- throws SQLException
-- {
-- try {
-- return getRealConnection().getHoldability();
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final void setHoldability(int holdability)
-- throws SQLException
-- {
-- try {
-- control.checkHoldCursors(holdability);
-- getRealConnection().setHoldability(holdability);
-- stateHoldability = holdability;
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final PreparedStatement prepareStatement(
-- String sql,
-- int autoGeneratedKeys)
-- throws SQLException
-- {
-- try {
-- return control.wrapStatement(getRealConnection().prepareStatement(sql, autoGeneratedKeys), sql, new Integer(autoGeneratedKeys));
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final PreparedStatement prepareStatement(
-- String sql,
-- int[] columnIndexes)
-- throws SQLException
-- {
-- try {
-- return control.wrapStatement(getRealConnection().prepareStatement(sql, columnIndexes), sql, columnIndexes);
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public final PreparedStatement prepareStatement(
-- String sql,
-- String[] columnNames)
-- throws SQLException
-- {
-- try {
-- return control.wrapStatement(getRealConnection().prepareStatement(sql, columnNames), sql, columnNames);
-- }
-- catch (SQLException se)
-- {
-- notifyException(se);
-- throw se;
-- }
-- }
--
-- public BrokeredPreparedStatement newBrokeredStatement(BrokeredStatementControl statementControl, String sql, Object generatedKeys) throws SQLException {
-- return new BrokeredPreparedStatement30(statementControl, getJDBCLevel(), sql, generatedKeys);
-- }
-- public BrokeredCallableStatement newBrokeredStatement(BrokeredStatementControl statementControl, String sql) throws SQLException {
-- return new BrokeredCallableStatement30(statementControl, getJDBCLevel(), sql);
-- }
--
-- protected int getJDBCLevel() { return 3;}
--
- }
diff --git a/java-derby-JDBC30only-BrokeredPreparedStatement.patch b/java-derby-JDBC30only-BrokeredPreparedStatement.patch
deleted file mode 100644
index a7a16f8..0000000
--- a/java-derby-JDBC30only-BrokeredPreparedStatement.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java.sav 2004-11-30 20:20:48.000000000 +0100
-+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java 2005-02-09 15:54:23.974922304 +0100
-@@ -502,6 +502,19 @@
- return getPreparedStatement();
- }
-
-+ public void setURL(int i, java.net.URL x)
-+ throws SQLException
-+ {
-+ getPreparedStatement().setURL( i, x);
-+ }
-+
-+ public ParameterMetaData getParameterMetaData()
-+ throws SQLException
-+ {
-+ return getPreparedStatement().getParameterMetaData();
-+ }
-+
-+
- /**
- Create a duplicate PreparedStatement to this, including state, from the passed in Connection.
- */
diff --git a/java-derby-JDBC30only-EmbedCallableStatement20.patch b/java-derby-JDBC30only-EmbedCallableStatement20.patch
deleted file mode 100644
index d6cfe15..0000000
--- a/java-derby-JDBC30only-EmbedCallableStatement20.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java.sav 2004-11-30 20:24:14.000000000 +0100
-+++ java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java 2005-02-09 16:36:01.972169000 +0100
-@@ -22,6 +22,7 @@
-
- import java.math.BigDecimal;
- import java.sql.CallableStatement;
-+import java.sql.ParameterMetaData;
- import java.sql.SQLException;
- import java.sql.Date;
- import java.sql.Time;
-@@ -1159,6 +1160,18 @@
- {
- throw Util.notImplemented();
- }
-+
-+ public ParameterMetaData getParameterMetaData()
-+ throws SQLException
-+ {
-+ checkStatus();
-+ if (preparedStatement == null)
-+ return null;
-+
-+ return new EmbedParameterMetaData30(
-+ getParms(), preparedStatement.getParameterTypes());
-+ }
-+
- }
-
-
diff --git a/java-derby-JDBC30only-EmbedConnection.patch b/java-derby-JDBC30only-EmbedConnection.patch
deleted file mode 100644
index fff5afb..0000000
--- a/java-derby-JDBC30only-EmbedConnection.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java.sav 2005-06-10 05:38:48.000000000 +0200
-+++ java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java 2006-09-07 10:37:58.000000000 +0200
-@@ -39,6 +39,7 @@
- import org.apache.derby.iapi.error.StandardException;
- import org.apache.derby.iapi.services.i18n.MessageService;
- import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
-+import org.apache.derby.iapi.sql.conn.StatementContext;
- import org.apache.derby.iapi.sql.execute.ExecutionContext;
- import org.apache.derby.iapi.sql.dictionary.DataDictionary;
- import org.apache.derby.iapi.store.access.XATransactionController;
-@@ -50,6 +51,7 @@
- import java.sql.PreparedStatement;
- import java.sql.CallableStatement;
- import java.sql.DatabaseMetaData;
-+import java.sql.Savepoint;
- import java.sql.SQLException;
- import java.sql.SQLWarning;
- import java.sql.Statement;
-@@ -1943,4 +1945,118 @@
- }
-
-
-+
-+ /**
-+ * Creates a savepoint with the given name(if it is a named savepoint else we will generate a name
-+ * becuase Cloudscape only supports named savepoints internally) in the current transaction and
-+ * returns the new Savepoint object that represents it.
-+ *
-+ * @param name A String containing the name of the savepoint. Will be null if this is an unnamed savepoint
-+ * @param userSuppliedSavepointName If true means it's a named user defined savepoint.
-+ *
-+ * @return The new Savepoint object
-+ */
-+ private Savepoint commonSetSavepointCode(String name, boolean userSuppliedSavepointName) throws SQLException
-+ {
-+ synchronized (getConnectionSynchronization()) {
-+ setupContextStack();
-+ try {
-+ verifySavepointCommandIsAllowed();
-+ if (userSuppliedSavepointName && (name == null))//make sure that if it is a named savepoint then supplied name is not null
-+ throw newSQLException(SQLState.NULL_NAME_FOR_SAVEPOINT);
-+ //make sure that if it is a named savepoint then supplied name length is not > 128
-+ if (userSuppliedSavepointName && name.startsWith("SYS")) //to enforce DB2 restriction which is savepoint name can't start with SYS
-+ throw newSQLException(SQLState.INVALID_SCHEMA_SYS, "SYS");
-+ Savepoint savePt = new EmbedSavepoint30(this, name);
-+ return savePt;
-+ } catch (StandardException e) {
-+ throw handleException(e);
-+ } finally {
-+ restoreContextStack();
-+ }
-+ }
-+ }
-+
-+ // used by setSavepoint to check autocommit is false and not inside the trigger code
-+ private void verifySavepointCommandIsAllowed() throws SQLException
-+ {
-+ if (autoCommit)
-+ throw newSQLException(SQLState.NO_SAVEPOINT_WHEN_AUTO);
-+
-+ //Bug 4507 - savepoint not allowed inside trigger
-+ StatementContext stmtCtxt = getLanguageConnection().getStatementContext();
-+ if (stmtCtxt!= null && stmtCtxt.inTrigger())
-+ throw newSQLException(SQLState.NO_SAVEPOINT_IN_TRIGGER);
-+ }
-+
-+ // used by release/rollback to check savepoint argument
-+ private void verifySavepointArg(Savepoint savepoint) throws SQLException
-+ {
-+ //bug 4451 - Check for null savepoint
-+ EmbedSavepoint30 lsv = (EmbedSavepoint30) savepoint;
-+ // bug 4451 need to throw error for null Savepoint
-+ if (lsv == null)
-+ throw
-+ Util.generateCsSQLException(SQLState.XACT_SAVEPOINT_NOT_FOUND, "null");
-+
-+ //bug 4468 - verify that savepoint rollback is for a savepoint from the current
-+ // connection
-+ if (!lsv.sameConnection(this))
-+ throw newSQLException(SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL);
-+
-+ return;
-+ }
-+
-+ public Savepoint setSavepoint()
-+ throws SQLException
-+ {
-+ return commonSetSavepointCode(null, false);
-+ }
-+
-+ public Savepoint setSavepoint(
-+ String name)
-+ throws SQLException
-+ {
-+ return commonSetSavepointCode(name, true);
-+ }
-+
-+ public void rollback(
-+ Savepoint savepoint)
-+ throws SQLException
-+ {
-+ synchronized (getConnectionSynchronization()) {
-+ setupContextStack();
-+ try {
-+ verifySavepointCommandIsAllowed();
-+ verifySavepointArg(savepoint);
-+ //Need to cast and get the name because JDBC3 spec doesn't support names for
-+ //unnamed savepoints but Cloudscape keeps names for named & unnamed savepoints.
-+ getLanguageConnection().internalRollbackToSavepoint(((EmbedSavepoint30)savepoint).getInternalName(),true, savepoint);
-+ } catch (StandardException e) {
-+ throw handleException(e);
-+ } finally {
-+ restoreContextStack();
-+ }
-+ }
-+ }
-+
-+ public void releaseSavepoint(
-+ Savepoint savepoint)
-+ throws SQLException
-+ {
-+ synchronized (getConnectionSynchronization()) {
-+ setupContextStack();
-+ try {
-+ verifySavepointCommandIsAllowed();
-+ verifySavepointArg(savepoint);
-+ //Need to cast and get the name because JDBC3 spec doesn't support names for
-+ //unnamed savepoints but Cloudscape keeps name for named & unnamed savepoints.
-+ getLanguageConnection().releaseSavePoint(((EmbedSavepoint30)savepoint).getInternalName(), savepoint);
-+ } catch (StandardException e) {
-+ throw handleException(e);
-+ } finally {
-+ restoreContextStack();
-+ }
-+ }
-+ }
- }
diff --git a/java-derby-JDBC30only-EmbedPreparedStatement20.patch b/java-derby-JDBC30only-EmbedPreparedStatement20.patch
deleted file mode 100644
index d577092..0000000
--- a/java-derby-JDBC30only-EmbedPreparedStatement20.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java.sav 2004-11-30 20:24:14.000000000 +0100
-+++ java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java 2005-02-09 16:31:08.411796960 +0100
-@@ -30,6 +30,7 @@
-
- import java.io.InputStream;
-
-+import java.sql.ParameterMetaData;
- import java.sql.SQLException;
- import java.sql.SQLWarning;
- import java.sql.Date;
-@@ -157,5 +158,17 @@
- public void setArray (int i, Array x) throws SQLException {
- throw Util.notImplemented();
- }
-+
-+ /**
-+ * JDBC 3.0
-+ */
-+ public ParameterMetaData getParameterMetaData()
-+ throws SQLException
-+ {
-+ checkStatus();
-+ return new EmbedParameterMetaData30(
-+ getParms(), preparedStatement.getParameterTypes());
-+ }
-+
- }
-
diff --git a/java-derby-compilepath_properties.patch b/java-derby-compilepath_properties.patch
deleted file mode 100644
index e04e532..0000000
--- a/java-derby-compilepath_properties.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/ant/properties/compilepath.properties.sav 2005-06-10 05:38:06.000000000 +0200
-+++ tools/ant/properties/compilepath.properties 2006-09-07 10:48:06.000000000 +0200
-@@ -12,8 +12,8 @@
-
- java13compile.classpath=${j13lib}/rt.jar;${javatools.dir}/jdbc2_0-stdext.jar
-
--jta1_2=${javatools.dir}/geronimo-spec-jta-1.0.1B-rc4.jar
--jce1_2_1=${javatools.dir}/jce1_2_2.jar
-+jta1_2=${javatools.dir}/jta.jar
-+jce1_2_1=${javatools.dir}/jce.jar
-
- # Java2 1.4 paths - for JDBC 3.0/JDK1.4
-
diff --git a/java-derby-extrapath_properties.patch b/java-derby-extrapath_properties.patch
deleted file mode 100644
index 4e93d31..0000000
--- a/java-derby-extrapath_properties.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/ant/properties/extrapath.properties.sav 2006-09-07 10:50:45.000000000 +0200
-+++ tools/ant/properties/extrapath.properties 2006-09-07 10:54:08.000000000 +0200
-@@ -1,15 +1,15 @@
- #
- # Extra jars/zips/classes
- #
--jndi=${javatools.dir}/jndi/jndi.jar;${javatools.dir}/jndi/providerutil.jar;${javatools.dir}/jndi/ldap.jar
--oro=${javatools.dir}/jakarta-oro-2.0.8.jar
--servlet24=${javatools.dir}/geronimo-spec-servlet-2.4-rc4.jar
-+jndi=${j14lib}/rt.jar
-+oro=${javatools.dir}/oro.jar
-+servlet24=${javatools.dir}/servletapi5.jar
- jcc=${javatools.dir}/db2jcc.jar
- jcc_l=${javatools.dir}/db2jcc_license_c.jar
- osgi=${javatools.dir}/osgi.jar
--xercesImpl=${javatools.dir}/xslt4j-2_5_0/xercesImpl.jar
--xml-apis=${javatools.dir}/xslt4j-2_5_0/xml-apis.jar
--xalan=${javatools.dir}/xslt4j-2_5_0/xalan.jar
-+xercesImpl=${javatools.dir}/xerces-j2.jar
-+xml-apis=${javatools.dir}/xml-commons-apis.jar
-+xalan=${javatools.dir}/xalan-j2.jar
- javacc=${javatools.dir}/javacc.jar
-
- #
diff --git a/java-derby-test.script b/java-derby-test.script
deleted file mode 100755
index 44d7b20..0000000
--- a/java-derby-test.script
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-LIB=../jars/sane
-TLIB=../tools/java
-export CLASSPATH=$LIB/derby.jar:$LIB/derbyLocale_de_DE.jar:$LIB/derbyLocale_es.jar:$LIB/derbyLocale_fr.jar:$LIB/derbyLocale_it.jar:$LIB/derbyLocale_ja_JP.jar:$LIB/derbyLocale_ko_KR.jar:$LIB/derbyLocale_pt_BR.jar:$LIB/derbyLocale_zh_CN.jar:$LIB/derbyLocale_zh_TW.jar:$LIB/derbynet.jar:$LIB/derbyTesting.jar:$LIB/derbytools.jar:$LIB/derbyclient.jar:$TLIB/oro.jar
-
-java -Dverbose=true \
- org.apache.derbyTesting.functionTests.harness.RunSuite derbyall
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-derby.git/commitdiff/aca75777ed544149805ed5343d3438df93b70aab
More information about the pld-cvs-commit
mailing list