Merge branch 'master' of https://github.com/wso2/product-sp

# Conflicts: # pom.xml
wso2 · Sep 14, 2018 · b17fd55 · b17fd55
2 parents c9fd7da + 1fb3052
commit b17fd55
Show file tree

Hide file tree

Showing 35 changed files with 50 additions and 71 deletions.
diff --git a/modules/distribution/carbon-home/conf/dashboard/deployment.yaml b/modules/distribution/carbon-home/conf/dashboard/deployment.yaml
@@ -446,34 +446,6 @@ wso2.status.dashboard:
   workerAccessCredentials:
     username: 'admin'
     password: 'admin'
-  queries:
-    -
-     mappings:
-        tableCreateQuery:
-        foreignKeyQuery:
-        tableCheckQuery:
-        recordSelectQuery:
-        recordSelectAppMetricsQuery:
-        recordSelectAgregatedAppMetricsQuery:
-        recordSelectWorkerThroughputQuery:
-        recordSelectWorkerAggregateThroughputQuery:
-        recordSelectWorkerMetricsQuery:
-        recordSelectWorkerAggregateMetricsQuery:
-        recordInsertQuery:
-        recordDeleteQuery:
-        selectAppComponentList:
-        selectAppComponentMetrics:
-        selectAppComponentHistory:
-        selectAppComponentAggregatedHistory:
-        doubleType:
-        floatType:
-        integerType:
-        longType:
-        stringType:
-        booleanType:
-
-     type: default
-     version: default
 
 wso2.transport.http:
   transportProperties:

diff --git a/modules/distribution/carbon-home/updates/product.txt b/modules/distribution/carbon-home/updates/product.txt
@@ -0,0 +1 @@
+${product.wum.name}-${product.version}
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>org.wso2.carbon.sp.parent</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
@@ -244,6 +244,12 @@
         </fileSet>
     </fileSets>
     <files>
+        <file>
+            <source>carbon-home/updates/product.txt</source>
+            <outputDirectory>updates/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>444</fileMode>
+        </file>
         <file>
             <source>target/wso2carbon-kernel-${carbon.kernel.version}/bin/kernel-version.txt</source>
             <outputDirectory>bin/</outputDirectory>

diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
@@ -1,4 +1,5 @@
 product.name=WSO2 Stream Processor
-product.version=4.2.0
+product.version=4.3.0
 server.name=WSO2 Carbon Kernel
-server.version=5.2.7
+server.version=5.2.7
+product.wum.name=wso2sp
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>org.wso2.carbon.sp.parent</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/performance/pom.xml b/modules/performance/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>org.wso2.carbon.sp.parent</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/artifacts/PublishEmailInTextFormat/PublishEmailInTextFormat.siddhi b/modules/samples/artifacts/PublishEmailInTextFormat/PublishEmailInTextFormat.siddhi
@@ -34,8 +34,8 @@ Viewing the Results:
         Subject: Test Siddhi-io-email-{{name}}
         Content: 
             name:"chocolate cake",
-            hourlyTotal:10.10,
-            currentHour:9.0
+            hourlyTotal:10.1,
+            currentHour:<current hour of the system's timestamp>
 
 */
 

diff --git a/modules/samples/artifacts/PublishJmsInKeyvalueFormat/PublishJmsInKeyvalueFormat.siddhi b/modules/samples/artifacts/PublishJmsInKeyvalueFormat/PublishJmsInKeyvalueFormat.siddhi
@@ -65,7 +65,7 @@ Testing the Sample:
         Option 2:
          Publish events with Curl command to the simulator http endpoint:
             a) Open a new terminal and issue the following command:
-                * curl -X POST -d '{"streamName": "SweetProductionStream", "siddhiAppName": "PublishJmsInKeyvalueFormat","data": ['chocolate cake', 50.50]}' http://localhost:9390/simulation/single -H 'content-type: text/plain'
+                * curl -X POST -d '{"streamName": "SweetProductionStream", "siddhiAppName": "PublishJmsInKeyvalueFormat","data": ["chocolate cake", 50.50]}' http://localhost:9390/simulation/single -H 'content-type: text/plain'
             b) If there is no error, the following messages are shown on the terminal:
                 *  {"status":"OK","message":"Single Event simulation started successfully"}
 

