rpms/eclipse-dtp/devel eclipse-dtp.spec, 1.12, 1.13 eclipse-dtp-java6.patch, 1.1, 1.2 get-dtp.sh, 1.6, 1.7 sources, 1.7, 1.8
Andrew Overholt
overholt at fedoraproject.org
Tue Jul 20 15:45:46 UTC 2010
Author: overholt
Update of /cvs/pkgs/rpms/eclipse-dtp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14378/devel
Modified Files:
eclipse-dtp.spec eclipse-dtp-java6.patch get-dtp.sh sources
Log Message:
* Tue Jul 20 2010 Andrew Overholt <overholt at redhat.com> 1.8.0-1
- Update to 1.8.0 (Helios).
- Clarify get-dtp.sh a bit.
- Re-generate Java 6 patch.
Index: eclipse-dtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/eclipse-dtp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- eclipse-dtp.spec 3 Mar 2010 11:16:40 -0000 1.12
+++ eclipse-dtp.spec 20 Jul 2010 15:45:45 -0000 1.13
@@ -2,7 +2,7 @@
%global eclipse_dropin %{_datadir}/eclipse/dropins
Name: eclipse-dtp
-Version: 1.7.2
+Version: 1.8.0
Release: 1%{?dist}
Summary: Eclipse Data Tools Platform
Group: System Environment/Libraries
@@ -15,6 +15,7 @@ URL: http://www.eclipse.org/datato
Source0: dtp-%{version}.tar.gz
Source1: get-dtp.sh
+# Build with Java 6 SQL interfaces
Patch0: %{name}-java6.patch
# remove duplicate plugin from sqltools features (it's actually built in the
@@ -58,10 +59,12 @@ data-centric technologies and supported
%setup -q -n dtp-%{version}
# apply patches
+pushd org.eclipse.datatools.connectivity.sqm.core
%patch0
+popd
%patch1
-# make sure upstream hasn't sneaked in any jars we don't know about
+# make sure upstream hasn't snuck in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
if [ ! -L $j ]; then
@@ -135,6 +138,11 @@ rm -rf %{buildroot}
%doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
%changelog
+* Tue Jul 20 2010 Andrew Overholt <overholt at redhat.com> 1.8.0-1
+- Update to 1.8.0 (Helios).
+- Clarify get-dtp.sh a bit.
+- Re-generate Java 6 patch.
+
* Wed Mar 3 2010 Alexander Kurtakov <akurtako at redhat.com> 1.7.2-1
- Update to 1.7.2.
eclipse-dtp-java6.patch:
ConnectionAdapter.java | 72 ++++++++++++++++++-
ResultSetAdapter.java | 183 +++++++++++++++++++++++++++++++++++++++++++++++++
StatementAdapter.java | 16 ++++
3 files changed, 267 insertions(+), 4 deletions(-)
Index: eclipse-dtp-java6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/eclipse-dtp-java6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-dtp-java6.patch 13 Feb 2009 09:42:51 -0000 1.1
+++ eclipse-dtp-java6.patch 20 Jul 2010 15:45:46 -0000 1.2
@@ -1,10 +1,12 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.datatools.connectivity.sqm.core
Index: src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ConnectionAdapter.java
===================================================================
RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ConnectionAdapter.java,v
-retrieving revision 1.1
-diff -u -r1.1 ConnectionAdapter.java
---- org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ConnectionAdapter.java 9 Dec 2005 21:13:16 -0000 1.1
-+++ org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ConnectionAdapter.java 28 Feb 2008 17:35:43 -0000
+retrieving revision 1.5
+diff -u -r1.5 ConnectionAdapter.java
+--- src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ConnectionAdapter.java 17 Feb 2009 14:52:31 -0000 1.5
++++ src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ConnectionAdapter.java 20 Jul 2010 15:22:13 -0000
@@ -10,15 +10,23 @@
*******************************************************************************/
package org.eclipse.datatools.connectivity.sqm.internal.core.connection;
@@ -108,40 +110,13 @@ diff -u -r1.1 ConnectionAdapter.java
+ return connection.unwrap(arg0);
}
}
-Index: src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java
-===================================================================
-RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java,v
-retrieving revision 1.1
-diff -u -r1.1 StatementAdapter.java
---- org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java 9 Dec 2005 21:13:16 -0000 1.1
-+++ org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java 28 Feb 2008 17:35:44 -0000
-@@ -160,4 +160,19 @@
- public String toString() {
- return statement.toString();
- }
-+ public boolean isClosed() throws SQLException {
-+ return statement.isClosed();
-+ }
-+ public boolean isPoolable() throws SQLException {
-+ return statement.isPoolable();
-+ }
-+ public boolean isWrapperFor(Class arg0) throws SQLException {
-+ return statement.isWrapperFor(arg0);
-+ }
-+ public void setPoolable(boolean poolable) throws SQLException {
-+ statement.setPoolable(poolable);
-+ }
-+ public Object unwrap(Class arg0) throws SQLException {
-+ return statement.unwrap(arg0);
-+ }
- }
Index: src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ResultSetAdapter.java
===================================================================
RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ResultSetAdapter.java,v
-retrieving revision 1.1
-diff -u -r1.1 ResultSetAdapter.java
---- org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ResultSetAdapter.java 9 Dec 2005 21:13:16 -0000 1.1
-+++ org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ResultSetAdapter.java 28 Feb 2008 17:35:44 -0000
+retrieving revision 1.5
+diff -u -r1.5 ResultSetAdapter.java
+--- src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ResultSetAdapter.java 17 Feb 2009 14:52:31 -0000 1.5
++++ src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/ResultSetAdapter.java 20 Jul 2010 15:22:13 -0000
@@ -18,11 +18,14 @@
import java.sql.Blob;
import java.sql.Clob;
@@ -342,3 +317,31 @@ diff -u -r1.1 ResultSetAdapter.java
+ resultSet.updateSQLXML(columnLabel, xmlObject);
+ }
}
+Index: src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java
+===================================================================
+RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.sqm.core/src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java,v
+retrieving revision 1.8
+diff -u -r1.8 StatementAdapter.java
+--- src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java 28 Feb 2010 09:54:06 -0000 1.8
++++ src/org/eclipse/datatools/connectivity/sqm/internal/core/connection/StatementAdapter.java 20 Jul 2010 15:22:13 -0000
+@@ -204,4 +204,20 @@
+ }
+
+ private static ArrayList handers = null;
++
++ public boolean isWrapperFor(Class arg0) throws SQLException {
++ return statement.isWrapperFor(arg0);
++ }
++ public Object unwrap(Class arg0) throws SQLException {
++ return statement.unwrap(arg0);
++ }
++ public boolean isClosed() throws SQLException {
++ return statement.isClosed();
++ }
++ public boolean isPoolable() throws SQLException {
++ return statement.isPoolable();
++ }
++ public void setPoolable(boolean poolable) throws SQLException {
++ statement.setPoolable(poolable);
++ }
+ }
Index: get-dtp.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/get-dtp.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- get-dtp.sh 3 Mar 2010 11:16:40 -0000 1.6
+++ get-dtp.sh 20 Jul 2010 15:45:46 -0000 1.7
@@ -1,7 +1,7 @@
#!/bin/bash
NAME="dtp"
-VERSION=1.7.2
-TAG="DTP_1_7_2_Release_201002051148"
+VERSION=1.8.0
+TAG="DTP_1_8_0_Release_201005311016"
MAPFILES='
org.eclipse.datatools.releng/maps/dtp-features.map
org.eclipse.datatools.modelbase/releng/org.eclipse.datatools.modelbase.releng/maps/modelbase-plugins.map
@@ -29,14 +29,21 @@ if (NF < 4) {
split($1, version, "=");
split(version[1], directory, "@");
cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+ cvsCommand=sprintf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]);
+
+ printf("%s", cvsCommand) | "/bin/bash";
}
else {
split($1, version, "=");
- total=split($4, directory, "/");
- cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
+ directorySegments=split($4, directory, "/");
+ cvsVersion=version[2];
+
+ cvsdir=split($2, dirName, ":");
+ cvsDirectory=dirName[cvsdir];
+ cvsCommand=sprintf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", cvsDirectory, "-q export -r", cvsVersion, "-d", directory[directorySegments], $4);
+
+ printf("%s", cvsCommand) | "/bin/bash";
}
}' $TEMPMAPFILE
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 3 Mar 2010 11:16:40 -0000 1.7
+++ sources 20 Jul 2010 15:45:46 -0000 1.8
@@ -1 +1 @@
-93dc2c271b1475cae403747acc3453f9 dtp-1.7.2.tar.gz
+766bee4726a7ea5ca38bc2f81c63f2fe dtp-1.8.0.tar.gz
More information about the scm-commits
mailing list