You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/12/17 12:47:55 UTC

[1/2] git commit: Add CEP related configurations

Updated Branches:
  refs/heads/master 502db4103 -> d6610d54d


Add CEP related configurations

Signed-off-by: Manula Thantriwatte <ma...@apache.org>


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

Branch: refs/heads/master
Commit: ecf3ba61e87296b174fdea6c3723f960f713fa2e
Parents: 29671ce
Author: Dinesh Bandara <di...@wso2.com>
Authored: Tue Dec 17 17:13:37 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Dec 17 17:17:06 2013 +0530

----------------------------------------------------------------------
 tools/stratos-installer/setup.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ecf3ba61/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index dee666a..b1d355a 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -245,7 +245,7 @@ function sm_conf_validate {
     if [[-z $cc_hostname || -z $as_hostname ]]; then
 	echo "Please specify valid hostname for AS and/or CC"
 	exit 1
-    elif
+    fi
 }
 
 
@@ -350,6 +350,7 @@ function cep_setup {
     cp -f $cep_extension_path/artifacts/outputeventadaptors/*.xml $cep_path/repository/deployment/server/outputeventadaptors/
     cp -f $cep_extension_path/artifacts/executionplans/*.xml $cep_path/repository/deployment/server/executionplans/
     cp -f $cep_extension_path/artifacts/eventformatters/*.xml $cep_path/repository/deployment/server/eventformatters/
+    cp -f $cep_extension_path/artifacts/streamdefinitions/*.xml $cep_path/repository/conf/
 
     pushd $cep_path
 
@@ -361,6 +362,10 @@ function cep_setup {
     cp -f repository/conf/jndi.properties repository/conf/jndi.properties.orig
     cat repository/conf/jndi.properties.orig | sed -e "s@MB_HOSTNAME:MB_LISTEN_PORT@$mb_hostname:$cep_mb_listen_port@g" > repository/conf/jndi.properties
 
+    echo "In outputeventadaptors"
+    cp -f repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml.orig
+    cat repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml.orig | sed -e "s@CEP_HOME@$cep_path@g" > repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml
+
     echo "In 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


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

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

Branch: refs/heads/master
Commit: d6610d54d3648ee7a4619381303b8054bc129226
Parents: ecf3ba6 502db41
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Tue Dec 17 17:17:37 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Dec 17 17:17:37 2013 +0530

----------------------------------------------------------------------
 service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------