From f13281845907a49e26f11525545f5b71dccc54a4 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Mon, 21 Nov 2016 19:14:48 +0530
Subject: [PATCH] renamed default idp name

---
 modules/analytics/distribution/src/assembly/bin.xml         | 2 +-
 .../distribution/src/repository/conf/etc/jwt.properties     | 4 ++--
 modules/core/distribution/src/assembly/bin.xml              | 4 ++--
 .../{CDMF_DEFAULT_IDP.xml => iot_default.xml}               | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename modules/core/distribution/src/repository/conf/identity/identity-providers/{CDMF_DEFAULT_IDP.xml => iot_default.xml} (93%)

diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index 9e6ee8a9..5191bf41 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -184,7 +184,7 @@
                 <include>inputwebsocket.war</include>
                 <include>outputwebsocket.war</include>
                 <include>outputui.war</include>
-                <include>secured-outputui.war</include>
+                <include>secured-websocket.war</include>
             </includes>
         </fileSet>
         <!-- END CEP -->
diff --git a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
index 40548373..56870d68 100644
--- a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
+++ b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
@@ -17,13 +17,13 @@
 #
 
 #issuer of the JWT
-iss=CDMF_DEFAULT_IDP
+iss=iot_default
 
 TokenEndpoint=https://localhost:${iot.core.https.port}/oauth2/token
 
 #audience of JWT claim
 #comma seperated values
-aud=JwtIdentityAudience
+aud=wso2.org/products/iot
 
 #expiration time of JWT (number of minutes from the current time)
 exp=1000
diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 0cac429d..321c76a5 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -839,7 +839,7 @@
         </file>
         <file>
             <source>
-                src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml
+                src/repository/conf/identity/identity-providers/iot_default.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers</outputDirectory>
             <filtered>true</filtered>
@@ -1153,7 +1153,7 @@
         </file>
         <file>
             <source>
-                src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml
+                src/repository/conf/identity/identity-providers/iot_default.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers</outputDirectory>
             <filtered>true</filtered>
diff --git a/modules/core/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml b/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
similarity index 93%
rename from modules/core/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml
rename to modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
index 8109ae92..07b7f035 100644
--- a/modules/core/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml
+++ b/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
@@ -17,10 +17,10 @@
   -->
 
 <IdentityProvider>
-	<IdentityProviderName>CDMF_DEFAULT_IDP</IdentityProviderName>
-	<DisplayName>CDMF_DEFAULT_IDP</DisplayName>
+	<IdentityProviderName>iot_default</IdentityProviderName>
+	<DisplayName>iot_default</DisplayName>
 	<IdentityProviderDescription></IdentityProviderDescription>
-	<Alias>JwtIdentityAudience</Alias>
+	<Alias>wso2.org/products/iot</Alias>
 	<IsPrimary>true</IsPrimary>
 	<IsFederationHub></IsFederationHub>
 	<HomeRealmId></HomeRealmId>