Merge remote-tracking branch 'origin/master'

README.md

@@ -65,7 +65,7 @@ System Requirements
 4. To compile and run the sample clients, an Ant version is required. Ant 1.7.0 version is recommended
 5. To build WSO2 CEP from the Source distribution, it is necessary that you have JDK 1.7 version or later and Maven 3.0.4 or later
 
-For more details see http://docs.wso2.com/display/CEP400/Installation+Prerequisites
+For more details see http://docs.wso2.com/display/CEP410/Installation+Prerequisites
 
 Installation & Running
 ----------------------
@@ -77,15 +77,15 @@ Installation & Running
     username : admin
     password : admin
 
-For more details see https://docs.wso2.com/display/CEP400/Installing+the+Product
+For more details see https://docs.wso2.com/display/CEP410/Installing+the+Product
 
 Running Samples
 ---------------
 WSO2 CEP server can be started with the sample mode
 To start with sample mode run ./wso2cep-samples.sh -sn <sampleNo> or wso2cep-samples.bat -sn <sampleNo> in the bin directory
 Example, to run sample 0001: ./wso2cep-samples.sh -sn 0001
 
-For more details see https://docs.wso2.com/display/CEP400/Samples+Guide .
+For more details see https://docs.wso2.com/display/CEP410/Samples+Guide .
 
 **For further details, see the WSO2 Complex Event Processor documentation at http://docs.wso2.com/complex-event-processor**
 

modules/distribution/INSTALL.txt

@@ -1,7 +1,7 @@
-Installing  WSO2 Complex Event Processor (CEP) 4.0.0
+Installing  WSO2 Complex Event Processor (CEP) 4.1.0
 ===================================================================
 
-(1) WSO2 Complex Event Processor 4.0.0 can run in standalone mode.
+(1) WSO2 Complex Event Processor 4.1.0 can run in standalone mode.
 
 
 Standalone Mode
@@ -56,7 +56,7 @@ System Requirements
    JDK 1.7 version or later and Maven 3.0.4 or later
 
 For more details see
-http://docs.wso2.com/display/CEP400/Installation+Prerequisites
+http://docs.wso2.com/display/CEP410/Installation+Prerequisites
 
 (2) Running Samples
 -------------------
