Revert "Ref #8 Changing directory structure"

This reverts commit f3f2d98.
IBM · Nov 9, 2024 · 32f8820 · 32f8820
1 parent 81485b4
commit 32f8820
Show file tree

Hide file tree

Showing 42 changed files with 16 additions and 18 deletions.
diff --git a/...-analyser/abstract_snapshot_collection.py → abstract_snapshot_collection.py b/...-analyser/abstract_snapshot_collection.py → abstract_snapshot_collection.py
diff --git a/...core-analyser/code_snapshot_collection.py → code_snapshot_collection.py b/...core-analyser/code_snapshot_collection.py → code_snapshot_collection.py
diff --git a/src/javacore-analyser/constants.py → constants.py b/src/javacore-analyser/constants.py → constants.py
@@ -35,5 +35,5 @@
 DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 
 # Web application constants
-DEFAULT_REPORTS_DIR = "../../reports"
+DEFAULT_REPORTS_DIR = "reports"
 DEFAULT_PORT = 5000
diff --git a/src/javacore-analyser/data/expand.js → data/expand.js b/src/javacore-analyser/data/expand.js → data/expand.js
diff --git a/src/javacore-analyser/data/jquery/chart.js → data/jquery/chart.js b/src/javacore-analyser/data/jquery/chart.js → data/jquery/chart.js
diff --git a/...ry/chartjs-adapter-date-fns.bundle.min.js → ...ry/chartjs-adapter-date-fns.bundle.min.js b/...ry/chartjs-adapter-date-fns.bundle.min.js → ...ry/chartjs-adapter-date-fns.bundle.min.js
diff --git a/src/javacore-analyser/data/jquery/jq.css → data/jquery/jq.css b/src/javacore-analyser/data/jquery/jq.css → data/jquery/jq.css
diff --git a/...e-analyser/data/jquery/jquery.mark.min.js → data/jquery/jquery.mark.min.js b/...e-analyser/data/jquery/jquery.mark.min.js → data/jquery/jquery.mark.min.js
diff --git a/...vacore-analyser/data/jquery/jquery.min.js → data/jquery/jquery.min.js b/...vacore-analyser/data/jquery/jquery.min.js → data/jquery/jquery.min.js
diff --git a/...ser/data/jquery/jquery.tablesorter.min.js → data/jquery/jquery.tablesorter.min.js b/...ser/data/jquery/jquery.tablesorter.min.js → data/jquery/jquery.tablesorter.min.js
diff --git a/.../jquery/jquery.tablesorter.widgets.min.js → .../jquery/jquery.tablesorter.widgets.min.js b/.../jquery/jquery.tablesorter.widgets.min.js → .../jquery/jquery.tablesorter.widgets.min.js
diff --git a/src/javacore-analyser/data/jquery/search.js → data/jquery/search.js b/src/javacore-analyser/data/jquery/search.js → data/jquery/search.js
diff --git a/src/javacore-analyser/data/jquery/sorting.js → data/jquery/sorting.js b/src/javacore-analyser/data/jquery/sorting.js → data/jquery/sorting.js
diff --git a/...acore-analyser/data/jquery/theme.blue.css → data/jquery/theme.blue.css b/...acore-analyser/data/jquery/theme.blue.css → data/jquery/theme.blue.css
diff --git a/...nalyser/data/jquery/theme.default.min.css → data/jquery/theme.default.min.css b/...nalyser/data/jquery/theme.default.min.css → data/jquery/theme.default.min.css
diff --git a/...core-analyser/data/jquery/wait2scripts.js → data/jquery/wait2scripts.js b/...core-analyser/data/jquery/wait2scripts.js → data/jquery/wait2scripts.js
diff --git a/src/javacore-analyser/data/style.css → data/style.css b/src/javacore-analyser/data/style.css → data/style.css
diff --git a/src/javacore-analyser/data/xml/index.xml → data/xml/index.xml b/src/javacore-analyser/data/xml/index.xml → data/xml/index.xml
diff --git a/...-analyser/data/xml/javacores/javacore.xml → data/xml/javacores/javacore.xml b/...-analyser/data/xml/javacores/javacore.xml → data/xml/javacores/javacore.xml
diff --git a/...-analyser/data/xml/javacores/javacore.xsl → data/xml/javacores/javacore.xsl b/...-analyser/data/xml/javacores/javacore.xsl → data/xml/javacores/javacore.xsl
diff --git a/src/javacore-analyser/data/xml/report.xsl → data/xml/report.xsl b/src/javacore-analyser/data/xml/report.xsl → data/xml/report.xsl
diff --git a/...core-analyser/data/xml/threads/thread.xml → data/xml/threads/thread.xml b/...core-analyser/data/xml/threads/thread.xml → data/xml/threads/thread.xml
diff --git a/...core-analyser/data/xml/threads/thread.xsl → data/xml/threads/thread.xsl b/...core-analyser/data/xml/threads/thread.xsl → data/xml/threads/thread.xsl
diff --git a/src/javacore-analyser/java_thread.py → java_thread.py b/src/javacore-analyser/java_thread.py → java_thread.py
diff --git a/src/javacore-analyser/javacore.py → javacore.py b/src/javacore-analyser/javacore.py → javacore.py
diff --git a/...avacore-analyser/javacore_analyser_web.py → javacore_analyser_web.py b/...avacore-analyser/javacore_analyser_web.py → javacore_analyser_web.py
diff --git a/src/javacore-analyser/javacore_analyzer.py → javacore_analyzer.py b/src/javacore-analyser/javacore_analyzer.py → javacore_analyzer.py
diff --git a/src/javacore-analyser/javacore_set.py → javacore_set.py b/src/javacore-analyser/javacore_set.py → javacore_set.py
@@ -14,7 +14,6 @@
 from pathlib import Path
 from xml.dom.minidom import parseString
 
