stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pradee...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Date Wed, 05 Feb 2014 06:50:42 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos


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

Branch: refs/heads/master
Commit: fb72772612928aac01572128b4b4443c15218d9e
Parents: 70dca51 c537b5a
Author: Pradeep Fernando <pradeepfn@gmail.com>
Authored: Wed Feb 5 12:19:31 2014 +0530
Committer: Pradeep Fernando <pradeepfn@gmail.com>
Committed: Wed Feb 5 12:19:31 2014 +0530

----------------------------------------------------------------------
 .../apache/stratos/autoscaler/Constants.java    |   3 +
 .../stratos/autoscaler/PartitionContext.java    |  39 +++
 .../stratos/cli/RestCommandLineService.java     | 274 ++++++++++++++++---
 .../apache/stratos/cli/StratosApplication.java  |   3 +
 .../stratos/cli/beans/cartridge/Cartridge.java  |  21 +-
 .../cli/beans/cartridge/PortMapping.java        |  68 +++++
 .../stratos/cli/beans/topology/Member.java      |  10 +
 .../cli/commands/ListCartridgeInfoCommand.java  | 127 +++++++++
 .../stratos/cli/commands/ListCommand.java       |   2 +-
 .../apache/stratos/cli/utils/CliConstants.java  |   5 +
 .../impl/CloudControllerServiceImpl.java        |   4 +-
 .../controller/topology/TopologyBuilder.java    |   3 +-
 .../extension/api/LoadBalancerExtension.java    |  28 +-
 .../conf/configurator/CEPConfigurator.java      |   8 +-
 .../apache/stratos/manager/dto/Cartridge.java   |  18 +-
 .../messaging/domain/topology/Member.java       |  12 +-
 .../rest/endpoint/bean/topology/Member.java     |   1 +
 .../bean/util/converter/PojoConverter.java      |   5 +
 .../rest/endpoint/services/ServiceUtils.java    |  47 +++-
 .../rest/endpoint/services/StratosAdmin.java    |  33 ++-
 .../main/webapp/stratos/WEB-INF/cxf-servlet.xml |   2 +
 .../src/main/bin/haproxy-extension.sh           |   4 +-
 .../src/main/conf/log4j.properties              |   1 +
 .../stratos/haproxy/extension/Constants.java    |  36 +++
 .../haproxy/extension/HAProxyConfigWriter.java  |   6 +-
 .../haproxy/extension/HAProxyContext.java       |  62 ++++-
 .../apache/stratos/haproxy/extension/Main.java  |   2 +-
 .../distribution/src/main/resources/stratos.bat |   2 +-
 .../distribution/src/main/resources/stratos.sh  |   1 +
 29 files changed, 753 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fb727726/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------


Mime
View raw message