diff --git a/db-derby/bin/MyDatabase/README_DO_NOT_TOUCH_FILES.txt b/db-derby/bin/MyDatabase/README_DO_NOT_TOUCH_FILES.txt
deleted file mode 100644
index a4bc14529893603be90684356d705e12a8b203f8..0000000000000000000000000000000000000000
--- a/db-derby/bin/MyDatabase/README_DO_NOT_TOUCH_FILES.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# *************************************************************************
-# *** DO NOT TOUCH FILES IN THIS DIRECTORY! ***
-# *** FILES IN THIS DIRECTORY AND SUBDIRECTORIES CONSTITUTE A DERBY ***
-# *** DATABASE, WHICH INCLUDES THE DATA (USER AND SYSTEM) AND THE ***
-# *** FILES NECESSARY FOR DATABASE RECOVERY. ***
-# *** EDITING, ADDING, OR DELETING ANY OF THESE FILES MAY CAUSE DATA ***
-# *** CORRUPTION AND LEAVE THE DATABASE IN A NON-RECOVERABLE STATE. ***
-# *************************************************************************
\ No newline at end of file
diff --git a/db-derby/bin/MyDatabase/db.lck b/db-derby/bin/MyDatabase/db.lck
deleted file mode 100644
index 92b23d895c64dc64f76da6f1dd41a350e852ed4a..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/db.lck and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/dbex.lck b/db-derby/bin/MyDatabase/dbex.lck
deleted file mode 100644
index 720d64f4baafc33efdf971f02084aca5f25b34a5..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/dbex.lck and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/log/README_DO_NOT_TOUCH_FILES.txt b/db-derby/bin/MyDatabase/log/README_DO_NOT_TOUCH_FILES.txt
deleted file mode 100644
index 56df292f65e5915a60263115d7202dca2dabd042..0000000000000000000000000000000000000000
--- a/db-derby/bin/MyDatabase/log/README_DO_NOT_TOUCH_FILES.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# *************************************************************************
-# *** DO NOT TOUCH FILES IN THIS DIRECTORY! ***
-# *** FILES IN THIS DIRECTORY ARE USED BY THE DERBY DATABASE RECOVERY ***
-# *** SYSTEM. EDITING, ADDING, OR DELETING FILES IN THIS DIRECTORY ***
-# *** WILL CAUSE THE DERBY RECOVERY SYSTEM TO FAIL, LEADING TO ***
-# *** NON-RECOVERABLE CORRUPT DATABASES. ***
-# *************************************************************************
\ No newline at end of file
diff --git a/db-derby/bin/MyDatabase/log/log.ctrl b/db-derby/bin/MyDatabase/log/log.ctrl
deleted file mode 100644
index d0d7a11e243e0cf73b41f93e059cd8ba9553c949..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/log/log.ctrl and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/log/log230.dat b/db-derby/bin/MyDatabase/log/log230.dat
deleted file mode 100644
index 627a4bff884aafd660ec76f0b7e7a87a1151ddb2..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/log/log230.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/log/log231.dat b/db-derby/bin/MyDatabase/log/log231.dat
deleted file mode 100644
index bd59519c9505f15c5a49d9c4c852f9b9d1f29974..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/log/log231.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/log/log232.dat b/db-derby/bin/MyDatabase/log/log232.dat
deleted file mode 100644
index e23827e7c3b7d79a915e28efafbe19d746f70f07..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/log/log232.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/log/log233.dat b/db-derby/bin/MyDatabase/log/log233.dat
deleted file mode 100644
index 0d4b6c8325e9e7d124ba051d5d41f62c6300206a..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/log/log233.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/log/logmirror.ctrl b/db-derby/bin/MyDatabase/log/logmirror.ctrl
deleted file mode 100644
index d0d7a11e243e0cf73b41f93e059cd8ba9553c949..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/log/logmirror.ctrl and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/README_DO_NOT_TOUCH_FILES.txt b/db-derby/bin/MyDatabase/seg0/README_DO_NOT_TOUCH_FILES.txt
deleted file mode 100644
index 2bdad06127437e4b9b82a64cdfaf694d3ba146b1..0000000000000000000000000000000000000000
--- a/db-derby/bin/MyDatabase/seg0/README_DO_NOT_TOUCH_FILES.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# *************************************************************************
-# *** DO NOT TOUCH FILES IN THIS DIRECTORY! ***
-# *** FILES IN THIS DIRECTORY ARE USED BY THE DERBY DATABASE TO STORE ***
-# *** USER AND SYSTEM DATA. EDITING, ADDING, OR DELETING FILES IN THIS ***
-# *** DIRECTORY WILL CORRUPT THE ASSOCIATED DERBY DATABASE AND MAKE ***
-# *** IT NON-RECOVERABLE. ***
-# *************************************************************************
\ No newline at end of file
diff --git a/db-derby/bin/MyDatabase/seg0/c10.dat b/db-derby/bin/MyDatabase/seg0/c10.dat
deleted file mode 100644
index f5af9f83b1feae4ddc64c9399255ee3444988f24..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c10.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c101.dat b/db-derby/bin/MyDatabase/seg0/c101.dat
deleted file mode 100644
index 1118178122878d154f3dc957aedb0924bf7933a6..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c101.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c111.dat b/db-derby/bin/MyDatabase/seg0/c111.dat
deleted file mode 100644
index 71b1f8d3f96f1adb7b0cd89180dd4c7c8814d408..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c111.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c121.dat b/db-derby/bin/MyDatabase/seg0/c121.dat
deleted file mode 100644
index fbf18b9c97f9d8c1268253438a612ab37daf5f8b..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c121.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c130.dat b/db-derby/bin/MyDatabase/seg0/c130.dat
deleted file mode 100644
index 7b2a6548baada97b880355f2e256c0229b1eeec6..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c130.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c141.dat b/db-derby/bin/MyDatabase/seg0/c141.dat
deleted file mode 100644
index 3d983c2400ee0701d5516580cd2cf2d208ddef8e..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c141.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c150.dat b/db-derby/bin/MyDatabase/seg0/c150.dat
deleted file mode 100644
index a4efd2643edae163374656573224dda7b73ee6ad..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c150.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c161.dat b/db-derby/bin/MyDatabase/seg0/c161.dat
deleted file mode 100644
index d6a3f2d8801880502e88dc39c0dddf9125427afd..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c161.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c171.dat b/db-derby/bin/MyDatabase/seg0/c171.dat
deleted file mode 100644
index b3e1217b32ccb3bdfb3ea034735ff62b630fce8c..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c171.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c180.dat b/db-derby/bin/MyDatabase/seg0/c180.dat
deleted file mode 100644
index d9b1d975e3449ae29a0df25d1c4096eb8c9bb3b1..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c180.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c191.dat b/db-derby/bin/MyDatabase/seg0/c191.dat
deleted file mode 100644
index 7a36fd9be66060843786d5abb98b6431edf57576..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c191.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c1a1.dat b/db-derby/bin/MyDatabase/seg0/c1a1.dat
deleted file mode 100644
index 4555e5e94e90c8be6f2ddfcd3ab5f02d8c446b42..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c1a1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c1b1.dat b/db-derby/bin/MyDatabase/seg0/c1b1.dat
deleted file mode 100644
index 614352b715ea8403c8f9d08a2ceda385bf55d067..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c1b1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c1c0.dat b/db-derby/bin/MyDatabase/seg0/c1c0.dat
deleted file mode 100644
index c5b91e2c3fef26113800b2a821fa2bb19fdf1105..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c1c0.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c1d1.dat b/db-derby/bin/MyDatabase/seg0/c1d1.dat
deleted file mode 100644
index 451f02f45f24d575ab53a16df6a3b9f730336855..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c1d1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c1e0.dat b/db-derby/bin/MyDatabase/seg0/c1e0.dat
deleted file mode 100644
index 761408d3b3483e2cb3bc4d3d46e37c5e92d2a255..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c1e0.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c1f1.dat b/db-derby/bin/MyDatabase/seg0/c1f1.dat
deleted file mode 100644
index 78d701f45559f9fc67104563ad350118d55c794e..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c1f1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c20.dat b/db-derby/bin/MyDatabase/seg0/c20.dat
deleted file mode 100644
index 8b46fa9ec3b5cee3657d7b96d7791460f4bd237d..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c20.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c200.dat b/db-derby/bin/MyDatabase/seg0/c200.dat
deleted file mode 100644
index c3a7808dd76bce2cfa24ab40d4e9e5d87dc76d32..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c200.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c211.dat b/db-derby/bin/MyDatabase/seg0/c211.dat
deleted file mode 100644
index 54e1586958acadf39872d757100822023755d145..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c211.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c221.dat b/db-derby/bin/MyDatabase/seg0/c221.dat
deleted file mode 100644
index 59900bc01279b60106d28567bbbf6524aaac4165..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c221.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c230.dat b/db-derby/bin/MyDatabase/seg0/c230.dat
deleted file mode 100644
index 6b7adb01156b893dc69083111192c85dc50eba2b..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c230.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c241.dat b/db-derby/bin/MyDatabase/seg0/c241.dat
deleted file mode 100644
index 9f7786838099569a6c341163cb3f9236f33e4497..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c241.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c251.dat b/db-derby/bin/MyDatabase/seg0/c251.dat
deleted file mode 100644
index 7d093bb0805fd1886c904015e51e2bed7f56c983..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c251.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c260.dat b/db-derby/bin/MyDatabase/seg0/c260.dat
deleted file mode 100644
index 25f81fde784105363c372eba91f6175388235f63..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c260.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c271.dat b/db-derby/bin/MyDatabase/seg0/c271.dat
deleted file mode 100644
index 51cde573e72a37ef75833e5cc49c51a7371e111b..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c271.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c281.dat b/db-derby/bin/MyDatabase/seg0/c281.dat
deleted file mode 100644
index cfed875dfceab65004fe1b91cbefd660cea0ccb7..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c281.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c290.dat b/db-derby/bin/MyDatabase/seg0/c290.dat
deleted file mode 100644
index a85589e545d81d6ae0a080bcb44ba28d846f9987..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c290.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c2a1.dat b/db-derby/bin/MyDatabase/seg0/c2a1.dat
deleted file mode 100644
index 8e2ed6afe90b6e9bab82029f98a338a3cf455bf8..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c2a1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c2b1.dat b/db-derby/bin/MyDatabase/seg0/c2b1.dat
deleted file mode 100644
index 2a2969247718ad8c76b895d72b43a1f781e3cbd9..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c2b1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c2c1.dat b/db-derby/bin/MyDatabase/seg0/c2c1.dat
deleted file mode 100644
index 5511575f62c4403a8655a1dc183f74e5747dc947..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c2c1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c2d0.dat b/db-derby/bin/MyDatabase/seg0/c2d0.dat
deleted file mode 100644
index 4adc6e4470f86182da42ea94fe6881290c97948a..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c2d0.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c2e1.dat b/db-derby/bin/MyDatabase/seg0/c2e1.dat
deleted file mode 100644
index b37b9b254234c4de527ff90f13f4624bfa8f98c3..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c2e1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c2f0.dat b/db-derby/bin/MyDatabase/seg0/c2f0.dat
deleted file mode 100644
index d854b4b482d64363d5e58c63e9e4d8e5633ff2ec..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c2f0.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c300.dat b/db-derby/bin/MyDatabase/seg0/c300.dat
deleted file mode 100644
index 2053e0105b40818ea4cc1ea3a6c1cb5edb9972df..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c300.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c31.dat b/db-derby/bin/MyDatabase/seg0/c31.dat
deleted file mode 100644
index 9df520c48e8320ba608bfe555d8f409b97f35d43..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c31.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c311.dat b/db-derby/bin/MyDatabase/seg0/c311.dat
deleted file mode 100644
index f60c260f85bd9b0a9e1ac4fbc0967fb1521015d6..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c311.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c321.dat b/db-derby/bin/MyDatabase/seg0/c321.dat
deleted file mode 100644
index a9d745366de2ffc50f52ab82f6a34a8543e111a0..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c321.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c331.dat b/db-derby/bin/MyDatabase/seg0/c331.dat
deleted file mode 100644
index 85ee72b31368516c6de9fbe3516e0e3229ea2755..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c331.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c340.dat b/db-derby/bin/MyDatabase/seg0/c340.dat
deleted file mode 100644
index d99b11a3f2dfe2333989898bca9463dfb265ef5f..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c340.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c351.dat b/db-derby/bin/MyDatabase/seg0/c351.dat
deleted file mode 100644
index f822f4cb0c68ba75ef276746d4ec866e151c9e4e..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c351.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c361.dat b/db-derby/bin/MyDatabase/seg0/c361.dat
deleted file mode 100644
index b5c8f259d0d1fefc112f60325bfde24724aded2e..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c361.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c371.dat b/db-derby/bin/MyDatabase/seg0/c371.dat
deleted file mode 100644
index ad11f01b25b6bd995142e4d731203e66b5792409..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c371.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c380.dat b/db-derby/bin/MyDatabase/seg0/c380.dat
deleted file mode 100644
index 445bc3fe58e9c4a214525a34e418ed19cbacbb2a..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c380.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c391.dat b/db-derby/bin/MyDatabase/seg0/c391.dat
deleted file mode 100644
index ae3f382ac716b1c53fd7979bea72cd4f4855139c..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c391.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c3a1.dat b/db-derby/bin/MyDatabase/seg0/c3a1.dat
deleted file mode 100644
index d4a16dbabdd79aae27f54871d1d0f463d8a7f5b8..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c3a1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c3b1.dat b/db-derby/bin/MyDatabase/seg0/c3b1.dat
deleted file mode 100644
index f71ef16457e10736ad516fa22d83ef980ab9c050..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c3b1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c3c0.dat b/db-derby/bin/MyDatabase/seg0/c3c0.dat
deleted file mode 100644
index 4d061cf0609ecd4b111d8f763b15c5658bf6caa6..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c3c0.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c3d1.dat b/db-derby/bin/MyDatabase/seg0/c3d1.dat
deleted file mode 100644
index 45c9fa244b0a2004a450ef39909f490377f00a45..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c3d1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c3e1.dat b/db-derby/bin/MyDatabase/seg0/c3e1.dat
deleted file mode 100644
index 48f53e682fad1a672e0f68dabb0eb43c224231f2..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c3e1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c3f1.dat b/db-derby/bin/MyDatabase/seg0/c3f1.dat
deleted file mode 100644
index 08acdcee31e218c5d9c3b4f62ef38fb0f42c8e72..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c3f1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c400.dat b/db-derby/bin/MyDatabase/seg0/c400.dat
deleted file mode 100644
index 1e8976f89fb63a0868c737d9434d15ecfdedc47c..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c400.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c41.dat b/db-derby/bin/MyDatabase/seg0/c41.dat
deleted file mode 100644
index 795c9223e070d9f644a5475713e590b1cac9d68f..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c41.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c411.dat b/db-derby/bin/MyDatabase/seg0/c411.dat
deleted file mode 100644
index 8aba2fb6bffcd33977141a28678d10b2f530515f..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c411.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c421.dat b/db-derby/bin/MyDatabase/seg0/c421.dat
deleted file mode 100644
index 65775ee7bfbd1fe9a4e81f326933d49be9138b53..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c421.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c430.dat b/db-derby/bin/MyDatabase/seg0/c430.dat
deleted file mode 100644
index 55c948db3494a63fd9c7aa83b683caed1cb112f5..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c430.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c441.dat b/db-derby/bin/MyDatabase/seg0/c441.dat
deleted file mode 100644
index 3948b2a3c5aa10a7b713afa7069d6d7442b77319..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c441.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c451.dat b/db-derby/bin/MyDatabase/seg0/c451.dat
deleted file mode 100644
index fe1ab73e129b9d8da878e8cb40be7e85925aac57..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c451.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c461.dat b/db-derby/bin/MyDatabase/seg0/c461.dat
deleted file mode 100644
index e6d98541fb79659dd82e6c495be7eda4795dd219..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c461.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c470.dat b/db-derby/bin/MyDatabase/seg0/c470.dat
deleted file mode 100644
index c9f2eb1cae75e19bcc6f3d1feb17572a3f80c36e..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c470.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c481.dat b/db-derby/bin/MyDatabase/seg0/c481.dat
deleted file mode 100644
index 397b291728daf0659f676de73f52ab7e45c3494b..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c481.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c51.dat b/db-derby/bin/MyDatabase/seg0/c51.dat
deleted file mode 100644
index a6e1d2104875d5aed457a1d67209f1bb49a5e7f0..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c51.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c560.dat b/db-derby/bin/MyDatabase/seg0/c560.dat
deleted file mode 100644
index 7dc80885783369f687483f7b90b8962856b2d8e5..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c560.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c570.dat b/db-derby/bin/MyDatabase/seg0/c570.dat
deleted file mode 100644
index dcdffe64d2fa6511604db1f2bcbed4aaf6671abb..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c570.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c580.dat b/db-derby/bin/MyDatabase/seg0/c580.dat
deleted file mode 100644
index dcdffe64d2fa6511604db1f2bcbed4aaf6671abb..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c580.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c60.dat b/db-derby/bin/MyDatabase/seg0/c60.dat
deleted file mode 100644
index cf7f4ef9dca1d553b303bce05c2ba3a146abe43a..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c60.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c71.dat b/db-derby/bin/MyDatabase/seg0/c71.dat
deleted file mode 100644
index 9df3f1362b2e84231d678fbbd12c4332ab19cb42..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c71.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c81.dat b/db-derby/bin/MyDatabase/seg0/c81.dat
deleted file mode 100644
index 62a0ec73519c288ff8a8fcfdc226f045a1775dd7..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c81.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/c90.dat b/db-derby/bin/MyDatabase/seg0/c90.dat
deleted file mode 100644
index f57fc3bc60058ac311305badee022d657a4e3420..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/c90.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/ca1.dat b/db-derby/bin/MyDatabase/seg0/ca1.dat
deleted file mode 100644
index 6f358f0ff4cdef47b82ceaf1843b237f6bde63dd..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/ca1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/cb1.dat b/db-derby/bin/MyDatabase/seg0/cb1.dat
deleted file mode 100644
index 7a5a11f12ec19d35cebc22dca6c02cbcae6e559a..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/cb1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/cc0.dat b/db-derby/bin/MyDatabase/seg0/cc0.dat
deleted file mode 100644
index 42f382c6e2de4acb82b38f8759ddef34d818d2d4..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/cc0.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/cd1.dat b/db-derby/bin/MyDatabase/seg0/cd1.dat
deleted file mode 100644
index dbfe15b4a2ac80e1f628afbe0e12db83412d45d3..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/cd1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/ce1.dat b/db-derby/bin/MyDatabase/seg0/ce1.dat
deleted file mode 100644
index 5462c6c8c04d12f52cf113099d6ff4e4900d6a37..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/ce1.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/cf0.dat b/db-derby/bin/MyDatabase/seg0/cf0.dat
deleted file mode 100644
index fb40ee421916f7cc965275d19623aec219c8c959..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/cf0.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/d530.dat b/db-derby/bin/MyDatabase/seg0/d530.dat
deleted file mode 100644
index b1ce924b280580e33b7003d54040f7d99fea7124..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/d530.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/d540.dat b/db-derby/bin/MyDatabase/seg0/d540.dat
deleted file mode 100644
index 917cac9e1f6c053bd3a38e30837472565a14e867..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/d540.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/d550.dat b/db-derby/bin/MyDatabase/seg0/d550.dat
deleted file mode 100644
index d9b4ece63fa1508330246e3a41b76a6734651c28..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/d550.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/seg0/d590.dat b/db-derby/bin/MyDatabase/seg0/d590.dat
deleted file mode 100644
index f165950d3f51be4aa9e886a6f1365026b9a2a43d..0000000000000000000000000000000000000000
Binary files a/db-derby/bin/MyDatabase/seg0/d590.dat and /dev/null differ
diff --git a/db-derby/bin/MyDatabase/service.properties b/db-derby/bin/MyDatabase/service.properties
deleted file mode 100644
index 1afd74013825a122fac9046f9cc2e548c08dd69e..0000000000000000000000000000000000000000
--- a/db-derby/bin/MyDatabase/service.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#/Users/ludovicapvrille/Work/attack-crawler-and-sysml-sec-models/Final_version_Forrat_Aktypi/Linux/db-derby-10.11.1.1-bin/bin/MyDatabase
-# ********************************************************************
-# *** Please do NOT edit this file. ***
-# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
-# ********************************************************************
-#Tue Mar 22 15:46:09 CET 2016
-SysschemasIndex2Identifier=225
-SyscolumnsIdentifier=144
-SysconglomeratesIndex1Identifier=49
-SysconglomeratesIdentifier=32
-SyscolumnsIndex2Identifier=177
-SysschemasIndex1Identifier=209
-SysconglomeratesIndex3Identifier=81
-SystablesIndex2Identifier=129
-SyscolumnsIndex1Identifier=161
-derby.serviceProtocol=org.apache.derby.database.Database
-SysschemasIdentifier=192
-derby.storage.propertiesId=16
-SysconglomeratesIndex2Identifier=65
-derby.serviceLocale=en_US
-SystablesIdentifier=96
-SystablesIndex1Identifier=113
-#--- last line, don't put anything after this line ---
diff --git a/src/web/crawler/Data_visualisation.java b/src/web/crawler/DataVisualisation.java
similarity index 76%
rename from src/web/crawler/Data_visualisation.java
rename to src/web/crawler/DataVisualisation.java
index 30f541799a634311a718d61f6b5a1846c3fac35f..6c5a818f42d2a1be9996be610c3e2ff2ebc8210b 100644
--- a/src/web/crawler/Data_visualisation.java
+++ b/src/web/crawler/DataVisualisation.java
@@ -1,8 +1,50 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ ludovic.apvrille AT enst.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+
+ /**
+ * Class Datavisualisation
+ * Implement all the graphs that can be generated according to data in a database db,
+ * used in the constructor of the class
+ * Creation: 2015
+ * @version 2.0 24/03/2016
+ * @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
+ * @see MainGUI
+ */
+
package web.crawler;
import com.panayotis.gnuplot.JavaPlot;
@@ -35,19 +77,16 @@ import javax.imageio.ImageIO;
import static javax.imageio.ImageIO.write;
import static javax.swing.WindowConstants.HIDE_ON_CLOSE;
-/**
- * Implement all the graphs that can be generated according to data in a database db, used in the constructor of the class
- * @author Marie FORRAT & Angeliki AKTYPI
- */
-public class Data_visualisation {
- private web.crawler.Database_creation database;
+public class DataVisualisation {
+
+ private web.crawler.DatabaseCreation database;
/**
*
* @param db database you want to do the query on
*/
- public Data_visualisation(web.crawler.Database_creation db) {
+ public DataVisualisation(web.crawler.DatabaseCreation db) {
this.database = db;
}
diff --git a/src/web/crawler/Database_creation.java b/src/web/crawler/DatabaseCreation.java
similarity index 81%
rename from src/web/crawler/Database_creation.java
rename to src/web/crawler/DatabaseCreation.java
index a63e5fbed8ca2fdbc626a6021ce608cde1c76ec9..eeb70b08bdaf658709a4e4530154c04ccd084424 100644
--- a/src/web/crawler/Database_creation.java
+++ b/src/web/crawler/DatabaseCreation.java
@@ -1,10 +1,55 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ ludovic.apvrille AT enst.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+
+ /**
+ * Class DatabaseCreation
+ * All the function necessary for the creation of the database, creation
+ * of tables in the database and the storage of this databse
+ * Management of Avatar block panels
+ * Creation: 2015
+ * @version 2.0 25/03/2016
+ * @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
+ * @see MainGUI
+ */
+
package web.crawler;
+import myutil.*;
+
import java.awt.AWTException;
import java.awt.Robot;
import java.io.File;
@@ -18,9 +63,10 @@ import org.apache.derby.drda.NetworkServerControl;
/**
* All the function necessary for the creation of the database, creation of tables in the database and the storage of this databse
- * @author Marie FORRAT & Angeliki AKTYPI
+ * @author Marie FORRAT, Angeliki AKTYPI, Ludovic Apvrille
*/
-public class Database_creation {
+
+public class DatabaseCreation {
/* Global variables */
private static Connection conn = null;
@@ -167,9 +213,9 @@ public class Database_creation {
/* STEP 1: Open a connection */
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
- System.out.println("Connecting with database...");
+ TraceManager.addDev("Connecting with database...");
conn = DriverManager.getConnection(url + dbName, username, password);
- System.out.println("Connection with the database established\n");
+ TraceManager.addDev("Connection with the database established\n");
/* STEP 2: Creating table VULNERABILITIES */
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
diff --git a/src/web/crawler/Database_query.java b/src/web/crawler/DatabaseQuery.java
similarity index 80%
rename from src/web/crawler/Database_query.java
rename to src/web/crawler/DatabaseQuery.java
index d5d896aff9630b9898e2041617d8d8f0e48da924..b38cdac79d38745809bf02bb218ea873f12c468f 100644
--- a/src/web/crawler/Database_query.java
+++ b/src/web/crawler/DatabaseQuery.java
@@ -1,8 +1,51 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ ludovic.apvrille AT enst.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+
+ /**
+ * Class DatabaseQuery
+ * Management of querys to a database
+ * Creation: 2015
+ * @version 2.0 25/03/2016
+ * @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
+ * @see MainGUI
+ */
+
+
package web.crawler;
import java.awt.AWTException;
@@ -18,24 +61,25 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.xml.transform.TransformerException;
-import static web.crawler.File_management.StoreResultsInFile;
+import static web.crawler.FileManagement.StoreResultsInFile;
-/**
- * Do different query on a database, the database have to be passed in the constructor
- * @author Marie FORRAT & Angeliki AKTYPI
- */
-public class Database_query {
+
+public class DatabaseQuery {
-private web.crawler.Database_creation database;
+private web.crawler.DatabaseCreation database;
/**
* Constructor of the class
* @param db the database to do query on
*/
- public Database_query(web.crawler.Database_creation db) {
+ public DatabaseQuery(web.crawler.DatabaseCreation db) {
this.database = db;
}
+ public DatabaseCreation getDatabase() {
+ return database;
+ }
+
/**
* Make query on table software according to keyword from the console
* Be careful: this function is NOT protected against SQL injection
diff --git a/src/web/crawler/File_management.java b/src/web/crawler/FileManagement.java
similarity index 90%
rename from src/web/crawler/File_management.java
rename to src/web/crawler/FileManagement.java
index ae328da6116a1efd5729c4d4c8e28718422a75ed..bf00dc336b02b9560fbca23d14914a06f6cbff0c 100644
--- a/src/web/crawler/File_management.java
+++ b/src/web/crawler/FileManagement.java
@@ -1,8 +1,50 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ ludovic.apvrille AT enst.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+
+ /**
+ * Class FileManagement
+ * Contain all the functions, which are using files
+ * Creation: 2015
+ * @version 2.0 25/03/2016
+ * @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
+ * @see MainGUI
+ */
+
+
package web.crawler;
import java.io.BufferedReader;
@@ -46,11 +88,8 @@ import java.util.Date;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-/**
- * Contain all the functions, which are using file
- * @author Marie FORRAT & Angeliki AKTYPI
- */
-public class File_management {
+
+public class FileManagement {
/**
* Download the zipped xml file from the National Vulnerability Database's website (https://nvd.nist.gov/)
@@ -126,6 +165,7 @@ public class File_management {
}
}
+
public static void unZipFile(String zipFile){
byte[] buffer = new byte[1024];
@@ -244,7 +284,7 @@ public class File_management {
* @param filename name of the xml file you want to parse
* @param database database you want to fill with data from the file
*/
- public static void ParsingXML(String filename, web.crawler.Database_creation database) {
+ public static void ParsingXML(String filename, web.crawler.DatabaseCreation database) {
LinkedList<String> list_id = new LinkedList<>();
LinkedList<String> list_pub_date = new LinkedList<>();
LinkedList<String> list_score = new LinkedList<>();
diff --git a/src/web/crawler/MultiThreadServer.java b/src/web/crawler/MultiThreadServer.java
index f7f7a795cfea252c651c05b31ebbf6555f0f211d..44f2f755a44163fa32b4e43629a493852f28bdb4 100644
--- a/src/web/crawler/MultiThreadServer.java
+++ b/src/web/crawler/MultiThreadServer.java
@@ -1,3 +1,50 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ ludovic.apvrille AT enst.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+
+ /**
+ * Class WebCrawler
+ * Implement of a webcrawler for CVEs
+ * Creation: 2015
+ * @version 2.0 25/03/2016
+ * @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
+ * @see MainGUI
+ */
+
package web.crawler;
import java.awt.AWTException;
@@ -19,10 +66,7 @@ import javax.xml.transform.TransformerException;
import org.apache.commons.io.FileUtils;
import web.crawler.WebCrawler;
-/**
- *
- * @author Marie FORRAT & Angeliki AKTYPI & Dan Huynh VO
- */
+
public class MultiThreadServer {
/**
@@ -57,7 +101,7 @@ public class MultiThreadServer {
* @throws AWTException
* @throws TransformerException
*/
- public static Message analyseRequestMessage(Message msg, web.crawler.Database_query database) throws IOException, SQLException, AWTException, TransformerException {
+ public static Message analyseRequestMessage(Message msg, web.crawler.DatabaseQuery database) throws IOException, SQLException, AWTException, TransformerException {
//System.out.println(msg.getCmd());
@@ -95,14 +139,14 @@ public class MultiThreadServer {
}
if (msg.getCmd().equals(Message.CMD_STATISTIC)) {
- Data_visualisation datavis = new Data_visualisation(WebCrawler.database);
+ DataVisualisation datavis = new DataVisualisation(database.getDatabase());
datavis.OpenCloud(msg.getValues().get(0));
//Set cmd for the answer message to sent back to the client
cmd = msg.RESULT_STATISTIC;
answerMessage = createImageAnswer(cmd, msg);
}
if (msg.getCmd().equals(Message.CMD_HISTOGRAM)) {
- Data_visualisation datavis = new Data_visualisation(WebCrawler.database);
+ DataVisualisation datavis = new DataVisualisation(database.getDatabase());
datavis.Histogram(msg.getValues().get(0));
//Set cmd for the answer message to sent back to the client
cmd = msg.RESULT_HISTOGRAM;
diff --git a/src/web/crawler/ThreadSocket.java b/src/web/crawler/ThreadSocket.java
index 6ffb640d12088f80a71534747a5a53ae0a3cce50..7229f8205945bbad99779203cce820445518498e 100644
--- a/src/web/crawler/ThreadSocket.java
+++ b/src/web/crawler/ThreadSocket.java
@@ -1,10 +1,51 @@
-package web.crawler;
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ ludovic.apvrille AT enst.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+
+ /**
+ * Class ThreadSocket
+ * Socket in a thread ;-)
+ * Creation: 2015
+ * @version 2.0 25/03/2016
+ * @author Dan Huynh VO, Ludovic APVRILLE
+ * @see
+ */
+
+package web.crawler;
import java.awt.AWTException;
import java.net.Socket;
@@ -16,22 +57,17 @@ import javax.xml.transform.TransformerException;
-/**
- *
- * @author Dan Huynh VO
- */
-public class ThreadSocket extends Thread{
+public class ThreadSocket extends Thread {
Socket socket = null;
- Database_query database = null;
+ DatabaseQuery database = null;
/**
*
* @param socket
* @param database
*/
- public ThreadSocket(Socket socket,web.crawler.Database_query database){
-
+ public ThreadSocket(Socket socket, web.crawler.DatabaseQuery database){
this.socket = socket;
this.database=database;
}
diff --git a/src/web/crawler/WebCrawler.java b/src/web/crawler/WebCrawler.java
index 6ce364aeef911bc096206b374e2551a5e96e4d80..104d3570cae8b4ff54f017d41554cb99f4688b5c 100644
--- a/src/web/crawler/WebCrawler.java
+++ b/src/web/crawler/WebCrawler.java
@@ -37,7 +37,7 @@
/**
* Class WebCrawler
- * Management of Avatar block panels
+ * Implement of a webcrawler for CVEs
* Creation: 2015
* @version 2.0 24/03/2016
* @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
@@ -64,16 +64,13 @@ import java.nio.file.attribute.FileTime;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.concurrent.TimeUnit;
-import static web.crawler.File_management.ParsingXML;
+import static web.crawler.FileManagement.ParsingXML;
public class WebCrawler {
- /**
- *create the database
- */
- public static Database_creation database;
+ public DatabaseCreation database;
public static final int PORT = 8244;
@@ -104,7 +101,7 @@ public class WebCrawler {
if (database.ReferencesSqlFile.exists() & database.VulnerabilitesSqlFile.exists() & database.SoftwaresSqlFile.exists()) {
- Path FilePath = Paths.get(FileNames[0]);
+ Path FilePath = Paths.get(pathToFiles + FileNames[0]);
BasicFileAttributes view = Files.getFileAttributeView(FilePath, BasicFileAttributeView.class).readAttributes();
//FileTime time = view.creationTime();
FileTime time = view.lastModifiedTime();
@@ -169,7 +166,7 @@ public class WebCrawler {
}
public static void main(String args[]) throws ClassNotFoundException, InstantiationException, IllegalAccessException, SQLException, IOException, AWTException, Exception {
- WebCrawler wc = new WebCrawler("../localdb");
+ WebCrawler wc = new WebCrawler("../localdb/");
wc.start();
}
@@ -184,13 +181,13 @@ public class WebCrawler {
String thisyear = new SimpleDateFormat("yyyy").format(new Date());
String FileNames[] = {
- pathToFiles + "nvdcve-2.0-"+thisyear+".xml",
- pathToFiles + "nvdcve-2.0-"+(Integer.valueOf(thisyear)-1)+".xml",
- pathToFiles + "nvdcve-2.0-"+(Integer.valueOf(thisyear)-2)+".xml",
- pathToFiles + "nvdcve-2.0-"+(Integer.valueOf(thisyear)-3)+".xml",
+ "nvdcve-2.0-"+thisyear+".xml",
+ "nvdcve-2.0-"+(Integer.valueOf(thisyear)-1)+".xml",
+ "nvdcve-2.0-"+(Integer.valueOf(thisyear)-2)+".xml",
+ "nvdcve-2.0-"+(Integer.valueOf(thisyear)-3)+".xml",
};
//Database_creation database = new Database_creation();
- database = new Database_creation();
+ database = new DatabaseCreation();
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
/* Establish connection with server and create database */
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
@@ -203,7 +200,7 @@ public class WebCrawler {
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
/* Data Visualization */
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
- Data_visualisation datavisual = new Data_visualisation(database);
+ DataVisualisation datavisual = new DataVisualisation(database);
// datavisual.Histogram("linux");
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
@@ -211,7 +208,7 @@ public class WebCrawler {
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
/* Execute SQL queries to the Database */
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
- Database_query dbq= new Database_query(database);
+ DatabaseQuery dbq= new DatabaseQuery(database);
// dbq.MakeQueryOnTheDatabase();
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
@@ -219,7 +216,7 @@ public class WebCrawler {
/* Server's Protocol Initialization */
/* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
try {
- ServerSocket server = new ServerSocket(8244);
+ ServerSocket server = new ServerSocket(PORT);
TraceManager.addDev("Server has been created successfully");
while (true) { //Allow a client to connect