Resolving conflicts. Fixing duplicate log entries issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/224f2007 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/224f2007 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/224f2007 Branch: refs/heads/master Commit: 224f2007f98708f1395f214525e4c34c33d5af00 Parents: b863a14 fe32cc5 Author: Sajith Kariyawasam <[email protected]> Authored: Mon Nov 25 12:33:13 2013 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Mon Nov 25 12:33:13 2013 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/adc/mgt/dao/Cluster.java | 71 + .../stratos/adc/mgt/dao/DataCartridge.java | 10 + .../exception/PersistenceManagerException.java | 49 + .../DatabaseBasedPersistenceManager.java | 1408 ++++++++++++++++++ .../adc/mgt/persistence/PersistenceManager.java | 79 + .../stratos/adc/mgt/repository/Repository.java | 9 + .../mgt/subscription/CartridgeSubscription.java | 58 +- .../subscription/DataCartridgeSubscription.java | 47 +- .../MultiTenantCartridgeSubscription.java | 12 +- .../SingleTenantCartridgeSubscription.java | 38 +- .../adc/mgt/utils/RepoPasswordMgtUtil.java | 12 +- .../deployers/DeploymentPolicyReader.java | 2 +- .../statistics/LoadBalancerStatsPublisher.java | 11 + .../statistics/WSO2CEPStatsPublisher.java | 40 +- .../api/LoadBalancerStatsNotifier.java | 7 +- .../TenantAwareLoadBalanceEndpoint.java | 36 +- .../internal/LoadBalancerServiceComponent.java | 13 + .../observers/WSO2CEPStatsObserver.java | 10 +- .../message/filter/topology/ClusterFilter.java | 83 ++ .../topology/ClusterCreatedEventProcessor.java | 12 + .../topology/ClusterRemovedEventProcessor.java | 12 + .../CompleteTopologyEventProcessor.java | 38 +- .../topology/InstanceSpawnedEventProcessor.java | 12 + .../topology/MemberActivatedEventProcessor.java | 12 + .../topology/MemberStartedEventProcessor.java | 12 + .../topology/MemberSuspendedEventProcessor.java | 12 + .../MemberTerminatedEventProcessor.java | 12 + .../extension/FaultHandlingWindowProcessor.java | 180 +++ .../src/main/bin/haproxy-extension.sh | 1 + .../distribution/src/main/conf/log4j.properties | 2 +- .../src/main/resources/log4j.properties | 4 +- .../src/main/bin/health-publisher.sh | 2 +- .../agent/health/publisher/HealthPublisher.java | 23 +- .../health/publisher/HealthPublisherClient.java | 55 +- .../cartridge/agent/health/publisher/Main.java | 26 +- .../src/main/resources/log4j.properties | 6 +- .../distribution/src/main/bin/stratos.bat | 2 +- .../distribution/src/main/bin/stratos.sh | 2 + 38 files changed, 2257 insertions(+), 163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java index 7ab5db2,d1994ff..618b3f7 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java @@@ -415,13 -411,11 +412,20 @@@ public abstract class CartridgeSubscrip this.subscriptionStatus = subscriptionStatus; } + public String getSubscriptionKey() { + return subscriptionKey; + } + + public void setSubscriptionKey(String subscriptionKey) { + this.subscriptionKey = subscriptionKey; + } - - ++ + public Cluster getCluster() { + return cluster; + } + + public void setCluster(Cluster cluster) { + this.cluster = cluster; + } ++ } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java index f87f0d3,c905044..20df7ab --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java @@@ -96,8 -96,8 +96,9 @@@ public class DataCartridgeSubscription return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), - getRepository(), getHostName(), getClusterDomain(), getClusterSubDomain(), - getMgtClusterDomain(), getMgtClusterSubDomain(), dataCartridge, "PENDING",getSubscriptionKey()); + getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), - getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), dataCartridge, "PENDING"); ++ getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), dataCartridge, "PENDING",getSubscriptionKey()); ++ } public String getHost() { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java index f6a4b59,a9a1a6c..d9705ef --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java @@@ -121,8 -121,8 +121,8 @@@ public class MultiTenantCartridgeSubscr return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), - getRepository(), getHostName(), getClusterDomain(), getClusterSubDomain(), - getMgtClusterDomain(), getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey()); + getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), - getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING"); ++ getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java index 1a551a0,b4f2f7f..0f17804 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java @@@ -72,8 -72,8 +72,8 @@@ public class SingleTenantCartridgeSubsc return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), - getRepository(), getHostName(), getClusterDomain(), getClusterSubDomain(), - getMgtClusterDomain(), getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey()); + getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), - getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING"); ++ getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/RepoPasswordMgtUtil.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/RepoPasswordMgtUtil.java index 533ceb2,e5c02ec..8420c12 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/RepoPasswordMgtUtil.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/RepoPasswordMgtUtil.java @@@ -67,9 -67,9 +67,9 @@@ public class RepoPasswordMgtUtil return securityKey; } - public static String encryptPassword(String repoUserPassword) { + public static String encryptPassword(String repoUserPassword, String secKey) { String encryptPassword = ""; - String secret = /*getSecurityKey()*/secKey; // secret key length must be 16 - String secret = getSecurityKey(); // secret key length must be 16 ++ String secret = secKey; // secret key length must be 16 SecretKey key; Cipher cipher; Base64 coder; @@@ -85,11 -85,11 +85,15 @@@ } return encryptPassword; } ++ ++ public static String encryptPassword(String repoUserPassword) { ++ return encryptPassword(repoUserPassword,getSecurityKey()); ++ } - public static String decryptPassword(String repoUserPassword) { + public static String decryptPassword(String repoUserPassword, String secKey) { String decryptPassword = ""; - String secret = /*getSecurityKey()*/secKey; // secret key length must be 16 - String secret = getSecurityKey(); // secret key length must be 16 ++ String secret = secKey; // secret key length must be 16 SecretKey key; Cipher cipher; Base64 coder; @@@ -106,4 -106,4 +110,8 @@@ } return decryptPassword; } ++ ++ public static String decryptPassword(String repoUserPassword) { ++ return decryptPassword(repoUserPassword,getSecurityKey()); ++ } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/products/autoscaler/modules/distribution/src/main/conf/log4j.properties ---------------------------------------------------------------------- diff --cc products/autoscaler/modules/distribution/src/main/conf/log4j.properties index 05f2042,05f2042..e9eaaab --- a/products/autoscaler/modules/distribution/src/main/conf/log4j.properties +++ b/products/autoscaler/modules/distribution/src/main/conf/log4j.properties @@@ -31,7 -31,7 +31,7 @@@ log4j.rootLogger=INFO, CARBON_CONSOLE, log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE --log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY ++log4j.logger.org.apache=INFO log4j.logger.org.apache.catalina=WARN log4j.logger.org.apache.tomcat=WARN log4j.logger.org.wso2.carbon.apacheds=WARN http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/products/autoscaler/modules/distribution/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --cc products/autoscaler/modules/distribution/src/main/resources/log4j.properties index 258b9ba,258b9ba..d61aa71 --- a/products/autoscaler/modules/distribution/src/main/resources/log4j.properties +++ b/products/autoscaler/modules/distribution/src/main/resources/log4j.properties @@@ -30,8 -30,8 +30,8 @@@ log4j.rootLogger=INFO, CARBON_CONSOLE, log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY --log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE --log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY ++log4j.logger.org.apache.axis2.clustering=INFO ++log4j.logger.org.apache=INFO log4j.logger.org.apache.catalina=WARN log4j.logger.org.apache.tomcat=WARN log4j.logger.org.wso2.carbon.apacheds=WARN http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/224f2007/products/cloud-controller/modules/distribution/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --cc products/cloud-controller/modules/distribution/src/main/resources/log4j.properties index 0c94be5,0c94be5..f6045ab --- a/products/cloud-controller/modules/distribution/src/main/resources/log4j.properties +++ b/products/cloud-controller/modules/distribution/src/main/resources/log4j.properties @@@ -29,9 -29,9 +29,9 @@@ log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE --log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY --log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE --log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY ++log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR ++log4j.logger.org.apache.axis2.clustering=INFO ++log4j.logger.org.apache=INFO log4j.logger.org.apache.catalina=WARN log4j.logger.org.apache.tomcat=WARN log4j.logger.org.wso2.carbon.apacheds=WARN
