Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2011-03-04 16:15:51 -0500
committerRyan D. Brooks2011-03-04 16:15:51 -0500
commit2a44605d583d6c7f90794269658ee0f1741fe267 (patch)
tree399f22a5031296591cfef1cd3d6d80c52fec9243 /plugins/org.eclipse.osee.framework.database
parent737c0ffb4e412cde548f3f9136850ed522cd2fe4 (diff)
downloadorg.eclipse.osee-2a44605d583d6c7f90794269658ee0f1741fe267.tar.gz
org.eclipse.osee-2a44605d583d6c7f90794269658ee0f1741fe267.tar.xz
org.eclipse.osee-2a44605d583d6c7f90794269658ee0f1741fe267.zip
feature: Remove Derby database
Diffstat (limited to 'plugins/org.eclipse.osee.framework.database')
-rw-r--r--plugins/org.eclipse.osee.framework.database/.project1
-rw-r--r--plugins/org.eclipse.osee.framework.database/build.properties1
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java3
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java3
-rw-r--r--plugins/org.eclipse.osee.framework.database/support/dbrelease.xml88
-rw-r--r--plugins/org.eclipse.osee.framework.database/support/sqlAnt.xml84
6 files changed, 0 insertions, 180 deletions
diff --git a/plugins/org.eclipse.osee.framework.database/.project b/plugins/org.eclipse.osee.framework.database/.project
index 16ccafdb72..02527d7283 100644
--- a/plugins/org.eclipse.osee.framework.database/.project
+++ b/plugins/org.eclipse.osee.framework.database/.project
@@ -29,6 +29,5 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.apache.derby.ui.derbyEngine</nature>
</natures>
</projectDescription>
diff --git a/plugins/org.eclipse.osee.framework.database/build.properties b/plugins/org.eclipse.osee.framework.database/build.properties
index ec3f77276f..c58ea2178c 100644
--- a/plugins/org.eclipse.osee.framework.database/build.properties
+++ b/plugins/org.eclipse.osee.framework.database/build.properties
@@ -1,6 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- support/,\
.,\
OSGI-INF/
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java
index 4e37a2d7cc..c39e5d80af 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java
@@ -157,9 +157,6 @@ public final class ConnectionHandler {
public static void deferConstraintChecking(OseeConnection connection) throws OseeCoreException {
SupportedDatabase dbType = SupportedDatabase.getDatabaseType(connection.getMetaData());
switch (dbType) {
- case derby:
- // Derby Does not support deferring constraints
- break;
case h2:
runPreparedUpdate(connection, "SET REFERENTIAL_INTEGRITY = FALSE");
break;
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java
index 589b794486..999a5bd302 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java
@@ -19,7 +19,6 @@ import org.eclipse.osee.framework.core.exception.OseeExceptions;
public enum SupportedDatabase {
h2,
oracle,
- derby,
foxpro,
mysql,
postgresql;
@@ -31,8 +30,6 @@ public enum SupportedDatabase {
String lowerCaseName = dbName.toLowerCase();
if (lowerCaseName.contains(SupportedDatabase.h2.toString())) {
toReturn = SupportedDatabase.h2;
- } else if (lowerCaseName.contains(SupportedDatabase.derby.toString())) {
- toReturn = SupportedDatabase.derby;
} else if (lowerCaseName.contains(SupportedDatabase.oracle.toString())) {
toReturn = SupportedDatabase.oracle;
} else if (lowerCaseName.contains(SupportedDatabase.foxpro.toString())) {
diff --git a/plugins/org.eclipse.osee.framework.database/support/dbrelease.xml b/plugins/org.eclipse.osee.framework.database/support/dbrelease.xml
deleted file mode 100644
index 91863b01f8..0000000000
--- a/plugins/org.eclipse.osee.framework.database/support/dbrelease.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<project name="DBRelease" default="dbrelease" basedir="..">
-
- <property name="ECLIPSE_HOME" value="C:\Program Files\OSEE" />
- <property name="release" value="dbrelease/" />
- <property name="targetzip" value="${release}../oseeDatabase.zip" />
- <property name="manifestname" value="RELEASE.MF" />
- <property name="antdir" value="ant/" />
- <property name="derby" value="${ECLIPSE_HOME}\plugins\org.apache.derby.core_10.1.2.1" />
-
- <property name="eclipseruntimejar" value="org.eclipse.core.runtime_3.1.2.jar"/>
- <property name="eclipseJFacejar" value="org.eclipse.jface_3.1.1.jar" />
- <property name="eclipseRuntime" value="${ECLIPSE_HOME}\plugins\${eclipseruntimejar}" />
- <property name="eclipseJFace" value="${ECLIPSE_HOME}\plugins\${eclipseJFacejar}" />
-
- <property name="oseecore" value="osee.jdk.core/bin/" />
- <property name="oseedb" value="osee.database/bin/" />
- <property name="oseejini" value="osee.jini/bin/" />
- <property name="oseeats2" value="osee.ats2/bin/" />
- <property name="oseedefine" value="osee.define/bin/" />
-
- <target name="clean">
- <delete file="${manifestname}" />
- <delete dir="${release}" />
- </target>
-
- <target name="createrelease">
- <echo message="createrelease PATH=${PATH}" />
- <mkdir dir="${PATH}" />
- <manifest file="RELEASE.MF">
- <attribute name="Main-Class" value="osee/database/core/OseeDbLauncher" />
- <attribute name="Class-Path" value="oseecore.jar oseejini.jar oseedefine.jar oseeats2.jar derby.jar derbyclient.jar derbynet.jar derbytools.jar ${eclipseruntimejar} ${eclipseJFacejar}" />
- <section name="common">
- <attribute name="Specification-Title" value="Example" />
- <attribute name="Specification-Version" value="${version}" />
- <attribute name="Specification-Vendor" value="Example Organization" />
- <attribute name="Implementation-Title" value="common" />
- <attribute name="Implementation-Version" value="${version} ${TODAY}" />
- <attribute name="Implementation-Vendor" value="Example Corp." />
- </section>
- </manifest>
-
- <jar jarfile="${PATH}/oseedb.jar" basedir="../${oseedb}" manifest="RELEASE.MF" />
- <jar jarfile="${PATH}/oseecore.jar" basedir="../${oseecore}" />
- <jar jarfile="${PATH}/oseejini.jar" basedir="../${oseejini}" />
- <jar jarfile="${PATH}/oseeats2.jar" basedir="../${oseeats2}" />
- <jar jarfile="${PATH}/oseedefine.jar" basedir="../${oseedefine}" />
-
- <copy toDir="${PATH}/">
- <fileset file="${eclipseRuntime}"/>
- <fileset file="${eclipseJFace}" />
- </copy>
-
- <copy toDir="${PATH}/">
- <fileset dir="${derby}" includes="*.jar" />
- </copy>
-
- <copy toDir="${PATH}/DatabaseSchemaDump">
- <fileset dir="DatabaseSchemaDump"/>
- </copy>
-
- <copy toDir="${PATH}/excelFiles">
- <fileset dir="excelFiles"/>
- </copy>
-
- <copy toDir="${PATH}/support/">
- <fileset file="../${oseecore}/../support/oseeSiteConfig.xml" />
- </copy>
- <delete file="${manifestname}" />
- </target>
-
- <target name="dbrelease">
- <antcall target="createrelease">
- <param name="PATH" value="dbrelease/" />
- </antcall>
- </target>
-
- <target name="dbreleasezip">
- <antcall target="createrelease">
- <param name="PATH" value="temp/" />
- </antcall>
- <zip destfile="${targetzip}">
- <fileset dir="temp/" />
- </zip>
-
- <delete dir="temp/" />
- </target>
-
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.database/support/sqlAnt.xml b/plugins/org.eclipse.osee.framework.database/support/sqlAnt.xml
deleted file mode 100644
index 96fb53be7d..0000000000
--- a/plugins/org.eclipse.osee.framework.database/support/sqlAnt.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<project name="SQLAnt" default="query" basedir=".">
-
- <!-- LOCAL DERBY PROPERTIES -->
- <property name="driver" value="org.apache.derby.jdbc.ClientDriver"/>
- <property name="url" value="jdbc:derby://localhost:1621/DerbyDatabase;create=true"/>
- <property name="userid" value="osee"/>
- <property name="password" value="osee"/>
- <property name="driverpath" value="C:\Program Files\OSEE\plugins\org.apache.derby.core_10.1.2.1\derbyclient.jar" />
-
- <target name="query" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- select * from OSEE_DEFINE_ATTRIBUTE_TYPE
- </sql>
- </target>
-
- <target name="getAllOseeInfo" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- select * from OSEE_INFO
- </sql>
- </target>
-
- <target name="insertderbyTestScriptOutputFalse" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- insert into OSEE_INFO (OSEE_VALUE, OSEE_KEY) values ('FALSE', 'SAVE_OUTFILE_IN_DB')
- </sql>
- </target>
-
- <target name="saveTestScriptOutputTrue" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- UPDATE OSEE_INFO SET OSEE_VALUE = 'TRUE'
- WHERE OSEE_KEY = 'SAVE_OUTFILE_IN_DB'
- </sql>
- </target>
-
- <target name="saveTestScriptOutputFalse" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- UPDATE OSEE_INFO SET OSEE_VALUE = 'FALSE'
- WHERE OSEE_KEY = 'SAVE_OUTFILE_IN_DB'
- </sql>
- </target>
-
- <target name="testskynet" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- SELECT attr_type_id FROM OSEE_DEFINE_valid_attributes WHERE art_type_id = 20 AND gamma_id &lt;= 100000
- </sql>
- </target>
-
-
- <target name="testskynet2" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- SELECT OSEE_DEFINE_attr_base_type.attribute_class,
- OSEE_DEFINE_attribute_type.attr_type_id,
- OSEE_DEFINE_attribute_type.name,
- OSEE_DEFINE_attribute_type.default_value,
- OSEE_DEFINE_attribute_type.validity_xml,
- OSEE_DEFINE_attribute_type.min_occurence,
- OSEE_DEFINE_attribute_type.max_occurence,
- OSEE_DEFINE_attribute_type.user_viewable,
- OSEE_DEFINE_attribute_type.tip_text
- FROM OSEE_DEFINE_attribute_type, OSEE_DEFINE_attr_base_type,transaction_gamma_view
- WHERE OSEE_DEFINE_attr_base_type.attr_base_type_id=OSEE_DEFINE_attribute_type.attr_base_type_id
- AND transaction_gamma_view.transaction_id=179
- AND OSEE_DEFINE_attribute_type.gamma_id&lt;=transaction_gamma_view.largest_gamma_id
- </sql>
- </target>
-
-
- <target name="getseqtable" >
- <sql driver="${driver}" url="${url}" userid="${userid}" password="${password}" print="true" >
- <classpath><pathelement location="${driverpath}"/></classpath>
- SELECT * FROM OSEE_DEFINE_SEQUENCE
- </sql>
- </target>
-
-</project>
-
-

Back to the top