You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/06/16 14:37:35 UTC
[3/6] stratos git commit: Merge branch 'master' into iaas-providers
Merge branch 'master' into iaas-providers
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1d08913
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1d08913
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1d08913
Branch: refs/heads/master
Commit: e1d089133b77aacb0c3a66a2dc26d5465339ffa6
Parents: 2090ff5 22de6a6
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Tue Jun 16 16:45:51 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Tue Jun 16 16:45:51 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.activation/pom.xml | 96 -
.../internal/ActivationServiceComponent.java | 152 -
.../activation/module/ActivationHandler.java | 161 -
.../activation/module/ActivationModule.java | 65 -
.../activation/service/ActivationService.java | 85 -
.../activation/utils/ActivationManager.java | 96 -
.../apache/stratos/activation/utils/Util.java | 138 -
.../src/main/resources/META-INF/module.xml | 34 -
.../src/main/resources/META-INF/services.xml | 30 -
.../component/ParentComponentMonitor.java | 30 +-
.../org.apache.stratos.cloud.controller/pom.xml | 7 +
.../iaases/kubernetes/KubernetesIaas.java | 33 +-
.../iaases/kubernetes/KubernetesIaasUtil.java | 30 +-
components/org.apache.stratos.common/pom.xml | 1 +
.../pom.xml | 28 +-
.../kubernetes/client/KubernetesApiClient.java | 676 +--
.../kubernetes/client/KubernetesConstants.java | 11 +-
.../KubernetesAPIClientInterface.java | 75 +-
.../kubernetes/client/model/Container.java | 143 -
.../client/model/EnvironmentVariable.java | 48 -
.../stratos/kubernetes/client/model/Labels.java | 46 -
.../kubernetes/client/model/Manifest.java | 80 -
.../stratos/kubernetes/client/model/Pod.java | 175 -
.../kubernetes/client/model/PodList.java | 65 -
.../stratos/kubernetes/client/model/Policy.java | 39 -
.../stratos/kubernetes/client/model/Port.java | 70 -
.../client/model/ReplicationController.java | 114 -
.../client/model/ReplicationControllerList.java | 65 -
.../kubernetes/client/model/Selector.java | 43 -
.../kubernetes/client/model/Service.java | 160 -
.../kubernetes/client/model/ServiceList.java | 65 -
.../stratos/kubernetes/client/model/State.java | 124 -
.../stratos/kubernetes/client/model/Volume.java | 41 -
.../kubernetes/client/model/VolumeMount.java | 60 -
.../kubernetes/client/rest/HttpResponse.java | 68 -
.../client/rest/KubernetesResponse.java | 89 -
.../client/rest/KubernetesResponseHandler.java | 99 -
.../kubernetes/client/rest/RestClient.java | 118 -
.../client/live/AbstractLiveTest.java | 58 +-
.../live/KubernetesApiClientLiveTest.java | 20 +-
.../client/live/KubernetesClusterCleanTest.java | 12 +-
.../kubernetes/client/unit/PodUnitTest.java | 106 -
.../console/configure_form.jag | 6 +
.../console/controllers/rest/rest_calls.jag | 4 +
components/org.apache.stratos.messaging/pom.xml | 8 +-
.../domain/instance/GroupInstance.java | 19 +
.../util/converter/ObjectConverter.java | 6 +-
components/pom.xml | 1 -
dependencies/fabric8/kubernetes-api/README.md | 7 +
dependencies/fabric8/kubernetes-api/pom.xml | 214 +
.../fabric8/kubernetes/api/AbstractWatcher.java | 61 +
.../io/fabric8/kubernetes/api/Controller.java | 850 ++++
.../java/io/fabric8/kubernetes/api/Entity.java | 28 +
.../kubernetes/api/ExceptionResponseMapper.java | 69 +
.../io/fabric8/kubernetes/api/Kubernetes.java | 283 ++
.../kubernetes/api/KubernetesApiException.java | 11 +
.../kubernetes/api/KubernetesClient.java | 1618 ++++++
.../kubernetes/api/KubernetesExtensions.java | 226 +
.../kubernetes/api/KubernetesFactory.java | 384 ++
.../api/KubernetesGlobalExtensions.java | 56 +
.../kubernetes/api/KubernetesHelper.java | 1724 +++++++
.../fabric8/kubernetes/api/PodStatusType.java | 25 +
.../io/fabric8/kubernetes/api/ServiceNames.java | 58 +
.../api/UserConfigurationCompare.java | 201 +
.../java/io/fabric8/kubernetes/api/Watcher.java | 13 +
.../api/builders/ListEnvVarBuilder.java | 43 +
.../api/builds/BuildFinishedEvent.java | 64 +
.../kubernetes/api/builds/BuildListener.java | 30 +
.../kubernetes/api/builds/BuildWatcher.java | 121 +
.../fabric8/kubernetes/api/builds/Builds.java | 199 +
.../io/fabric8/kubernetes/api/builds/Links.java | 35 +
.../kubernetes/api/extensions/Configs.java | 117 +
.../kubernetes/api/extensions/Templates.java | 225 +
.../api/support/KindToClassMapping.java | 264 +
.../src/main/kubernetes/api/Dockerfile | 5 +
.../api/examples/controller-list.json | 35 +
.../kubernetes/api/examples/controller.json | 24 +
.../api/examples/external-service.json | 13 +
.../src/main/kubernetes/api/examples/list.json | 98 +
.../api/examples/pod-list-empty-results.json | 19 +
.../main/kubernetes/api/examples/pod-list.json | 93 +
.../src/main/kubernetes/api/examples/pod.json | 34 +
.../kubernetes/api/examples/service-list.json | 28 +
.../main/kubernetes/api/examples/service.json | 33 +
.../main/kubernetes/api/examples/template.json | 146 +
.../src/main/kubernetes/api/kubernetes.html | 1636 ++++++
.../src/main/kubernetes/api/kubernetes.raml | 185 +
.../src/main/resources/log4j.properties | 8 +
.../java/io/fabric8/kubernetes/api/Apply.java | 48 +
.../kubernetes/api/ConfigComparePodTest.java | 243 +
.../ConfigCompareReplicationControllerTest.java | 530 ++
.../api/ConfigCompareServiceTest.java | 235 +
.../kubernetes/api/ConfigFileParseTest.java | 58 +
.../java/io/fabric8/kubernetes/api/Example.java | 134 +
.../api/FindOpenShiftNamespaceTest.java | 41 +
.../kubernetes/api/KubernetesHelperTest.java | 71 +
.../kubernetes/api/ParseDateTimeTest.java | 36 +
.../kubernetes/api/ParseExamplesTest.java | 128 +
.../kubernetes/api/ParseServiceTest.java | 65 +
.../io/fabric8/kubernetes/api/ParseTest.java | 157 +
.../PodIdToReplicationControllerIDExample.java | 42 +
.../api/ProcessTemplateLocallyTest.java | 54 +
.../fabric8/kubernetes/api/TemplatesTest.java | 50 +
.../io/fabric8/kubernetes/api/TriggerBuild.java | 45 +
.../kubernetes/api/UsingBadAddressTest.java | 47 +
.../fabric8/kubernetes/api/ViewEndpoints.java | 88 +
.../io/fabric8/kubernetes/api/ViewNodes.java | 61 +
.../fabric8/kubernetes/api/ViewServiceIPs.java | 45 +
.../io/fabric8/kubernetes/api/WatchBuilds.java | 52 +
.../kubernetes/api/WatchBuildsExample.java | 23 +
.../kubernetes/api/WatchPodsExample.java | 23 +
.../kubernetes/api/WatchServicesExample.java | 23 +
.../src/test/resources/config.yml | 52 +
.../src/test/resources/errorexample.json | 77 +
.../src/test/resources/fmq-service.json | 20 +
.../src/test/resources/glance-api-service.yaml | 7 +
.../src/test/resources/log4j.properties | 25 +
dependencies/fabric8/kubernetes-model/README.md | 7 +
dependencies/fabric8/kubernetes-model/pom.xml | 176 +
.../io/fabric8/config/KubernetesBaseConfig.java | 14 +
.../io/fabric8/config/KubernetesConfig.java | 81 +
.../java/io/fabric8/config/OpenshiftConfig.java | 67 +
.../kubernetes/api/model/HasMetadata.java | 7 +
.../kubernetes/api/model/KubernetesKind.java | 71 +
.../kubernetes/api/model/KubernetesList.java | 49 +
.../api/model/KubernetesResource.java | 8 +
.../kubernetes/api/model/resource/Quantity.java | 135 +
.../kubernetes/api/model/util/IntOrString.java | 195 +
.../internal/HasMetadataComparator.java | 30 +
.../kubernetes/internal/HasMetadataSet.java | 25 +
.../internal/KubernetesDeserializer.java | 33 +
.../openshift/api/model/template/Template.java | 306 ++
.../src/main/resources/log4j.properties | 8 +
.../src/main/resources/schema/kube-schema.json | 4692 ++++++++++++++++++
.../kubernetes/api/model/InlineTest.java | 18 +
.../api/model/KubernetesListTest.java | 85 +
.../kubernetes/api/model/UnmarshallTest.java | 66 +
.../src/test/resources/service-list.json | 239 +
.../src/test/resources/simple-list.json | 64 +
.../src/test/resources/simple-template.json | 45 +
.../src/test/resources/valid-pod.json | 22 +
dependencies/fabric8/pom.xml | 55 +
dependencies/pom.xml | 3 +-
.../pom.xml | 14 +-
.../pom.xml | 6 -
features/manager/pom.xml | 5 -
.../distribution/src/main/license/LICENSE | 1 -
.../scripts/common/undeploy.sh | 1 -
148 files changed, 18557 insertions(+), 3434 deletions(-)
----------------------------------------------------------------------