-import importlib_resources
 from lxml import etree
 from lxml.etree import XMLSyntaxError
 
@@ -112,20 +111,15 @@ def generate_report_files(self, output_dir):
     def __create_output_files_structure(self, output_dir):
         if not os.path.isdir(output_dir):
             os.mkdir(output_dir)
-        data_output_dir = output_dir + '/data'
-        if os.path.isdir(data_output_dir):
-            shutil.rmtree(data_output_dir, ignore_errors=True)
-        logging.info("Data dir: " + data_output_dir)
-
-        # In pip package we have to access file by resource, not directly by filename
-        style_css_resource = importlib_resources.files("javacore-analyser") / "data" / "style.css"
-        data_dir = os.path.dirname(style_css_resource)
-        os.mkdir(data_output_dir)
-        shutil.copytree(data_dir, data_output_dir, dirs_exist_ok=True)
+        data_dir = output_dir + '/data'
+        if os.path.isdir(data_dir):
+            shutil.rmtree(data_dir, ignore_errors=True)
+        logging.info("Data dir: " + data_dir)
+        shutil.copytree("data", data_dir, dirs_exist_ok=True)
 
     def __generate_htmls_for_threads(self, output_dir, temp_dir_name):
         self.create_xml_xsl_for_collection(temp_dir_name + "/threads",
-                                           output_dir + "/data/xml/threads/thread",
+                                           "data/xml/threads/thread",
                                            self.threads,
                                            "thread")
         self.generate_htmls_from_xmls_xsls(self.report_xml_file,
@@ -134,7 +128,7 @@ def __generate_htmls_for_threads(self, output_dir, temp_dir_name):
 
     def __generate_htmls_for_javacores(self, output_dir, temp_dir_name):
         self.create_xml_xsl_for_collection(temp_dir_name + "/javacores",
-                                           output_dir + "/data/xml/javacores/javacore",
+                                           "data/xml/javacores/javacore",
                                            self.javacores,
                                            "")
         self.generate_htmls_from_xmls_xsls(self.report_xml_file,
@@ -463,8 +457,8 @@ def get_javacore_set_in_xml(self):
     def __create_index_html(input_dir, output_dir):
 
         # Copy index.xml and report.xsl to temp - for index.html we don't need to generate anything. Copying is enough.
-        shutil.copy2(output_dir + "/data/xml/index.xml", input_dir)
-        shutil.copy2(output_dir + "/data/xml/report.xsl", input_dir)
+        shutil.copy2("data/xml/index.xml", input_dir)
+        shutil.copy2("data/xml/report.xsl", input_dir)
 
         xslt_doc = etree.parse(input_dir + "/report.xsl")
         xslt_transformer = etree.XSLT(xslt_doc)

diff --git a/src/javacore-analyser/logging_utils.py → logging_utils.py b/src/javacore-analyser/logging_utils.py → logging_utils.py
diff --git a/src/javacore-analyser/snapshot_collection.py → snapshot_collection.py b/src/javacore-analyser/snapshot_collection.py → snapshot_collection.py
diff --git a/...nalyser/snapshot_collection_collection.py → snapshot_collection_collection.py b/...nalyser/snapshot_collection_collection.py → snapshot_collection_collection.py
diff --git a/src/javacore-analyser/__init__.py b/src/javacore-analyser/__init__.py
diff --git a/src/javacore-analyser/stack_trace.py → stack_trace.py b/src/javacore-analyser/stack_trace.py → stack_trace.py
diff --git a/src/javacore-analyser/stack_trace_element.py → stack_trace_element.py b/src/javacore-analyser/stack_trace_element.py → stack_trace_element.py
diff --git a/src/javacore-analyser/stack_trace_kind.py → stack_trace_kind.py b/src/javacore-analyser/stack_trace_kind.py → stack_trace_kind.py
diff --git a/src/javacore-analyser/templates/index.html → templates/index.html b/src/javacore-analyser/templates/index.html → templates/index.html
diff --git a/test/__init__.py b/test/__init__.py
@@ -0,0 +1,4 @@
+#
+# Copyright IBM Corp. 2024 - 2024
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/test/test_code_snapshot_collection.py b/test/test_code_snapshot_collection.py
@@ -5,8 +5,8 @@
 
 import unittest
 
+from code_snapshot_collection import CodeSnapshotCollection
 from java_thread import Thread
-from javacore_analyser.code_snapshot_collection import CodeSnapshotCollection
 from thread_snapshot import ThreadSnapshot
 
 

diff --git a/test/test_javacore_analyzer.py b/test/test_javacore_analyzer.py
@@ -63,7 +63,7 @@ def test_api(self):
 
         test_failed = False
         try:
-            javacore_analyzer.process_javacores_and_generate_report_data([], "tmp")
+            javacore_analyzer.process_javacores_and_generate_report_data([],"tmp")
         except RuntimeError:
             test_failed = True
         self.assertTrue(test_failed, "API on missing javacores should fail but finished successfully")

diff --git a/src/javacore-analyser/thread_snapshot.py → thread_snapshot.py b/src/javacore-analyser/thread_snapshot.py → thread_snapshot.py
diff --git a/src/javacore-analyser/tips.py → tips.py b/src/javacore-analyser/tips.py → tips.py
diff --git a/src/javacore-analyser/verbose_gc.py → verbose_gc.py b/src/javacore-analyser/verbose_gc.py → verbose_gc.py