You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/08/07 07:02:38 UTC

[1/2] git commit: adding a new test case to AxiomParser

Updated Branches:
  refs/heads/master 4526f8680 -> 81b0ffef9


adding a new test case to AxiomParser


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6c562a05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6c562a05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6c562a05

Branch: refs/heads/master
Commit: 6c562a050b87a29effaefb6d1e4e1fa039c08067
Parents: 3fcaf1f
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Aug 7 10:31:49 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Aug 7 10:31:49 2013 +0530

----------------------------------------------------------------------
 .../cloud/controller/deployers/CloudControllerDeployer.java   | 2 +-
 .../autoscaler/service/axiom/AxiomXpathParserTest.java        | 7 +++++++
 .../src/test/resources/cloud-controller.xml                   | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6c562a05/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
index 5689479..ddaaf83 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
@@ -70,7 +70,7 @@ public class CloudControllerDeployer extends AbstractDeployer{
 			// parse the file
 			parser.parse();
 
-			// deploy iaases
+			// load iaases
 			parser.setIaasProvidersList();
 			parser.setDataPublisherRelatedData();
 			parser.setTopologySyncRelatedData();

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6c562a05/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
index 68b35bc..5c9a5be 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
+++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
@@ -48,5 +48,12 @@ public class AxiomXpathParserTest extends TestCase {
         assertEquals(1, FasterLookUpDataHolder.getInstance().getIaasProviders().size());
         assertEquals(5, FasterLookUpDataHolder.getInstance().getIaasProviders().get(0).getMaxInstanceLimit());
     }
+    
+    public void testDataPublisherConfig() {
+		parser.setDataPublisherRelatedData();
+		assertEquals(true, FasterLookUpDataHolder.getInstance().getEnableBAMDataPublisher());
+		assertEquals("nirmal", FasterLookUpDataHolder.getInstance().getBamUsername());
+		assertEquals("nirmal", FasterLookUpDataHolder.getInstance().getBamPassword());
+	}
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6c562a05/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
index 127ce48..054e3c5 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
@@ -22,12 +22,12 @@
 	<svns:secureVault
 		provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
 	
-	<dataPublisher enable="false">
+	<dataPublisher enable="true">
 		<!-- BAM Server Info - default values are 'admin' and 'admin' 
 			 Optional element. -->
 		<bamServer>
-			<adminUserName>admin</adminUserName>
-			<adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
+			<adminUserName>nirmal</adminUserName>
+			<adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">nirmal</adminPassword>
 		</bamServer>
 		<!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
 			 Optional element. -->


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by ni...@apache.org.
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/81b0ffef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/81b0ffef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/81b0ffef

Branch: refs/heads/master
Commit: 81b0ffef9ccd053eea92c55985ec2eb8438b06a8
Parents: 6c562a0 4526f86
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Aug 7 10:32:15 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Aug 7 10:32:15 2013 +0530

----------------------------------------------------------------------
 .../resources/web/account-mgt/account_mgt.jsp   |  2 +-
 .../stratos-agent/modules/p2-profile/pom.xml    | 78 ++++++++++----------
 tools/ec2-demo-setup/clean.sh                   |  4 +-
 tools/ec2-demo-setup/config.sh                  | 24 +++---
 .../tempconfigs/cartridge-config.properties     | 16 ++--
 .../tempconfigs/s2reponotifier.groovy           |  4 -
 .../tempconfigs/stratosreponotifier.groovy      |  4 +
 7 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------