Merge remote-tracking branch 'origin/es-integration' into es-integration

modules/distribution/src/assembly/bin.xml

@@ -523,6 +523,21 @@
                 <exclude>styles-layout.css</exclude>
             </excludes>
         </fileSet-->
+
+        <!-- Analytics related config -->
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics</outputDirectory>
+            <includes>
+                <include>**/analytics-config.xml</include>
+                <include>**/rdbms-config.xml</include>
+                <include>**/hbase-analytics-config.xml</include>
+                <include>**/analytics-data-config.xml</include>
+                <include>**/analytics-eventsink-config.xml</include>
+            </includes>
+        </fileSet>
     </fileSets>
 
     <dependencySets>
@@ -1006,14 +1021,25 @@
 
         <!-- Copying apim feature - bam.xml -->
         <file>
-        <source>
+            <source>
-        ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml
-        </source>
+            </source>
-        <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-        <filtered>true</filtered>
+            <filtered>true</filtered>
-        <fileMode>644</fileMode>
+            <fileMode>644</fileMode>
+        </file>
+
+        <!-- Analytics datasources -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/analytics-datasources.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
         </file>
 
 
+
     </files>
 </assembly>

pom.xml

@@ -790,8 +790,6 @@
                 <artifactId>commons-httpclient</artifactId>
                 <version>${orbit.version.commons-httpclient}</version>
             </dependency>
-
-
         </dependencies>
     </dependencyManagement>
 
@@ -894,6 +892,13 @@
 
         <!--DAS-->
         <carbon.analytics.version>1.0.3-SNAPSHOT</carbon.analytics.version>
+        <carbon.analytics.common.version>5.0.1-SNAPSHOT</carbon.analytics.common.version>
+        <das.release.version>3.0.0-SNAPSHOT</das.release.version>
+        <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
+        <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
+        <shindig.version>1.0.0</shindig.version>
+        <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
+        <carbon.event-processing.version>2.0.4-SNAPSHOT</carbon.event-processing.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>