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/cbe7b4c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cbe7b4c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cbe7b4c6

Branch: refs/heads/master
Commit: cbe7b4c6f25572fb5111fe91f11456436833596a
Parents: cefbde6 6984375
Author: Udara Liyanage <[email protected]>
Authored: Fri Dec 6 15:00:48 2013 -0500
Committer: Udara Liyanage <[email protected]>
Committed: Fri Dec 6 15:00:48 2013 -0500

----------------------------------------------------------------------
 components/org.apache.stratos.adc.mgt/pom.xml   |   6 +-
 .../adc/mgt/client/AutoscalerServiceClient.java | 111 ++++
 .../stratos/adc/mgt/utils/PojoConverter.java    |  25 +
 .../stratos/messaging/domain/tenant/Tenant.java |   4 +
 .../event/tenant/TenantCreatedEvent.java        |  18 +-
 .../tenant/TenantCreatedMessageProcessor.java   |  36 +-
 .../tenant/TenantRemovedMessageProcessor.java   |  45 +-
 .../tenant/TenantUpdatedMessageProcessor.java   |  45 +-
 .../bean/util/convert/PojoConverter.java        |  25 -
 .../bean/util/converter/PojoConverter.java      | 297 ++++++++++
 .../service/client/AutoscalerServiceClient.java | 111 ----
 .../rest/endpoint/services/ServiceUtils.java    | 282 +--------
 tools/stratos-installer/conf/setup.conf         |  31 +-
 .../config/agent/bin/stratos.sh                 | 298 ----------
 .../agent/repository/conf/agent.properties      |  47 --
 .../config/agent/repository/conf/carbon.xml     | 586 -------------------
 .../config/as/repository/conf/carbon.xml        | 586 +++++++++++++++++++
 .../config/as/repository/conf/jndi.properties   |   4 +
 .../stratos-installer/config/elb/bin/stratos.sh | 298 ----------
 .../config/elb/repository/conf/axis2/axis2.xml  | 526 -----------------
 .../conf/datasources/master-datasources.xml     | 109 ----
 .../elb/repository/conf/loadbalancer.conf       |  85 ---
 .../config/lb/repository/conf/axis2/axis2.xml   | 526 +++++++++++++++++
 .../config/lb/repository/conf/loadbalancer.conf | 118 ++++
 tools/stratos-installer/setup.sh                | 174 ++----
 tools/stratos-installer/start-servers.sh        |  36 +-
 26 files changed, 1907 insertions(+), 2522 deletions(-)
----------------------------------------------------------------------


Reply via email to