You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/10/11 21:04:49 UTC

[04/11] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a1969d57
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a1969d57
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a1969d57

Branch: refs/heads/master
Commit: a1969d57ad4144bc69b719ea9addc3b4e81e8064
Parents: 42f049e 2c3e152
Author: R-Rajkumar <rr...@gmail.com>
Authored: Sat Oct 11 19:31:35 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Sat Oct 11 19:31:35 2014 +0530

----------------------------------------------------------------------
 .../apache/stratos/cli/CommandLineService.java  |   12 +-
 .../java/org/apache/stratos/cli/RestClient.java |    6 +-
 .../stratos/cli/RestCommandLineService.java     |  125 +-
 .../apache/stratos/cli/StratosApplication.java  |   30 +-
 .../cli/commands/ActivateTenantCommand.java     |    4 +-
 .../cli/commands/AddDomainMappingCommand.java   |    6 +-
 .../stratos/cli/commands/AddTenantCommand.java  |    8 +-
 .../stratos/cli/commands/AddUserCommand.java    |    8 +-
 .../cli/commands/AutoscalePolicyCommand.java    |   66 -
 .../AutoscalingPolicyDeploymentCommand.java     |  138 --
 .../commands/CartridgeDeploymentCommand.java    |  140 --
 .../cli/commands/DeactivateTenantCommand.java   |    4 +-
 .../cli/commands/DeleteTenantCommand.java       |    4 +-
 .../stratos/cli/commands/DeleteUserCommand.java |    4 +-
 .../DeployAutoscalingPolicyCommand.java         |  138 ++
 .../cli/commands/DeployCartridgeCommand.java    |  140 ++
 .../commands/DeployDeploymentPolicyCommand.java |  138 ++
 .../commands/DeployKubernetesGroupCommand.java  |   16 +-
 .../commands/DeployKubernetesHostCommand.java   |   16 +-
 .../cli/commands/DeployPartitionCommand.java    |  138 ++
 .../cli/commands/DeployServiceCommand.java      |  139 ++
 .../DeployServiceDeploymentCommand.java         |  139 --
 .../cli/commands/DeploymentPolicyCommand.java   |   66 -
 .../DeploymentPolicyDeploymentCommand.java      |  138 --
 .../DescribeAutoScalingPolicyCommand.java       |    4 +-
 .../cli/commands/DescribeCartridgeCommand.java  |    4 +-
 .../DescribeDeploymentPolicyCommand.java        |    4 +-
 .../cli/commands/DescribePartitionCommand.java  |    4 +-
 .../stratos/cli/commands/ExitCommand.java       |    9 +-
 .../stratos/cli/commands/HelpCommand.java       |    6 +-
 .../stratos/cli/commands/InfoCommand.java       |    4 +-
 .../stratos/cli/commands/ListAllTenants.java    |    4 +-
 .../stratos/cli/commands/ListAllUsers.java      |    4 +-
 .../commands/ListAutoscalePolicyCommand.java    |   66 +
 .../ListCartridgeSubscriptionsCommand.java      |   95 ++
 .../cli/commands/ListCartridgesCommand.java     |    4 +-
 .../cli/commands/ListDeployServiceCommand.java  |    4 +-
 .../commands/ListDeploymentPolicyCommand.java   |   66 +
 .../commands/ListKubernetesGroupsCommand.java   |    4 +-
 .../commands/ListKubernetesHostsCommand.java    |    4 +-
 .../stratos/cli/commands/ListMemberCommand.java |   10 +-
 .../cli/commands/ListPartitionCommand.java      |   65 +
 .../ListSubscribedCartridgesCommand.java        |   10 +-
 .../stratos/cli/commands/PartitionCommand.java  |   65 -
 .../commands/PartitionDeploymentCommand.java    |  138 --
 .../stratos/cli/commands/PoliciesCommand.java   |   71 -
 .../commands/RemoveDomainMappingCommand.java    |   75 -
 .../cli/commands/SubscribeCartridgeCommand.java |  307 ++++
 .../stratos/cli/commands/SubscribeCommand.java  |  358 -----
 .../SubscribedCartridgeInfoCommand.java         |  101 --
 .../stratos/cli/commands/SyncCommand.java       |   13 +-
 .../UnDeployKubernetesGroupCommand.java         |    6 +-
 .../UndeployCartridgeDefinitionCommand.java     |    4 +-
 .../commands/UndeployKubernetesHostCommand.java |    4 +-
 .../UndeployServiceDefinitionCommand.java       |    4 +-
 .../cli/commands/UnsubscribeCommand.java        |   10 +-
 .../apache/stratos/cli/utils/CliConstants.java  |    4 +-
 .../org/apache/stratos/cli/utils/CliUtils.java  |  147 ++
 .../stratos/cli/utils/CommandLineUtils.java     |  147 --
 .../stratos/kubernetes/client/model/Pod.java    |   23 +
 tools/python-cartridge-agent/__init__.py        |    0
 .../cartridge-agent/__init__.py                 |   16 +
 .../cartridge-agent/agent.conf                  |   60 +
 .../cartridge-agent/agent.properties            |   47 -
 .../cartridge-agent/agent.py                    |  573 +++----
 .../cartridge-agent/agent.sh                    |    8 -
 .../cartridge-agent/agent1.py                   |   15 -
 .../cartridge-agent/extensionhandler.py         |   44 -
 .../cartridge-agent/extensionhandler.pyc        |  Bin 1987 -> 0 bytes
 .../cartridge-agent/logging.ini                 |   52 +
 .../cartridge-agent/modules/__init__.py         |   16 +
 .../cartridge-agent/modules/__init__.pyc        |  Bin 0 -> 194 bytes
 .../modules/artifactmgt/__init__.py             |   17 +
 .../modules/artifactmgt/git/__init__.py         |   17 +
 .../modules/artifactmgt/git/agentgithandler.py  |  501 ++++++
 .../modules/artifactmgt/git/gitrepository.py    |   51 +
 .../artifactmgt/repositoryinformation.py        |   37 +
 .../cartridge-agent/modules/config/__init__.py  |   17 +
 .../cartridge-agent/modules/config/__init__.pyc |  Bin 0 -> 254 bytes
 .../config/cartridgeagentconfiguration.py       |  343 ++++
 .../config/cartridgeagentconfiguration.pyc      |  Bin 0 -> 17633 bytes
 .../modules/databridge/__init__.py              |   17 +
 .../cartridge-agent/modules/databridge/agent.py |  187 +++
 .../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      |  111 ++
 .../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       |  274 ++++
 .../cartridge-agent/modules/event/__init__.py   |    0
 .../modules/event/instance/__init__.py          |   16 +
 .../modules/event/instance/notifier/__init__.py |   17 +
 .../modules/event/instance/notifier/events.py   |   76 +
 .../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            |  233 +++
 .../modules/exception/__init__.py               |   16 +
 .../modules/exception/__init__.pyc              |  Bin 0 -> 256 bytes
 .../exception/parameternotfoundexception.py     |   35 +
 .../exception/parameternotfoundexception.pyc    |  Bin 0 -> 1133 bytes
 .../modules/extensions/__init__.py              |   16 +
 .../extensions/abstractextensionhandler.py      |   75 +
 .../extensions/defaultextensionhandler.py       |  762 +++++++++
 .../modules/healthstatspublisher/__init__.py    |   16 +
 .../abstracthealthstatisticspublisher.py        |   62 +
 .../modules/healthstatspublisher/healthstats.py |  235 +++
 .../modules/publisher/__init__.py               |   16 +
 .../publisher/cartridgeagentpublisher.py        |  164 ++
 .../modules/subscriber/__init__.py              |   17 +
 .../modules/subscriber/eventsubscriber.py       |   96 ++
 .../cartridge-agent/modules/tenant/__init__.py  |   16 +
 .../modules/tenant/tenantcontext.py             |  184 +++
 .../modules/topology/__init__.py                |   16 +
 .../modules/topology/topologycontext.py         |  452 ++++++
 .../cartridge-agent/modules/util/__init__.py    |   16 +
 .../cartridge-agent/modules/util/__init__.pyc   |  Bin 0 -> 297 bytes
 .../modules/util/asyncscheduledtask.py          |   50 +
 .../modules/util/cartridgeagentconstants.py     |  135 ++
 .../modules/util/cartridgeagentconstants.pyc    |  Bin 0 -> 3917 bytes
 .../modules/util/cartridgeagentutils.py         |  165 ++
 .../modules/util/cartridgeagentutils.pyc        |  Bin 0 -> 3924 bytes
 .../modules/util/extensionutils.py              |  494 ++++++
 .../cartridge-agent/modules/util/log.py         |   55 +
 .../cartridge-agent/readme.txt                  |    2 -
 .../cartridge-agent/script.sh                   |    0
 .../cartridge-agent/util.py                     |   22 -
 .../cartridge-agent/util.pyc                    |  Bin 762 -> 0 bytes
 171 files changed, 16791 insertions(+), 2236 deletions(-)
----------------------------------------------------------------------