diff --git a/spiff_example/serializer/sqlite/__init__.py b/app/serializer/__init__.py similarity index 61% rename from spiff_example/serializer/sqlite/__init__.py rename to app/serializer/__init__.py index 7182872..e579451 100644 --- a/spiff_example/serializer/sqlite/__init__.py +++ b/app/serializer/__init__.py @@ -1,4 +1,5 @@ -from .serializer import ( +from .json_file import FileSerializer +from .sqlite_db import ( SqliteSerializer, WorkflowConverter, SubworkflowConverter, diff --git a/spiff_example/serializer/file/serializer.py b/app/serializer/json_file.py similarity index 100% rename from spiff_example/serializer/file/serializer.py rename to app/serializer/json_file.py diff --git a/spiff_example/serializer/sqlite/schema-sqlite.sql b/app/serializer/schema-sqlite.sql similarity index 100% rename from spiff_example/serializer/sqlite/schema-sqlite.sql rename to app/serializer/schema-sqlite.sql diff --git a/spiff_example/serializer/sqlite/serializer.py b/app/serializer/sqlite_db.py similarity index 100% rename from spiff_example/serializer/sqlite/serializer.py rename to app/serializer/sqlite_db.py diff --git a/spiff_example/camunda/default.py b/spiff_example/camunda/default.py index a25488a..d2c0cf7 100644 --- a/spiff_example/camunda/default.py +++ b/spiff_example/camunda/default.py @@ -9,7 +9,7 @@ from SpiffWorkflow.bpmn.util.subworkflow import BpmnSubWorkflow from SpiffWorkflow.bpmn.specs import BpmnProcessSpec -from ..serializer.sqlite import ( +from app.serializer import ( SqliteSerializer, WorkflowConverter, SubworkflowConverter, diff --git a/spiff_example/misc/custom_start_event.py b/spiff_example/misc/custom_start_event.py index 1644d7e..a8e1034 100644 --- a/spiff_example/misc/custom_start_event.py +++ b/spiff_example/misc/custom_start_event.py @@ -18,7 +18,7 @@ from SpiffWorkflow.bpmn.serializer.default import EventConverter from SpiffWorkflow.spiff.serializer.task_spec import SpiffBpmnTaskConverter -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/misc/event_handler.py b/spiff_example/misc/event_handler.py index 4974a18..73727a4 100644 --- a/spiff_example/misc/event_handler.py +++ b/spiff_example/misc/event_handler.py @@ -12,7 +12,7 @@ from SpiffWorkflow.bpmn.exceptions import WorkflowTaskException from SpiffWorkflow.bpmn import BpmnEvent -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine, Instance from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/misc/restricted.py b/spiff_example/misc/restricted.py index f118c2d..92ed8e6 100644 --- a/spiff_example/misc/restricted.py +++ b/spiff_example/misc/restricted.py @@ -8,7 +8,7 @@ from SpiffWorkflow.bpmn.specs.mixins.none_task import NoneTask from SpiffWorkflow.bpmn.script_engine import TaskDataEnvironment -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/misc/threaded_service_task.py b/spiff_example/misc/threaded_service_task.py index 72857fa..3996061 100644 --- a/spiff_example/misc/threaded_service_task.py +++ b/spiff_example/misc/threaded_service_task.py @@ -13,7 +13,7 @@ from SpiffWorkflow.bpmn.parser.util import full_tag from SpiffWorkflow.bpmn.exceptions import WorkflowTaskException -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine, Instance from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/serializer/__init__.py b/spiff_example/serializer/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/spiff_example/serializer/file/__init__.py b/spiff_example/serializer/file/__init__.py deleted file mode 100644 index 0dfef43..0000000 --- a/spiff_example/serializer/file/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .serializer import FileSerializer diff --git a/spiff_example/spiff/custom_exec.py b/spiff_example/spiff/custom_exec.py index a95b628..29a7da6 100644 --- a/spiff_example/spiff/custom_exec.py +++ b/spiff_example/spiff/custom_exec.py @@ -9,7 +9,7 @@ from SpiffWorkflow.bpmn.script_engine.python_environment import BasePythonScriptEngineEnvironment from SpiffWorkflow.util.deep_merge import DeepMerge -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/spiff/custom_object.py b/spiff_example/spiff/custom_object.py index 0060e60..5861ae9 100644 --- a/spiff_example/spiff/custom_object.py +++ b/spiff_example/spiff/custom_object.py @@ -8,7 +8,7 @@ from SpiffWorkflow.bpmn.specs.mixins.none_task import NoneTask from SpiffWorkflow.bpmn.script_engine import TaskDataEnvironment -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/spiff/diffs.py b/spiff_example/spiff/diffs.py index 3cb266a..9c81e7b 100644 --- a/spiff_example/spiff/diffs.py +++ b/spiff_example/spiff/diffs.py @@ -10,7 +10,7 @@ from SpiffWorkflow.bpmn.specs.mixins.none_task import NoneTask from SpiffWorkflow.bpmn.script_engine import TaskDataEnvironment -from ..serializer.sqlite import ( +from app.serializer import ( SqliteSerializer, WorkflowConverter, SubworkflowConverter, diff --git a/spiff_example/spiff/file.py b/spiff_example/spiff/file.py index d481c49..3149559 100644 --- a/spiff_example/spiff/file.py +++ b/spiff_example/spiff/file.py @@ -7,7 +7,7 @@ from SpiffWorkflow.bpmn.specs.mixins.none_task import NoneTask from SpiffWorkflow.bpmn.script_engine import TaskDataEnvironment -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/spiff/service_task.py b/spiff_example/spiff/service_task.py index 357f013..17885a5 100644 --- a/spiff_example/spiff/service_task.py +++ b/spiff_example/spiff/service_task.py @@ -8,7 +8,7 @@ from SpiffWorkflow.bpmn.specs.mixins.none_task import NoneTask from SpiffWorkflow.bpmn.script_engine import TaskDataEnvironment -from ..serializer.file import FileSerializer +from app.serializer import FileSerializer from ..engine import BpmnEngine from .curses_handlers import UserTaskHandler, ManualTaskHandler diff --git a/spiff_example/spiff/sqlite.py b/spiff_example/spiff/sqlite.py index 4eab9ac..d666b27 100644 --- a/spiff_example/spiff/sqlite.py +++ b/spiff_example/spiff/sqlite.py @@ -11,7 +11,7 @@ from SpiffWorkflow.bpmn.specs.mixins import NoneTaskMixin as NoneTask from SpiffWorkflow.bpmn.script_engine import TaskDataEnvironment -from ..serializer.sqlite import ( +from app.serializer import ( SqliteSerializer, WorkflowConverter, SubworkflowConverter,