From 2a44605d583d6c7f90794269658ee0f1741fe267 Mon Sep 17 00:00:00 2001 From: rescobar Date: Fri, 4 Mar 2011 14:15:51 -0700 Subject: feature: Remove Derby database --- .../org.eclipse.osee.external.feature/feature.xml | 7 - .../org.eclipse.osee.framework.feature/feature.xml | 7 - .../feature.xml | 7 - .../feature.xml | 8 - .../testAppServerLaunch.xml | 24 +- .../exchange/handler/BaseDbSaxHandler.java | 37 +- .../datastore/schema/sql/DerbySqlDataType.java | 112 --- .../core/datastore/schema/sql/DerbySqlManager.java | 118 --- .../core/datastore/schema/sql/SqlFactory.java | 3 - .../org.eclipse.osee.framework.database/.project | 1 - .../build.properties | 1 - .../framework/database/core/ConnectionHandler.java | 3 - .../framework/database/core/SupportedDatabase.java | 3 - .../support/dbrelease.xml | 88 -- .../support/sqlAnt.xml | 84 -- .../org.eclipse.osee.framework.derby/.classpath | 7 - plugins/org.eclipse.osee.framework.derby/.pmd | 925 --------------------- plugins/org.eclipse.osee.framework.derby/.project | 33 - .../META-INF/MANIFEST.MF | 20 - .../derby.client.connection.driver.provider.xml | 7 - .../derby.embed.connection.driver.provider.xml | 7 - .../build.properties | 5 - .../framework/derby/DerbyClientConnection.java | 48 -- .../osee/framework/derby/DerbyDbServer.java | 182 ---- .../framework/derby/EmbeddedDerbyConnection.java | 37 - .../osee/framework/derby/internal/Activator.java | 29 - .../org/eclipse/osee/framework/h2/H2DbServer.java | 2 +- plugins/org.eclipse.osee.framework.help.ui/toc.xml | 1 - .../server/admin/search/TaggerDropAllWorker.java | 14 +- .../actions/RemoveTestBatchProjectNature.java | 19 - .../support/config.ini | 2 - .../support/orbit.map | 1 - .../support/osee.map | 1 - .../DB Config [localhost, branch import].launch | 2 +- .../OSEE Application Server[H2].launch | 6 +- .../OSEE Demo Application Server [H2].launch | 1 - ...emo Application Server [localhost derby].launch | 387 --------- ...OSEE Demo Application Server [localhost].launch | 1 - .../OSEE Demo product [microdoc].launch | 2 +- .../projectSets/OseeAppServerProjectSet.psf | 2 - .../projectSets/OseeClientProjectSet.psf | 2 - .../build.properties | 1 - .../maps/osee_client.map | 1 - .../maps/osee_client_external.map | 1 - .../build.properties | 1 - .../maps/osee_app_server.map | 1 - .../maps/osee_server_external.map | 1 - 47 files changed, 28 insertions(+), 2224 deletions(-) delete mode 100644 plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlDataType.java delete mode 100644 plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlManager.java delete mode 100644 plugins/org.eclipse.osee.framework.database/support/dbrelease.xml delete mode 100644 plugins/org.eclipse.osee.framework.database/support/sqlAnt.xml delete mode 100644 plugins/org.eclipse.osee.framework.derby/.classpath delete mode 100644 plugins/org.eclipse.osee.framework.derby/.pmd delete mode 100644 plugins/org.eclipse.osee.framework.derby/.project delete mode 100644 plugins/org.eclipse.osee.framework.derby/META-INF/MANIFEST.MF delete mode 100644 plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.client.connection.driver.provider.xml delete mode 100644 plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.embed.connection.driver.provider.xml delete mode 100644 plugins/org.eclipse.osee.framework.derby/build.properties delete mode 100644 plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java delete mode 100644 plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java delete mode 100644 plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java delete mode 100644 plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java delete mode 100644 plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost derby].launch diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml index 40e543e868f..595647818e5 100644 --- a/features/org.eclipse.osee.external.feature/feature.xml +++ b/features/org.eclipse.osee.external.feature/feature.xml @@ -121,13 +121,6 @@ version="0.0.0" unpack="false"/> - - - - - - - @@ -109,13 +108,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - - + @@ -63,17 +57,12 @@ - - - - - - + @@ -148,13 +137,6 @@ <Url>#PREFIX#://#HOST#:#PORT#/#DBHOME##DBNAME#</Url>${line.separator} </ConnectionDescription>${line.separator} ${line.separator} - <ConnectionDescription id="net.derby.db.connection">${line.separator} - <Driver>org.apache.derby.jdbc.ClientDriver</Driver>${line.separator} - <Url>#PREFIX#://#HOST#:#PORT#/#DBHOME##DBNAME#;</Url>${line.separator} - <UrlAttributes>${line.separator} - <Entry>create=true</Entry>${line.separator} - </UrlAttributes>${line.separator} - </ConnectionDescription>${line.separator} diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java index 0cb6147022f..b3818040135 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java @@ -21,7 +21,6 @@ import org.eclipse.osee.framework.branch.management.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.OseeConnection; -import org.eclipse.osee.framework.database.core.SupportedDatabase; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.resource.management.Options; @@ -108,26 +107,24 @@ public abstract class BaseDbSaxHandler extends BaseExportImportSaxHandler { private boolean isTruncateSupported() throws OseeCoreException { boolean isTruncateSupported = false; DatabaseMetaData metaData = connection.getMetaData(); - if (!SupportedDatabase.isDatabaseType(metaData, SupportedDatabase.derby)) { - ResultSet resultSet = null; - try { - resultSet = metaData.getTablePrivileges(null, null, getMetaData().getTableName().toUpperCase()); - while (resultSet.next()) { - String value = resultSet.getString("PRIVILEGE"); - if ("TRUNCATE".equalsIgnoreCase(value)) { - isTruncateSupported = true; - break; - } + ResultSet resultSet = null; + try { + resultSet = metaData.getTablePrivileges(null, null, getMetaData().getTableName().toUpperCase()); + while (resultSet.next()) { + String value = resultSet.getString("PRIVILEGE"); + if ("TRUNCATE".equalsIgnoreCase(value)) { + isTruncateSupported = true; + break; } - } catch (SQLException ex1) { - OseeLog.log(Activator.class, Level.INFO, ex1); - } finally { - if (resultSet != null) { - try { - resultSet.close(); - } catch (SQLException ex) { - // Do Nothing - } + } + } catch (SQLException ex1) { + OseeLog.log(Activator.class, Level.INFO, ex1); + } finally { + if (resultSet != null) { + try { + resultSet.close(); + } catch (SQLException ex) { + // Do Nothing } } } diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlDataType.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlDataType.java deleted file mode 100644 index 3429ee8030a..00000000000 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlDataType.java +++ /dev/null @@ -1,112 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.core.datastore.schema.sql; - -/** - * @author Roberto E. Escobar - */ -public class DerbySqlDataType extends SqlDataType { - - public DerbySqlDataType() { - super(); - } - - @Override - public String getBooleanType() { - return "boolean"; - } - - @Override - public String getBitType() { - return "smallint"; - } - - @Override - public String getIntegerType() { - return "integer"; - } - - @Override - public String getDecimalType() { - return "decimal"; - } - - @Override - public String getFloatType() { - return "float"; - } - - @Override - public String getRealType() { - return "real"; - } - - @Override - public String getDoubleType() { - return getRealType(); - } - - @Override - public String getDateType() { - return "date"; - } - - @Override - public String getCharType() { - return "char"; - } - - @Override - public String getVarCharType() { - return "varchar"; - } - - @Override - public String getSmallIntType() { - return "smallint"; - } - - @Override - protected String getClobType() { - return "clob"; - } - - @Override - protected String getTimestamp() { - return "timestamp"; - } - - @Override - protected String getTime() { - return "time"; - } - - @Override - protected String getBlobType() { - return "blob"; - } - - @Override - protected String getBigInt() { - return "bigint"; - } - - @Override - protected String getLongVarCharType() { - return "long varchar"; - } - - @Override - protected String getNumericType() { - return "numeric"; - } - -} diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlManager.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlManager.java deleted file mode 100644 index 260276205a9..00000000000 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/DerbySqlManager.java +++ /dev/null @@ -1,118 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ - -package org.eclipse.osee.framework.core.datastore.schema.sql; - -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import org.eclipse.osee.framework.core.datastore.internal.Activator; -import org.eclipse.osee.framework.core.datastore.schema.data.ConstraintElement; -import org.eclipse.osee.framework.core.datastore.schema.data.ForeignKey; -import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause; -import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause.OnDeleteEnum; -import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause.OnUpdateEnum; -import org.eclipse.osee.framework.core.datastore.schema.data.TableElement.ColumnFields; -import org.eclipse.osee.framework.database.core.SQL3DataType; -import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.logging.OseeLog; - -/** - * @author Roberto E. Escobar - */ -public class DerbySqlManager extends SqlManagerImpl { - - public DerbySqlManager(SqlDataType sqlDataType) { - super(sqlDataType); - } - - @Override - public String constraintDataToSQL(ConstraintElement constraint, String tableID) { - StringBuilder toReturn = new StringBuilder(); - String id = formatQuotedString(constraint.getId(), "\\."); - String type = constraint.getConstraintType().toString(); - String appliesTo = formatQuotedString(constraint.getCommaSeparatedColumnsList(), ","); - - if (Strings.isValid(id) && Strings.isValid(appliesTo)) { - toReturn.append("CONSTRAINT " + id + " " + type + " (" + appliesTo + ")"); - - if (constraint instanceof ForeignKey) { - ForeignKey fk = (ForeignKey) constraint; - List refs = fk.getReferences(); - - for (ReferenceClause ref : refs) { - String refTable = formatQuotedString(ref.getFullyQualifiedTableName(), "\\."); - String refColumns = formatQuotedString(ref.getCommaSeparatedColumnsList(), ","); - - String onUpdate = ""; - if (!ref.getOnUpdateAction().equals(OnUpdateEnum.UNSPECIFIED)) { - onUpdate = "ON UPDATE " + ref.getOnUpdateAction().toString(); - } - - String onDelete = ""; - if (!ref.getOnDeleteAction().equals(OnDeleteEnum.UNSPECIFIED)) { - onDelete = "ON DELETE " + ref.getOnDeleteAction().toString(); - } - - if (refTable != null && refColumns != null && !refTable.equals("") && !refColumns.equals("")) { - toReturn.append(" REFERENCES " + refTable + " (" + refColumns + ")"); - if (!onUpdate.equals("")) { - toReturn.append(" " + onUpdate); - } - - if (!onDelete.equals("")) { - toReturn.append(" " + onDelete); - } - - // Not Supported in Derby ? - // if (constraint.isDeferrable()) { - // toReturn.append(" DEFERRABLE"); - // } - } - - else { - OseeLog.log(Activator.class, Level.WARNING, - "Skipping CONSTRAINT at Table: " + tableID + "\n\t " + fk.toString()); - } - - } - } - } else { - OseeLog.log(Activator.class, Level.WARNING, - "Skipping CONSTRAINT at Table: " + tableID + "\n\t " + constraint.toString()); - } - return toReturn.toString(); - } - - @Override - public String columnDataToSQL(Map column) { - StringBuilder toReturn = new StringBuilder(); - - String columnLimits = column.get(ColumnFields.limits); - String defaultValue = column.get(ColumnFields.defaultValue); - - SQL3DataType dataType = SQL3DataType.valueOf(column.get(ColumnFields.type)); - columnLimits = sqlDataType.getLimit(dataType, columnLimits); - toReturn.append("\""); - toReturn.append(column.get(ColumnFields.id)); - toReturn.append("\""); - toReturn.append(" "); - toReturn.append(sqlDataType.getType(dataType)); - - if (Strings.isValid(columnLimits)) { - toReturn.append(" (" + columnLimits + ")"); - } - if (Strings.isValid(defaultValue)) { - toReturn.append(" " + defaultValue); - } - return toReturn.toString(); - } -} diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java index bbc751a5a85..5434156848a 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java @@ -33,9 +33,6 @@ public class SqlFactory { case oracle: instance = new OracleSqlManager(new OracleSqlDataType()); break; - case derby: - instance = new DerbySqlManager(new DerbySqlDataType()); - break; case foxpro: instance = new SqlManagerImpl(new FoxProDataType()); break; diff --git a/plugins/org.eclipse.osee.framework.database/.project b/plugins/org.eclipse.osee.framework.database/.project index 16ccafdb72a..02527d72839 100644 --- a/plugins/org.eclipse.osee.framework.database/.project +++ b/plugins/org.eclipse.osee.framework.database/.project @@ -29,6 +29,5 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - org.apache.derby.ui.derbyEngine diff --git a/plugins/org.eclipse.osee.framework.database/build.properties b/plugins/org.eclipse.osee.framework.database/build.properties index ec3f77276f4..c58ea2178c3 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 4e37a2d7cc9..c39e5d80afa 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 589b794486a..999a5bd302c 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 91863b01f87..00000000000 --- a/plugins/org.eclipse.osee.framework.database/support/dbrelease.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 96fb53be7d0..00000000000 --- a/plugins/org.eclipse.osee.framework.database/support/sqlAnt.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - select * from OSEE_DEFINE_ATTRIBUTE_TYPE - - - - - - - select * from OSEE_INFO - - - - - - - insert into OSEE_INFO (OSEE_VALUE, OSEE_KEY) values ('FALSE', 'SAVE_OUTFILE_IN_DB') - - - - - - - UPDATE OSEE_INFO SET OSEE_VALUE = 'TRUE' - WHERE OSEE_KEY = 'SAVE_OUTFILE_IN_DB' - - - - - - - UPDATE OSEE_INFO SET OSEE_VALUE = 'FALSE' - WHERE OSEE_KEY = 'SAVE_OUTFILE_IN_DB' - - - - - - - SELECT attr_type_id FROM OSEE_DEFINE_valid_attributes WHERE art_type_id = 20 AND gamma_id <= 100000 - - - - - - - - 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<=transaction_gamma_view.largest_gamma_id - - - - - - - - SELECT * FROM OSEE_DEFINE_SEQUENCE - - - - - - diff --git a/plugins/org.eclipse.osee.framework.derby/.classpath b/plugins/org.eclipse.osee.framework.derby/.classpath deleted file mode 100644 index ad32c83a788..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/plugins/org.eclipse.osee.framework.derby/.pmd b/plugins/org.eclipse.osee.framework.derby/.pmd deleted file mode 100644 index c7b0a9fb3f5..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/.pmd +++ /dev/null @@ -1,925 +0,0 @@ - - - false - .ruleset - - - LooseCoupling - Type Resolution Rules - - - CloneMethodMustImplementCloneable - Type Resolution Rules - - - UnusedImports - Type Resolution Rules - - - SignatureDeclareThrowsException - Type Resolution Rules - - - IfStmtsMustUseBraces - Braces Rules - - - WhileLoopsMustUseBraces - Braces Rules - - - IfElseStmtsMustUseBraces - Braces Rules - - - ForLoopsMustUseBraces - Braces Rules - - - UseSingleton - Design Rules - - - SimplifyBooleanReturns - Design Rules - - - SimplifyBooleanExpressions - Design Rules - - - SwitchStmtsShouldHaveDefault - Design Rules - - - AvoidDeeplyNestedIfStmts - Design Rules - - - AvoidReassigningParameters - Design Rules - - - SwitchDensity - Design Rules - - - ConstructorCallsOverridableMethod - Design Rules - - - AccessorClassGeneration - Design Rules - - - FinalFieldCouldBeStatic - Design Rules - - - CloseResource - Design Rules - - - NonStaticInitializer - Design Rules - - - DefaultLabelNotLastInSwitchStmt - Design Rules - - - NonCaseLabelInSwitchStatement - Design Rules - - - OptimizableToArrayCall - Design Rules - - - BadComparison - Design Rules - - - EqualsNull - Design Rules - - - ConfusingTernary - Design Rules - - - InstantiationToGetClass - Design Rules - - - IdempotentOperations - Design Rules - - - SimpleDateFormatNeedsLocale - Design Rules - - - ImmutableField - Design Rules - - - UseLocaleWithCaseConversions - Design Rules - - - AvoidProtectedFieldInFinalClass - Design Rules - - - AssignmentToNonFinalStatic - Design Rules - - - MissingStaticMethodInNonInstantiatableClass - Design Rules - - - AvoidSynchronizedAtMethodLevel - Design Rules - - - MissingBreakInSwitch - Design Rules - - - UseNotifyAllInsteadOfNotify - Design Rules - - - AvoidInstanceofChecksInCatchClause - Design Rules - - - AbstractClassWithoutAbstractMethod - Design Rules - - - SimplifyConditional - Design Rules - - - CompareObjectsWithEquals - Design Rules - - - PositionLiteralsFirstInComparisons - Design Rules - - - UnnecessaryLocalBeforeReturn - Design Rules - - - NonThreadSafeSingleton - Design Rules - - - UncommentedEmptyMethod - Design Rules - - - UncommentedEmptyConstructor - Design Rules - - - AvoidConstantsInterface - Design Rules - - - UnsynchronizedStaticDateFormatter - Design Rules - - - PreserveStackTrace - Design Rules - - - UseCollectionIsEmpty - Design Rules - - - ClassWithOnlyPrivateConstructorsShouldBeFinal - Design Rules - - - EmptyMethodInAbstractClassShouldBeAbstract - Design Rules - - - SingularField - Design Rules - - - ReturnEmptyArrayRatherThanNull - Design Rules - - - AbstractClassWithoutAnyMethod - Design Rules - - - TooFewBranchesForASwitchStatement - Design Rules - - - AvoidCatchingThrowable - Strict Exception Rules - - - SignatureDeclareThrowsException - Type Resolution Rules - - - ExceptionAsFlowControl - Strict Exception Rules - - - AvoidCatchingNPE - Strict Exception Rules - - - AvoidThrowingRawExceptionTypes - Strict Exception Rules - - - AvoidThrowingNullPointerException - Strict Exception Rules - - - AvoidRethrowingException - Strict Exception Rules - - - DoNotExtendJavaLangError - Strict Exception Rules - - - DoNotThrowExceptionInFinally - Strict Exception Rules - - - AvoidThrowingNewInstanceOfSameException - Strict Exception Rules - - - UnusedPrivateField - Unused Code Rules - - - UnusedLocalVariable - Unused Code Rules - - - UnusedPrivateMethod - Unused Code Rules - - - UnusedFormalParameter - Unused Code Rules - - - MoreThanOneLogger - Java Logging Rules - - - LoggerIsNotStaticFinal - Java Logging Rules - - - SystemPrintln - Java Logging Rules - - - AvoidPrintStackTrace - Java Logging Rules - - - AvoidDuplicateLiterals - String and StringBuffer Rules - - - StringInstantiation - String and StringBuffer Rules - - - StringToString - String and StringBuffer Rules - - - InefficientStringBuffering - String and StringBuffer Rules - - - UnnecessaryCaseChange - String and StringBuffer Rules - - - UseStringBufferLength - String and StringBuffer Rules - - - AppendCharacterWithChar - String and StringBuffer Rules - - - ConsecutiveLiteralAppends - String and StringBuffer Rules - - - UseIndexOfChar - String and StringBuffer Rules - - - InefficientEmptyStringCheck - String and StringBuffer Rules - - - InsufficientStringBufferDeclaration - String and StringBuffer Rules - - - UselessStringValueOf - String and StringBuffer Rules - - - StringBufferInstantiationWithChar - String and StringBuffer Rules - - - UseEqualsToCompareStrings - String and StringBuffer Rules - - - AvoidStringBufferField - String and StringBuffer Rules - - - ReplaceVectorWithList - Migration Rules - - - ReplaceHashtableWithMap - Migration Rules - - - ReplaceEnumerationWithIterator - Migration Rules - - - AvoidEnumAsIdentifier - Migration Rules - - - AvoidAssertAsIdentifier - Migration Rules - - - IntegerInstantiation - Migration Rules - - - ByteInstantiation - Migration Rules - - - ShortInstantiation - Migration Rules - - - LongInstantiation - Migration Rules - - - JUnit4TestShouldUseBeforeAnnotation - Migration Rules - - - JUnit4TestShouldUseAfterAnnotation - Migration Rules - - - JUnit4TestShouldUseTestAnnotation - Migration Rules - - - JUnit4SuitesShouldUseSuiteAnnotation - Migration Rules - - - JUnitUseExpected - Migration Rules - - - UseProperClassLoader - J2EE Rules - - - MDBAndSessionBeanNamingConvention - J2EE Rules - - - RemoteSessionInterfaceNamingConvention - J2EE Rules - - - LocalInterfaceSessionNamingConvention - J2EE Rules - - - LocalHomeNamingConvention - J2EE Rules - - - RemoteInterfaceNamingConvention - J2EE Rules - - - DoNotCallSystemExit - J2EE Rules - - - StaticEJBFieldShouldBeFinal - J2EE Rules - - - DoNotUseThreads - J2EE Rules - - - AvoidInstantiatingObjectsInLoops - Optimization Rules - - - UseArrayListInsteadOfVector - Optimization Rules - - - SimplifyStartsWith - Optimization Rules - - - UseStringBufferForStringAppends - Optimization Rules - - - UseArraysAsList - Optimization Rules - - - AvoidArrayLoops - Optimization Rules - - - UnnecessaryWrapperObjectCreation - Optimization Rules - - - AddEmptyString - Optimization Rules - - - EmptyCatchBlock - Basic Rules - - - EmptyIfStmt - Basic Rules - - - EmptyWhileStmt - Basic Rules - - - EmptyTryBlock - Basic Rules - - - EmptyFinallyBlock - Basic Rules - - - EmptySwitchStatements - Basic Rules - - - JumbledIncrementer - Basic Rules - - - ForLoopShouldBeWhileLoop - Basic Rules - - - UnnecessaryConversionTemporary - Basic Rules - - - OverrideBothEqualsAndHashcode - Basic Rules - - - DoubleCheckedLocking - Basic Rules - - - ReturnFromFinallyBlock - Basic Rules - - - EmptySynchronizedBlock - Basic Rules - - - UnnecessaryReturn - Basic Rules - - - EmptyStaticInitializer - Basic Rules - - - UnconditionalIfStatement - Basic Rules - - - EmptyStatementNotInLoop - Basic Rules - - - BooleanInstantiation - Basic Rules - - - UnnecessaryFinalModifier - Basic Rules - - - CollapsibleIfStatements - Basic Rules - - - UselessOverridingMethod - Basic Rules - - - ClassCastExceptionWithToArray - Basic Rules - - - AvoidDecimalLiteralsInBigDecimalConstructor - Basic Rules - - - UselessOperationOnImmutable - Basic Rules - - - MisplacedNullCheck - Basic Rules - - - UnusedNullCheckInEquals - Basic Rules - - - AvoidThreadGroup - Basic Rules - - - BrokenNullCheck - Basic Rules - - - BigIntegerInstantiation - Basic Rules - - - AvoidUsingOctalValues - Basic Rules - - - AvoidUsingHardCodedIP - Basic Rules - - - CheckResultSet - Basic Rules - - - AvoidMultipleUnaryOperators - Basic Rules - - - EmptyInitializer - Basic Rules - - - MethodReturnsInternalArray - Security Code Guidelines - - - ArrayIsStoredDirectly - Security Code Guidelines - - - CouplingBetweenObjects - Coupling Rules - - - ExcessiveImports - Coupling Rules - - - LooseCoupling - Type Resolution Rules - - - DuplicateImports - Import Statement Rules - - - DontImportJavaLang - Import Statement Rules - - - UnusedImports - Type Resolution Rules - - - ImportFromSamePackage - Import Statement Rules - - - TooManyStaticImports - Import Statement Rules - - - JUnitStaticSuite - JUnit Rules - - - JUnitSpelling - JUnit Rules - - - JUnitAssertionsShouldIncludeMessage - JUnit Rules - - - JUnitTestsShouldIncludeAssert - JUnit Rules - - - TestClassWithoutTestCases - JUnit Rules - - - UnnecessaryBooleanAssertion - JUnit Rules - - - UseAssertEqualsInsteadOfAssertTrue - JUnit Rules - - - UseAssertSameInsteadOfAssertTrue - JUnit Rules - - - UseAssertNullInsteadOfAssertTrue - JUnit Rules - - - SimplifyBooleanAssertion - JUnit Rules - - - UnnecessaryConstructor - Controversial Rules - - - NullAssignment - Controversial Rules - - - UnusedModifier - Controversial Rules - - - AssignmentInOperand - Controversial Rules - - - AtLeastOneConstructor - Controversial Rules - - - DontImportSun - Controversial Rules - - - SuspiciousOctalEscape - Controversial Rules - - - CallSuperInConstructor - Controversial Rules - - - UnnecessaryParentheses - Controversial Rules - - - DefaultPackage - Controversial Rules - - - BooleanInversion - Controversial Rules - - - DataflowAnomalyAnalysis - Controversial Rules - - - AvoidFinalLocalVariable - Controversial Rules - - - AvoidUsingShortType - Controversial Rules - - - AvoidUsingVolatile - Controversial Rules - - - AvoidUsingNativeCode - Controversial Rules - - - AvoidAccessibilityAlteration - Controversial Rules - - - DoNotCallGarbageCollectionExplicitly - Controversial Rules - - - MethodNamingConventions - Naming Rules - - - ClassNamingConventions - Naming Rules - - - AbstractNaming - Naming Rules - - - AvoidDollarSigns - Naming Rules - - - MethodWithSameNameAsEnclosingClass - Naming Rules - - - SuspiciousHashcodeMethodName - Naming Rules - - - SuspiciousConstantFieldName - Naming Rules - - - SuspiciousEqualsMethodName - Naming Rules - - - AvoidFieldNameMatchingTypeName - Naming Rules - - - AvoidFieldNameMatchingMethodName - Naming Rules - - - NoPackage - Naming Rules - - - PackageCase - Naming Rules - - - MisleadingVariableName - Naming Rules - - - BooleanGetMethodName - Naming Rules - - - NPathComplexity - Code Size Rules - - - ExcessiveMethodLength - Code Size Rules - - - ExcessiveParameterList - Code Size Rules - - - ExcessiveClassLength - Code Size Rules - - - CyclomaticComplexity - Code Size Rules - - - ExcessivePublicCount - Code Size Rules - - - TooManyFields - Code Size Rules - - - NcssMethodCount - Code Size Rules - - - NcssTypeCount - Code Size Rules - - - NcssConstructorCount - Code Size Rules - - - TooManyMethods - Code Size Rules - - - EmptyFinalizer - Finalizer Rules - - - FinalizeOnlyCallsSuperFinalize - Finalizer Rules - - - FinalizeOverloaded - Finalizer Rules - - - FinalizeDoesNotCallSuperFinalize - Finalizer Rules - - - FinalizeShouldBeProtected - Finalizer Rules - - - AvoidCallingFinalize - Finalizer Rules - - - UseCorrectExceptionLogging - Jakarta Commons Logging Rules - - - ProperLogger - Jakarta Commons Logging Rules - - - MissingSerialVersionUID - JavaBean Rules - - - ProperCloneImplementation - Clone Implementation Rules - - - CloneThrowsCloneNotSupportedException - Clone Implementation Rules - - - CloneMethodMustImplementCloneable - Type Resolution Rules - - - false - true - diff --git a/plugins/org.eclipse.osee.framework.derby/.project b/plugins/org.eclipse.osee.framework.derby/.project deleted file mode 100644 index 87307034289..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - org.eclipse.osee.framework.derby - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.ds.core.builder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/plugins/org.eclipse.osee.framework.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.derby/META-INF/MANIFEST.MF deleted file mode 100644 index 9d465071d82..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Derby Db Connector Plug-in (Incubation) -Bundle-SymbolicName: org.eclipse.osee.framework.derby;singleton:=true -Bundle-Version: 0.9.9.qualifier -Bundle-Activator: org.eclipse.osee.framework.derby.internal.Activator -Bundle-ActivationPolicy: lazy -Import-Package: - org.apache.derby.drda;version="10.5.1.1", - org.apache.derby.jdbc;version="10.5.1.1", - org.eclipse.osee.framework.database.core, - org.eclipse.osee.framework.jdk.core.type, - org.eclipse.osee.framework.jdk.core.util, - org.eclipse.osee.framework.logging, - org.osgi.framework -Export-Package: org.eclipse.osee.framework.derby -Service-Component: OSGI-INF/derby.client.connection.driver.provider.xml, - OSGI-INF/derby.embed.connection.driver.provider.xml -Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.client.connection.driver.provider.xml b/plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.client.connection.driver.provider.xml deleted file mode 100644 index ec65ce355df..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.client.connection.driver.provider.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.embed.connection.driver.provider.xml b/plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.embed.connection.driver.provider.xml deleted file mode 100644 index d797a31fe66..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/OSGI-INF/derby.embed.connection.driver.provider.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.derby/build.properties b/plugins/org.eclipse.osee.framework.derby/build.properties deleted file mode 100644 index c58ea2178c3..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - OSGI-INF/ diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java deleted file mode 100644 index f9493fc2aa4..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.derby; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.util.Properties; -import org.eclipse.osee.framework.database.core.IConnectionFactory; -import org.eclipse.osee.framework.jdk.core.type.Pair; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; - -/** - * @author Roberto E. Escobar - */ -public class DerbyClientConnection implements IConnectionFactory { - - private static final String driver = "org.apache.derby.jdbc.ClientDriver"; - private boolean firstTime = true; - - @Override - public Connection getConnection(Properties properties, String connectionURL) throws Exception { - Class.forName(driver); - - if (firstTime) { - firstTime = false; - Pair addressAndPort = OseeProperties.getOseeDbEmbeddedServerAddress(); - if (addressAndPort != null) { - DerbyDbServer.startServer(addressAndPort.getFirst(), addressAndPort.getSecond()); - } - } - Connection connection = DriverManager.getConnection(connectionURL, properties); - return connection; - } - - @Override - public String getDriver() { - return driver; - } - -} diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java deleted file mode 100644 index 47e03c45d18..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java +++ /dev/null @@ -1,182 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ - -package org.eclipse.osee.framework.derby; - -import java.io.PrintWriter; -import java.net.InetAddress; -import java.util.logging.Level; -import org.apache.derby.drda.NetworkServerControl; -import org.eclipse.osee.framework.derby.internal.Activator; -import org.eclipse.osee.framework.logging.OseeLog; - -/** - * @author Roberto E. Escobar - */ -public class DerbyDbServer { - protected static Object keepAlive; - private NetworkServerUtil nwServer; - private static final DerbyDbServer instance = new DerbyDbServer(); - - private DerbyDbServer() { - this.nwServer = null; - } - - public static void startServer(String host, int port) throws Exception { - instance.startServerInternal(host, port); - } - - private void startServerInternal(String host, int port) throws Exception { - try { - OseeLog.log(Activator.class, Level.INFO, "Starting Derby Network Server ...."); - nwServer = new NetworkServerUtil(InetAddress.getByName(host), port); - nwServer.start(); - - if (isConnectionAvailable()) { - nwServer.printInfo(); - addShutdownHook(); - // stayAlive(); - } else { - OseeLog.log(Activator.class, Level.INFO, "Exiting, since unable to connect to Derby Network Server."); - OseeLog.log(Activator.class, Level.INFO, - "Please try to increase the amount of time to keep trying to connect to the Server."); - } - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } - } - - private void stayAlive() { - keepAlive = new Object(); - synchronized (keepAlive) { - try { - keepAlive.wait(); - } catch (InterruptedException e) { - OseeLog.log(Activator.class, Level.SEVERE, e.getMessage(), e); - } - } - } - - private void commitSuicide() { - if (keepAlive != null) { - synchronized (keepAlive) { - keepAlive.notify(); - } - } - } - - private void shutdown() { - OseeLog.log(Activator.class, Level.INFO, "Shutting down network server..."); - nwServer.shutdown(); - OseeLog.log(Activator.class, Level.INFO, "Server down."); - commitSuicide(); - } - - private void addShutdownHook() { - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - OseeLog.log(Activator.class, Level.INFO, "Shutting down"); - shutdown(); - } - }); - } - - private boolean isConnectionAvailable() throws InterruptedException { - boolean knowIfServerUp = false; - int numTimes = 5; - - while (!knowIfServerUp && numTimes > 0) { - try { - numTimes--; - nwServer.testForConnection(); - knowIfServerUp = true; - } catch (Exception e) { - OseeLog.log(Activator.class, Level.SEVERE, - "Unable to obtain a connection to network server, trying again after 3000 ms.", e); - Thread.sleep(3000); - } - } - return knowIfServerUp; - } - - // public static void main(String[] args) throws Exception { - // (new DBServer( new PrintWriter(System.out, true)).startServer(args); - // } - - private final class NetworkServerUtil { - - private NetworkServerControl serverControl; - - public NetworkServerUtil(InetAddress host, int port) { - try { - serverControl = new NetworkServerControl(host, port); - OseeLog.log(Activator.class, Level.INFO, "Derby Network Server created"); - } catch (Exception e) { - OseeLog.log(Activator.class, Level.SEVERE, "Error Initializing Server Control.", e); - } - } - - /** - * trace utility of server - */ - public void trace(boolean onoff) { - try { - serverControl.trace(onoff); - } catch (Exception e) { - OseeLog.log(Activator.class, Level.SEVERE, e.getMessage(), e); - } - } - - /** - * Try to test for a connection Throws exception if unable to get a connection - */ - public void testForConnection() throws Exception { - serverControl.ping(); - } - - /** - * Shutdown the NetworkServer - */ - public void shutdown() { - try { - serverControl.shutdown(); - } catch (Exception e) { - OseeLog.log(Activator.class, Level.SEVERE, e.getMessage(), e); - } - } - - /** - * Start Derby Network server - */ - public void start() { - try { - serverControl.start(new PrintWriter(System.out, true)); - } catch (Exception e) { - OseeLog.log(Activator.class, Level.SEVERE, e.getMessage(), e); - } - } - - public void printInfo() { - try { - String sysinfo = serverControl.getSysinfo(); - int start = sysinfo.indexOf("Java classpath:"); - int stop = sysinfo.indexOf("OS name:"); - String cpSubString = sysinfo.substring(start, stop); - cpSubString = cpSubString.replaceAll(";", ";\n\t"); - String temp = sysinfo.substring(0, start) + cpSubString + sysinfo.substring(stop, sysinfo.length()); - OseeLog.log(Activator.class, Level.INFO, temp); - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, "Error getting Server Information", ex); - } - } - } -} diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java deleted file mode 100644 index 42f0616d6be..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.derby; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.util.Properties; -import org.eclipse.osee.framework.database.core.IConnectionFactory; - -/** - * @author Roberto E. Escobar - */ -public class EmbeddedDerbyConnection implements IConnectionFactory { - - private static final String driver = "org.apache.derby.jdbc.EmbeddedDriver"; - - @Override - public Connection getConnection(Properties properties, String connectionURL) throws Exception { - Class.forName(driver); - Connection connection = DriverManager.getConnection(connectionURL, properties); - return connection; - } - - @Override - public String getDriver() { - return driver; - } - -} diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java deleted file mode 100644 index f71d3b2a72b..00000000000 --- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.derby.internal; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * @author Roberto E. Escobar - */ -public class Activator implements BundleActivator { - - @Override - public void start(BundleContext context) throws Exception { - } - - @Override - public void stop(BundleContext context) throws Exception { - } - -} diff --git a/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java b/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java index b71f1b5ce09..4c31b776c72 100644 --- a/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java +++ b/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java @@ -42,7 +42,7 @@ public class H2DbServer { addShutdownHook(); // stayAlive(); } else { - OseeLog.log(H2DbServer.class, Level.INFO, "Exiting, since unable to connect to Derby Network Server."); + OseeLog.log(H2DbServer.class, Level.INFO, "Exiting, since unable to connect to H2 Network Server."); OseeLog.log(H2DbServer.class, Level.INFO, "Please try to increase the amount of time to keep trying to connect to the Server."); } diff --git a/plugins/org.eclipse.osee.framework.help.ui/toc.xml b/plugins/org.eclipse.osee.framework.help.ui/toc.xml index 2c5d1c4ed7e..3e65a95c835 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/toc.xml +++ b/plugins/org.eclipse.osee.framework.help.ui/toc.xml @@ -9,7 +9,6 @@ - diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerDropAllWorker.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerDropAllWorker.java index eea146c0dc4..3e218d1e868 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerDropAllWorker.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerDropAllWorker.java @@ -10,18 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.framework.server.admin.search; -import java.sql.DatabaseMetaData; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.SupportedDatabase; import org.eclipse.osee.framework.server.admin.BaseServerCommand; /** * @author Roberto E. Escobar */ class TaggerDropAllWorker extends BaseServerCommand { - private static final String TRUNCATE_SQL = "TRUNCATE TABLE osee_search_tags"; - private static final String DELETE_TABLE_SQL = "DELETE FROM osee_search_tags"; + private static final String TRUNCATE_SQL = "TRUNCATE osee_search_tags"; protected TaggerDropAllWorker() { super("Drop All Search Tags"); @@ -29,13 +26,6 @@ class TaggerDropAllWorker extends BaseServerCommand { @Override protected void doCommandWork(IProgressMonitor monitor) throws Exception { - String deleteSql = null; - DatabaseMetaData metaData = ConnectionHandler.getMetaData(); - if (SupportedDatabase.isDatabaseType(metaData, SupportedDatabase.derby)) { - deleteSql = DELETE_TABLE_SQL; - } else { - deleteSql = TRUNCATE_SQL; - } - ConnectionHandler.runPreparedUpdate(deleteSql); + ConnectionHandler.runPreparedUpdate(TRUNCATE_SQL); } } diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/batches/actions/RemoveTestBatchProjectNature.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/batches/actions/RemoveTestBatchProjectNature.java index 2ca58e7e178..9c137587de3 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/batches/actions/RemoveTestBatchProjectNature.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/batches/actions/RemoveTestBatchProjectNature.java @@ -70,25 +70,6 @@ public class RemoveTestBatchProjectNature implements IObjectActionDelegate { if (currentJavaProject == null) { currentJavaProject = JavaCore.create(currentProject); } - // //Shutdown server if running for the current project - // if (DerbyServerUtils.getDefault().getRunning(currentJavaProject.getProject())) { - // DerbyServerUtils.getDefault().stopDerbyServer(currentJavaProject.getProject()); - // } - // IClasspathEntry[] rawClasspath = currentJavaProject.getRawClasspath(); - // - // List newEntries = new ArrayList(); - // for (IClasspathEntry e : rawClasspath) { - // if (e.getEntryKind() != IClasspathEntry.CPE_CONTAINER) { - // newEntries.add(e); - // } else if (!e.getPath().equals(DerbyClasspathContainer.CONTAINER_ID)) { - // newEntries.add(e); - // } - // } - - // IClasspathEntry[] newEntriesArray = new IClasspathEntry[newEntries.size()]; - // newEntriesArray = (IClasspathEntry[]) newEntries.toArray(newEntriesArray); - // currentJavaProject.setRawClasspath(newEntriesArray, null); - IProjectDescription description = currentJavaProject.getProject().getDescription(); String[] natures = description.getNatureIds(); diff --git a/plugins/org.eclipse.osee.support.build/support/config.ini b/plugins/org.eclipse.osee.support.build/support/config.ini index 6b6b6a69a63..fc0045ad89c 100644 --- a/plugins/org.eclipse.osee.support.build/support/config.ini +++ b/plugins/org.eclipse.osee.support.build/support/config.ini @@ -9,7 +9,6 @@ plugins/org.apache.commons.codec@3:start,\ plugins/org.apache.commons.httpclient@3:start,\ plugins/org.apache.commons.lang@3:start,\ plugins/org.apache.commons.logging@3:start,\ -plugins/org.apache.derby@3:start,\ plugins/org.apache.log4j@3:start,\ plugins/org.apache.xerces@3:start,\ plugins/org.apache.xml.resolver@3:start,\ @@ -39,7 +38,6 @@ plugins/org.eclipse.osee.framework.branch.management@3:start,\ plugins/org.eclipse.osee.framework.core.server@3:start,\ plugins/org.eclipse.osee.framework.core@3:start,\ plugins/org.eclipse.osee.framework.database@3:start,\ -plugins/org.eclipse.osee.framework.derby@3:start,\ plugins/org.eclipse.osee.framework.jdk.core@3:start,\ plugins/org.eclipse.osee.framework.logging@3:start,\ plugins/org.eclipse.osee.framework.manager.servlet@3:start,\ diff --git a/plugins/org.eclipse.osee.support.build/support/orbit.map b/plugins/org.eclipse.osee.support.build/support/orbit.map index bf9a32b29a0..29d8603868e 100644 --- a/plugins/org.eclipse.osee.support.build/support/orbit.map +++ b/plugins/org.eclipse.osee.support.build/support/orbit.map @@ -8,7 +8,6 @@ plugin@org.apache.commons.httpclient,3.1.0=GET,http://download.eclipse.org/tools plugin@org.apache.commons.lang,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.commons.lang_2.4.0.v20081016-1030.jar plugin@org.apache.commons.logging,1.1.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.commons.logging_1.1.1.v200904062255.jar plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.commons.net_1.4.1.v200905122237.jar -plugin@org.apache.derby,10.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20091203150826/bundles/org.apache.derby_10.5.1.1_200912031533.jar plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.oro_2.0.8.v200903061218.jar plugin@org.apache.xerces,2.9.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.xerces_2.9.0.v200909240008.jar plugin@org.apache.xml.resolver,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.xml.resolver_1.2.0.v200902170519.jar diff --git a/plugins/org.eclipse.osee.support.build/support/osee.map b/plugins/org.eclipse.osee.support.build/support/osee.map index 0cab8ee7ec2..a02594d9fd6 100644 --- a/plugins/org.eclipse.osee.support.build/support/osee.map +++ b/plugins/org.eclipse.osee.support.build/support/osee.map @@ -22,7 +22,6 @@ plugin@net.jini=SVN,url=https://dev.eclipse.org/svnroot/technology/org.eclipse.o plugin@jms.activemq.launch=SVN,url=https://dev.eclipse.org/svnroot/technology/org.eclipse.osee,tag=trunk,path=plugins/jms.activemq.launch plugin@jms.libraries=SVN,url=https://dev.eclipse.org/svnroot/technology/org.eclipse.osee,tag=trunk,path=plugins/jms.libraries -plugin@org.eclipse.osee.framework.derby=SVN,url=https://dev.eclipse.org/svnroot/technology/org.eclipse.osee,tag=trunk,path=plugins/org.eclipse.osee.framework.derby plugin@org.eclipse.osee.framework.core=SVN,url=https://dev.eclipse.org/svnroot/technology/org.eclipse.osee,tag=trunk,path=plugins/org.eclipse.osee.framework.core plugin@org.eclipse.osee.framework.core.client=SVN,url=https://dev.eclipse.org/svnroot/technology/org.eclipse.osee,tag=trunk,path=plugins/org.eclipse.osee.framework.core.client plugin@org.eclipse.osee.framework.core.server=SVN,url=https://dev.eclipse.org/svnroot/technology/org.eclipse.osee,tag=trunk,path=plugins/org.eclipse.osee.framework.core.server diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/DB Config [localhost, branch import].launch b/plugins/org.eclipse.osee.support.config/launchConfig/DB Config [localhost, branch import].launch index f6590d0e629..ff194e3ddda 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/DB Config [localhost, branch import].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/DB Config [localhost, branch import].launch @@ -23,7 +23,7 @@ - + diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch index 0b260a5ec58..1c06cead11c 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch @@ -15,12 +15,12 @@ - + - + - + diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch index 5eaf7434000..f89390bfdf7 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch @@ -92,7 +92,6 @@ - diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost derby].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost derby].launch deleted file mode 100644 index cc3b979c157..00000000000 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost derby].launch +++ /dev/null @@ -1,387 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch index 158e54dd5b5..0d2daa2456d 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch @@ -92,7 +92,6 @@ - diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [microdoc].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [microdoc].launch index cf8c5d81d76..2245b46bf75 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [microdoc].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [microdoc].launch @@ -8,7 +8,7 @@ - + diff --git a/plugins/org.eclipse.osee.support.config/projectSets/OseeAppServerProjectSet.psf b/plugins/org.eclipse.osee.support.config/projectSets/OseeAppServerProjectSet.psf index 41a5edc654d..f2653942b1c 100644 --- a/plugins/org.eclipse.osee.support.config/projectSets/OseeAppServerProjectSet.psf +++ b/plugins/org.eclipse.osee.support.config/projectSets/OseeAppServerProjectSet.psf @@ -9,7 +9,6 @@ - @@ -55,7 +54,6 @@ - diff --git a/plugins/org.eclipse.osee.support.config/projectSets/OseeClientProjectSet.psf b/plugins/org.eclipse.osee.support.config/projectSets/OseeClientProjectSet.psf index 98cfcf37508..395b316b77d 100644 --- a/plugins/org.eclipse.osee.support.config/projectSets/OseeClientProjectSet.psf +++ b/plugins/org.eclipse.osee.support.config/projectSets/OseeClientProjectSet.psf @@ -32,7 +32,6 @@ - @@ -123,7 +122,6 @@ - diff --git a/releng/org.eclipse.osee.client.releng/build.properties b/releng/org.eclipse.osee.client.releng/build.properties index bfd6c335f59..cfa391a6f2c 100644 --- a/releng/org.eclipse.osee.client.releng/build.properties +++ b/releng/org.eclipse.osee.client.releng/build.properties @@ -78,7 +78,6 @@ org.apache.commons.lang+\ org.apache.commons.logging+\ org.apache.commons.net+\ org.h2+\ -org.apache.derby+\ org.apache.oro+\ org.apache.xerces+\ org.apache.xml.resolver+\ diff --git a/releng/org.eclipse.osee.client.releng/maps/osee_client.map b/releng/org.eclipse.osee.client.releng/maps/osee_client.map index edf39d8c53b..f15c64eb968 100755 --- a/releng/org.eclipse.osee.client.releng/maps/osee_client.map +++ b/releng/org.eclipse.osee.client.releng/maps/osee_client.map @@ -5,7 +5,6 @@ plugin@org.eclipse.osee.framework.access=SVN,,http://dev.eclipse.org/svnroot/tec plugin@org.eclipse.osee.framework.core.client=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.core.client plugin@org.eclipse.osee.framework.database=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.database plugin@org.eclipse.osee.framework.database.init=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.database.init -plugin@org.eclipse.osee.framework.derby=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.derby plugin@org.eclipse.osee.framework.h2=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.h2 plugin@org.eclipse.osee.framework.messaging.event.skynet=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.messaging.event.skynet plugin@org.eclipse.osee.framework.messaging.event.res=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.messaging.event.res diff --git a/releng/org.eclipse.osee.client.releng/maps/osee_client_external.map b/releng/org.eclipse.osee.client.releng/maps/osee_client_external.map index 85911d7934c..73a68b68990 100644 --- a/releng/org.eclipse.osee.client.releng/maps/osee_client_external.map +++ b/releng/org.eclipse.osee.client.releng/maps/osee_client_external.map @@ -7,7 +7,6 @@ plugin@org.apache.commons.logging,1.1.1=GET,http://download.eclipse.org/tools/or plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.commons.net_2.0.0.v200905272248.jar plugin@org.h2,1.1.117=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.h2_1.1.117.v20091003-1000.jar -plugin@org.apache.derby,10.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.derby_10.5.1.1_201005192117.jar plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.oro_2.0.8.v201005080400.jar plugin@org.apache.xerces,2.9.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.xerces_2.9.0.v201005080400.jar plugin@org.apache.xml.resolver,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.xml.resolver_1.2.0.v201005080400.jar diff --git a/releng/org.eclipse.osee.server.releng/build.properties b/releng/org.eclipse.osee.server.releng/build.properties index 7c678a93e55..cc556d3c2da 100644 --- a/releng/org.eclipse.osee.server.releng/build.properties +++ b/releng/org.eclipse.osee.server.releng/build.properties @@ -52,7 +52,6 @@ org.apache.commons.lang+\ org.apache.commons.logging+\ org.apache.commons.net+\ org.h2+\ -org.apache.derby+\ org.apache.oro+\ org.apache.xerces+\ org.apache.xml.resolver+\ diff --git a/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map b/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map index 67746e1e667..40cceadbd19 100644 --- a/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map +++ b/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map @@ -6,7 +6,6 @@ plugin@org.eclipse.osee.framework.branch.management=SVN,,http://dev.eclipse.org/ plugin@org.eclipse.osee.framework.core.datastore=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.core.datastore plugin@org.eclipse.osee.framework.core.server=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.core.server plugin@org.eclipse.osee.framework.database=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.database -plugin@org.eclipse.osee.framework.derby=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.derby plugin@org.eclipse.osee.framework.h2=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.h2 plugin@org.eclipse.osee.framework.manager.servlet=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.manager.servlet plugin@org.eclipse.osee.framework.resource.locator.attribute=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.resource.locator.attribute diff --git a/releng/org.eclipse.osee.server.releng/maps/osee_server_external.map b/releng/org.eclipse.osee.server.releng/maps/osee_server_external.map index 4da26ed08a2..e3c7ed8b0f1 100644 --- a/releng/org.eclipse.osee.server.releng/maps/osee_server_external.map +++ b/releng/org.eclipse.osee.server.releng/maps/osee_server_external.map @@ -7,7 +7,6 @@ plugin@org.apache.commons.logging,1.1.1=GET,http://download.eclipse.org/tools/or plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.commons.net_2.0.0.v200905272248.jar plugin@org.h2,1.1.117=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.h2_1.1.117.v20091003-1000.jar -plugin@org.apache.derby,10.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.derby_10.5.1.1_201005192117.jar plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.oro_2.0.8.v201005080400.jar plugin@org.apache.xerces,2.9.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.xerces_2.9.0.v201005080400.jar plugin@org.apache.xml.resolver,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.xml.resolver_1.2.0.v201005080400.jar -- cgit v1.2.3