diff --git a/modules/samples/artifacts/PublishJmsInXmlFormat/PublishJmsInXmlFormat.siddhi b/modules/samples/artifacts/PublishJmsInXmlFormat/PublishJmsInXmlFormat.siddhi
@@ -65,7 +65,7 @@ Testing the Sample:
         Option 2:
          Publish events with Curl command to the simulator http endpoint:
             a) Open a new terminal and issue the following command:
-                * curl -X POST -d '{"streamName": "SweetProductionStream", "siddhiAppName": "PublishJmsInXmlFormat","data": ['chocolate cake', 50.50]}' http://localhost:9390/simulation/single -H 'content-type: text/plain'
+                * curl -X POST -d '{"streamName": "SweetProductionStream", "siddhiAppName": "PublishJmsInXmlFormat","data": ["chocolate cake", 50.50]}' http://localhost:9390/simulation/single -H 'content-type: text/plain'
             b) If there is no error, the following messages are shown on the terminal:
                 *  {"status":"OK","message":"Single Event simulation started successfully"}
 

diff --git a/modules/samples/artifacts/RScriptSample/RScriptSample.siddhi b/modules/samples/artifacts/RScriptSample/RScriptSample.siddhi
@@ -39,7 +39,7 @@ Viewing the Results:
 define stream weather (time long, temp double);
 
 @sink(type='log')
-define stream dataOut (c long, m double );
+define stream dataOut (time long, temp double, c long, m double );
 
 @info(name = 'query')
 from weather#window.lengthBatch(2)#r:eval("c <- sum(time); m <- sum(temp); ", "c long, m double",time, temp)