@@ -66,4 +66,4 @@ CEP server can also start with the sample mode (Note : dashboard will not work i
     Example, to run sample 0001: ./wso2cep-samples.sh -sn 0001
 
 CEP samples are available at CARBON_HOME/samples directory.
-The instructions to run sample are given at https://docs.wso2.com/display/CEP400/Samples+Guide .
+The instructions to run sample are given at https://docs.wso2.com/display/CEP410/Samples+Guide .

modules/distribution/README.txt

@@ -1,8 +1,8 @@
 ================================================================================
-                        WSO2 Complex Event Processing Server 4.0.0
+                        WSO2 Complex Event Processing Server 4.1.0
 ================================================================================
 
-Welcome to the WSO2 CEP 4.0.0 release
+Welcome to the WSO2 CEP 4.1.0 release
 
 WSO2 CEP is a lightweight and easy-to-use Open Source Complex Event Processing
 Server (CEP) is available under the Apache Software License v2.0. WSO2 Complex
@@ -96,7 +96,7 @@ You can use the carbon Feature management Console and add the back end runtime f
 For more information on installation read INSTALL.txt.
 
 
-WSO2 CEP 4.0.0 Binary Distribution Directory Structure
+WSO2 CEP 4.1.0 Binary Distribution Directory Structure
 ==========================================================
 
 
@@ -196,7 +196,7 @@ WSO2 CEP 4.0.0 Binary Distribution Directory Structure
       This document contains information on installing WSO2 CEP
 
     - release-notes.html
-      Release information for WSO2 CEP 4.0.0
+      Release information for WSO2 CEP 4.1.0
 
 
 Secure sensitive information in carbon configuration files
@@ -298,7 +298,7 @@ Crypto Notice
 
 
 For further details, see theWSO2 Complex Event Processor documentation at
-https://docs.wso2.com/display/CEP400/WSO2+Complex+Event+Processor+Documentation
+https://docs.wso2.com/display/CEP410/WSO2+Complex+Event+Processor+Documentation
 
 ---------------------------------------------------------------------------
 (c) Copyright 2015 WSO2 Inc.

modules/distribution/release-notes.html

@@ -17,14 +17,14 @@
 <html>
 <head>
     <meta http-equiv="content-type" content=""/>
-    <title>WSO2 Complex Event Processor 4.0.0 Release
+    <title>WSO2 Complex Event Processor 4.1.0 Release
         Notes</title>
     <link href="./tools/cmd/css/wsas-dist-doc.css" rel="stylesheet"
           type="text/css" media="all"/>
 </head>
 
 <body>
-<h1>WSO2 Complex Event Processor(WSO2 CEP) 4.0.0
+<h1>WSO2 Complex Event Processor(WSO2 CEP) 4.1.0
     Release Notes</h1>
 
 <h3>18 Sep 2015</h3>
@@ -60,8 +60,8 @@ <h3>18 Sep 2015</h3>
 
 <p>
     The WIKI based documentation is available at
-    <a href="https://docs.wso2.com/display/CEP400/WSO2+Complex+Event+Processor+Documentation">
-        https://docs.wso2.com/display/CEP400/WSO2+Complex+Event+Processor+Documentation
+    <a href="https://docs.wso2.com/display/CEP410/WSO2+Complex+Event+Processor+Documentation">
+        https://docs.wso2.com/display/CEP410/WSO2+Complex+Event+Processor+Documentation
     </a>
 </p>
 

modules/distribution/src/assembly/filter.properties

@@ -17,6 +17,6 @@
 product.name=WSO2 Complex Event Processor
 product.key=CEP
 default.server.role=ComplexEventProcessor
-product.version=4.0.0
+product.version=4.1.0
 carbon.version=4.4.0-SNAPSHOT
-cep.version=4.0.0
+cep.version=4.1.0

modules/integration/tests-integration/tests/src/test/java/org/wso2/carbon/integration/test/client/util/BasicDataSource.java

@@ -38,7 +38,7 @@ public Connection getConnection() throws SQLException {
 
         //String prefix = FrameworkPathUtil.getCarbonHome();
        // H2_CONNECTION_URL = "jdbc:h2:"+prefix+"/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000";
-        //H2_CONNECTION_URL = "jdbc:h2:/home/mohan/SVN_Files/git-repo/product-cep/modules/distribution/target/wso2cep-4.0.0-SNAPSHOT/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;AUTO_SERVER=TRUE";
+        //H2_CONNECTION_URL = "jdbc:h2:/home/mohan/SVN_Files/git-repo/product-cep/modules/distribution/target/wso2cep-4.1.0-SNAPSHOT/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;AUTO_SERVER=TRUE";
 
         try {
             Class.forName(H2_DRIVER_CLASS);

modules/integration/tests-integration/tests/src/test/resources/artifacts/CEP/StormTestCase/ManagerServiceTestCase/axis2.xml

@@ -69,10 +69,10 @@
     <parameter name="ModulesDirectory">axis2modules</parameter>
 
     <parameter name="userAgent" locked="true">
-        WSO2 Complex Event Processor-4.0.0
+        WSO2 Complex Event Processor-4.1.0
     </parameter>
     <parameter name="server" locked="true">
-        WSO2 Complex Event Processor-4.0.0
+        WSO2 Complex Event Processor-4.1.0
     </parameter>
 
     <!-- ========================================================================-->

modules/integration/tests-integration/tests/src/test/resources/artifacts/CEP/metrics/carbon.xml

@@ -37,7 +37,7 @@
     <!--
        Product Version
     -->
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
 
     <!--
        Host name or IP address of the machine hosting this server

modules/samples/ReadMe.txt

@@ -1,33 +1,33 @@
 Samples -  WSO2 Complex Event Processor
 ------------------------------------------------
 
-This sample provides a simple scenario to check the event flow from the publisher to the subscriber through the CEP.
-
-There are basic samples given to try how CEP 4.0.0 works with different event adaptors and mappings..
+This directory provides simple scenarios to illustrate CEP functionality with different configurations.
 
 To run the samples...
 
-1) run the command ./wso2cep-samples.sh -sn {sample_id} from <CEP_HOME>/bin
+From Linux :
+    run the command ./wso2cep-samples.sh -sn {sample_id} from <CEP_HOME>/bin
     eg:- ./wso2cep-samples.sh -sn 0001
-    This command will startup the server with the sample configuration files.
-    The samples can be found in the <CEP_HOME>/samples/artifacts
 
-2) Here with the CEP 4.0.0 alpha-2 pack, there are 7 samples given...
+From Windows :
+    run the command wso2cep-samples.bat -sn {sample_id} from <CEP_HOME>/bin
+    eg:- wso2cep-samples.bat -sn 0001
 
+This command will startup the server with the sample configuration files.
+The samples can be found in the <CEP_HOME>/samples/artifacts
 
-Basic samples are numbered from 0001 to 0099. These samples explain how to configure different types of input/output adaptors and mappings.
 
+Basic samples are numbered from 0001 to 0099. These samples explain how to configure different types of event receivers & publishers and their mappings.
 Samples with processing queries are numbered from 0100 onwards.
 
-Each sample artifact will have its own ReadMe.txt in samples/artifacts/<sample-no> folder. The readme will contain the event adaptors,
-mappings in the sample and will also specify the consumer and producer clients needed for the sample.
+Each sample artifact will have its own ReadMe.txt in samples/artifacts/<sample-no> folder.
+The readme will contain the Producer & Consumer clients needed for the sample to run.
 
-Consumer clients are in samples/consumers/ and producer clients are in samples/producers/
+Consumer clients are in samples/consumers/ and Producer clients are in samples/producers/
 
-Each client can be run through the ant client and any additional options will be printed to the console when running ant.
+Each client can be run through the provided ant script and additional options it supports will be printed to the console when running ant.
 
-Here you can traverse through the UI and check the user-friendliness of the UI and check for the new features which
-available in CEP 4.0.0
+For more infomaiton of running samples please refer https://docs.wso2.com/display/CEP410/Samples+Guide
 
 
 

modules/styles/product/src/main/resources/META-INF/product.xml

@@ -17,7 +17,7 @@
 <product xmlns="http://products.wso2.org/carbon">
     <properties>
         <property name="userforum">http://stackoverflow.com/questions/tagged/wso2cep/</property>
-        <property name="userguide">http://docs.wso2.com/display/CEP400/</property>
+        <property name="userguide">http://docs.wso2.com/display/CEP410/</property>
         <property name="mailinglist">http://wso2.org/mail</property>
         <property name="issuetracker">https://wso2.org/jira/browse/CEP</property>
     </properties>

modules/styles/product/src/main/resources/web/product/about.html

@@ -20,13 +20,13 @@
 <link href="../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all"/>
 </head>
 <body>
-<h1>Version 4.0.0</h1>
+<h1>Version 4.1.0</h1>
 <h2>About WSO2 Complex Event Processor </h2>
 <p>WSO2 CEP is a lightweight and easy-to-use Open Source Complex Event Processor
 (CEP) available under the Apache Software License v2.0.</p>
 
 
-<p>WSO2 CEP 4.0.0 is developed on top of the revolutionary
+<p>WSO2 CEP 4.1.0 is developed on top of the revolutionary
     <a href="http://wso2.org/projects/carbon">Carbon platform</a>
 and is based on the OSGi framework to achieve the
 better modularity for your SOA architecture. This also contains a lots of new
@@ -109,7 +109,7 @@ <h3>Stay connected </h3>
 more.</p>
 <!--h3>Need more help?</h3>
 <ul>
-<li><a href="http://wso2.org/project/cep/java/4.0.0/docs/index.html">Online Documentation</a></li>
+<li><a href="http://wso2.org/project/cep/java/4.1.0/docs/index.html">Online Documentation</a></li>
 <li><a href="http://wso2.org/library/esb">Read articles</a></li>
 <li><a href="http://wso2.org/forum/187">Post to the BRS forum</a></li>
 <li><a href="http://wso2.org/mail">Subscribe to the mailing list</a></li>

modules/styles/service/src/main/resources/META-INF/product.xml

@@ -17,7 +17,7 @@
 <product xmlns="http://products.wso2.org/carbon">
     <properties>
         <property name="userforum">http://stackoverflow.com/questions/tagged/wso2cep/</property>
-        <property name="userguide">http://docs.wso2.org/display/CEP400/</property>
+        <property name="userguide">http://docs.wso2.org/display/CEP410/</property>
         <property name="mailinglist">http://wso2.org/mail</property>
         <property name="issuetracker">https://wso2.org/jira/browse/CEP</property>
     </properties>

modules/styles/service/src/main/resources/web/product/about.html

@@ -109,7 +109,7 @@ <h3>Stay connected </h3>
     more.</p>
 <!--h3>Need more help?</h3>
 <ul>
-<li><a href="http://wso2.org/project/cep/java/4.0.0/docs/index.html">Online Documentation</a></li>
+<li><a href="http://wso2.org/project/cep/java/4.1.0/docs/index.html">Online Documentation</a></li>
 <li><a href="http://wso2.org/library/esb">Read articles</a></li>
 <li><a href="http://wso2.org/forum/187">Post to the BRS forum</a></li>
 <li><a href="http://wso2.org/mail">Subscribe to the mailing list</a></li>