changing MQTT message broker port to 1886

revert-dabc3590
GPrathap 8 years ago
parent c96f2a8162
commit 136f2f34b1

@ -48,7 +48,7 @@ import java.util.Properties;
public class AndroidSenseServiceImpl implements AndroidSenseService { public class AndroidSenseServiceImpl implements AndroidSenseService {
private static Log log = LogFactory.getLog(AndroidSenseServiceImpl.class); private static Log log = LogFactory.getLog(AndroidSenseServiceImpl.class);
private static String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1883"; private static String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1886";
@Path("device/{deviceId}/words") @Path("device/{deviceId}/words")
@POST @POST

@ -40,6 +40,6 @@ public class AndroidSenseConstants {
public static final String HOST_NAME = "HostName"; public static final String HOST_NAME = "HostName";
public static final String LOCALHOST = "localhost"; public static final String LOCALHOST = "localhost";
public static final String CONFIG_TYPE = "general"; public static final String CONFIG_TYPE = "general";
public static final String DEFAULT_ENDPOINT = "tcp://localhost:1883"; public static final String DEFAULT_ENDPOINT = "tcp://localhost:1886";
} }

@ -64,7 +64,7 @@ public class ZipUtil {
private static final String HTTPS_PROTOCOL_APPENDER = "https://"; private static final String HTTPS_PROTOCOL_APPENDER = "https://";
private static final String HTTP_PROTOCOL_APPENDER = "http://"; private static final String HTTP_PROTOCOL_APPENDER = "http://";
private static final String CONFIG_TYPE = "general"; private static final String CONFIG_TYPE = "general";
private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1883"; private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1886";
public ZipArchive createZipFile(String owner, String tenantDomain, String deviceType, public ZipArchive createZipFile(String owner, String tenantDomain, String deviceType,
String deviceId, String deviceName, String token, String deviceId, String deviceName, String token,

@ -67,7 +67,7 @@ public class ZipUtil {
private static final String HTTPS_PROTOCOL_APPENDER = "https://"; private static final String HTTPS_PROTOCOL_APPENDER = "https://";
private static final String HTTP_PROTOCOL_APPENDER = "http://"; private static final String HTTP_PROTOCOL_APPENDER = "http://";
private static final String CONFIG_TYPE = "general"; private static final String CONFIG_TYPE = "general";
private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1883"; private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1886";
public static final String HOST_NAME = "HostName"; public static final String HOST_NAME = "HostName";
public ZipArchive createZipFile(String owner, String deviceType, String deviceId, String deviceName, public ZipArchive createZipFile(String owner, String deviceType, String deviceId, String deviceName,

@ -46,7 +46,7 @@ public class VirtualFireAlarmConstants {
public static final String CARBON_CONFIG_PORT_OFFSET = "Ports.Offset"; public static final String CARBON_CONFIG_PORT_OFFSET = "Ports.Offset";
public static final String DEFAULT_CARBON_LOCAL_IP_PROPERTY = "carbon.local.ip"; public static final String DEFAULT_CARBON_LOCAL_IP_PROPERTY = "carbon.local.ip";
public static final int CARBON_DEFAULT_PORT_OFFSET = 0; public static final int CARBON_DEFAULT_PORT_OFFSET = 0;
public static final int DEFAULT_MQTT_PORT = 1883; public static final int DEFAULT_MQTT_PORT = 1886;
//xmpp transport related constants //xmpp transport related constants
public static final String XMPP_ADAPTER_NAME = "virtual_firealarm_xmpp"; public static final String XMPP_ADAPTER_NAME = "virtual_firealarm_xmpp";

@ -27,7 +27,7 @@ public class PropertyUtils {
private static final String CARBON_CONFIG_PORT_OFFSET = "Ports.Offset"; private static final String CARBON_CONFIG_PORT_OFFSET = "Ports.Offset";
private static final String DEFAULT_CARBON_LOCAL_IP_PROPERTY = "carbon.local.ip"; private static final String DEFAULT_CARBON_LOCAL_IP_PROPERTY = "carbon.local.ip";
private static final int CARBON_DEFAULT_PORT_OFFSET = 0; private static final int CARBON_DEFAULT_PORT_OFFSET = 0;
private static final int DEFAULT_MQTT_PORT = 1883; private static final int DEFAULT_MQTT_PORT = 1886;
//This method is only used if the mb features are within DAS. //This method is only used if the mb features are within DAS.
public static String replaceMqttProperty (String urlWithPlaceholders) { public static String replaceMqttProperty (String urlWithPlaceholders) {

@ -29,7 +29,7 @@ dcrUrl=dcrUrl
dcrUrl.hint=dynamic client registration endpoint URL to create application (if required) eg: https://localhost:9443/dynamic-client-web/register dcrUrl.hint=dynamic client registration endpoint URL to create application (if required) eg: https://localhost:9443/dynamic-client-web/register
contentValidator=contentValidation contentValidator=contentValidation
contentValidator.hint=Class Name of the content Validation or 'default' to set default class, required to implement (if required) contentValidator.hint=Class Name of the content Validation or 'default' to set default class, required to implement (if required)
url.hint=MQTT broker url tcp://localhost:1883 url.hint=MQTT broker url tcp://localhost:1886
cleanSession=Clean Session cleanSession=Clean Session
cleanSession.hint=Persist topic subscriptions and ack positions across client sessions cleanSession.hint=Persist topic subscriptions and ack positions across client sessions
keepAlive=Keep Alive (In seconds) keepAlive=Keep Alive (In seconds)

@ -57,7 +57,7 @@
<!--if file based properties is set to false then the configuration will be picked from platform configuration--> <!--if file based properties is set to false then the configuration will be picked from platform configuration-->
<ConfigProperties> <ConfigProperties>
<Property Name="mqtt.adapter.name">androidsense.mqtt.adapter</Property> <Property Name="mqtt.adapter.name">androidsense.mqtt.adapter</Property>
<Property Name="url">tcp://localhost:1883</Property> <Property Name="url">tcp://localhost:1886</Property>
<Property Name="username">admin</Property> <Property Name="username">admin</Property>
<Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property> <Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property>
<Property Name="qos">0</Property> <Property Name="qos">0</Property>

@ -39,7 +39,7 @@
<!--if file based properties is set to false then the configuration will be picked from platform configuration--> <!--if file based properties is set to false then the configuration will be picked from platform configuration-->
<ConfigProperties> <ConfigProperties>
<Property Name="mqtt.adapter.name">raspberrypi.mqtt.adapter</Property> <Property Name="mqtt.adapter.name">raspberrypi.mqtt.adapter</Property>
<Property Name="url">tcp://localhost:1883</Property> <Property Name="url">tcp://localhost:1886</Property>
<Property Name="username">admin</Property> <Property Name="username">admin</Property>
<Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property> <Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property>
<Property Name="qos">0</Property> <Property Name="qos">0</Property>

@ -23,7 +23,7 @@
<EventListenerProvider>MQTT</EventListenerProvider> <EventListenerProvider>MQTT</EventListenerProvider>
<Properties> <Properties>
<Property Name="mqtt.adapter.name">virtualfirealarm.mqtt.adapter</Property> <Property Name="mqtt.adapter.name">virtualfirealarm.mqtt.adapter</Property>
<Property Name="url">tcp://localhost:1883</Property> <Property Name="url">tcp://localhost:1886</Property>
<Property Name="username">admin</Property> <Property Name="username">admin</Property>
<Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property> <Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property>
<Property Name="qos">0</Property> <Property Name="qos">0</Property>

@ -39,7 +39,7 @@
<!--if file based properties is set to false then the configuration will be picked from platform configuration--> <!--if file based properties is set to false then the configuration will be picked from platform configuration-->
<ConfigProperties> <ConfigProperties>
<Property Name="mqtt.adapter.name">virtualfirealarm.mqtt.adapter</Property> <Property Name="mqtt.adapter.name">virtualfirealarm.mqtt.adapter</Property>
<Property Name="url">tcp://localhost:1883</Property> <Property Name="url">tcp://localhost:1886</Property>
<Property Name="username">admin</Property> <Property Name="username">admin</Property>
<Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property> <Property Name="dcrUrl">https://localhost:9443/dynamic-client-web/register</Property>
<Property Name="qos">0</Property> <Property Name="qos">0</Property>

Loading…
Cancel
Save