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/08/06 11:30:38 UTC
[2/3] git commit: Cleanup Agent code. Removed truststore property
Cleanup Agent code. Removed truststore property
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ba9bcfe0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ba9bcfe0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ba9bcfe0
Branch: refs/heads/master
Commit: ba9bcfe00a71831d069dda8253235b26fa3cffb5
Parents: 4f3dd4d
Author: Isuru Perera <is...@apache.org>
Authored: Tue Aug 6 15:00:02 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Tue Aug 6 15:00:02 2013 +0530
----------------------------------------------------------------------
.../internal/CartridgeAgentServiceComponent.java | 14 --------------
.../agent/service/CartridgeAgentService.java | 1 -
.../src/main/resources/conf/agent.properties | 3 ---
tools/ec2-demo-setup/tempconfigs/agent.properties | 3 ---
4 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba9bcfe0/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/internal/CartridgeAgentServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/internal/CartridgeAgentServiceComponent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/internal/CartridgeAgentServiceComponent.java
index b31cc7a..b6f1f84 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/internal/CartridgeAgentServiceComponent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/internal/CartridgeAgentServiceComponent.java
@@ -92,20 +92,6 @@ public class CartridgeAgentServiceComponent {
healthChecker));
healthChecker.startAll();
DataHolder.setHealthChecker(healthChecker);
- /*configurationContext.deployService(AxisService.createService(CartridgeAgentService.class.getName().toString(),
- configurationContext.getAxisConfiguration()));*/
-// axisServer.deployService(CartridgeAgentService.class.getName());
-
-
- // Starting cliet..
-// String trustStorePath = conf.getProperty("wso2.carbon.truststore");
-// System.setProperty("javax.net.ssl.trustStore", trustStorePath);
-// System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon");
-// // new InstanceStateNotificationClient().notify(null, null);
-//
-// System.setProperty("adc.host", conf.getProperty("adc.host"));
-// System.setProperty("adc.port", conf.getProperty("adc.port"));
- // ----------------------
Runtime.getRuntime().addShutdownHook(new Thread(){
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba9bcfe0/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/service/CartridgeAgentService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/service/CartridgeAgentService.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/service/CartridgeAgentService.java
index 2136164..be8009f 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/service/CartridgeAgentService.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/service/CartridgeAgentService.java
@@ -49,7 +49,6 @@ public class CartridgeAgentService {
}
log.info("Trying to add new registrant " + registrant + "...");
clusteringClient.joinGroup(registrant, configurationContext);
-// Main.getHealthChecker().start(registrant);
DataHolder.getHealthChecker().start(registrant);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba9bcfe0/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties
index 9c42c6a..5cd9230 100644
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties
@@ -17,9 +17,6 @@ members.1.host=localhost
#members.1.host=10.100.2.139
members.1.port=4000
-# TRustrore
-wso2.carbon.truststore=/var/lib/opt/ADS/repository/resources/security/wso2carbon.jks
-
# Instance State Notification Service
adc.host=ADC_HOSTNAME
adc.port=ADC_PORT
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba9bcfe0/tools/ec2-demo-setup/tempconfigs/agent.properties
----------------------------------------------------------------------
diff --git a/tools/ec2-demo-setup/tempconfigs/agent.properties b/tools/ec2-demo-setup/tempconfigs/agent.properties
index 9b06ba3..c82259d 100755
--- a/tools/ec2-demo-setup/tempconfigs/agent.properties
+++ b/tools/ec2-demo-setup/tempconfigs/agent.properties
@@ -15,9 +15,6 @@ clustering.localMemberPort=4025
members.1.host=s2_ip
members.1.port=4000
-# TRustrore
-wso2.carbon.truststore=/opt/apache-stratos-sc-3.0.0-SNAPSHOT/repository/resources/security/wso2carbon.jks
-
# Instance State Notification Service
adc.host=s2_ip
adc.port=9445