You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/04/17 04:43:32 UTC
[52/52] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
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/03c5c234
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/03c5c234
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/03c5c234
Branch: refs/heads/master
Commit: 03c5c234451d391cb015f32091211e8a6830a0d9
Parents: 6b1dba5 754df51
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Apr 17 08:11:42 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Apr 17 08:11:42 2014 +0530
----------------------------------------------------------------------
.../cli/beans/cartridge/CartridgeInfoBean.java | 35 +-
.../controller/util/CloudControllerUtil.java | 8 +
.../console/app.js~ | 14 -
.../console/controllers/router.jag | 4 +-
.../console/default_page.jag | 25 -
.../console/error-404.html | 110 +++++
.../console/error.html | 118 +++++
.../console/jaggery.conf | 7 +-
.../console/themes/theme1/partials/404.hbs | 52 --
.../themes/theme1/renderers/default_page.js | 59 ---
.../repository/RepositoryNotification.java | 34 +-
.../manager/subscription/SubscriptionData.java | 36 +-
.../.TenantSelfRegistrationClient.java.swp | Bin 16384 -> 0 bytes
.../org/apache/stratos/rest/endpoint/Utils.java | 36 +-
.../rest/endpoint/bean/CartridgeInfoBean.java | 35 +-
.../repositoryNotificationInfoBean/Payload.java | 34 +-
.../Repository.java | 34 +-
.../rest/endpoint/bean/topology/Cluster.java | 35 +-
.../rest/endpoint/bean/topology/Member.java | 35 +-
...tractAuthenticationAuthorizationHandler.java | 36 +-
.../handlers/CustomExceptionMapper.java | 36 +-
.../stratos/rest/endpoint/mock/MockContext.java | 36 +-
.../rest/endpoint/services/ServiceUtils.java | 36 +-
.../pom.xml | 1 -
.../resources/conf/eula.xml | 187 -------
.../resources/p2.inf | 1 -
.../src/main/resources/conf/eula.xml | 187 -------
.../src/main/resources/p2.inf | 1 -
.../pom.xml | 29 +-
.../src/main/conf/loadbalancer.conf | 2 +-
.../distribution/src/main/conf/log4j.properties | 5 +
.../stratos/modules/distribution/LICENSE.txt | 488 -------------------
.../modules/distribution/src/assembly/bin.xml | 1 -
.../distribution/src/main/conf/log4j.properties | 2 +
tools/puppet3/manifests/nodes.pp | 12 +-
.../templates/extensions/addons/_nodejs.erb | 21 +
.../agent/templates/extensions/addons/_php.erb | 18 +
.../extensions/artifacts-updated.sh.erb | 4 +
.../templates/extensions/start-servers.sh.erb | 3 +
.../repository/conf/activemq/jndi.properties | 31 +-
.../config/all/repository/conf/jndi.properties | 31 +-
.../all/repository/conf/wso2mb/jndi.properties | 17 +
.../repository/conf/activemq/jndi.properties | 31 +-
.../config/cep/repository/conf/jndi.properties | 31 +-
44 files changed, 638 insertions(+), 1320 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/03c5c234/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------