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/21 17:16:41 UTC
[1/2] git commit: changes related to setting java truststore and
password
Updated Branches:
refs/heads/master c7dfb11f3 -> 012482efc
changes related to setting java truststore and password
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c2242d73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c2242d73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c2242d73
Branch: refs/heads/master
Commit: c2242d73cd885313b88964dc04031dfbe00f4a5a
Parents: 00a32e1
Author: Isuru <is...@wso2.com>
Authored: Sat Dec 21 21:46:08 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sat Dec 21 21:46:08 2013 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/bin/cartridge-agent.sh | 4 +++-
products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c2242d73/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh b/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
index cceba0c..b933c7d 100644
--- a/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
+++ b/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
@@ -32,7 +32,9 @@ properties="-Dmb.ip=MB-IP
-Djndi.properties.dir=${script_path}/../conf
-Dlog4j.properties.file.path=${script_path}/../conf/log4j.properties
-Dparam.file.path=/opt/apache-stratos-cartridge-agent/payload/launch-params
- -Dcep.stats.publisher.enabled=true"
+ -Dcep.stats.publisher.enabled=true
+ -Djavax.net.ssl.trustStore=CERT-TRUSTSTORE
+ -Djavax.net.ssl.trustStorePassword=TRUSTSTORE-PASSWORD"
# Uncomment below line to enable remote debugging
#debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c2242d73/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh b/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh
index b8c3d3a..b16325f 100755
--- a/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh
+++ b/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh
@@ -86,6 +86,10 @@ cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
cat bin/$cartridge_agent_script.tmp | sed -e "s@CEP-IP@$CEP_IP@g" > bin/$cartridge_agent_script
cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
cat bin/$cartridge_agent_script.tmp | sed -e "s@CEP-PORT@$CEP_PORT@g" > bin/$cartridge_agent_script
+cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
+cat bin/$cartridge_agent_script.tmp | sed -e "s@CERT-TRUSTSTORE@$CERT_TRUSTSTORE@g" > bin/$cartridge_agent_script
+cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
+cat bin/$cartridge_agent_script.tmp | sed -e "s@\bTRUSTSTORE-PASSWORD\b@$TRUSTSTORE_PASSWORD@g" > bin/$cartridge_agent_script
rm -f bin/$cartridge_agent_script.tmp
popd
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@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/012482ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/012482ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/012482ef
Branch: refs/heads/master
Commit: 012482efc471dd7bf5f8b1bb3530a77957249e3d
Parents: c2242d7 c7dfb11
Author: Isuru <is...@wso2.com>
Authored: Sat Dec 21 21:46:22 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sat Dec 21 21:46:22 2013 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/bin/cartridge-agent.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/012482ef/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
----------------------------------------------------------------------