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/202707fd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/202707fd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/202707fd Branch: refs/heads/master Commit: 202707fd2eb98f6e01fa3196248f842028172632 Parents: 40fedbb cc0af81 Author: Udara Liyanage <[email protected]> Authored: Tue Sep 9 12:38:53 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Tue Sep 9 12:38:53 2014 +0530 ---------------------------------------------------------------------- .gitignore | 1 + .../pom.xml | 93 ++++++ .../kubernetes/client/KubernetesApiClient.java | 280 +++++++++++++++++++ .../exceptions/KubernetesClientException.java | 46 +++ .../KubernetesAPIClientInterface.java | 121 ++++++++ .../kubernetes/client/model/Container.java | 90 ++++++ .../client/model/EnvironmentVariable.java | 47 ++++ .../stratos/kubernetes/client/model/Label.java | 43 +++ .../kubernetes/client/model/Manifest.java | 71 +++++ .../stratos/kubernetes/client/model/Pod.java | 133 +++++++++ .../kubernetes/client/model/PodList.java | 61 ++++ .../stratos/kubernetes/client/model/Policy.java | 42 +++ .../stratos/kubernetes/client/model/Port.java | 65 +++++ .../client/model/ReplicationController.java | 94 +++++++ .../client/model/ReplicationControllerList.java | 61 ++++ .../kubernetes/client/model/Selector.java | 43 +++ .../kubernetes/client/model/Service.java | 116 ++++++++ .../kubernetes/client/model/ServiceList.java | 61 ++++ .../stratos/kubernetes/client/model/State.java | 111 ++++++++ .../stratos/kubernetes/client/model/Volume.java | 44 +++ .../kubernetes/client/model/VolumeMount.java | 57 ++++ .../manager/CartridgeSubscriptionManager.java | 221 +++++---------- .../filter/LBCreationSubscriptionFilter.java | 214 ++++++++++++++ .../subscription/filter/SubscriptionFilter.java | 40 +++ .../manager/utils/CartridgeConstants.java | 3 + ...nager.subscription.filter.SubscriptionFilter | 1 + .../handlers/CustomExceptionMapper.java | 2 + .../rest/endpoint/services/ServiceUtils.java | 27 +- components/pom.xml | 1 + tools/stratos-docker-images/activemq/Dockerfile | 14 +- tools/stratos-docker-images/mysql/Dockerfile | 7 +- .../puppetmaster/Dockerfile | 35 +-- .../puppetmaster/docker-build.sh | 46 ++- tools/stratos-docker-images/run-example.sh | 9 +- tools/stratos-docker-images/stratos/Dockerfile | 26 +- .../stratos/docker-build.sh | 31 +- 36 files changed, 2138 insertions(+), 219 deletions(-) ----------------------------------------------------------------------
