From 751b2f8daeb55988259a6b57ab7c3e4ed158907b Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 3 May 2016 18:40:31 +0530
Subject: [PATCH] removed unused sample device types

---
 modules/distribution/pom.xml                  |  6 ++
 modules/distribution/src/assembly/bin.xml     | 19 ++++--
 modules/distribution/src/assembly/dist.xml    |  2 +-
 .../src/repository/conf/cdm-config.xml        | 61 +++++++++++++++++++
 4 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 modules/distribution/src/repository/conf/cdm-config.xml

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 3c18a0fa..724539a0 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -260,6 +260,12 @@ d                                        <exclude name="**/shindig.properties" /
 										<exclude name="**/*.iml"/>
 										<exclude name="**/.DS_Store"/>
 										<exclude name="**/target/"/>
+										<exclude name="**/currentsensor/**"/>
+										<exclude name="**/digitaldisplay/**"/>
+										<exclude name="**/doormanager/**"/>
+										<exclude name="**/droneanalyzer/**"/>
+										<exclude name="**/firealarm/**"/>
+										<exclude name="**/installer/**"/>
 									</fileset>
 								</copy>
 
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 9ea50b60..889a13f2 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -111,9 +111,7 @@
                 <exclude>**/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
                 <exclude>**/org.wso2.carbon.hostobjects.sso_4.4.3.jar</exclude>
                 <exclude>**/org.wso2.carbon.hostobjects.sso_4.3.2.jar</exclude>
-                <!--<exclude>**/libthrift_0.8.0.wso2v1.jar</exclude>-->
-                <exclude>**/am#sample#calculator#v1.war</exclude>
-                <exclude>**/api.war</exclude>
+                <exclude>**/conf/log4j.properties</exclude>
             </excludes>
         </fileSet>
 
@@ -220,6 +218,7 @@
                 <include>**/sso-idp-config.xml</include>
                 <include>**/application-authentication.xml</include>
                 <include>**/broker.xml</include>
+                <include>**/log4j.properties</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -436,6 +435,8 @@
             </outputDirectory>
             <excludes>
                 <exclude>appmoauth2.war</exclude>
+                <exclude>am#sample#calculator#v1.war</exclude>
+                <exclude>api.war</exclude>
             </excludes>
             <filtered>false</filtered>
             <fileMode>644</fileMode>
@@ -937,7 +938,7 @@
         <!--cdm config file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml
+                src/repository/conf/cdm-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
@@ -1382,5 +1383,15 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <!-- Copying product specific log4j.properties that has unnecessary logs printed by third parties
+        components suppressed -->
+        <file>
+            <source>
+                src/repository/conf/log4j.properties
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
     </files>
 </assembly>
diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml
index ff057c49..1cc58910 100644
--- a/modules/distribution/src/assembly/dist.xml
+++ b/modules/distribution/src/assembly/dist.xml
@@ -32,7 +32,7 @@
                 <exclude>**/*.lock</exclude>
                 <exclude>**/.data</exclude>
                 <exclude>**/.settings</exclude>
-		<exclude>features/**</exclude>
+		        <exclude>features/**</exclude>
             </excludes>
         </fileSet>
     </fileSets>
diff --git a/modules/distribution/src/repository/conf/cdm-config.xml b/modules/distribution/src/repository/conf/cdm-config.xml
new file mode 100644
index 00000000..4ac277e3
--- /dev/null
+++ b/modules/distribution/src/repository/conf/cdm-config.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ you may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<DeviceMgtConfiguration>
+	<ManagementRepository>
+		<DataSourceConfiguration>
+			<JndiLookupDefinition>
+				<Name>jdbc/DM_DS</Name>
+			</JndiLookupDefinition>
+		</DataSourceConfiguration>
+	</ManagementRepository>
+	<IdentityConfiguration>
+		<ServerUrl>https://localhost:9443</ServerUrl>
+		<AdminUsername>admin</AdminUsername>
+		<AdminPassword>admin</AdminPassword>
+	</IdentityConfiguration>
+	<PolicyConfiguration>
+		<MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
+		<MonitoringEnable>false</MonitoringEnable>
+		<MonitoringFrequency>60000</MonitoringFrequency>
+		<MaxRetries>5</MaxRetries>
+		<MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
+		<MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
+	</PolicyConfiguration>
+	<TaskConfiguration>
+		<Enable>false</Enable>
+		<Frequency>600000</Frequency>
+		<TaskClass>org.wso2.carbon.device.mgt.core.task.impl.DeviceDetailsRetrieverTask</TaskClass>
+		<Operations>
+			<Operation>
+				<Name>DEVICE_INFO</Name>
+				<RecurrentTimes>1</RecurrentTimes>
+			</Operation>
+			<Operation>
+				<Name>APPLICATION_LIST</Name>
+				<RecurrentTimes>5</RecurrentTimes>
+			</Operation>
+			<Operation>
+				<Name>DEVICE_LOCATION</Name>
+				<RecurrentTimes>1</RecurrentTimes>
+			</Operation>
+		</Operations>
+	</TaskConfiguration>
+</DeviceMgtConfiguration>
+