From 8597299bba3977af7a2625a712f4b712921409df Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 8 Sep 2015 12:08:45 +0530
Subject: [PATCH] Added files to cater apim component activation

---
 modules/distribution/pom.xml              | 70 -----------------------
 modules/distribution/src/assembly/bin.xml |  9 +++
 modules/p2-profile-gen/pom.xml            | 34 ++++++++++-
 pom.xml                                   | 11 +---
 4 files changed, 44 insertions(+), 80 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 50b69080..3988dad4 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -97,47 +97,6 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
 
-                    <!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
-                    <!--<execution>-->
-                        <!--<id>2-identity-h2-table-gen</id>-->
-                        <!--<phase>package</phase>-->
-                        <!--<configuration>-->
-                            <!--<target>-->
-                                <!--<echo message="########### Create Identity Database ##############"/>-->
-                                <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity"-->
-                                      <!--overwrite="false">-->
-                                    <!--<fileset-->
-                                            <!--dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/">-->
-                                    <!--</fileset>-->
-                                <!--</copy>-->
-                                <!--<path id="h2.classpath">-->
-                                    <!--<path refid="maven.compile.classpath"/>-->
-                                <!--</path>-->
-                                <!--<echo message="########### Create Identity Database ##############"/>-->
-                                <!--<sql driver="org.h2.Driver"-->
-                                     <!--url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB"-->
-                                     <!--userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">-->
-                                    <!--<classpath>-->
-                                        <!--<path refid="h2.classpath"/>-->
-                                    <!--</classpath>-->
-                                    <!--<fileset-->
-                                            <!--file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql"/>-->
-                                <!--</sql>-->
-                                <!--&lt;!&ndash;sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">-->
-                                    <!--<classpath>-->
-                                        <!--<path refid="h2.classpath" />-->
-                                    <!--</classpath>-->
-                                    <!--<fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql" />-->
-
-                                <!--</sql&ndash;&gt;-->
-                                <!--<echo message="##################### END ########################"/>-->
-                            <!--</target>-->
-                        <!--</configuration>-->
-                        <!--<goals>-->
-                            <!--<goal>run</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-
                     <!--============ Added with ES Features ===============-->
 
                     <execution>
@@ -191,33 +150,6 @@
                         </configuration>
                     </execution>
 
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IDP Management schema &ndash;&gt;-->
-                    <!--<id>create-idp-mgt-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/repository/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE"/>-->
-
-                    <!--<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}"-->
-                    <!--autocommit="true" onerror="continue">-->
-                    <!--<classpath refid="maven.dependency.classpath"/>-->
-                    <!--<classpath refid="maven.compile.classpath"/>-->
-                    <!--<classpath refid="maven.runtime.classpath"/>-->
-                    <!--<fileset-->
-                    <!--file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/application-mgt/h2.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
                     <execution>
                         <!-- Creating API Management schema -->
                         <id>create-api-mgt-schema</id>
@@ -482,8 +414,6 @@
 
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics"/>
 
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches"/>
-
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib"/>
 
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps"
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 12f9692b..1ce13c3f 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1003,6 +1003,15 @@
         <!--========================================================================================================-->
         <!-- End of Enterprise Store Features -->
 
+        <!-- Copying apim feature - bam.xml -->
+        <file>
+        <source>
+        ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml
+        </source>
+        <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+        <filtered>true</filtered>
+        <fileMode>644</fileMode>
+        </file>
 
 
     </files>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 0a2305b7..c5379e6f 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -577,6 +577,20 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
+
+                                <!--added das features-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.lite.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+
+                                <!--APIM feature-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.bam.service.agent.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <!--End of APIM Feature-->
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1085,9 +1099,25 @@
 								<!--========================================================================================================-->
 								<!-- End of Enterprise Store Features -->
 
+                                <!--<feature>-->
+                                    <!--<id>org.apache.synapse.wso2.feature.group</id>-->
+                                    <!--<version>${carbon.mediation.version}</version>-->
+                                <!--</feature>-->
+
+                                <!--APIM feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.system.statistics.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.bam.service.agent.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <!--End of APIM Feature-->
+                                <!--DAS Feature-->
                                 <feature>
-                                <id>org.apache.synapse.wso2.feature.group</id>
-                                <version>${carbon.mediation.version}</version>
+                                    <id>org.wso2.carbon.analytics.lite.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
                                 </feature>
 							</features>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 66a06561..6d133036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -790,6 +790,8 @@
                 <artifactId>commons-httpclient</artifactId>
                 <version>${orbit.version.commons-httpclient}</version>
             </dependency>
+
+
         </dependencies>
     </dependencyManagement>
 
@@ -846,7 +848,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Commons -->
-        <carbon.commons.version>4.4.6</carbon.commons.version>
+        <carbon.commons.version>4.4.7</carbon.commons.version>
 
         <!-- Carbon Deployment -->
         <carbon.deployment.version>4.5.0</carbon.deployment.version>
@@ -892,13 +894,6 @@
 
         <!--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>