From e5db02c08f251de82517b3a6133a303ce4375425 Mon Sep 17 00:00:00 2001 From: lasanthaS Date: Wed, 19 Jun 2019 00:57:27 +0530 Subject: [PATCH] Remove version from component names --- {PySiddhi5 => PySiddhi}/DataTypes/DataWrapper.py | 6 +++--- {PySiddhi5 => PySiddhi}/DataTypes/DoubleType.py | 0 {PySiddhi5 => PySiddhi}/DataTypes/LongType.py | 0 {PySiddhi5 => PySiddhi}/DataTypes/__init__.py | 0 {PySiddhi5 => PySiddhi}/SiddhiLoader.py | 4 ++-- {PySiddhi5 => PySiddhi}/__init__.py | 0 {PySiddhi5 => PySiddhi}/core/SiddhiAppRuntime.py | 10 +++++----- {PySiddhi5 => PySiddhi}/core/SiddhiManager.py | 6 +++--- {PySiddhi5 => PySiddhi}/core/__init__.py | 0 .../core/debugger/SiddhiDebugger.py | 6 +++--- .../core/debugger/SiddhiDebuggerCallback.py | 2 +- {PySiddhi5 => PySiddhi}/core/debugger/__init__.py | 0 {PySiddhi5 => PySiddhi}/core/event/ComplexEvent.py | 4 ++-- {PySiddhi5 => PySiddhi}/core/event/Event.py | 6 +++--- {PySiddhi5 => PySiddhi}/core/event/__init__.py | 0 {PySiddhi5 => PySiddhi}/core/query/__init__.py | 0 .../core/query/output/__init__.py | 0 .../core/query/output/callback/QueryCallback.py | 4 ++-- .../core/query/output/callback/__init__.py | 0 {PySiddhi5 => PySiddhi}/core/stream/__init__.py | 0 .../core/stream/input/InputHandler.py | 4 ++-- .../core/stream/input/__init__.py | 0 .../core/stream/output/StreamCallback.py | 4 ++-- .../core/stream/output/__init__.py | 0 {PySiddhi5 => PySiddhi}/core/util/EventPrinter.py | 2 +- {PySiddhi5 => PySiddhi}/core/util/__init__.py | 0 {PySiddhi5 => PySiddhi}/log4j.xml | 0 .../sp/EventSimulator/AttributeConfiguration.py | 6 +++--- .../sp/EventSimulator/EventSimulatorClient.py | 4 ++-- .../EventSimulator/FeedSimulationConfiguration.py | 8 ++++---- .../sp/EventSimulator/SimulationProperties.py | 6 +++--- .../sp/EventSimulator/SimulationSource.py | 6 +++--- .../SingleSimulationConfiguration.py | 4 ++-- .../sp/EventSimulator/__init__.py | 0 .../sp/ObjectMapping/APIObject.py | 2 +- .../sp/ObjectMapping/FieldMapping.py | 4 ++-- .../sp/ObjectMapping/__init__.py | 0 {PySiddhi5 => PySiddhi}/sp/SPClient.py | 4 ++-- .../SiddhiAppManagementClient.py | 2 +- .../sp/SiddhiAppManagement/__init__.py | 0 .../sp/__Communication/RestClient.py | 0 .../sp/__Communication/__init__.py | 0 {PySiddhi5 => PySiddhi}/sp/__Util.py | 0 {PySiddhi5 => PySiddhi}/sp/__init__.py | 0 Tests/SPTests/EventSimulatorTests.py | 10 +++++----- Tests/SPTests/SiddhiAppManagerTests.py | 4 ++-- Tests/SiddhiCoreTests/BasicTest.py | 8 ++++---- Tests/SiddhiCoreTests/EventTest.py | 4 ++-- Tests/SiddhiCoreTests/ExtensionsTest.py | 10 +++++----- .../Resources/{Extensions5 => Extensions}/pom.xml | 2 +- Tests/SiddhiCoreTests/TestDebugger.py | 8 ++++---- Tests/SiddhiCoreTests/TestOutputStream.py | 4 ++-- {__PySiddhi5Proxy => __PySiddhiProxy}/pom.xml | 7 +++---- .../java/io/siddhi/pythonapi/DataWrapProxy.java | 0 .../pythonapi/proxy/core/SiddhiAPICoreProxy.java | 0 .../siddhi_debugger/QueryTerminalProxy.java | 0 .../SiddhiDebuggerCallbackProxy.java | 0 .../event_polling/EventQueue.java | 0 .../event_polling/QueuedEvent.java | 0 .../event/complex_event/ComplexEventProxy.java | 0 .../proxy/core/event/complex_event/TypeProxy.java | 0 .../proxy/core/event/event/EventProxy.java | 0 .../query_callback/QueryCallbackProxy.java | 0 .../query_callback/ReceiveCallbackProxy.java | 0 .../input/input_handler/InputHandlerProxy.java | 0 .../stream_callback/ReceiveCallbackProxy.java | 0 .../stream_callback/StreamCallbackProxy.java | 0 .../proxy/core/util/EventPrinterProxy.java | 0 .../io/siddhi/pythonapi/threadfix/PyThreadFix.java | 0 .../pythonapi/threadfix/PyThreadFixCaller.java | 0 .../java/org/jnius/NativeInvocationHandler.java | 0 .../src/main/resources/log4j.xml | 0 .../threadfix_c_code/README.MD | 0 .../threadfix_c_code/build.sh | 0 .../io_siddhi_pythonapi_threadfix_PyThreadFix.c | 0 .../io_siddhi_pythonapi_threadfix_PyThreadFix.h | 0 .../threadfix_c_code/makefile | 0 setup.py | 14 +++++++------- 78 files changed, 87 insertions(+), 88 deletions(-) rename {PySiddhi5 => PySiddhi}/DataTypes/DataWrapper.py (96%) rename {PySiddhi5 => PySiddhi}/DataTypes/DoubleType.py (100%) rename {PySiddhi5 => PySiddhi}/DataTypes/LongType.py (100%) rename {PySiddhi5 => PySiddhi}/DataTypes/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/SiddhiLoader.py (97%) rename {PySiddhi5 => PySiddhi}/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/SiddhiAppRuntime.py (93%) rename {PySiddhi5 => PySiddhi}/core/SiddhiManager.py (95%) rename {PySiddhi5 => PySiddhi}/core/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/debugger/SiddhiDebugger.py (98%) rename {PySiddhi5 => PySiddhi}/core/debugger/SiddhiDebuggerCallback.py (98%) rename {PySiddhi5 => PySiddhi}/core/debugger/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/event/ComplexEvent.py (97%) rename {PySiddhi5 => PySiddhi}/core/event/Event.py (97%) rename {PySiddhi5 => PySiddhi}/core/event/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/query/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/query/output/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/query/output/callback/QueryCallback.py (97%) rename {PySiddhi5 => PySiddhi}/core/query/output/callback/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/stream/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/stream/input/InputHandler.py (95%) rename {PySiddhi5 => PySiddhi}/core/stream/input/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/stream/output/StreamCallback.py (96%) rename {PySiddhi5 => PySiddhi}/core/stream/output/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/core/util/EventPrinter.py (97%) rename {PySiddhi5 => PySiddhi}/core/util/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/log4j.xml (100%) rename {PySiddhi5 => PySiddhi}/sp/EventSimulator/AttributeConfiguration.py (94%) rename {PySiddhi5 => PySiddhi}/sp/EventSimulator/EventSimulatorClient.py (98%) rename {PySiddhi5 => PySiddhi}/sp/EventSimulator/FeedSimulationConfiguration.py (86%) rename {PySiddhi5 => PySiddhi}/sp/EventSimulator/SimulationProperties.py (92%) rename {PySiddhi5 => PySiddhi}/sp/EventSimulator/SimulationSource.py (94%) rename {PySiddhi5 => PySiddhi}/sp/EventSimulator/SingleSimulationConfiguration.py (90%) rename {PySiddhi5 => PySiddhi}/sp/EventSimulator/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/sp/ObjectMapping/APIObject.py (98%) rename {PySiddhi5 => PySiddhi}/sp/ObjectMapping/FieldMapping.py (96%) rename {PySiddhi5 => PySiddhi}/sp/ObjectMapping/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/sp/SPClient.py (88%) rename {PySiddhi5 => PySiddhi}/sp/SiddhiAppManagement/SiddhiAppManagementClient.py (98%) rename {PySiddhi5 => PySiddhi}/sp/SiddhiAppManagement/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/sp/__Communication/RestClient.py (100%) rename {PySiddhi5 => PySiddhi}/sp/__Communication/__init__.py (100%) rename {PySiddhi5 => PySiddhi}/sp/__Util.py (100%) rename {PySiddhi5 => PySiddhi}/sp/__init__.py (100%) rename Tests/SiddhiCoreTests/Resources/{Extensions5 => Extensions}/pom.xml (99%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/pom.xml (98%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/DataWrapProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/SiddhiAPICoreProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger/QueryTerminalProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/SiddhiDebuggerCallbackProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/EventQueue.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/QueuedEvent.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/ComplexEventProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/TypeProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/event/event/EventProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/QueryCallbackProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/ReceiveCallbackProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/stream/input/input_handler/InputHandlerProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/ReceiveCallbackProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/StreamCallbackProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/proxy/core/util/EventPrinterProxy.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFix.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFixCaller.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/java/org/jnius/NativeInvocationHandler.java (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/src/main/resources/log4j.xml (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/threadfix_c_code/README.MD (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/threadfix_c_code/build.sh (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.c (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.h (100%) rename {__PySiddhi5Proxy => __PySiddhiProxy}/threadfix_c_code/makefile (100%) diff --git a/PySiddhi5/DataTypes/DataWrapper.py b/PySiddhi/DataTypes/DataWrapper.py similarity index 96% rename from PySiddhi5/DataTypes/DataWrapper.py rename to PySiddhi/DataTypes/DataWrapper.py index b023f00..ce48496 100644 --- a/PySiddhi5/DataTypes/DataWrapper.py +++ b/PySiddhi/DataTypes/DataWrapper.py @@ -15,9 +15,9 @@ # under the License. -from PySiddhi5 import SiddhiLoader -from PySiddhi5.DataTypes.DoubleType import DoubleType -from PySiddhi5.DataTypes.LongType import LongType +from PySiddhi import SiddhiLoader +from PySiddhi.DataTypes.DoubleType import DoubleType +from PySiddhi.DataTypes.LongType import LongType ''' Data Wrapping is used because python 3 doesn't distinctly support long and double data types diff --git a/PySiddhi5/DataTypes/DoubleType.py b/PySiddhi/DataTypes/DoubleType.py similarity index 100% rename from PySiddhi5/DataTypes/DoubleType.py rename to PySiddhi/DataTypes/DoubleType.py diff --git a/PySiddhi5/DataTypes/LongType.py b/PySiddhi/DataTypes/LongType.py similarity index 100% rename from PySiddhi5/DataTypes/LongType.py rename to PySiddhi/DataTypes/LongType.py diff --git a/PySiddhi5/DataTypes/__init__.py b/PySiddhi/DataTypes/__init__.py similarity index 100% rename from PySiddhi5/DataTypes/__init__.py rename to PySiddhi/DataTypes/__init__.py diff --git a/PySiddhi5/SiddhiLoader.py b/PySiddhi/SiddhiLoader.py similarity index 97% rename from PySiddhi5/SiddhiLoader.py rename to PySiddhi/SiddhiLoader.py index 4181cf9..e9e6c41 100644 --- a/PySiddhi5/SiddhiLoader.py +++ b/PySiddhi/SiddhiLoader.py @@ -19,7 +19,7 @@ import sys -import PySiddhi5 +import PySiddhi # Instantiate Global Variables siddhi_api_core = None @@ -91,7 +91,7 @@ def loadLibrary(): # at initialization of pyjnius jnius_config.add_options('-Xss1280k') - jnius_config.add_options('-Djava.library.path=' + PySiddhi5.root_path + "/__PySiddhi5Proxy") + jnius_config.add_options('-Djava.library.path=' + PySiddhi.root_path + "/__PySiddhiProxy") # Determine library class path class_paths = ['.', os.path.join(siddhi_home, 'lib', '*')] diff --git a/PySiddhi5/__init__.py b/PySiddhi/__init__.py similarity index 100% rename from PySiddhi5/__init__.py rename to PySiddhi/__init__.py diff --git a/PySiddhi5/core/SiddhiAppRuntime.py b/PySiddhi/core/SiddhiAppRuntime.py similarity index 93% rename from PySiddhi5/core/SiddhiAppRuntime.py rename to PySiddhi/core/SiddhiAppRuntime.py index e6b19d9..6cc8a25 100644 --- a/PySiddhi5/core/SiddhiAppRuntime.py +++ b/PySiddhi/core/SiddhiAppRuntime.py @@ -14,11 +14,11 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5 import SiddhiLoader -from PySiddhi5.core.debugger.SiddhiDebugger import SiddhiDebugger -from PySiddhi5.core.query.output.callback.QueryCallback import QueryCallback -from PySiddhi5.core.stream.input.InputHandler import InputHandler -from PySiddhi5.core.stream.output.StreamCallback import StreamCallback +from PySiddhi import SiddhiLoader +from PySiddhi.core.debugger.SiddhiDebugger import SiddhiDebugger +from PySiddhi.core.query.output.callback.QueryCallback import QueryCallback +from PySiddhi.core.stream.input.InputHandler import InputHandler +from PySiddhi.core.stream.output.StreamCallback import StreamCallback class SiddhiAppRuntime(object): diff --git a/PySiddhi5/core/SiddhiManager.py b/PySiddhi/core/SiddhiManager.py similarity index 95% rename from PySiddhi5/core/SiddhiManager.py rename to PySiddhi/core/SiddhiManager.py index 69770cb..551f7a0 100644 --- a/PySiddhi5/core/SiddhiManager.py +++ b/PySiddhi/core/SiddhiManager.py @@ -14,9 +14,9 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5 import SiddhiLoader -from PySiddhi5.DataTypes import DataWrapper -from PySiddhi5.core.SiddhiAppRuntime import SiddhiAppRuntime +from PySiddhi import SiddhiLoader +from PySiddhi.DataTypes import DataWrapper +from PySiddhi.core.SiddhiAppRuntime import SiddhiAppRuntime class SiddhiManager(object): diff --git a/PySiddhi5/core/__init__.py b/PySiddhi/core/__init__.py similarity index 100% rename from PySiddhi5/core/__init__.py rename to PySiddhi/core/__init__.py diff --git a/PySiddhi5/core/debugger/SiddhiDebugger.py b/PySiddhi/core/debugger/SiddhiDebugger.py similarity index 98% rename from PySiddhi5/core/debugger/SiddhiDebugger.py rename to PySiddhi/core/debugger/SiddhiDebugger.py index d5cccf6..e2f7c83 100644 --- a/PySiddhi5/core/debugger/SiddhiDebugger.py +++ b/PySiddhi/core/debugger/SiddhiDebugger.py @@ -17,10 +17,10 @@ import threading from time import sleep -from PySiddhi5 import SiddhiLoader -from PySiddhi5.DataTypes.DataWrapper import unwrapHashMap +from PySiddhi import SiddhiLoader +from PySiddhi.DataTypes.DataWrapper import unwrapHashMap from enum import Enum -from PySiddhi5.core.event.ComplexEvent import ComplexEvent +from PySiddhi.core.event.ComplexEvent import ComplexEvent class SiddhiDebugger(object): diff --git a/PySiddhi5/core/debugger/SiddhiDebuggerCallback.py b/PySiddhi/core/debugger/SiddhiDebuggerCallback.py similarity index 98% rename from PySiddhi5/core/debugger/SiddhiDebuggerCallback.py rename to PySiddhi/core/debugger/SiddhiDebuggerCallback.py index 07edade..c22c960 100644 --- a/PySiddhi5/core/debugger/SiddhiDebuggerCallback.py +++ b/PySiddhi/core/debugger/SiddhiDebuggerCallback.py @@ -17,7 +17,7 @@ from abc import ABCMeta, abstractmethod from future.utils import with_metaclass -from PySiddhi5 import SiddhiLoader +from PySiddhi import SiddhiLoader _siddhi_debugger_callback_proxy = SiddhiLoader._loadType( "io.siddhi.pythonapi.proxy.core.debugger.siddhi_debugger_callback.SiddhiDebuggerCallbackProxy") diff --git a/PySiddhi5/core/debugger/__init__.py b/PySiddhi/core/debugger/__init__.py similarity index 100% rename from PySiddhi5/core/debugger/__init__.py rename to PySiddhi/core/debugger/__init__.py diff --git a/PySiddhi5/core/event/ComplexEvent.py b/PySiddhi/core/event/ComplexEvent.py similarity index 97% rename from PySiddhi5/core/event/ComplexEvent.py rename to PySiddhi/core/event/ComplexEvent.py index 8076ab6..97dbcb4 100644 --- a/PySiddhi5/core/event/ComplexEvent.py +++ b/PySiddhi/core/event/ComplexEvent.py @@ -16,8 +16,8 @@ from enum import Enum -from PySiddhi5 import SiddhiLoader -from PySiddhi5.DataTypes.DataWrapper import unwrapData, wrapData +from PySiddhi import SiddhiLoader +from PySiddhi.DataTypes.DataWrapper import unwrapData, wrapData class ComplexEvent(object): diff --git a/PySiddhi5/core/event/Event.py b/PySiddhi/core/event/Event.py similarity index 97% rename from PySiddhi5/core/event/Event.py rename to PySiddhi/core/event/Event.py index 1962d2b..2dc3e4a 100644 --- a/PySiddhi5/core/event/Event.py +++ b/PySiddhi/core/event/Event.py @@ -14,10 +14,10 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5 import SiddhiLoader +from PySiddhi import SiddhiLoader -from PySiddhi5.DataTypes import DataWrapper -from PySiddhi5.core.event import ComplexEvent +from PySiddhi.DataTypes import DataWrapper +from PySiddhi.core.event import ComplexEvent _event_class = SiddhiLoader._loadType("io.siddhi.core.event.Event") _event_proxy_class = SiddhiLoader._loadType("io.siddhi.pythonapi.proxy.core.event.event.EventProxy") diff --git a/PySiddhi5/core/event/__init__.py b/PySiddhi/core/event/__init__.py similarity index 100% rename from PySiddhi5/core/event/__init__.py rename to PySiddhi/core/event/__init__.py diff --git a/PySiddhi5/core/query/__init__.py b/PySiddhi/core/query/__init__.py similarity index 100% rename from PySiddhi5/core/query/__init__.py rename to PySiddhi/core/query/__init__.py diff --git a/PySiddhi5/core/query/output/__init__.py b/PySiddhi/core/query/output/__init__.py similarity index 100% rename from PySiddhi5/core/query/output/__init__.py rename to PySiddhi/core/query/output/__init__.py diff --git a/PySiddhi5/core/query/output/callback/QueryCallback.py b/PySiddhi/core/query/output/callback/QueryCallback.py similarity index 97% rename from PySiddhi5/core/query/output/callback/QueryCallback.py rename to PySiddhi/core/query/output/callback/QueryCallback.py index 071e25f..26fa974 100644 --- a/PySiddhi5/core/query/output/callback/QueryCallback.py +++ b/PySiddhi/core/query/output/callback/QueryCallback.py @@ -18,8 +18,8 @@ from abc import ABCMeta, abstractmethod -from PySiddhi5 import SiddhiLoader -from PySiddhi5.core.event.Event import Event +from PySiddhi import SiddhiLoader +from PySiddhi.core.event.Event import Event from future.utils import with_metaclass diff --git a/PySiddhi5/core/query/output/callback/__init__.py b/PySiddhi/core/query/output/callback/__init__.py similarity index 100% rename from PySiddhi5/core/query/output/callback/__init__.py rename to PySiddhi/core/query/output/callback/__init__.py diff --git a/PySiddhi5/core/stream/__init__.py b/PySiddhi/core/stream/__init__.py similarity index 100% rename from PySiddhi5/core/stream/__init__.py rename to PySiddhi/core/stream/__init__.py diff --git a/PySiddhi5/core/stream/input/InputHandler.py b/PySiddhi/core/stream/input/InputHandler.py similarity index 95% rename from PySiddhi5/core/stream/input/InputHandler.py rename to PySiddhi/core/stream/input/InputHandler.py index 367fccc..716215b 100644 --- a/PySiddhi5/core/stream/input/InputHandler.py +++ b/PySiddhi/core/stream/input/InputHandler.py @@ -14,8 +14,8 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5 import SiddhiLoader -from PySiddhi5.DataTypes.DataWrapper import wrapData +from PySiddhi import SiddhiLoader +from PySiddhi.DataTypes.DataWrapper import wrapData input_handler_proxy = SiddhiLoader._loadType( "io.siddhi.pythonapi.proxy.core.stream.input.input_handler.InputHandlerProxy") diff --git a/PySiddhi5/core/stream/input/__init__.py b/PySiddhi/core/stream/input/__init__.py similarity index 100% rename from PySiddhi5/core/stream/input/__init__.py rename to PySiddhi/core/stream/input/__init__.py diff --git a/PySiddhi5/core/stream/output/StreamCallback.py b/PySiddhi/core/stream/output/StreamCallback.py similarity index 96% rename from PySiddhi5/core/stream/output/StreamCallback.py rename to PySiddhi/core/stream/output/StreamCallback.py index 2b4064d..ac01536 100644 --- a/PySiddhi5/core/stream/output/StreamCallback.py +++ b/PySiddhi/core/stream/output/StreamCallback.py @@ -20,8 +20,8 @@ from abc import ABCMeta, abstractmethod -from PySiddhi5 import SiddhiLoader -from PySiddhi5.core.event.Event import Event +from PySiddhi import SiddhiLoader +from PySiddhi.core.event.Event import Event from future.utils import with_metaclass diff --git a/PySiddhi5/core/stream/output/__init__.py b/PySiddhi/core/stream/output/__init__.py similarity index 100% rename from PySiddhi5/core/stream/output/__init__.py rename to PySiddhi/core/stream/output/__init__.py diff --git a/PySiddhi5/core/util/EventPrinter.py b/PySiddhi/core/util/EventPrinter.py similarity index 97% rename from PySiddhi5/core/util/EventPrinter.py rename to PySiddhi/core/util/EventPrinter.py index 5b271cb..b5e482e 100644 --- a/PySiddhi5/core/util/EventPrinter.py +++ b/PySiddhi/core/util/EventPrinter.py @@ -14,7 +14,7 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5 import SiddhiLoader +from PySiddhi import SiddhiLoader _event_printer_proxy = SiddhiLoader._loadType("io.siddhi.pythonapi.proxy.core.util.EventPrinterProxy") diff --git a/PySiddhi5/core/util/__init__.py b/PySiddhi/core/util/__init__.py similarity index 100% rename from PySiddhi5/core/util/__init__.py rename to PySiddhi/core/util/__init__.py diff --git a/PySiddhi5/log4j.xml b/PySiddhi/log4j.xml similarity index 100% rename from PySiddhi5/log4j.xml rename to PySiddhi/log4j.xml diff --git a/PySiddhi5/sp/EventSimulator/AttributeConfiguration.py b/PySiddhi/sp/EventSimulator/AttributeConfiguration.py similarity index 94% rename from PySiddhi5/sp/EventSimulator/AttributeConfiguration.py rename to PySiddhi/sp/EventSimulator/AttributeConfiguration.py index 1aaeac3..569be19 100644 --- a/PySiddhi5/sp/EventSimulator/AttributeConfiguration.py +++ b/PySiddhi/sp/EventSimulator/AttributeConfiguration.py @@ -16,9 +16,9 @@ from enum import Enum -from PySiddhi5.sp.ObjectMapping.APIObject import APIObject, NotSet -from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping -from PySiddhi5.sp.__Util import decodeField, decodeObject +from PySiddhi.sp.ObjectMapping.APIObject import APIObject, NotSet +from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping +from PySiddhi.sp.__Util import decodeField, decodeObject class AttributeConfiguration(APIObject): diff --git a/PySiddhi5/sp/EventSimulator/EventSimulatorClient.py b/PySiddhi/sp/EventSimulator/EventSimulatorClient.py similarity index 98% rename from PySiddhi5/sp/EventSimulator/EventSimulatorClient.py rename to PySiddhi/sp/EventSimulator/EventSimulatorClient.py index d52c67f..82afe8a 100644 --- a/PySiddhi5/sp/EventSimulator/EventSimulatorClient.py +++ b/PySiddhi/sp/EventSimulator/EventSimulatorClient.py @@ -17,8 +17,8 @@ import json import logging -from PySiddhi5.sp.__Communication.RestClient import RestClient -from PySiddhi5.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration +from PySiddhi.sp.__Communication.RestClient import RestClient +from PySiddhi.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration from requests.auth import HTTPBasicAuth diff --git a/PySiddhi5/sp/EventSimulator/FeedSimulationConfiguration.py b/PySiddhi/sp/EventSimulator/FeedSimulationConfiguration.py similarity index 86% rename from PySiddhi5/sp/EventSimulator/FeedSimulationConfiguration.py rename to PySiddhi/sp/EventSimulator/FeedSimulationConfiguration.py index a11073c..a9a2715 100644 --- a/PySiddhi5/sp/EventSimulator/FeedSimulationConfiguration.py +++ b/PySiddhi/sp/EventSimulator/FeedSimulationConfiguration.py @@ -14,10 +14,10 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5.sp.EventSimulator.SimulationProperties import SimulationProperties -from PySiddhi5.sp.EventSimulator.SimulationSource import SimulationSource -from PySiddhi5.sp.ObjectMapping.APIObject import APIObject -from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping +from PySiddhi.sp.EventSimulator.SimulationProperties import SimulationProperties +from PySiddhi.sp.EventSimulator.SimulationSource import SimulationSource +from PySiddhi.sp.ObjectMapping.APIObject import APIObject +from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping class FeedSimulationConfiguration(APIObject): diff --git a/PySiddhi5/sp/EventSimulator/SimulationProperties.py b/PySiddhi/sp/EventSimulator/SimulationProperties.py similarity index 92% rename from PySiddhi5/sp/EventSimulator/SimulationProperties.py rename to PySiddhi/sp/EventSimulator/SimulationProperties.py index 30df83a..d795470 100644 --- a/PySiddhi5/sp/EventSimulator/SimulationProperties.py +++ b/PySiddhi/sp/EventSimulator/SimulationProperties.py @@ -16,9 +16,9 @@ import random -from PySiddhi5.sp.ObjectMapping.APIObject import APIObject, NotSet -from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping -from PySiddhi5.sp.__Util import decodeField +from PySiddhi.sp.ObjectMapping.APIObject import APIObject, NotSet +from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping +from PySiddhi.sp.__Util import decodeField ran = random diff --git a/PySiddhi5/sp/EventSimulator/SimulationSource.py b/PySiddhi/sp/EventSimulator/SimulationSource.py similarity index 94% rename from PySiddhi5/sp/EventSimulator/SimulationSource.py rename to PySiddhi/sp/EventSimulator/SimulationSource.py index 725f3d8..c3d4b2c 100644 --- a/PySiddhi5/sp/EventSimulator/SimulationSource.py +++ b/PySiddhi/sp/EventSimulator/SimulationSource.py @@ -16,9 +16,9 @@ from enum import Enum -from PySiddhi5.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration -from PySiddhi5.sp.ObjectMapping.APIObject import APIObject, NotSet -from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping, strOrInt +from PySiddhi.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration +from PySiddhi.sp.ObjectMapping.APIObject import APIObject, NotSet +from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping, strOrInt class SimulationSource(APIObject): diff --git a/PySiddhi5/sp/EventSimulator/SingleSimulationConfiguration.py b/PySiddhi/sp/EventSimulator/SingleSimulationConfiguration.py similarity index 90% rename from PySiddhi5/sp/EventSimulator/SingleSimulationConfiguration.py rename to PySiddhi/sp/EventSimulator/SingleSimulationConfiguration.py index e913370..7aaa94b 100644 --- a/PySiddhi5/sp/EventSimulator/SingleSimulationConfiguration.py +++ b/PySiddhi/sp/EventSimulator/SingleSimulationConfiguration.py @@ -14,8 +14,8 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5.sp.ObjectMapping.APIObject import APIObject -from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping +from PySiddhi.sp.ObjectMapping.APIObject import APIObject +from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping class SingleSimulationConfiguration(APIObject): diff --git a/PySiddhi5/sp/EventSimulator/__init__.py b/PySiddhi/sp/EventSimulator/__init__.py similarity index 100% rename from PySiddhi5/sp/EventSimulator/__init__.py rename to PySiddhi/sp/EventSimulator/__init__.py diff --git a/PySiddhi5/sp/ObjectMapping/APIObject.py b/PySiddhi/sp/ObjectMapping/APIObject.py similarity index 98% rename from PySiddhi5/sp/ObjectMapping/APIObject.py rename to PySiddhi/sp/ObjectMapping/APIObject.py index ed3cb98..25c88d2 100644 --- a/PySiddhi5/sp/ObjectMapping/APIObject.py +++ b/PySiddhi/sp/ObjectMapping/APIObject.py @@ -17,7 +17,7 @@ from abc import ABCMeta from future.utils import with_metaclass -from PySiddhi5.sp.__Util import decodeField, encodeField +from PySiddhi.sp.__Util import decodeField, encodeField class NotSet(object): diff --git a/PySiddhi5/sp/ObjectMapping/FieldMapping.py b/PySiddhi/sp/ObjectMapping/FieldMapping.py similarity index 96% rename from PySiddhi5/sp/ObjectMapping/FieldMapping.py rename to PySiddhi/sp/ObjectMapping/FieldMapping.py index 58bf6b9..44828ac 100644 --- a/PySiddhi5/sp/ObjectMapping/FieldMapping.py +++ b/PySiddhi/sp/ObjectMapping/FieldMapping.py @@ -14,8 +14,8 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5.sp.ObjectMapping.APIObject import NotSet -from PySiddhi5.sp.__Util import encodeField, decodeField +from PySiddhi.sp.ObjectMapping.APIObject import NotSet +from PySiddhi.sp.__Util import encodeField, decodeField def strOrInt(v): diff --git a/PySiddhi5/sp/ObjectMapping/__init__.py b/PySiddhi/sp/ObjectMapping/__init__.py similarity index 100% rename from PySiddhi5/sp/ObjectMapping/__init__.py rename to PySiddhi/sp/ObjectMapping/__init__.py diff --git a/PySiddhi5/sp/SPClient.py b/PySiddhi/sp/SPClient.py similarity index 88% rename from PySiddhi5/sp/SPClient.py rename to PySiddhi/sp/SPClient.py index 55d5acb..3298831 100644 --- a/PySiddhi5/sp/SPClient.py +++ b/PySiddhi/sp/SPClient.py @@ -14,8 +14,8 @@ # specific language governing permissions and limitations # under the License. -from PySiddhi5.sp.EventSimulator.EventSimulatorClient import EventSimulatorClient -from PySiddhi5.sp.SiddhiAppManagement.SiddhiAppManagementClient import SiddhiAppManagementClient +from PySiddhi.sp.EventSimulator.EventSimulatorClient import EventSimulatorClient +from PySiddhi.sp.SiddhiAppManagement.SiddhiAppManagementClient import SiddhiAppManagementClient class SPClient(object): diff --git a/PySiddhi5/sp/SiddhiAppManagement/SiddhiAppManagementClient.py b/PySiddhi/sp/SiddhiAppManagement/SiddhiAppManagementClient.py similarity index 98% rename from PySiddhi5/sp/SiddhiAppManagement/SiddhiAppManagementClient.py rename to PySiddhi/sp/SiddhiAppManagement/SiddhiAppManagementClient.py index 927ec59..21f90be 100644 --- a/PySiddhi5/sp/SiddhiAppManagement/SiddhiAppManagementClient.py +++ b/PySiddhi/sp/SiddhiAppManagement/SiddhiAppManagementClient.py @@ -17,7 +17,7 @@ from enum import Enum from requests.auth import HTTPBasicAuth -from PySiddhi5.sp.__Communication.RestClient import RestClient +from PySiddhi.sp.__Communication.RestClient import RestClient class UpdateAppStatusResponse(Enum): diff --git a/PySiddhi5/sp/SiddhiAppManagement/__init__.py b/PySiddhi/sp/SiddhiAppManagement/__init__.py similarity index 100% rename from PySiddhi5/sp/SiddhiAppManagement/__init__.py rename to PySiddhi/sp/SiddhiAppManagement/__init__.py diff --git a/PySiddhi5/sp/__Communication/RestClient.py b/PySiddhi/sp/__Communication/RestClient.py similarity index 100% rename from PySiddhi5/sp/__Communication/RestClient.py rename to PySiddhi/sp/__Communication/RestClient.py diff --git a/PySiddhi5/sp/__Communication/__init__.py b/PySiddhi/sp/__Communication/__init__.py similarity index 100% rename from PySiddhi5/sp/__Communication/__init__.py rename to PySiddhi/sp/__Communication/__init__.py diff --git a/PySiddhi5/sp/__Util.py b/PySiddhi/sp/__Util.py similarity index 100% rename from PySiddhi5/sp/__Util.py rename to PySiddhi/sp/__Util.py diff --git a/PySiddhi5/sp/__init__.py b/PySiddhi/sp/__init__.py similarity index 100% rename from PySiddhi5/sp/__init__.py rename to PySiddhi/sp/__init__.py diff --git a/Tests/SPTests/EventSimulatorTests.py b/Tests/SPTests/EventSimulatorTests.py index fdb4c4f..80da4cb 100644 --- a/Tests/SPTests/EventSimulatorTests.py +++ b/Tests/SPTests/EventSimulatorTests.py @@ -20,11 +20,11 @@ import os from time import sleep -from PySiddhi5.sp.SPClient import SPClient -from PySiddhi5.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration -from PySiddhi5.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration -from PySiddhi5.sp.EventSimulator.SimulationSource import SimulationSource -from PySiddhi5.sp.EventSimulator.SingleSimulationConfiguration import SingleSimulationConfiguration +from PySiddhi.sp.SPClient import SPClient +from PySiddhi.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration +from PySiddhi.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration +from PySiddhi.sp.EventSimulator.SimulationSource import SimulationSource +from PySiddhi.sp.EventSimulator.SingleSimulationConfiguration import SingleSimulationConfiguration logging.basicConfig(level=logging.INFO) diff --git a/Tests/SPTests/SiddhiAppManagerTests.py b/Tests/SPTests/SiddhiAppManagerTests.py index 94bd282..e3fb78a 100644 --- a/Tests/SPTests/SiddhiAppManagerTests.py +++ b/Tests/SPTests/SiddhiAppManagerTests.py @@ -20,8 +20,8 @@ import logging from time import sleep -from PySiddhi5.sp.SPClient import SPClient -from PySiddhi5.sp.SiddhiAppManagement.SiddhiAppManagementClient import UpdateAppStatusResponse +from PySiddhi.sp.SPClient import SPClient +from PySiddhi.sp.SiddhiAppManagement.SiddhiAppManagementClient import UpdateAppStatusResponse logging.basicConfig(level=logging.INFO) diff --git a/Tests/SiddhiCoreTests/BasicTest.py b/Tests/SiddhiCoreTests/BasicTest.py index 816e29a..4590fbb 100644 --- a/Tests/SiddhiCoreTests/BasicTest.py +++ b/Tests/SiddhiCoreTests/BasicTest.py @@ -18,10 +18,10 @@ import unittest import logging from time import sleep -from PySiddhi5.DataTypes.LongType import LongType -from PySiddhi5.core.SiddhiManager import SiddhiManager -from PySiddhi5.core.query.output.callback.QueryCallback import QueryCallback -from PySiddhi5.core.util.EventPrinter import PrintEvent +from PySiddhi.DataTypes.LongType import LongType +from PySiddhi.core.SiddhiManager import SiddhiManager +from PySiddhi.core.query.output.callback.QueryCallback import QueryCallback +from PySiddhi.core.util.EventPrinter import PrintEvent logging.basicConfig(level=logging.INFO) diff --git a/Tests/SiddhiCoreTests/EventTest.py b/Tests/SiddhiCoreTests/EventTest.py index 7a46cb9..e55f7df 100644 --- a/Tests/SiddhiCoreTests/EventTest.py +++ b/Tests/SiddhiCoreTests/EventTest.py @@ -19,8 +19,8 @@ logging.basicConfig(level=logging.INFO) -from PySiddhi5.DataTypes.LongType import LongType -from PySiddhi5.core.event.Event import Event +from PySiddhi.DataTypes.LongType import LongType +from PySiddhi.core.event.Event import Event class BasicTests(unittest.TestCase): diff --git a/Tests/SiddhiCoreTests/ExtensionsTest.py b/Tests/SiddhiCoreTests/ExtensionsTest.py index b22b048..f09aae8 100644 --- a/Tests/SiddhiCoreTests/ExtensionsTest.py +++ b/Tests/SiddhiCoreTests/ExtensionsTest.py @@ -16,7 +16,7 @@ from subprocess import call import os -from PySiddhi5 import SiddhiLoader +from PySiddhi import SiddhiLoader # Download extension jars @@ -24,10 +24,10 @@ import logging from time import sleep -from PySiddhi5.DataTypes.LongType import LongType -from PySiddhi5.core.SiddhiManager import SiddhiManager -from PySiddhi5.core.query.output.callback.QueryCallback import QueryCallback -from PySiddhi5.core.util.EventPrinter import PrintEvent +from PySiddhi.DataTypes.LongType import LongType +from PySiddhi.core.SiddhiManager import SiddhiManager +from PySiddhi.core.query.output.callback.QueryCallback import QueryCallback +from PySiddhi.core.util.EventPrinter import PrintEvent logging.basicConfig(level=logging.INFO) diff --git a/Tests/SiddhiCoreTests/Resources/Extensions5/pom.xml b/Tests/SiddhiCoreTests/Resources/Extensions/pom.xml similarity index 99% rename from Tests/SiddhiCoreTests/Resources/Extensions5/pom.xml rename to Tests/SiddhiCoreTests/Resources/Extensions/pom.xml index 948355c..b3245cb 100644 --- a/Tests/SiddhiCoreTests/Resources/Extensions5/pom.xml +++ b/Tests/SiddhiCoreTests/Resources/Extensions/pom.xml @@ -24,7 +24,7 @@ io.siddhi.python.api siddhi-python-api-extensions-downloader-for-tests - 1.0.0 + 5.0.0 Downloads extensions (JARS) used by Siddhi Python API Tests pom diff --git a/Tests/SiddhiCoreTests/TestDebugger.py b/Tests/SiddhiCoreTests/TestDebugger.py index 1a18e86..f2aa14b 100644 --- a/Tests/SiddhiCoreTests/TestDebugger.py +++ b/Tests/SiddhiCoreTests/TestDebugger.py @@ -23,10 +23,10 @@ from time import sleep from unittest.case import TestCase -from PySiddhi5.core.SiddhiManager import SiddhiManager -from PySiddhi5.core.debugger.SiddhiDebugger import SiddhiDebugger -from PySiddhi5.core.debugger.SiddhiDebuggerCallback import SiddhiDebuggerCallback -from PySiddhi5.core.stream.output.StreamCallback import StreamCallback +from PySiddhi.core.SiddhiManager import SiddhiManager +from PySiddhi.core.debugger.SiddhiDebugger import SiddhiDebugger +from PySiddhi.core.debugger.SiddhiDebuggerCallback import SiddhiDebuggerCallback +from PySiddhi.core.stream.output.StreamCallback import StreamCallback from Tests.Util.AtomicInt import AtomicInt import threading diff --git a/Tests/SiddhiCoreTests/TestOutputStream.py b/Tests/SiddhiCoreTests/TestOutputStream.py index 46b7272..736ad2f 100644 --- a/Tests/SiddhiCoreTests/TestOutputStream.py +++ b/Tests/SiddhiCoreTests/TestOutputStream.py @@ -23,8 +23,8 @@ from time import sleep from unittest.case import TestCase -from PySiddhi5.core.SiddhiManager import SiddhiManager -from PySiddhi5.core.stream.output.StreamCallback import StreamCallback +from PySiddhi.core.SiddhiManager import SiddhiManager +from PySiddhi.core.stream.output.StreamCallback import StreamCallback from Tests.Util.AtomicInt import AtomicInt diff --git a/__PySiddhi5Proxy/pom.xml b/__PySiddhiProxy/pom.xml similarity index 98% rename from __PySiddhi5Proxy/pom.xml rename to __PySiddhiProxy/pom.xml index de075eb..7d17394 100644 --- a/__PySiddhi5Proxy/pom.xml +++ b/__PySiddhiProxy/pom.xml @@ -23,8 +23,8 @@ 4.0.0 io.siddhi.python.api - siddhi-python-api-proxy-5 - 1.0.0 + siddhi-python-api-proxy + 5.0.0 @@ -32,9 +32,8 @@ siddhi-core 5.0.0 - - + platform-windows diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/DataWrapProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/DataWrapProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/DataWrapProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/DataWrapProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/SiddhiAPICoreProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/SiddhiAPICoreProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/SiddhiAPICoreProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/SiddhiAPICoreProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger/QueryTerminalProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger/QueryTerminalProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger/QueryTerminalProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger/QueryTerminalProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/SiddhiDebuggerCallbackProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/SiddhiDebuggerCallbackProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/SiddhiDebuggerCallbackProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/SiddhiDebuggerCallbackProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/EventQueue.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/EventQueue.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/EventQueue.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/EventQueue.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/QueuedEvent.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/QueuedEvent.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/QueuedEvent.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/debugger/siddhi_debugger_callback/event_polling/QueuedEvent.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/ComplexEventProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/ComplexEventProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/ComplexEventProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/ComplexEventProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/TypeProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/TypeProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/TypeProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/complex_event/TypeProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/event/EventProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/event/EventProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/event/EventProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/event/event/EventProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/QueryCallbackProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/QueryCallbackProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/QueryCallbackProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/QueryCallbackProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/ReceiveCallbackProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/ReceiveCallbackProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/ReceiveCallbackProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/query/output/callback/query_callback/ReceiveCallbackProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/input/input_handler/InputHandlerProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/input/input_handler/InputHandlerProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/input/input_handler/InputHandlerProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/input/input_handler/InputHandlerProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/ReceiveCallbackProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/ReceiveCallbackProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/ReceiveCallbackProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/ReceiveCallbackProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/StreamCallbackProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/StreamCallbackProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/StreamCallbackProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/stream/output/callback/stream_callback/StreamCallbackProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/util/EventPrinterProxy.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/util/EventPrinterProxy.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/proxy/core/util/EventPrinterProxy.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/proxy/core/util/EventPrinterProxy.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFix.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFix.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFix.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFix.java diff --git a/__PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFixCaller.java b/__PySiddhiProxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFixCaller.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFixCaller.java rename to __PySiddhiProxy/src/main/java/io/siddhi/pythonapi/threadfix/PyThreadFixCaller.java diff --git a/__PySiddhi5Proxy/src/main/java/org/jnius/NativeInvocationHandler.java b/__PySiddhiProxy/src/main/java/org/jnius/NativeInvocationHandler.java similarity index 100% rename from __PySiddhi5Proxy/src/main/java/org/jnius/NativeInvocationHandler.java rename to __PySiddhiProxy/src/main/java/org/jnius/NativeInvocationHandler.java diff --git a/__PySiddhi5Proxy/src/main/resources/log4j.xml b/__PySiddhiProxy/src/main/resources/log4j.xml similarity index 100% rename from __PySiddhi5Proxy/src/main/resources/log4j.xml rename to __PySiddhiProxy/src/main/resources/log4j.xml diff --git a/__PySiddhi5Proxy/threadfix_c_code/README.MD b/__PySiddhiProxy/threadfix_c_code/README.MD similarity index 100% rename from __PySiddhi5Proxy/threadfix_c_code/README.MD rename to __PySiddhiProxy/threadfix_c_code/README.MD diff --git a/__PySiddhi5Proxy/threadfix_c_code/build.sh b/__PySiddhiProxy/threadfix_c_code/build.sh similarity index 100% rename from __PySiddhi5Proxy/threadfix_c_code/build.sh rename to __PySiddhiProxy/threadfix_c_code/build.sh diff --git a/__PySiddhi5Proxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.c b/__PySiddhiProxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.c similarity index 100% rename from __PySiddhi5Proxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.c rename to __PySiddhiProxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.c diff --git a/__PySiddhi5Proxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.h b/__PySiddhiProxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.h similarity index 100% rename from __PySiddhi5Proxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.h rename to __PySiddhiProxy/threadfix_c_code/io_siddhi_pythonapi_threadfix_PyThreadFix.h diff --git a/__PySiddhi5Proxy/threadfix_c_code/makefile b/__PySiddhiProxy/threadfix_c_code/makefile similarity index 100% rename from __PySiddhi5Proxy/threadfix_c_code/makefile rename to __PySiddhiProxy/threadfix_c_code/makefile diff --git a/setup.py b/setup.py index 5b02360..666d5fc 100644 --- a/setup.py +++ b/setup.py @@ -26,10 +26,10 @@ class PostInstallCommand(install): def run(self): # Compile JAVA Code here if os.name == "nt": - check_call("mvn clean install".split(), cwd="__PySiddhi5Proxy", + check_call("mvn clean install".split(), cwd="__PySiddhiProxy", shell=True) # shell=True is necessary for windows else: - check_call("mvn clean install".split(), cwd="__PySiddhi5Proxy") # shell=True should be skipped for linux + check_call("mvn clean install".split(), cwd="__PySiddhiProxy") # shell=True should be skipped for linux install.run(self) @@ -42,15 +42,15 @@ def run(self): filtered_packages.append(package) setup( - name="PySiddhi5", - version="1.1.0", + name="PySiddhi", + version="5.0.0", packages=filtered_packages, python_requires='>=2.7, ~=3.5', install_requires=["requests","pyjnius", "future", "enum34 ; python_version<'4'"], package_data={ - "PySiddhi5": ["../__PySiddhi5Proxy/target/lib/*.jar", - "../__PySiddhi5Proxy/target/*.jar", - "../__PySiddhi5Proxy/*.so"] + "PySiddhi": ["../__PySiddhiProxy/target/lib/*.jar", + "../__PySiddhiProxy/target/*.jar", + "../__PySiddhiProxy/*.so"] }, # metadata for upload to PyPI