Updated Branches:
  refs/heads/master c9e2dab45 -> 308abedc0

Copy andes client jar to CEP using installer

Signed-off-by: Manula Thantriwatte <[email protected]>


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

Branch: refs/heads/master
Commit: 308abedc0e0871228149d25c5e8128207cfc9f0f
Parents: c9e2dab
Author: Dinesh Bandara <[email protected]>
Authored: Wed Feb 12 18:00:02 2014 +0530
Committer: Manula Thantriwatte <[email protected]>
Committed: Thu Feb 13 12:36:41 2014 +0530

----------------------------------------------------------------------
 tools/stratos-installer/README.txt                  | 13 ++++++++-----
 tools/stratos-installer/conf/setup.conf             |  3 ++-
 .../config/cep/repository/conf/jndi.properties      | 16 ++++++++--------
 tools/stratos-installer/setup.sh                    |  5 +++++
 4 files changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/308abedc/tools/stratos-installer/README.txt
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/README.txt 
b/tools/stratos-installer/README.txt
index 786cc17..118ddb1 100644
--- a/tools/stratos-installer/README.txt
+++ b/tools/stratos-installer/README.txt
@@ -46,16 +46,18 @@ How to Install
 
 7. Download MySql Java connector from http://dev.mysql.com/downloads and copy 
the jar file to stratos-pack-path.
 
-8. Create and download keys from IaaSs and store them on a secure location.
+8. Download andes client jar from 
http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/andes/wso2/andes-client/0.13.wso2v8/
 and copy to stratos-pack-path.
 
-9. If Apache Stratos being setup in multiple nodes open up the security rules 
in IaaSs for ports which are used in cloud controller, stratos manager, 
autoscaler,
+9. Create and download keys from IaaSs and store them on a secure location.
+
+10. If Apache Stratos being setup in multiple nodes open up the security rules 
in IaaSs for ports which are used in cloud controller, stratos manager, 
autoscaler,
    WSO2 Message Broker and WSO2 Complex Event Processor as well as 
stratos_db_port, userstore_db_port ports (defined in ./conf/setup.conf file).
 
-10. Either download pre-built cartridge images from Apache Stratos website or 
create your own cartridges. Please refer Apache Stratos documentation 
+11. Either download pre-built cartridge images from Apache Stratos website or 
create your own cartridges. Please refer Apache Stratos documentation 
    for more information on creating cartridge images. For Amazon EC2, you 
could find pre-built PHP, MySQL and Tomcat cartridges published in Amazon EC2
    AMI image repository.
 
-11. Update ./conf/setup.conf and configure settings. If you run the stratos in 
a single node and for openstack, please update the following entries in the 
setup.conf
+12. Update ./conf/setup.conf and configure settings. If you run the stratos in 
a single node and for openstack, please update the following entries in the 
setup.conf
 
        - setup_path            ==> Folder path containing 
stratos_setup(stratos_installer)
        - stratos_pack_path     ==> Folder path containing stratos packages(all 
stratos packs + cep + mb) 
@@ -69,6 +71,7 @@ How to Install
        - sm_ip                 ==> Machine ip on which sc run
        - puppet_ip             ==> Machine ip on which puppet master run
        - cep_extension_path    ==> Folder path containing cep 
extensions(STRATOS_SOURCE_ROOT/extensions/cep)
+       - andes_client_jar      ==> andes client jar file name
        - mysql_connector_jar   ==> mysql connector jar file name
        - userstore_db_hostname ==> hostname or ip where mysql is running
        - userstore_db_schema   ==> "userstore": the name of the userstore 
database
@@ -96,7 +99,7 @@ How to Install
        - openstack_jclouds_endpoint    ==> "http://xxxxxxxxx:5000/v2.0";
 
 
-12. Run setup.sh as root to install.
+13. Run setup.sh as root to install.
 
     sudo ./setup.sh -p "<product-list>"
     <product-list> could be defined as "cc sm as mb cep" or any other 
combination according to the deployment configuration.

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/308abedc/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf 
b/tools/stratos-installer/conf/setup.conf
index f9681a1..9cd0c20 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -79,7 +79,8 @@ export mb_pack_path=$stratos_pack_path/"wso2mb-2.1.0.zip"
 # CEP configuration
 # ----------------------------------------------------------------------------
 export cep_extension_path= #Folder path containing cep extensions
-export 
cep_extension_jar=$stratos_pack_path/"org.apache.stratos.cep.extension-1.0.0-SNAPSHOT.jar"
 # cep extensions jaf file name
+export 
cep_extension_jar=$stratos_pack_path/"org.apache.stratos.cep.extension-1.0.0-SNAPSHOT.jar"
 # cep extensions jar file name
+export andes_client_jar=$stratos_pack_path/"andes-client-0.13.wso2v8.jar" # 
andes client jar file name
 
 export cep_path=$stratos_path/"wso2cep-3.0.0"
 export cep_pack_path=$stratos_pack_path/"wso2cep-3.0.0.zip"

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/308abedc/tools/stratos-installer/config/cep/repository/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/cep/repository/conf/jndi.properties 
b/tools/stratos-installer/config/cep/repository/conf/jndi.properties
index f8eac5b..990ded6 100644
--- a/tools/stratos-installer/config/cep/repository/conf/jndi.properties
+++ b/tools/stratos-installer/config/cep/repository/conf/jndi.properties
@@ -15,18 +15,18 @@
 #
 
 # register some connection factories
-# connectionfactory.[jndiname] = [ConnectionURL]
+# connectionfactory.[jndiname]=[ConnectionURL]
 
-#java.naming.factory.initial = 
org.wso2.andes.jndi.PropertiesFileInitialContextFactory
+java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
 
 # use the following property to configure the default connector
-connectionfactory.topicConnectionfactory = 
amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5677'&reconnect='true'
+connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true'
 
 # use the following property to specify the JNDI name of the connection 
factory 
-connectionFactoryNames = connectionfactory, topicConnectionfactory
+connectionfactoryName=connectionfactory,topicConnectionfactory
 
 # register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-topic.lb-stats = lb-stats
-topic.instance-stats = instance-stats
-topic.summarized-health-stats = summarized-health-stats
+# topic.[jndiName]=[physicalName]
+topic.lb-stats=lb-stats
+topic.instance-stats=instance-stats
+topic.summarized-health-stats=summarized-health-stats

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/308abedc/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index f4b9e0c..922747d 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -199,6 +199,10 @@ function cep_conf_validate {
         echo "Please copy the cep extension jar into the same folder as this 
command(stratos release pack folder) and update conf/setup.conf file"
         exit 1
     fi
+    if [[ ! -f $andes_client_jar ]]; then
+        echo "Please copy the andes client jar into the same folder as this 
command(stratos release pack folder) and update conf/setup.conf file"
+        exit 1
+    fi
 }
 
 function cc_conf_validate {
@@ -377,6 +381,7 @@ function cep_setup {
 
     cp -f ./config/cep/repository/conf/jndi.properties 
$cep_path/repository/conf/
     cp -f $cep_extension_jar $cep_path/repository/components/lib/
+    cp -f $andes_client_jar $cep_path/repository/components/dropins/
     cp -f $cep_extension_path/artifacts/eventbuilders/*.xml 
$cep_path/repository/deployment/server/eventbuilders/
     cp -f $cep_extension_path/artifacts/inputeventadaptors/*.xml 
$cep_path/repository/deployment/server/inputeventadaptors/
     cp -f $cep_extension_path/artifacts/outputeventadaptors/*.xml 
$cep_path/repository/deployment/server/outputeventadaptors/

Reply via email to