You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2017/10/27 00:47:32 UTC
svn commit: r1813467 [1/2] - in /openoffice/trunk/main:
connectivity/java/dbtools/ connectivity/java/dbtools/src/
connectivity/java/dbtools/src/org/ connectivity/java/dbtools/src/org/apache/
connectivity/java/dbtools/src/org/apache/openoffice/ connecti...
Author: damjan
Date: Fri Oct 27 00:47:30 2017
New Revision: 1813467
URL: http://svn.apache.org/viewvc?rev=1813467&view=rev
Log:
Split off a new dbtools.jar from the PostgreSQL driver, containing
the support code that can be reused by other drivers.
Also put it in an org.apache.openoffice base package.
Patch by: me
Added:
openoffice/trunk/main/connectivity/java/dbtools/
openoffice/trunk/main/connectivity/java/dbtools/build.xml (with props)
openoffice/trunk/main/connectivity/java/dbtools/makefile.mk
openoffice/trunk/main/connectivity/java/dbtools/src/
openoffice/trunk/main/connectivity/java/dbtools/src/org/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/
- copied from r1813466, openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/
- copied from r1813466, openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/
- copied from r1813466, openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/DatabaseMetaDataResultSet.java
- copied, changed from r1813370, openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DatabaseMetaDataResultSet.java
Removed:
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DatabaseMetaDataResultSet.java
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/
Modified:
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java
openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java
openoffice/trunk/main/connectivity/java/sdbc_postgresql/build.xml
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java
openoffice/trunk/main/connectivity/prj/build.lst
openoffice/trunk/main/connectivity/prj/d.lst
openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
Added: openoffice/trunk/main/connectivity/java/dbtools/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/build.xml?rev=1813467&view=auto
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/build.xml (added)
+++ openoffice/trunk/main/connectivity/java/dbtools/build.xml Fri Oct 27 00:47:30 2017
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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.
+ *
+ ***********************************************************-->
+
+
+<project name="dbtools" default="main" basedir=".">
+
+ <!-- ================================================================= -->
+ <!-- settings -->
+ <!-- ================================================================= -->
+
+ <!-- global properties -->
+ <property file="../../../ant.properties"/>
+ <!-- version info -->
+ <property file="../../../solenv/inc/minor.mk"/>
+
+ <!-- name of this sub target used in recursive builds -->
+ <property name="target" value="dbtools"/>
+
+ <!-- name of jar file created, without .jar extension -->
+ <property name="jarname" value="dbtools"/>
+
+ <!-- relative path to project directory -->
+ <property name="prj" value="../.."/>
+
+ <!-- build output directory -->
+ <!-- FIXME: there are also extremely rare/obsolete dbcs/bndchk/truetime/hbtoolkit cases in main/solenv/inc/settings.mk -->
+ <condition property="out" value="${prj}/${OUTPATH}.cap">
+ <isset property="${profile}"/>
+ </condition>
+ <condition property="out" value="${prj}/${OUTPATH}.pro">
+ <isset property="${PRODUCT}"/>
+ </condition>
+ <property name="out" value="${prj}/${OUTPATH}"/>
+
+ <!-- build directories -->
+ <property name="build.dir" value="${out}"/>
+ <property name="build.class" value="${build.dir}/class/${target}"/>
+ <property name="build.misc" value="${build.dir}/misc/${target}"/>
+
+ <!-- start of java source code package structure -->
+ <property name="java.dir" value="src"/>
+
+ <!-- define how to handle CLASSPATH environment -->
+ <property name="build.sysclasspath" value="ignore"/>
+
+ <!-- classpath settings for compile and javadoc tasks -->
+ <condition property="jar-class-path" value="${COMMONS_LANG_JAR}" else="commons-lang3-3.3.jar">
+ <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/>
+ </condition>
+ <condition property="commons-lang-jar" value="${COMMONS_LANG_JAR}" else="${OUTDIR}/bin/commons-lang3-3.3.jar">
+ <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/>
+ </condition>
+ <path id="classpath">
+ <pathelement location="${OUTDIR}/bin/juh.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ <!-- 3rd party libs -->
+ <pathelement location="${commons-lang-jar}"/>
+ </path>
+
+ <!-- name to display in documentation -->
+ <property name="docname" value="dbtools"/>
+
+ <!-- set "modern" java compiler -->
+ <property name="build.compiler" value="modern"/>
+
+ <!-- set wether we want to compile with debug information -->
+ <property name="debug" value="on"/>
+
+ <!-- set wether we want to compile with optimisation -->
+ <property name="optimize" value="off"/>
+
+ <!-- set wether we want to compile with or without deprecation -->
+ <property name="deprecation" value="on"/>
+
+ <target name="info">
+ <echo message="--------------------"/>
+ <echo message="${target}"/>
+ <echo message="--------------------"/>
+ </target>
+
+ <!-- ================================================================= -->
+ <!-- custom targets -->
+ <!-- ================================================================= -->
+
+ <!-- the main target, called in recursive builds -->
+ <target name="main" depends="info,prepare,compile,jar,javadoc,zipdoc"/>
+
+ <!-- prepare output directories -->
+ <target name="prepare">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dir}/doc/${target}"/>
+ <mkdir dir="${build.class}"/>
+ <mkdir dir="${build.misc}"/>
+ </target>
+
+
+ <target name="res" depends="prepare">
+ <copy todir="${build.class}">
+ <fileset dir="${java.dir}">
+ <include name="**/*.properties"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.form"/>
+ <include name="**/*.gif "/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.js"/>
+ <include name="**/*.mod"/>
+ <include name="**/*.sql"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.map"/>
+
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="compile" depends="prepare,res">
+ <javac destdir="${build.class}"
+ debug="${debug}"
+ debuglevel="lines,vars,source"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ classpathref="classpath">
+ <src path="${java.dir}"/>
+ <include name="**/*.java"/>
+ </javac>
+ </target>
+
+ <!-- check if javadoc is up to date -->
+ <target name="javadoc_check" depends="prepare" if="build.dir">
+ <uptodate property="javadocBuild.notRequired" value="true"
+ targetfile="${build.dir}/doc/${target}/${target}_javadoc.zip">
+ <srcfiles dir="${java.dir}" includes="**/*.java"/>
+ </uptodate>
+ </target>
+
+ <!-- generate java documentation -->
+ <target name="javadoc" depends="prepare,javadoc_check,compile"
+ unless="javadocBuild.notRequired"
+ if="build.dir">
+
+ <javadoc destdir="${build.dir}/doc/${target}/javadoc"
+ verbose="false"
+ author="false"
+ nodeprecated="true"
+ nodeprecatedlist="true"
+ use="true"
+ Doctitle="${docname}"
+ windowtitle="${docname}"
+ classpathref="classpath">
+
+ <packageset dir="${java.dir}" defaultexcludes="yes">
+ <include name="com/**"/>
+ <include name="org/**"/>
+ </packageset>
+
+ <link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api"
+ packagelistLoc="${common.doc}/jdk1.4.2"/>
+ <link offline="true"
+ href="http://java.sun.com/products/servlet/2.3/javadoc"
+ packagelistLoc="${common.doc}/servlet2.3"/>
+ <link offline="true"
+ href="http://logging.apache.org/log4j/docs/api"
+ packagelistLoc="${common.doc}/log4j-1.2.8"/>
+ <link offline="true"
+ href="http://java.sun.com/products/javabeans/glasgow/javadocs"
+ packagelistLoc="${common.doc}/jaf-1.0.2"/>
+ <link offline="true"
+ href="http://java.sun.com/products/javamail/javadocs"
+ packagelistLoc="${common.doc}/javamail-1.3.1"/>
+ <link offline="true"
+ href="http://ws.apache.org/soap/docs"
+ packagelistLoc="${common.doc}/soap-2.3.1"/>
+
+ <bottom><i>Copyright &#169; 2004 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA</i></bottom>
+ <header>${docname}</header>
+
+ </javadoc>
+ </target>
+
+ <!-- zip documentation and store in build/doc/${target} -->
+ <target name="zipdoc" depends="javadoc" if="build.dir" unless="javadocBuild.notRequired">
+ <zip zipfile="${build.dir}/doc/${target}/${target}_javadoc.zip"
+ basedir="${build.dir}/doc/${target}/javadoc"
+ update="true"/>
+ </target>
+
+ <!-- clean up -->
+ <target name="clean" depends="prepare">
+ <delete dir="${build.class}" includeEmptyDirs="true"/>
+ <delete dir="${build.dir}/doc/${target}" includeEmptyDirs="true"/>
+ </target>
+
+ <!-- create jar file -->
+ <target name="jar" depends="prepare,compile" if="build.class">
+ <jar jarfile="${build.class}/${jarname}.jar"
+ basedir="${build.class}">
+ <manifest>
+ <attribute name="Class-Path" value="${jar-class-path} juh.jar jurt.jar ridl.jar unoil.jar"/>
+ <attribute name="Solar-Version" value="${RSCREVISION}"/>
+ <attribute name="RegistrationClassName" value="com.sun.star.sdbcx.comp.postgresql.PostgresqlDriver"/>
+ <attribute name="Sealed" value="true"/>
+ <attribute name="UNO-Type-Path" value=""/>
+ </manifest>
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.form"/>
+ <include name="**/*.gif "/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.js"/>
+ <include name="**/*.mod"/>
+ <include name="**/*.sql"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.map"/>
+ </jar>
+ </target>
+
+ <target name="test" depends="prepare">
+ </target>
+
+</project>
+
Propchange: openoffice/trunk/main/connectivity/java/dbtools/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openoffice/trunk/main/connectivity/java/dbtools/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: openoffice/trunk/main/connectivity/java/dbtools/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/makefile.mk?rev=1813467&view=auto
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/makefile.mk (added)
+++ openoffice/trunk/main/connectivity/java/dbtools/makefile.mk Fri Oct 27 00:47:30 2017
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+PRJ=..$/..
+PRJNAME=connectivity
+TARGET=dbtools
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : ant.mk
+
+.IF defined(debug) || defined(DEBUG)
+ANTDEBUG=true
+.ELSE
+ANTDEBUG=off
+.ENDIF
+
+ANT_FLAGS+=-Dantdebug=$(ANTDEBUG)
+
+ALLTAR: ANTBUILD
+
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.comphelper;
+package org.apache.openoffice.comp.sdbc.dbtools.comphelper;
import com.sun.star.beans.Property;
import com.sun.star.beans.PropertyAttribute;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.comphelper;
+package org.apache.openoffice.comp.sdbc.dbtools.comphelper;
import com.sun.star.container.NoSuchElementException;
import com.sun.star.container.XEnumeration;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.comphelper;
+package org.apache.openoffice.comp.sdbc.dbtools.comphelper;
import com.sun.star.container.NoSuchElementException;
import com.sun.star.container.XEnumeration;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.comphelper;
+package org.apache.openoffice.comp.sdbc.dbtools.comphelper;
import com.sun.star.container.NoSuchElementException;
import com.sun.star.container.XEnumeration;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.comphelper;
+package org.apache.openoffice.comp.sdbc.dbtools.comphelper;
import com.sun.star.lang.NullPointerException;
import com.sun.star.resource.MissingResourceException;
@@ -59,6 +59,13 @@ public class OfficeResourceBundle implem
CompHelper.disposeComponent(bundle);
}
+ /**
+ * Return the bundle's base name as passed to the constructor.
+ */
+ public String getBaseName() {
+ return baseName;
+ }
+
/** loads the string with the given resource id from the resource bundle
@param _resourceId
the id of the string to load
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,10 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.comphelper;
+package org.apache.openoffice.comp.sdbc.dbtools.comphelper;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.UnknownPropertyException;
@@ -33,8 +36,6 @@ import com.sun.star.beans.XVetoableChang
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
import com.sun.star.lib.uno.helper.ComponentBase;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
import com.sun.star.uno.Type;
public class PropertySet extends ComponentBase implements XPropertySet, XFastPropertySet, XMultiPropertySet {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.comphelper;
+package org.apache.openoffice.comp.sdbc.dbtools.comphelper;
import java.util.Arrays;
import java.util.Comparator;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,10 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
+
+import org.apache.openoffice.comp.sdbc.dbtools.util.ComposeRule;
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.XServiceInfo;
@@ -31,8 +34,6 @@ import com.sun.star.sdbcx.XGroupsSupplie
import com.sun.star.sdbcx.XTablesSupplier;
import com.sun.star.sdbcx.XUsersSupplier;
import com.sun.star.sdbcx.XViewsSupplier;
-import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
/** Base expects the containers returned by X(Tables/Views/Groups/Users)Supplier
* to be the same throughout the lifetime of the catalog!!
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,13 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxColumnDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.beans.PropertyAttribute;
import com.sun.star.beans.XPropertySet;
@@ -27,11 +33,6 @@ import com.sun.star.container.XNamed;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.sdbc.ColumnValue;
import com.sun.star.sdbcx.XDataDescriptorFactory;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxColumnDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class OColumn extends ODescriptor implements XNamed, XDataDescriptorFactory, XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java Fri Oct 27 00:47:30 2017
@@ -19,13 +19,20 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.SqlTableHelper.ColumnDescription;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxColumnDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.ComposeRule;
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
+import org.apache.openoffice.comp.sdbc.dbtools.util.Osl;
+
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ElementExistException;
import com.sun.star.container.XNameAccess;
@@ -34,12 +41,6 @@ import com.sun.star.sdbc.DataType;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XDatabaseMetaData;
import com.sun.star.sdbc.XStatement;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.SqlTableHelper.ColumnDescription;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxColumnDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
-import com.sun.star.sdbcx.comp.postgresql.util.Osl;
import com.sun.star.uno.UnoRuntime;
public class OColumnContainer extends OContainer {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.ArrayList;
import java.util.Comparator;
@@ -27,6 +27,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.TreeMap;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.OEnumerationByIndex;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
+import org.apache.openoffice.comp.sdbc.dbtools.util.Resources;
+import org.apache.openoffice.comp.sdbc.dbtools.util.SharedResources;
+import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState;
+
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ContainerEvent;
@@ -50,12 +57,6 @@ import com.sun.star.sdbc.XColumnLocate;
import com.sun.star.sdbcx.XAppend;
import com.sun.star.sdbcx.XDataDescriptorFactory;
import com.sun.star.sdbcx.XDrop;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.OEnumerationByIndex;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
-import com.sun.star.sdbcx.comp.postgresql.util.Resources;
-import com.sun.star.sdbcx.comp.postgresql.util.SharedResources;
-import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Type;
import com.sun.star.util.XRefreshListener;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java Fri Oct 27 00:47:30 2017
@@ -19,13 +19,14 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySet;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.beans.PropertyAttribute;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySet;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class ODescriptor extends PropertySet {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java Fri Oct 27 00:47:30 2017
@@ -19,10 +19,16 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.List;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxIndexDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
+
import com.sun.star.beans.PropertyAttribute;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ElementExistException;
@@ -31,11 +37,6 @@ import com.sun.star.lang.XServiceInfo;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbcx.XColumnsSupplier;
import com.sun.star.sdbcx.XDataDescriptorFactory;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxIndexDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class OIndex extends ODescriptor implements XColumnsSupplier, XDataDescriptorFactory, XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java Fri Oct 27 00:47:30 2017
@@ -19,15 +19,16 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxIndexColumnDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.beans.PropertyAttribute;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxIndexColumnDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class OIndexColumn extends OColumn implements XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java Fri Oct 27 00:47:30 2017
@@ -19,10 +19,15 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.List;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxIndexColumnDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
+import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState;
+
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ElementExistException;
@@ -31,10 +36,6 @@ import com.sun.star.lang.WrappedTargetEx
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbc.XRow;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxIndexColumnDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
-import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java Fri Oct 27 00:47:30 2017
@@ -19,11 +19,18 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.ArrayList;
import java.util.List;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxIndexDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.ComposeRule;
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
+import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState;
+
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ElementExistException;
@@ -39,12 +46,6 @@ import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbc.XRow;
import com.sun.star.sdbc.XStatement;
import com.sun.star.sdbcx.XColumnsSupplier;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxIndexDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
-import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java Fri Oct 27 00:47:30 2017
@@ -19,10 +19,16 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.List;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxKeyDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
+
import com.sun.star.beans.PropertyAttribute;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ElementExistException;
@@ -31,11 +37,6 @@ import com.sun.star.lang.XServiceInfo;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbcx.XColumnsSupplier;
import com.sun.star.sdbcx.XDataDescriptorFactory;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxKeyDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class OKey extends ODescriptor
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java Fri Oct 27 00:47:30 2017
@@ -19,15 +19,16 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxKeyColumnDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.beans.PropertyAttribute;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxKeyColumnDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class OKeyColumn extends OColumn implements XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java Fri Oct 27 00:47:30 2017
@@ -19,10 +19,14 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.List;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxKeyColumnDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
+import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState;
+
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ElementExistException;
@@ -31,9 +35,6 @@ import com.sun.star.lang.WrappedTargetEx
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbc.XRow;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxKeyColumnDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
-import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java Fri Oct 27 00:47:30 2017
@@ -19,12 +19,18 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxKeyDescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.ComposeRule;
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
+
import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
@@ -42,11 +48,6 @@ import com.sun.star.sdbc.XRow;
import com.sun.star.sdbc.XStatement;
import com.sun.star.sdbcx.KeyType;
import com.sun.star.sdbcx.XColumnsSupplier;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxKeyDescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,10 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.beans.PropertyAttribute;
import com.sun.star.container.XIndexAccess;
@@ -33,8 +36,6 @@ import com.sun.star.sdbcx.XDataDescripto
import com.sun.star.sdbcx.XIndexesSupplier;
import com.sun.star.sdbcx.XKeysSupplier;
import com.sun.star.sdbcx.XRename;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public abstract class OTable extends ODescriptor
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java Fri Oct 27 00:47:30 2017
@@ -18,14 +18,15 @@
* under the License.
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.beans.PropertyAttribute;
import com.sun.star.container.XNamed;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class OView extends ODescriptor
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx;
import java.util.ArrayList;
import java.util.List;
@@ -28,17 +28,18 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.util.ComposeRule;
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
+import org.apache.openoffice.comp.sdbc.dbtools.util.Osl;
+import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState;
+
import com.sun.star.container.ElementExistException;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XDatabaseMetaData;
import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbc.XRow;
import com.sun.star.sdbcx.KeyType;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
-import com.sun.star.sdbcx.comp.postgresql.util.Osl;
-import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
import com.sun.star.uno.Any;
import com.sun.star.uno.UnoRuntime;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java Fri Oct 27 00:47:30 2017
@@ -19,13 +19,14 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.ODescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.ODescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class SdbcxColumnDescriptor extends ODescriptor implements XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
import com.sun.star.beans.XPropertySet;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java Fri Oct 27 00:47:30 2017
@@ -19,14 +19,15 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OContainer;
+import org.apache.openoffice.comp.sdbc.dbtools.util.Resources;
+import org.apache.openoffice.comp.sdbc.dbtools.util.SharedResources;
+import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState;
import com.sun.star.beans.XPropertySet;
import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer;
-import com.sun.star.sdbcx.comp.postgresql.util.Resources;
-import com.sun.star.sdbcx.comp.postgresql.util.SharedResources;
-import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
public abstract class SdbcxDescriptorContainer extends OContainer {
public SdbcxDescriptorContainer(Object lock, boolean isCaseSensitive) {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java Fri Oct 27 00:47:30 2017
@@ -19,12 +19,13 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class SdbcxIndexColumnDescriptor extends SdbcxColumnDescriptor implements XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
import com.sun.star.beans.XPropertySet;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java Fri Oct 27 00:47:30 2017
@@ -19,14 +19,15 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.ODescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.sdbcx.XColumnsSupplier;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.ODescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class SdbcxIndexDescriptor extends ODescriptor implements XColumnsSupplier, XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java Fri Oct 27 00:47:30 2017
@@ -19,11 +19,12 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
import com.sun.star.beans.XPropertySet;
import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
public class SdbcxIndexDescriptorContainer extends SdbcxDescriptorContainer {
public SdbcxIndexDescriptorContainer(Object lock, boolean isCaseSensitive) {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java Fri Oct 27 00:47:30 2017
@@ -19,12 +19,13 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class SdbcxKeyColumnDescriptor extends SdbcxColumnDescriptor implements XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
import com.sun.star.beans.XPropertySet;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java Fri Oct 27 00:47:30 2017
@@ -19,15 +19,16 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.ODescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.sdbcx.XColumnsSupplier;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.ODescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class SdbcxKeyDescriptor extends ODescriptor implements XColumnsSupplier, XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java Fri Oct 27 00:47:30 2017
@@ -19,11 +19,12 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools;
import com.sun.star.beans.XPropertySet;
import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
public class SdbcxKeyDescriptorContainer extends SdbcxDescriptorContainer {
public SdbcxKeyDescriptorContainer(Object lock, boolean isCaseSensitive) {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java Fri Oct 27 00:47:30 2017
@@ -19,18 +19,19 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OContainer;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.ODescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.sdbcx.XColumnsSupplier;
import com.sun.star.sdbcx.XKeysSupplier;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.ODescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class SdbcxTableDescriptor extends ODescriptor implements XColumnsSupplier, XKeysSupplier, XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java Fri Oct 27 00:47:30 2017
@@ -18,13 +18,14 @@
* under the License.
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors;
+package org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors;
+
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertyGetter;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.PropertySetAdapter.PropertySetter;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.ODescriptor;
+import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertyGetter;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.PropertySetAdapter.PropertySetter;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.ODescriptor;
-import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.uno.Type;
public class SdbcxViewDescriptor extends ODescriptor implements XServiceInfo {
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
public enum ComposeRule {
InTableDefinitions,
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
import java.math.BigInteger;
import java.util.StringTokenizer;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java Fri Oct 27 00:47:30 2017
@@ -19,11 +19,14 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
import java.util.Map;
import java.util.TreeMap;
+import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper;
+import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OColumnContainer.ExtraColumnInfo;
+
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.UnknownPropertyException;
@@ -53,8 +56,6 @@ import com.sun.star.sdbcx.KeyType;
import com.sun.star.sdbcx.XAppend;
import com.sun.star.sdbcx.XColumnsSupplier;
import com.sun.star.sdbcx.XKeysSupplier;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.OColumnContainer.ExtraColumnInfo;
import com.sun.star.uno.Any;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
import com.sun.star.beans.XPropertySet;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
import java.util.Map;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
import java.util.Map;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java?rev=1813467&r1=1813466&r2=1813467&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java (original)
+++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java Fri Oct 27 00:47:30 2017
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.util;
+package org.apache.openoffice.comp.sdbc.dbtools.util;
public class Osl {
public static void ensure(boolean condition, String message) {