Merge pull request #128 from ayyoob/das-ext

Added few changes after testing

modules/distribution/src/assembly/bin.xml

@@ -780,6 +780,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/etc/device-analytics-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <destName>device-analytics-config.xml</destName>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- Copying synapse-handlers.xml file -->
         <file>
             <source>src/repository/conf/synapse-handlers.xml</source>

modules/distribution/src/repository/conf/etc/device-analytics-config.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2016, 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.
+  -->
+
+<AnalyticsConfiguration>
+    <!--
+        Server URL of the remote DAS/BAM/CEP server used to collect statistics. Must
+        be specified in protocol://hostname:port/ format.
+
+        An event can also be published to multiple Receiver Groups each having 1 or more receivers. Receiver
+        Groups are delimited by curly braces whereas receivers are delimited by commas.
+        Ex - Multiple Receivers within a single group
+        tcp://localhost:7612/,tcp://localhost:7613/,tcp://localhost:7614/
+        Ex - Multiple Receiver Groups with two receivers each
+                 {tcp://localhost:7612/,tcp://localhost:7613},{tcp://localhost:7712/,tcp://localhost:7713/}
+    -->
+    <Enabled>true</Enabled>
+    <ReceiverServerUrl>tcp://localhost:7611</ReceiverServerUrl>
+    <AdminUsername>admin</AdminUsername>
+    <AdminPassword>admin</AdminPassword>
+</AnalyticsConfiguration>

modules/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml

@@ -20,7 +20,7 @@
 	<IdentityProviderName>CDMF_DEFAULT_IDP</IdentityProviderName>
 	<DisplayName>CDMF_DEFAULT_IDP</DisplayName>
 	<IdentityProviderDescription></IdentityProviderDescription>
-	<Alias>https://localhost:9443/oauth2/token</Alias>
+	<Alias>JwtIdentityAudience</Alias>
 	<IsPrimary>true</IsPrimary>
 	<IsFederationHub></IsFederationHub>
 	<HomeRealmId></HomeRealmId>

modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.input.adapter.extensions/pom.xml

@@ -154,7 +154,9 @@
                             org.apache.commons.httpclient.protocol,
                             org.apache.commons.pool,
                             org.apache.commons.pool.impl,
-                            org.apache.log4j
+                            org.apache.log4j,
+                            org.wso2.carbon.base,
+                            org.wso2.carbon.core.util
                         </Import-Package>
                     </instructions>
                 </configuration>

modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.input.adapter.extensions/src/main/java/org/wso2/carbon/event/input/adapter/extensions/http/oauth/OAuthTokenValidaterStubFactory.java

@@ -32,6 +32,7 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
 import org.apache.commons.pool.BasePoolableObjectFactory;
 import org.apache.log4j.Logger;
+import org.wso2.carbon.core.util.Utils;
 import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration;
 import org.wso2.carbon.event.input.adapter.extensions.http.oauth.exception.OAuthTokenValidationException;
 import org.wso2.carbon.event.input.adapter.extensions.http.util.HTTPEventAdapterConstants;
@@ -91,8 +92,8 @@ public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory {
 	private OAuth2TokenValidationServiceStub generateStub() throws OAuthTokenValidationException {
 		OAuth2TokenValidationServiceStub stub;
 		try {
-			URL hostURL = new URL(eventAdapterConfiguration.getProperties().get(
+			URL hostURL = new URL(Utils.replaceSystemProperty(eventAdapterConfiguration.getProperties().get(
-					HTTPEventAdapterConstants.TOKEN_VALIDATION_ENDPOINT_URL));
+					HTTPEventAdapterConstants.TOKEN_VALIDATION_ENDPOINT_URL)));
 			if (hostURL != null) {
 				stub = new OAuth2TokenValidationServiceStub(hostURL.toString());
 				if (stub != null) {

modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.input.adapter.extensions/src/main/java/org/wso2/carbon/event/input/adapter/extensions/mqtt/util/MQTTBrokerConnectionConfiguration.java

@@ -18,6 +18,7 @@
 package org.wso2.carbon.event.input.adapter.extensions.mqtt.util;
 
 import org.wso2.carbon.event.input.adapter.extensions.mqtt.Constants;
+import org.wso2.carbon.event.input.adapter.extensions.util.PropertyUtils;
 
 import java.util.Map;
 
@@ -108,8 +109,8 @@ public class MQTTBrokerConnectionConfiguration {
         if (brokerScopes == null) {
             this.brokerScopes = Constants.EMPTY_STRING;
         }
-        this.brokerUrl = brokerUrl;
+        this.brokerUrl = PropertyUtils.replaceMqttProperty(brokerUrl);
-        this.dcrUrl = dcrUrl;
+        this.dcrUrl = PropertyUtils.replaceMqttProperty(dcrUrl);
         this.contentValidatorClassName = contentValidatorClassName;
         if (cleanSession != null) {
             this.cleanSession = Boolean.parseBoolean(cleanSession);

modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.input.adapter.extensions/src/main/java/org/wso2/carbon/event/input/adapter/extensions/util/PropertyUtils.java

@@ -0,0 +1,55 @@
+/*
+*  Copyright (c) 2016, 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.
+*/
+
+package org.wso2.carbon.event.input.adapter.extensions.util;
+
+import org.wso2.carbon.base.ServerConfiguration;
+import org.wso2.carbon.core.util.Utils;
+
+public class PropertyUtils {
+    private static final String MQTT_PORT = "\\$\\{mqtt.broker.port\\}";
+    private static final String MQTT_BROKER_HOST = "\\$\\{mqtt.broker.host\\}";
+    private static final String CARBON_CONFIG_PORT_OFFSET = "Ports.Offset";
+    private static final String DEFAULT_CARBON_SERVER_HOST_PROPERTY = "server.host";
+    private static final int CARBON_DEFAULT_PORT_OFFSET = 0;
+    private static final int DEFAULT_MQTT_PORT = 1883;
+
+    //This method is only used if the mb features are within DAS.
+    public static String replaceMqttProperty (String urlWithPlaceholders) {
+        urlWithPlaceholders = Utils.replaceSystemProperty(urlWithPlaceholders);
+        urlWithPlaceholders = urlWithPlaceholders.replaceAll(MQTT_PORT, "" + (DEFAULT_MQTT_PORT + getPortOffset()));
+        urlWithPlaceholders = urlWithPlaceholders.replaceAll(MQTT_BROKER_HOST, System.getProperty(DEFAULT_CARBON_SERVER_HOST_PROPERTY,
+                                                                                                "localhost"));
+        return urlWithPlaceholders;
+    }
+
+    private static int getPortOffset() {
+        ServerConfiguration carbonConfig = ServerConfiguration.getInstance();
+        String portOffset = System.getProperty("portOffset",
+                                               carbonConfig.getFirstProperty(CARBON_CONFIG_PORT_OFFSET));
+        try {
+            if ((portOffset != null)) {
+                return Integer.parseInt(portOffset.trim());
+            } else {
+                return CARBON_DEFAULT_PORT_OFFSET;
+            }
+        } catch (NumberFormatException e) {
+            return CARBON_DEFAULT_PORT_OFFSET;
+        }
+    }
+}