new derby driver update and changed the project in maven prj

openefsa · Sep 14, 2018 · f508ce5 · f508ce5
1 parent 199f50a
commit f508ce5
Show file tree

Hide file tree

Showing 144 changed files with 889 additions and 117 deletions.
diff --git a/.classpath b/.classpath
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/xmlbeans-2.6.0.jar"/>
-	<classpathentry kind="lib" path="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/poi-3.13-20150929.jar"/>
-	<classpathentry kind="lib" path="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/poi-ooxml-3.13-20150929.jar" sourcepath="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/poi-ooxml-3.13-20150929.jar"/>
-	<classpathentry kind="lib" path="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/poi-ooxml-schemas-3.13-20150929.jar"/>
-	<classpathentry kind="lib" path="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/log4j/log4j-1.2.17.jar"/>
-	<classpathentry kind="lib" path="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/eclipse-equinox-common-3.5.0.jar"/>
-	<classpathentry kind="lib" path="D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/UnusedJarFiles/derby.jar"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="classes"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/DCF webservice framework"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.project b/.project
@@ -10,8 +10,21 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>classes</name>
+			<type>2</type>
+			<location>D:/PortableApps/EclipsePortable/App/eclipse/Data/workspace/BusinessRules/target/classes</location>
+		</link>
+	</linkedResources>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/bin/business_rules/WarningUtil$1.class b/bin/business_rules/WarningUtil$1.class
diff --git a/bin/business_rules/WarningUtil$ForbiddenProcess.class b/bin/business_rules/WarningUtil$ForbiddenProcess.class
diff --git a/bin/business_rules/WarningUtil$MtxNotFoundException.class b/bin/business_rules/WarningUtil$MtxNotFoundException.class
diff --git a/bin/business_rules/WarningUtil$WarningMessage.class b/bin/business_rules/WarningUtil$WarningMessage.class
diff --git a/bin/business_rules/WarningUtil$WarningOptions.class b/bin/business_rules/WarningUtil$WarningOptions.class
diff --git a/bin/business_rules/WarningUtil.class b/bin/business_rules/WarningUtil.class
diff --git a/derby.log b/derby.log
diff --git a/logs/2018-06-28-15-34-54.efsa.log b/logs/2018-06-28-15-34-54.efsa.log
diff --git a/logs/2018-06-28-15-37-37.efsa.log b/logs/2018-06-28-15-37-37.efsa.log
diff --git a/logs/2018-06-28-15-38-31.efsa.log b/logs/2018-06-28-15-38-31.efsa.log
diff --git a/logs/2018-06-28-16-25-24.efsa.log b/logs/2018-06-28-16-25-24.efsa.log
diff --git a/logs/2018-06-28-16-56-40.efsa.log b/logs/2018-06-28-16-56-40.efsa.log
diff --git a/logs/2018-06-28-17-03-13.efsa.log b/logs/2018-06-28-17-03-13.efsa.log
diff --git a/logs/latest.efsa.log b/logs/latest.efsa.log
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,64 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>BusinessRules</groupId>
+  <artifactId>BusinessRules</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.7.0</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+  	<dependency>
+  		<groupId>org.apache.xmlbeans</groupId>
+  		<artifactId>xmlbeans</artifactId>
+  		<version>3.0.0</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.poi</groupId>
+  		<artifactId>poi</artifactId>
+  		<version>3.17</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.poi</groupId>
+  		<artifactId>poi-ooxml</artifactId>
+  		<version>3.17</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.poi</groupId>
+  		<artifactId>poi-ooxml-schemas</artifactId>
+  		<version>3.17</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.eclipse.equinox</groupId>
+  		<artifactId>common</artifactId>
+  		<version>3.6.200-v20130402-1505</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.derby</groupId>
+  		<artifactId>derby</artifactId>
+  		<version>10.14.2.0</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.eclipse.ecf</groupId>
+  		<artifactId>org.apache.log4j</artifactId>
+  		<version>1.2.15.v201012070815</version>
+  	</dependency>
+  </dependencies>
+</project>
diff --git a/src/business_rules/WarningUtil.java b/src/business_rules/WarningUtil.java
@@ -52,8 +52,6 @@ private static enum WarningLevel {
 
 	private ArrayList<ForbiddenProcess> forbiddenProcesses;
 
-	private WarningOptions warnOptions;
-
 	/**
 	 * Start the program by command line
 	 * 
@@ -180,7 +178,7 @@ public static void performWarningChecksOnly(String[] args) throws InterruptedExc
 
 			// System.err.println("DONE!\nCheck completed!");
 			// wait before close
-			// Thread.sleep(5000);
+			Thread.sleep(5000);
 			return;
 
 		} catch (Exception e) {
@@ -350,7 +348,7 @@ public void performWarningChecks(String fullCode, boolean stdOut) throws Interru
 	private void loadFileData() throws InterruptedException {
 
 		forbiddenProcesses = loadForbiddenProcesses(GlobalUtil.getBRData());
-		warnOptions = loadWarningOptions(GlobalUtil.getBRColors());
+		loadWarningOptions(GlobalUtil.getBRColors());
 		warningMessages = loadWarningMessages(GlobalUtil.getBRMessages());
 	}
 

diff --git a/target/classes/business_rules/WarningUtil$1.class b/target/classes/business_rules/WarningUtil$1.class
diff --git a/target/classes/business_rules/WarningUtil$ForbiddenProcess.class b/target/classes/business_rules/WarningUtil$ForbiddenProcess.class
diff --git a/target/classes/business_rules/WarningUtil$MtxNotFoundException.class b/target/classes/business_rules/WarningUtil$MtxNotFoundException.class
diff --git a/target/classes/business_rules/WarningUtil$WarningEvent.class b/target/classes/business_rules/WarningUtil$WarningEvent.class
diff --git a/target/classes/business_rules/WarningUtil$WarningLevel.class b/target/classes/business_rules/WarningUtil$WarningLevel.class
diff --git a/target/classes/business_rules/WarningUtil$WarningMessage.class b/target/classes/business_rules/WarningUtil$WarningMessage.class
diff --git a/target/classes/business_rules/WarningUtil$WarningOptions.class b/target/classes/business_rules/WarningUtil$WarningOptions.class
diff --git a/target/classes/business_rules/WarningUtil.class b/target/classes/business_rules/WarningUtil.class
diff --git a/target/classes/catalogue/AttachmentNotFoundException.class b/target/classes/catalogue/AttachmentNotFoundException.class
diff --git a/target/classes/catalogue/Catalogue$1.class b/target/classes/catalogue/Catalogue$1.class
diff --git a/target/classes/catalogue/Catalogue$2.class b/target/classes/catalogue/Catalogue$2.class
diff --git a/target/classes/catalogue/Catalogue$3.class b/target/classes/catalogue/Catalogue$3.class
diff --git a/target/classes/catalogue/Catalogue$4.class b/target/classes/catalogue/Catalogue$4.class
diff --git a/target/classes/catalogue/Catalogue$CatalogueStatus.class b/target/classes/catalogue/Catalogue$CatalogueStatus.class
diff --git a/target/classes/catalogue/Catalogue.class b/target/classes/catalogue/Catalogue.class
diff --git a/target/classes/catalogue/CatalogueBuilder.class b/target/classes/catalogue/CatalogueBuilder.class
diff --git a/target/classes/catalogue/CatalogueVersion.class b/target/classes/catalogue/CatalogueVersion.class
diff --git a/target/classes/catalogue/CataloguesList.class b/target/classes/catalogue/CataloguesList.class
diff --git a/target/classes/catalogue/ReleaseNotes.class b/target/classes/catalogue/ReleaseNotes.class
diff --git a/target/classes/catalogue/ReleaseNotesOperation.class b/target/classes/catalogue/ReleaseNotesOperation.class
diff --git a/target/classes/catalogue/ReservedCatalogue.class b/target/classes/catalogue/ReservedCatalogue.class
diff --git a/target/classes/catalogue_browser_dao/AttributeDAO.class b/target/classes/catalogue_browser_dao/AttributeDAO.class
diff --git a/target/classes/catalogue_browser_dao/CatalogueDAO$1.class b/target/classes/catalogue_browser_dao/CatalogueDAO$1.class
diff --git a/target/classes/catalogue_browser_dao/CatalogueDAO.class b/target/classes/catalogue_browser_dao/CatalogueDAO.class
diff --git a/target/classes/catalogue_browser_dao/CatalogueEntityDAO.class b/target/classes/catalogue_browser_dao/CatalogueEntityDAO.class
diff --git a/target/classes/catalogue_browser_dao/CatalogueRelationDAO.class b/target/classes/catalogue_browser_dao/CatalogueRelationDAO.class
diff --git a/target/classes/catalogue_browser_dao/DatabaseManager.class b/target/classes/catalogue_browser_dao/DatabaseManager.class
diff --git a/target/classes/catalogue_browser_dao/ForceCatEditDAO.class b/target/classes/catalogue_browser_dao/ForceCatEditDAO.class
diff --git a/target/classes/catalogue_browser_dao/HierarchyDAO.class b/target/classes/catalogue_browser_dao/HierarchyDAO.class
diff --git a/target/classes/catalogue_browser_dao/ICatalogueDAO.class b/target/classes/catalogue_browser_dao/ICatalogueDAO.class
diff --git a/target/classes/catalogue_browser_dao/IForcedCatalogueDAO.class b/target/classes/catalogue_browser_dao/IForcedCatalogueDAO.class
diff --git a/target/classes/catalogue_browser_dao/ParentTermDAO.class b/target/classes/catalogue_browser_dao/ParentTermDAO.class
diff --git a/target/classes/catalogue_browser_dao/ReleaseNotesDAO.class b/target/classes/catalogue_browser_dao/ReleaseNotesDAO.class
diff --git a/target/classes/catalogue_browser_dao/ReleaseNotesOperationDAO.class b/target/classes/catalogue_browser_dao/ReleaseNotesOperationDAO.class
diff --git a/target/classes/catalogue_browser_dao/ReservedCatDAO.class b/target/classes/catalogue_browser_dao/ReservedCatDAO.class
diff --git a/target/classes/catalogue_browser_dao/TermAttributeDAO.class b/target/classes/catalogue_browser_dao/TermAttributeDAO.class
diff --git a/target/classes/catalogue_browser_dao/TermDAO.class b/target/classes/catalogue_browser_dao/TermDAO.class
diff --git a/target/classes/catalogue_generator/CatalogueDownloader.class b/target/classes/catalogue_generator/CatalogueDownloader.class
diff --git a/target/classes/catalogue_generator/ThreadFinishedListener.class b/target/classes/catalogue_generator/ThreadFinishedListener.class
diff --git a/target/classes/catalogue_object/Applicability.class b/target/classes/catalogue_object/Applicability.class
diff --git a/target/classes/catalogue_object/Attribute.class b/target/classes/catalogue_object/Attribute.class
diff --git a/target/classes/catalogue_object/AttributeBuilder.class b/target/classes/catalogue_object/AttributeBuilder.class
diff --git a/target/classes/catalogue_object/BaseObject.class b/target/classes/catalogue_object/BaseObject.class
diff --git a/target/classes/catalogue_object/BaseObjectBuilder.class b/target/classes/catalogue_object/BaseObjectBuilder.class
diff --git a/target/classes/catalogue_object/CatalogueObject.class b/target/classes/catalogue_object/CatalogueObject.class
diff --git a/target/classes/catalogue_object/CatalogueObjectBuilder.class b/target/classes/catalogue_object/CatalogueObjectBuilder.class
diff --git a/target/classes/catalogue_object/Hierarchy.class b/target/classes/catalogue_object/Hierarchy.class
diff --git a/target/classes/catalogue_object/HierarchyBuilder.class b/target/classes/catalogue_object/HierarchyBuilder.class
diff --git a/target/classes/catalogue_object/Mappable.class b/target/classes/catalogue_object/Mappable.class
diff --git a/target/classes/catalogue_object/Nameable.class b/target/classes/catalogue_object/Nameable.class
diff --git a/target/classes/catalogue_object/ParentField.class b/target/classes/catalogue_object/ParentField.class
diff --git a/target/classes/catalogue_object/RepeatableParser.class b/target/classes/catalogue_object/RepeatableParser.class
diff --git a/target/classes/catalogue_object/Sortable.class b/target/classes/catalogue_object/Sortable.class
diff --git a/target/classes/catalogue_object/SortableCatalogueObject.class b/target/classes/catalogue_object/SortableCatalogueObject.class
diff --git a/target/classes/catalogue_object/Status$StatusValues.class b/target/classes/catalogue_object/Status$StatusValues.class
diff --git a/target/classes/catalogue_object/Status.class b/target/classes/catalogue_object/Status.class
diff --git a/target/classes/catalogue_object/Term$1.class b/target/classes/catalogue_object/Term$1.class
diff --git a/target/classes/catalogue_object/Term$2.class b/target/classes/catalogue_object/Term$2.class
diff --git a/target/classes/catalogue_object/Term$Position.class b/target/classes/catalogue_object/Term$Position.class
diff --git a/target/classes/catalogue_object/Term.class b/target/classes/catalogue_object/Term.class
diff --git a/target/classes/catalogue_object/TermAttribute.class b/target/classes/catalogue_object/TermAttribute.class
diff --git a/target/classes/catalogue_object/TermBuilder.class b/target/classes/catalogue_object/TermBuilder.class
diff --git a/target/classes/catalogue_object/Version.class b/target/classes/catalogue_object/Version.class
diff --git a/target/classes/config/AppConfig.class b/target/classes/config/AppConfig.class
diff --git a/target/classes/data_collection/CatalogueConfigDAO.class b/target/classes/data_collection/CatalogueConfigDAO.class
diff --git a/target/classes/data_collection/CatalogueConfiguration.class b/target/classes/data_collection/CatalogueConfiguration.class
diff --git a/target/classes/data_collection/DCDAO.class b/target/classes/data_collection/DCDAO.class
diff --git a/target/classes/data_collection/DCTable.class b/target/classes/data_collection/DCTable.class
diff --git a/target/classes/data_collection/DCTableConfig.class b/target/classes/data_collection/DCTableConfig.class
diff --git a/target/classes/data_collection/DCTableConfigDAO.class b/target/classes/data_collection/DCTableConfigDAO.class
diff --git a/target/classes/data_collection/DCTableDAO.class b/target/classes/data_collection/DCTableDAO.class
diff --git a/target/classes/data_collection/DCTableList.class b/target/classes/data_collection/DCTableList.class
diff --git a/target/classes/data_collection/DataCollection.class b/target/classes/data_collection/DataCollection.class
diff --git a/target/classes/data_collection/DataCollectionsList.class b/target/classes/data_collection/DataCollectionsList.class
diff --git a/target/classes/data_transformation/BooleanConverter.class b/target/classes/data_transformation/BooleanConverter.class
diff --git a/target/classes/data_transformation/DateTrimmer.class b/target/classes/data_transformation/DateTrimmer.class
diff --git a/target/classes/data_transformation/ValuesGrouper.class b/target/classes/data_transformation/ValuesGrouper.class
diff --git a/target/classes/dcf_manager/Dcf$1.class b/target/classes/dcf_manager/Dcf$1.class
diff --git a/target/classes/dcf_manager/Dcf$DcfType.class b/target/classes/dcf_manager/Dcf$DcfType.class
diff --git a/target/classes/dcf_manager/Dcf.class b/target/classes/dcf_manager/Dcf.class
diff --git a/target/classes/dcf_user/User$CatalogueStatus.class b/target/classes/dcf_user/User$CatalogueStatus.class
diff --git a/target/classes/dcf_user/User.class b/target/classes/dcf_user/User.class
diff --git a/target/classes/dcf_user/UserAccessLevel.class b/target/classes/dcf_user/UserAccessLevel.class
diff --git a/target/classes/dcf_user/UserListener.class b/target/classes/dcf_user/UserListener.class
diff --git a/target/classes/dcf_user/UserProfileChecker$1.class b/target/classes/dcf_user/UserProfileChecker$1.class
diff --git a/target/classes/dcf_user/UserProfileChecker.class b/target/classes/dcf_user/UserProfileChecker.class
diff --git a/target/classes/detail_level/DetailLevelDAO.class b/target/classes/detail_level/DetailLevelDAO.class
diff --git a/target/classes/detail_level/DetailLevelGraphics.class b/target/classes/detail_level/DetailLevelGraphics.class
diff --git a/target/classes/global_manager/GlobalManager.class b/target/classes/global_manager/GlobalManager.class
diff --git a/target/classes/import_catalogue/ImportException.class b/target/classes/import_catalogue/ImportException.class
diff --git a/target/classes/import_catalogue/ParentImporter.class b/target/classes/import_catalogue/ParentImporter.class
diff --git a/target/classes/import_catalogue/SheetImporter.class b/target/classes/import_catalogue/SheetImporter.class
diff --git a/target/classes/import_catalogue/TermSheetImporter.class b/target/classes/import_catalogue/TermSheetImporter.class
diff --git a/target/classes/instance_checker/InstanceChecker.class b/target/classes/instance_checker/InstanceChecker.class
diff --git a/target/classes/messages/Messages.class b/target/classes/messages/Messages.class