diff --git a/modules/samples/artifacts/ReceiveKafkaInBinaryFormat/ReceiveKafkaInBinaryFormat.siddhi b/modules/samples/artifacts/ReceiveKafkaInBinaryFormat/ReceiveKafkaInBinaryFormat.siddhi
@@ -4,7 +4,7 @@
 
 /*
 Purpose:
-    This application demonstrates how to configure WSO2 Stream Processor to receive events to the SweetProductionStream via Kafka transport in Text format using custom mapping and log the events in LowProductionAlertStream to the output console.
+    This application demonstrates how to configure WSO2 Stream Processor to receive events to the SweetProductionStream via Kafka transport in Binary Format and log the events in LowProductionAlertStream to the output console.
 
 Prerequisites:
     1) The following steps must be executed to enable WSO2 SP to receive events via the Kafka transport. Since you need to shut down the server to execute these steps, get a copy of these instructions prior to proceeding.
@@ -32,7 +32,7 @@ Prerequisites:
 Executing the Sample:
     1) Start the Siddhi application by clicking on 'Run'
     2) If the Siddhi application starts successfully, the following messages would be shown on the console,
-        * ReceiveKafkaInTextFormatWithCustomMapping.siddhi - Started Successfully!
+        * ReceiveKafkaInBinaryFormat.siddhi - Started Successfully!
 
     Notes:
     If you edit this application while it's running, stop the application -> Save -> Start.
@@ -44,7 +44,7 @@ Testing the Sample:
 Viewing the Results:
     Messages similar to the following would be shown on the console.
 
-    INFO {org.wso2.siddhi.core.stream.output.sink.LogSink} - ReceiveKafkaInTextFormatWithCustomMapping : LowProductionAlertStream : Event{timestamp=1513282182570, data=["Cupcake", 1665.0], isExpired=false}
+    INFO {org.wso2.siddhi.core.stream.output.sink.LogSink} - ReceiveKafkaInBinaryFormat : LowProductionAlertStream : Event{timestamp=1513282182570, data=["Cupcake", 1665.0], isExpired=false}
 
     Note:
     Stop this Siddhi application, once you are done with the execution.

diff --git a/modules/samples/artifacts/SentimentSample/sentimentExtensionSample.siddhi b/modules/samples/artifacts/SentimentSample/sentimentExtensionSample.siddhi
@@ -31,7 +31,7 @@ Testing the Sample:
                   * Send events to the simulator http endpoint through the curl commands:
                       a) Open a new terminal and issue the following commands one after the other:
                           curl -X POST \
-                            http://localhost:9090/simulation/single \
+                            http://localhost:9390/simulation/single \
                             -u admin:admin \
                             -H 'content-type: text/plain' \
                             -d '{
@@ -45,7 +45,7 @@ Testing the Sample:
                           }'
 
                           curl -X POST \
-                            http://localhost:9090/simulation/single \
+                            http://localhost:9390/simulation/single \
                             -u admin:admin \
                             -H 'content-type: text/plain' \
                             -d '{

diff --git a/...amples/artifacts/StreamingHoeffdingClassifierSample/hoeffding-adaptive-tree-sample.siddhi b/...amples/artifacts/StreamingHoeffdingClassifierSample/hoeffding-adaptive-tree-sample.siddhi
@@ -71,15 +71,15 @@ Testing the Sample:
 
                   * Send events to the simulator http endpoint through the curl command:
                       a) Open a new terminal and issue the following command:
-                          * curl -X POST -d '{"streamName": "ProductionInputStream", "siddhiAppName": "streaming-hoeffding-classifier-sample","data": [30.4, 20.5]}' http://localhost:9390/simulation/single -H 'content-type: text/plain'
+                          * curl -X POST -d '{"streamName": "SweetProductionStream", "siddhiAppName": "streaming-hoeffding-classifier-sample","data": [30.4, 20.5]}' http://localhost:9390/simulation/single -H 'content-type: text/plain'
                       b) If there is no error, the following messages are shown on the terminal:
                           *  {"status":"OK","message":"Single Event simulation started successfully"}
 
                   * Publish events with Postman:
                       a) Install 'Postman' application from Chrome web store.
                       b) Launch the application.
                       c) Make a 'Post' request to the 'http://localhost:9390/simulation/single' endpoint. Set the Content-Type to 'text/plain' and set the request body in text as follows:
-                            	{"streamName": "ProductionInputStream", "siddhiAppName": "streaming-hoeffding-classifier-sample","data": [30.4, 20.5]}
+                            	{"streamName": "SweetProductionStream", "siddhiAppName": "streaming-hoeffding-classifier-sample","data": [30.4, 20.5]}
                       d) Click 'send'. If there is no error, the following messages are shown on the console:
                             *  "status": "OK",
                             *  "message": "Single Event simulation started successfully"

diff --git a/modules/samples/sample-clients/ei-analytics-client/pom.xml b/modules/samples/sample-clients/ei-analytics-client/pom.xml
@@ -15,13 +15,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/http-client/pom.xml b/modules/samples/sample-clients/http-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/http-server/pom.xml b/modules/samples/sample-clients/http-server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/is-analytics-client/pom.xml b/modules/samples/sample-clients/is-analytics-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/jms-consumer/pom.xml b/modules/samples/sample-clients/jms-consumer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/jms-producer/pom.xml b/modules/samples/sample-clients/jms-producer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/kafka-consumer/pom.xml b/modules/samples/sample-clients/kafka-consumer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/kafka-producer/pom.xml b/modules/samples/sample-clients/kafka-producer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/mqtt-client/pom.xml b/modules/samples/sample-clients/mqtt-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/mqtt-consumer/pom.xml b/modules/samples/sample-clients/mqtt-consumer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/pom.xml b/modules/samples/sample-clients/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>org.wso2.carbon.sp.parent</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/rabbitmq-consumer/pom.xml b/modules/samples/sample-clients/rabbitmq-consumer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/rabbitmq-producer/pom.xml b/modules/samples/sample-clients/rabbitmq-producer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/tcp-client/pom.xml b/modules/samples/sample-clients/tcp-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/tcp-server/pom.xml b/modules/samples/sample-clients/tcp-server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/websocket-producer/pom.xml b/modules/samples/sample-clients/websocket-producer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>sample-clients</artifactId>
         <groupId>org.wso2.sp</groupId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>WSO2 Stream Processor - Sample - WebSocket Client</name>

diff --git a/modules/samples/sample-clients/websocket-receiver/pom.xml b/modules/samples/sample-clients/websocket-receiver/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>sample-clients</artifactId>
         <groupId>org.wso2.sp</groupId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>WSO2 Stream Processor - Sample - WebSocket Consumer</name>

diff --git a/modules/samples/sample-clients/wso2event-client/pom.xml b/modules/samples/sample-clients/wso2event-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/samples/sample-clients/wso2event-server/pom.xml b/modules/samples/sample-clients/wso2event-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.sp</groupId>
         <artifactId>org.wso2.carbon.sp.parent</artifactId>
-        <version>4.3.0-rc2-SNAPSHOT</version>
+        <version>4.3.0-rc4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>