You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/04/03 11:51:19 UTC
[1/2] git commit: removing cep and mb config steps
Repository: incubator-stratos
Updated Branches:
refs/heads/master 6d75b4ba8 -> 742b189d8
removing cep and mb config steps
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9de63a66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9de63a66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9de63a66
Branch: refs/heads/master
Commit: 9de63a66c85f7b4cbdca270dccaba76b3f5c4268
Parents: 28b292a
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Apr 3 15:20:48 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Apr 3 15:20:48 2014 +0530
----------------------------------------------------------------------
tools/stratos-installer/stratos-setup.sh | 46 +--------------------------
1 file changed, 1 insertion(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9de63a66/tools/stratos-installer/stratos-setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/stratos-setup.sh b/tools/stratos-installer/stratos-setup.sh
index 87ca410..ace9540 100755
--- a/tools/stratos-installer/stratos-setup.sh
+++ b/tools/stratos-installer/stratos-setup.sh
@@ -140,17 +140,6 @@ function activemq_validate() {
fi
}
-# ActiveMQ jar validation
-function mb_jars_validate() {
- for activemq_client_lib in "${activemq_client_libs[@]}"
- do
- lib_path=$stratos_packs/$activemq_client_lib
- if [[ ! -f $lib_path ]]; then
- echo "Please copy the $activemq_client_lib into the stratos pack folder"
- exit 1
- fi
- done
-}
# CC related functions
# -------------------------------------------------------------------
@@ -415,50 +404,19 @@ function sm_setup() {
echo "End configuring the SM"
}
-# CEP related functions
-# -------------------------------------------------------------------
-function cep_conf_validate() {
- if [[ ! -d $cep_artifacts_path ]]; then
- echo "Please specify the cep_artifacts_path folder which contains cep artifacts files"
- exit 1
- fi
- if [[ ! -f $cep_extension_jar ]]; then
- echo "Please copy the cep extension jar into the same folder as this command(stratos release pack folder) and update conf/stratos-setup.conf file"
- exit 1
- fi
-}
# Setup CEP
function cep_setup() {
echo "Setup CEP" >> $LOG
echo "Configuring the Complex Event Processor"
- cp -f $cep_extension_jar $stratos_extract_path/repository/components/lib/
- cep_xml_path=$stratos_extract_path/repository/deployment/server
- cep_conf_path=$stratos_extract_path/repository/conf
-
- test -d "$cep_xml_path/eventbuilders" || mkdir -p "$cep_xml_path/eventbuilders" && cp -f $cep_artifacts_path/eventbuilders/*.xml $cep_xml_path/eventbuilders/
- test -d "$cep_xml_path/inputeventadaptors" || mkdir -p "$cep_xml_path/inputeventadaptors" && cp -f $cep_artifacts_path/inputeventadaptors/*.xml $cep_xml_path/inputeventadaptors/
- test -d "$cep_xml_path/outputeventadaptors" || mkdir -p "$cep_xml_path/outputeventadaptors" && cp -f $cep_artifacts_path/outputeventadaptors/*.xml $cep_xml_path/outputeventadaptors/
- test -d "$cep_xml_path/executionplans" || mkdir -p "$cep_xml_path/executionplans" && cp -f $cep_artifacts_path/executionplans/*.xml $cep_xml_path/executionplans/
- test -d "$cep_xml_path/eventformatters" || mkdir -p "$cep_xml_path/eventformatters" && cp -f $cep_artifacts_path/eventformatters/*.xml $cep_xml_path/eventformatters/
- cp -f $cep_artifacts_path/streamdefinitions/*.xml $cep_conf_path/
-
pushd $stratos_extract_path
echo "In outputeventadaptors"
+
sed -i "s@CEP_HOME@$stratos_extract_path@g" repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml
sed -i "s@MB_HOSTNAME:MB_LISTEN_PORT@$mb_ip:$mb_port@g" repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml
-
- echo "In repository/conf/siddhi/siddhi.extension"
- test -d "repository/conf/siddhi" || mkdir -p "repository/conf/siddhi" && touch repository/conf/siddhi/siddhi.extension
- cp -f repository/conf/siddhi/siddhi.extension repository/conf/siddhi/siddhi.extension.orig
- echo "org.apache.stratos.cep.extension.GradientFinderWindowProcessor" >> repository/conf/siddhi/siddhi.extension.orig
- echo "org.apache.stratos.cep.extension.SecondDerivativeFinderWindowProcessor" >> repository/conf/siddhi/siddhi.extension.orig
- echo "org.apache.stratos.cep.extension.FaultHandlingWindowProcessor" >> repository/conf/siddhi/siddhi.extension.orig
- mv -f repository/conf/siddhi/siddhi.extension.orig repository/conf/siddhi/siddhi.extension
-
echo "End configuring the Complex Event Processor"
popd
}
@@ -535,7 +493,6 @@ if [ "$UID" -ne "0" ]; then
fi
general_conf_validate
-mb_jars_validate
if [[ $profile = "cc" ]]; then
cc_conf_validate
elif [[ $profile = "as" ]]; then
@@ -548,7 +505,6 @@ else
cc_conf_validate
as_conf_validate
sm_conf_validate
- cep_conf_validate
fi
if [[ ! -d $log_path ]]; then
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@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/742b189d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/742b189d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/742b189d
Branch: refs/heads/master
Commit: 742b189d85080b36b7c6095473211ad3aec77b14
Parents: 9de63a6 6d75b4b
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Apr 3 15:20:56 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Apr 3 15:20:56 2014 +0530
----------------------------------------------------------------------
...AndSecurityGroupsAsNeededAndReturnRunOptionsTest.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------