Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/08b7cac1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/08b7cac1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/08b7cac1 Branch: refs/heads/docker-grouping-merge Commit: 08b7cac1ad9aa5dd6a4608df24a1e4d1f5dab151 Parents: 37ebabe 46edc50 Author: Imesh Gunaratne <[email protected]> Authored: Fri Nov 7 16:03:36 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Nov 7 16:03:36 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 22 +- .../apache/stratos/cli/StratosApplication.java | 3 + .../definitions/DependencyDefinitions.java | 50 + .../definitions/ServiceGroupDefinition.java | 66 + .../grouping/definitions/ServiceGroupList.java | 41 + .../definitions/StartupOrderDefinition.java | 43 + .../commands/DescribeServiceGroupCommand.java | 67 + .../definitions/ServiceGroupDefinition.java | 2 +- .../deployer/DefaultServiceGroupDeployer.java | 11 +- .../pom.xml | 35 + .../python_cartridgeagent/__init__.py | 0 .../cartridgeagent/__init__.py | 16 + .../cartridgeagent/agent.conf | 61 + .../cartridgeagent/agent.py | 349 ++++ .../cartridgeagent/logging.ini | 52 + .../cartridgeagent/modules/__init__.py | 16 + .../modules/artifactmgt/__init__.py | 17 + .../modules/artifactmgt/git/__init__.py | 17 + .../modules/artifactmgt/git/agentgithandler.py | 574 +++++++ .../modules/artifactmgt/git/gitrepository.py | 48 + .../artifactmgt/repositoryinformation.py | 37 + .../cartridgeagent/modules/config/__init__.py | 17 + .../config/cartridgeagentconfiguration.py | 346 ++++ .../modules/databridge/__init__.py | 17 + .../cartridgeagent/modules/databridge/agent.py | 225 +++ .../modules/databridge/thrift/__init__.py | 17 + .../databridge/thrift/gen/Data/__init__.py | 1 + .../databridge/thrift/gen/Data/constants.py | 8 + .../databridge/thrift/gen/Data/ttypes.py | 320 ++++ .../databridge/thrift/gen/Exception/__init__.py | 1 + .../thrift/gen/Exception/constants.py | 8 + .../databridge/thrift/gen/Exception/ttypes.py | 473 ++++++ .../ThriftEventTransmissionService-remote | 117 ++ .../ThriftEventTransmissionService.py | 1143 +++++++++++++ .../ThriftEventTransmissionService/__init__.py | 1 + .../ThriftEventTransmissionService/constants.py | 8 + .../ThriftEventTransmissionService/ttypes.py | 21 + .../ThriftSecureEventTransmissionService-remote | 131 ++ .../ThriftSecureEventTransmissionService.py | 1495 ++++++++++++++++++ .../__init__.py | 1 + .../constants.py | 8 + .../ttypes.py | 21 + .../modules/databridge/thrift/gen/__init__.py | 0 .../modules/databridge/thrift/publisher.py | 110 ++ .../modules/databridge/thrift/thrift/TSCons.py | 35 + .../databridge/thrift/thrift/TSerialization.py | 38 + .../databridge/thrift/thrift/TTornado.py | 153 ++ .../modules/databridge/thrift/thrift/Thrift.py | 170 ++ .../databridge/thrift/thrift/__init__.py | 20 + .../databridge/thrift/thrift/protocol/TBase.py | 81 + .../thrift/thrift/protocol/TBinaryProtocol.py | 261 +++ .../thrift/thrift/protocol/TCompactProtocol.py | 405 +++++ .../thrift/thrift/protocol/TJSONProtocol.py | 552 +++++++ .../thrift/thrift/protocol/TProtocol.py | 406 +++++ .../thrift/thrift/protocol/__init__.py | 20 + .../thrift/thrift/protocol/fastbinary.c | 1219 ++++++++++++++ .../thrift/thrift/server/THttpServer.py | 87 + .../thrift/thrift/server/TNonblockingServer.py | 346 ++++ .../thrift/thrift/server/TProcessPoolServer.py | 118 ++ .../databridge/thrift/thrift/server/TServer.py | 269 ++++ .../databridge/thrift/thrift/server/__init__.py | 20 + .../thrift/thrift/transport/THttpClient.py | 147 ++ .../thrift/thrift/transport/TSSLSocket.py | 214 +++ .../thrift/thrift/transport/TSocket.py | 176 +++ .../thrift/thrift/transport/TTransport.py | 330 ++++ .../thrift/thrift/transport/TTwisted.py | 221 +++ .../thrift/thrift/transport/TZlibTransport.py | 249 +++ .../thrift/thrift/transport/__init__.py | 20 + .../modules/datapublisher/__init__.py | 18 + .../modules/datapublisher/exception/__init__.py | 17 + .../exception/datapublisherexception.py | 33 + .../modules/datapublisher/logpublisher.py | 273 ++++ .../cartridgeagent/modules/event/__init__.py | 0 .../modules/event/instance/__init__.py | 16 + .../modules/event/instance/notifier/__init__.py | 17 + .../modules/event/instance/notifier/events.py | 77 + .../modules/event/instance/status/__init__.py | 17 + .../modules/event/instance/status/events.py | 98 ++ .../modules/event/tenant/__init__.py | 16 + .../modules/event/tenant/events.py | 147 ++ .../modules/event/topology/__init__.py | 17 + .../modules/event/topology/events.py | 280 ++++ .../modules/exception/__init__.py | 16 + .../exception/parameternotfoundexception.py | 35 + .../modules/extensions/__init__.py | 16 + .../extensions/abstractextensionhandler.py | 78 + .../extensions/defaultextensionhandler.py | 793 ++++++++++ .../modules/healthstatspublisher/__init__.py | 16 + .../abstracthealthstatisticspublisher.py | 62 + .../modules/healthstatspublisher/healthstats.py | 249 +++ .../modules/publisher/__init__.py | 16 + .../publisher/cartridgeagentpublisher.py | 165 ++ .../modules/subscriber/__init__.py | 17 + .../modules/subscriber/eventsubscriber.py | 96 ++ .../cartridgeagent/modules/tenant/__init__.py | 16 + .../modules/tenant/tenantcontext.py | 184 +++ .../cartridgeagent/modules/topology/__init__.py | 16 + .../modules/topology/topologycontext.py | 454 ++++++ .../cartridgeagent/modules/util/__init__.py | 16 + .../modules/util/asyncscheduledtask.py | 71 + .../modules/util/cartridgeagentconstants.py | 135 ++ .../modules/util/cartridgeagentutils.py | 168 ++ .../modules/util/extensionutils.py | 494 ++++++ .../cartridgeagent/modules/util/log.py | 55 + .../python_cartridgeagent/tests/__init__.py | 16 + .../python_cartridgeagent/tests/asynctest.txt | 1 + .../python_cartridgeagent/tests/test_util.py | 133 ++ .../rest/endpoint/api/StratosApiV41.java | 2 +- .../webapp/api-test/WEB-INF/cxf-servlet.xml | 16 +- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 + components/pom.xml | 2 + products/python-cartridge-agent/__init__.py | 0 .../cartridgeagent/__init__.py | 16 - .../cartridgeagent/agent.conf | 61 - .../cartridgeagent/agent.py | 349 ---- .../cartridgeagent/logging.ini | 52 - .../cartridgeagent/modules/__init__.py | 16 - .../modules/artifactmgt/__init__.py | 17 - .../modules/artifactmgt/git/__init__.py | 17 - .../modules/artifactmgt/git/agentgithandler.py | 574 ------- .../modules/artifactmgt/git/gitrepository.py | 48 - .../artifactmgt/repositoryinformation.py | 37 - .../cartridgeagent/modules/config/__init__.py | 17 - .../config/cartridgeagentconfiguration.py | 346 ---- .../modules/databridge/__init__.py | 17 - .../cartridgeagent/modules/databridge/agent.py | 225 --- .../modules/databridge/thrift/__init__.py | 17 - .../databridge/thrift/gen/Data/__init__.py | 1 - .../databridge/thrift/gen/Data/constants.py | 8 - .../databridge/thrift/gen/Data/ttypes.py | 320 ---- .../databridge/thrift/gen/Exception/__init__.py | 1 - .../thrift/gen/Exception/constants.py | 8 - .../databridge/thrift/gen/Exception/ttypes.py | 473 ------ .../ThriftEventTransmissionService-remote | 117 -- .../ThriftEventTransmissionService.py | 1143 ------------- .../ThriftEventTransmissionService/__init__.py | 1 - .../ThriftEventTransmissionService/constants.py | 8 - .../ThriftEventTransmissionService/ttypes.py | 21 - .../ThriftSecureEventTransmissionService-remote | 131 -- .../ThriftSecureEventTransmissionService.py | 1495 ------------------ .../__init__.py | 1 - .../constants.py | 8 - .../ttypes.py | 21 - .../modules/databridge/thrift/gen/__init__.py | 0 .../modules/databridge/thrift/publisher.py | 110 -- .../modules/databridge/thrift/thrift/TSCons.py | 35 - .../databridge/thrift/thrift/TSerialization.py | 38 - .../databridge/thrift/thrift/TTornado.py | 153 -- .../modules/databridge/thrift/thrift/Thrift.py | 170 -- .../databridge/thrift/thrift/__init__.py | 20 - .../databridge/thrift/thrift/protocol/TBase.py | 81 - .../thrift/thrift/protocol/TBinaryProtocol.py | 261 --- .../thrift/thrift/protocol/TCompactProtocol.py | 405 ----- .../thrift/thrift/protocol/TJSONProtocol.py | 552 ------- .../thrift/thrift/protocol/TProtocol.py | 406 ----- .../thrift/thrift/protocol/__init__.py | 20 - .../thrift/thrift/protocol/fastbinary.c | 1219 -------------- .../thrift/thrift/server/THttpServer.py | 87 - .../thrift/thrift/server/TNonblockingServer.py | 346 ---- .../thrift/thrift/server/TProcessPoolServer.py | 118 -- .../databridge/thrift/thrift/server/TServer.py | 269 ---- .../databridge/thrift/thrift/server/__init__.py | 20 - .../thrift/thrift/transport/THttpClient.py | 147 -- .../thrift/thrift/transport/TSSLSocket.py | 214 --- .../thrift/thrift/transport/TSocket.py | 176 --- .../thrift/thrift/transport/TTransport.py | 330 ---- .../thrift/thrift/transport/TTwisted.py | 221 --- .../thrift/thrift/transport/TZlibTransport.py | 249 --- .../thrift/thrift/transport/__init__.py | 20 - .../modules/datapublisher/__init__.py | 18 - .../modules/datapublisher/exception/__init__.py | 17 - .../exception/datapublisherexception.py | 33 - .../modules/datapublisher/logpublisher.py | 273 ---- .../cartridgeagent/modules/event/__init__.py | 0 .../modules/event/instance/__init__.py | 16 - .../modules/event/instance/notifier/__init__.py | 17 - .../modules/event/instance/notifier/events.py | 77 - .../modules/event/instance/status/__init__.py | 17 - .../modules/event/instance/status/events.py | 98 -- .../modules/event/tenant/__init__.py | 16 - .../modules/event/tenant/events.py | 147 -- .../modules/event/topology/__init__.py | 17 - .../modules/event/topology/events.py | 280 ---- .../modules/exception/__init__.py | 16 - .../exception/parameternotfoundexception.py | 35 - .../modules/extensions/__init__.py | 16 - .../extensions/abstractextensionhandler.py | 78 - .../extensions/defaultextensionhandler.py | 793 ---------- .../modules/healthstatspublisher/__init__.py | 16 - .../abstracthealthstatisticspublisher.py | 62 - .../modules/healthstatspublisher/healthstats.py | 249 --- .../modules/publisher/__init__.py | 16 - .../publisher/cartridgeagentpublisher.py | 165 -- .../modules/subscriber/__init__.py | 17 - .../modules/subscriber/eventsubscriber.py | 96 -- .../cartridgeagent/modules/tenant/__init__.py | 16 - .../modules/tenant/tenantcontext.py | 184 --- .../cartridgeagent/modules/topology/__init__.py | 16 - .../modules/topology/topologycontext.py | 454 ------ .../cartridgeagent/modules/util/__init__.py | 16 - .../modules/util/asyncscheduledtask.py | 71 - .../modules/util/cartridgeagentconstants.py | 135 -- .../modules/util/cartridgeagentutils.py | 168 -- .../modules/util/extensionutils.py | 494 ------ .../cartridgeagent/modules/util/log.py | 55 - .../python-cartridge-agent/tests/__init__.py | 16 - .../python-cartridge-agent/tests/asynctest.txt | 1 - .../python-cartridge-agent/tests/test_util.py | 133 -- 208 files changed, 15932 insertions(+), 15585 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/08b7cac1/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ----------------------------------------------------------------------
