You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/12 11:00:05 UTC
[1/2] git commit: adding the autoscaler service stub to rest EP
feature and adding the new cartridge-config.properties file to SC product
Updated Branches:
refs/heads/master cebf4a23a -> 3a5b5d056
adding the autoscaler service stub to rest EP feature and adding the new cartridge-config.properties file to SC product
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d03c2f4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d03c2f4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d03c2f4f
Branch: refs/heads/master
Commit: d03c2f4f485a49483a460fa0fa43ae052ced6a2d
Parents: 61d4106
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 12 15:28:02 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 12 15:28:02 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 8 +++
.../modules/distribution/src/assembly/bin.xml | 3 +-
.../src/main/conf/cartridge-config.properties | 65 ++++++++++++++++++++
3 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d03c2f4f/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
index 78daf2e..e176835 100644
--- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
+++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
@@ -216,6 +216,11 @@
<artifactId>carbon-cxf</artifactId>
<version>1.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -287,6 +292,9 @@
<propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
</properties>
</adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.autoscaler.service.stub:${project.version}</bundleDef>
+ </bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef>
</importFeatures>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d03c2f4f/products/stratos-controller/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/assembly/bin.xml b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
index 8799fed..e7fdfec 100755
--- a/products/stratos-controller/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
@@ -222,7 +222,8 @@
<!-- adc.mgt related files -->
<fileSet>
- <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory>
+ <!--directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory-->
+ <directory>src/main/conf/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<includes>
<include>cartridge-config.properties</include>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d03c2f4f/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties b/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties
new file mode 100644
index 0000000..1740dd8
--- /dev/null
+++ b/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties
@@ -0,0 +1,65 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+# Configuration properties
+
+sc.ip=stratos_ip
+autoscalerService.url=https://cc.wso2.com:9444/services/CloudControllerService/
+autoscaler.service.url=https://as.wso2.com:9446/services/AutoScalerService/
+cloud.controller.service.url=https://cc.wso2.com:9446/services/CloudControllerService/
+autoscaler.time.out=190000
+cartridge.agent.epr=https://stratos_ip:9447/services/CartridgeAgentService
+git.host.name=s2_hostname
+git.host.ip=stratos_ip
+git.repo.notification.url=https://sc.wso2.com:9445/services/RepoNotificationService/
+identity.server.url=https://sc.wso2.com:9447/services/RepoNotificationService/
+
+adc.jdbc.url=jdbc:h2:repository/database/WSO2S2_DB
+adc.jdbc.username=wso2carbon
+adc.jdbc.password=wso2carbon
+adc.jdbc.driver=org.h2.Driver
+
+mb.ip=mb.stratos.apache.org
+mb.port=5677
+cep.ip=cep.stratos.apache.org
+cep.port=7615
+
+feature.externalrepo.validation.enabled=true
+feature.internalrepo.enabled=false
+feature.multitenant.multiplesubscription.enabled=false
+
+internal.repo.username=admin
+internal.repo.password=admin
+
+append.script=SCRIPT_PATH/add_entry_zone_file.sh
+remove.script=SCRIPT_PATH/remove_entry_zone_file.sh
+bind.file.path=/etc/bind/db.STRATOS_DOMAIN
+elb.ip=stratos_ip
+
+bam.ip=stratos_ip
+bam.port=7714
+
+max.attempts=1000
+
+cartridge.key=KEYPATH
+
+repository.info.epr=https://stratos_ip:9445/services/RepositoryInformationService
+
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into products
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into products
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3a5b5d05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3a5b5d05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3a5b5d05
Branch: refs/heads/master
Commit: 3a5b5d056df27238d769d058c7f703c9717504a5
Parents: d03c2f4 cebf4a2
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 12 15:29:22 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 12 15:29:22 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 6 +-
.../adc/mgt/client/CartridgeAgentClient.java | 4 +-
.../client/CloudControllerServiceClient.java | 2 +-
.../mgt/publisher/TenantSynzhronizerTask.java | 4 +-
.../adc/mgt/utils/CartridgeConstants.java | 3 +-
.../org.apache.stratos.autoscaler/pom.xml | 4 +-
.../src/main/resources/META-INF/component.xml | 5 +-
.../apache/stratos/cli/CartridgeInfoBean.java | 18 ++++
.../stratos/cli/RestCommandLineService.java | 12 ++-
.../apache/stratos/cli/StratosApplication.java | 11 +++
.../stratos/cli/commands/SubscribeCommand.java | 54 +++++++++---
.../apache/stratos/cli/utils/CliConstants.java | 24 ++++--
.../impl/CloudControllerServiceImpl.java | 4 +-
.../topology/TopologyEventSender.java | 4 +-
.../bean/util/converter/PojoConverter.java | 4 +-
.../AverageInFlightRequestsFinder.xml | 2 +-
.../GradientOfRequestsInFlightFinder.xml | 2 +-
...SecondDerivativeOfRequestsInFlightFinder.xml | 2 +-
.../ec2/load-balancer/cartridge-agent.sh | 89 ++++++++++++++++++++
.../ec2/load-balancer/start-load-balancer.sh | 7 ++
.../templates/loadbalancer.conf.template | 10 ++-
21 files changed, 223 insertions(+), 48 deletions(-)
----------------------------------------------------------------------