Merge branch 'develop' of https://github.com/eclipse/kura into develop

kura/distrib/config/kura.build.properties

@@ -5,12 +5,12 @@ org.eclipse.kura.core.version=1.0.7
 org.eclipse.kura.core.certificates.version=1.0.2
 org.eclipse.kura.core.cloud.version=1.0.8-SNAPSHOT
 org.eclipse.kura.core.comm.version=1.0.2
-org.eclipse.kura.core.configuration.version=1.0.6
+org.eclipse.kura.core.configuration.version=1.0.7-SNAPSHOT
 org.eclipse.kura.core.crypto.version=1.0.3
 org.eclipse.kura.deployment.agent.version=1.0.6-SNAPSHOT
 org.eclipse.kura.core.deployment.version=1.1.1-SNAPSHOT
 org.eclipse.kura.core.log.version=1.0.1
-org.eclipse.kura.core.net.version=1.0.7
+org.eclipse.kura.core.net.version=1.0.8-SNAPSHOT
 org.eclipse.kura.core.status.version=1.0.1
 org.eclipse.kura.emulator.version=1.0.5
 org.eclipse.kura.emulator.clock.version=1.0.0

kura/distrib/src/main/resources/beaglebone/kura.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+# Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
@@ -116,7 +116,7 @@ db.service.hsqldb.url=jdbc:hsqldb:mem:kuradb
 ## -----------------------------------------------------------------------------
 ##  Remote Configuration Properties
 ## -----------------------------------------------------------------------------
-console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService
+console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService,org.eclipse.kura.net.admin.FirewallConfigurationService
 
 
 ## -----------------------------------------------------------------------------
@@ -153,4 +153,4 @@ ccs.status.notification.url=ccs:log
 
 #3. Cloud Connection Status disabled
 #Disables the Cloud Connection Status service
-#ccs.status.notification.url=ccs:none
+#ccs.status.notification.url=ccs:none

kura/distrib/src/main/resources/beaglebone/snapshot_0.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+    Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
@@ -13,6 +13,19 @@
 
 -->
 <esf:configurations xmlns:ocd="http://www.osgi.org/xmlns/metatype/v1.2.0" xmlns:esf="http://eurotech.com/esf/2.0">
+    <esf:configuration pid="org.eclipse.kura.net.admin.FirewallConfigurationService">
+	<esf:properties>
+	    <esf:property array="false" encrypted="false" name="firewall.open.ports" type="String">
+                <esf:value>22,tcp,,,,,,#;80,tcp,,eth0,,,,#;80,tcp,,wlan0,,,,#;80,tcp,10.234.0.0/16,,,,,#;1450,tcp,,eth0,,,,#;1450,tcp,,wlan0,,,,#;502,tcp,127.0.0.1/32,,,,,#;53,udp,,eth0,,,,#;53,udp,,wlan0,,,,#;67,udp,,eth0,,,,#;67,udp,,wlan0,,,,#;8000,tcp,,eth0,,,,#;8000,tcp,,wlan0,,,,#</esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.port.forwarding" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.nat" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	</esf:properties>
+    </esf:configuration>
     <esf:configuration pid="org.eclipse.kura.net.admin.NetworkConfigurationService">
         <esf:properties>
             <esf:property name="net.interface.eth0.config.ip4.dnsServers" array="false" encrypted="false" type="String">

kura/distrib/src/main/resources/intel-edison/kura.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+# Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
@@ -116,7 +116,7 @@ db.service.hsqldb.url=jdbc:hsqldb:mem:kuradb
 ## -----------------------------------------------------------------------------
 ##  Remote Configuration Properties
 ## -----------------------------------------------------------------------------
-console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService
+console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService,org.eclipse.kura.net.admin.FirewallConfigurationService
 
 
 ## -----------------------------------------------------------------------------

kura/distrib/src/main/resources/intel-edison/snapshot_0.xml

@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    Copyright (c) 2011, 2016 Eurotech and/or its affiliates
+
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Eurotech
+
+-->
 <esf:configurations xmlns:ocd="http://www.osgi.org/xmlns/metatype/v1.2.0" xmlns:esf="http://eurotech.com/esf/2.0">
+    <esf:configuration pid="org.eclipse.kura.net.admin.FirewallConfigurationService">
+	<esf:properties>
+	    <esf:property array="false" encrypted="false" name="firewall.open.ports" type="String">
+                <esf:value>22,tcp,,,,,,#;80,tcp,,usb0,,,,#;80,tcp,,wlan0,,,,#;80,tcp,10.234.0.0/16,,,,,#;1450,tcp,,usb0,,,,#;1450,tcp,,wlan0,,,,#;502,tcp,127.0.0.1/32,,,,,#;53,udp,,usb0,,,,#;53,udp,,wlan0,,,,#;67,udp,,usb0,,,,#;67,udp,,wlan0,,,,#;8000,tcp,,usb0,,,,#;8000,tcp,,wlan0,,,,#</esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.port.forwarding" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.nat" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	</esf:properties>
+    </esf:configuration>
     <esf:configuration pid="org.eclipse.kura.net.admin.NetworkConfigurationService">
         <esf:properties>
             <esf:property name="net.interface.wlan0.config.wifi.master.broadcast" array="false" encrypted="false" type="Boolean">

kura/distrib/src/main/resources/raspberry-pi-2/kura.properties

@@ -1,3 +1,15 @@
+#
+# Copyright (c) 2011, 2016 Eurotech and/or its affiliates
+#
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Eurotech
+#
+
 ## -----------------------------------------------------------------------------
 ##  Kura Properties
 ## -----------------------------------------------------------------------------
@@ -97,8 +109,7 @@ db.service.hsqldb.url=jdbc:hsqldb:mem:kuradb
 ## -----------------------------------------------------------------------------
 ##  Remote Configuration Properties
 ## -----------------------------------------------------------------------------
-console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService
-
+console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService,org.eclipse.kura.net.admin.FirewallConfigurationService
 
 ## -----------------------------------------------------------------------------
 ## File upload settings

kura/distrib/src/main/resources/raspberry-pi-2/snapshot_0.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+    Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
@@ -13,6 +13,19 @@
 
 -->
 <esf:configurations xmlns:ocd="http://www.osgi.org/xmlns/metatype/v1.2.0" xmlns:esf="http://eurotech.com/esf/2.0">
+    <esf:configuration pid="org.eclipse.kura.net.admin.FirewallConfigurationService">
+	<esf:properties>
+	    <esf:property array="false" encrypted="false" name="firewall.open.ports" type="String">
+                <esf:value>22,tcp,,,,,,#;80,tcp,,eth0,,,,#;80,tcp,,wlan0,,,,#;80,tcp,10.234.0.0/16,,,,,#;1450,tcp,,eth0,,,,#;1450,tcp,,wlan0,,,,#;502,tcp,127.0.0.1/32,,,,,#;53,udp,,eth0,,,,#;53,udp,,wlan0,,,,#;67,udp,,eth0,,,,#;67,udp,,wlan0,,,,#;8000,tcp,,eth0,,,,#;8000,tcp,,wlan0,,,,#</esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.port.forwarding" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.nat" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	</esf:properties>
+    </esf:configuration>
     <esf:configuration pid="org.eclipse.kura.net.admin.NetworkConfigurationService">
         <esf:properties>
             <esf:property name="net.interface.wlan0.config.wifi.master.broadcast" array="false" encrypted="false" type="Boolean">

kura/distrib/src/main/resources/raspberry-pi-bplus/kura.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+# Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
@@ -116,7 +116,7 @@ db.service.hsqldb.url=jdbc:hsqldb:mem:kuradb
 ## -----------------------------------------------------------------------------
 ##  Remote Configuration Properties
 ## -----------------------------------------------------------------------------
-console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService
+console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService,org.eclipse.kura.net.admin.FirewallConfigurationService
 
 
 ## -----------------------------------------------------------------------------
@@ -153,4 +153,4 @@ ccs.status.notification.url=ccs:log
 
 #3. Cloud Connection Status disabled
 #Disables the Cloud Connection Status service
-#ccs.status.notification.url=ccs:none
+#ccs.status.notification.url=ccs:none

kura/distrib/src/main/resources/raspberry-pi-bplus/snapshot_0.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+    Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
@@ -13,6 +13,19 @@
 
 -->
 <esf:configurations xmlns:ocd="http://www.osgi.org/xmlns/metatype/v1.2.0" xmlns:esf="http://eurotech.com/esf/2.0">
+    <esf:configuration pid="org.eclipse.kura.net.admin.FirewallConfigurationService">
+	<esf:properties>
+	    <esf:property array="false" encrypted="false" name="firewall.open.ports" type="String">
+                <esf:value>22,tcp,,,,,,#;80,tcp,,eth0,,,,#;80,tcp,,wlan0,,,,#;80,tcp,10.234.0.0/16,,,,,#;1450,tcp,,eth0,,,,#;1450,tcp,,wlan0,,,,#;502,tcp,127.0.0.1/32,,,,,#;53,udp,,eth0,,,,#;53,udp,,wlan0,,,,#;67,udp,,eth0,,,,#;67,udp,,wlan0,,,,#;8000,tcp,,eth0,,,,#;8000,tcp,,wlan0,,,,#</esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.port.forwarding" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.nat" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	</esf:properties>
+    </esf:configuration>
     <esf:configuration pid="org.eclipse.kura.net.admin.NetworkConfigurationService">
         <esf:properties>
             <esf:property name="net.interface.wlan0.config.wifi.master.broadcast" array="false" encrypted="false" type="Boolean">

kura/distrib/src/main/resources/raspberry-pi/kura.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+# Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
@@ -116,7 +116,7 @@ db.service.hsqldb.url=jdbc:hsqldb:mem:kuradb
 ## -----------------------------------------------------------------------------
 ##  Remote Configuration Properties
 ## -----------------------------------------------------------------------------
-console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService
+console.device.management.service.ignore=org.eclipse.kura.net.admin.NetworkConfigurationService,org.eclipse.kura.net.admin.FirewallConfigurationService
 
 
 ## -----------------------------------------------------------------------------
@@ -153,4 +153,4 @@ ccs.status.notification.url=ccs:log
 
 #3. Cloud Connection Status disabled
 #Disables the Cloud Connection Status service
-#ccs.status.notification.url=ccs:none
+#ccs.status.notification.url=ccs:none

kura/distrib/src/main/resources/raspberry-pi/snapshot_0.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 2011, 2014 Eurotech and/or its affiliates
+    Copyright (c) 2011, 2016 Eurotech and/or its affiliates
 
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
@@ -13,6 +13,19 @@
 
 -->
 <esf:configurations xmlns:ocd="http://www.osgi.org/xmlns/metatype/v1.2.0" xmlns:esf="http://eurotech.com/esf/2.0">
+    <esf:configuration pid="org.eclipse.kura.net.admin.FirewallConfigurationService">
+	<esf:properties>
+	    <esf:property array="false" encrypted="false" name="firewall.open.ports" type="String">
+                <esf:value>22,tcp,,,,,,#;80,tcp,,eth0,,,,#;80,tcp,,wlan0,,,,#;80,tcp,10.234.0.0/16,,,,,#;1450,tcp,,eth0,,,,#;1450,tcp,,wlan0,,,,#;502,tcp,127.0.0.1/32,,,,,#;53,udp,,eth0,,,,#;53,udp,,wlan0,,,,#;67,udp,,eth0,,,,#;67,udp,,wlan0,,,,#;8000,tcp,,eth0,,,,#;8000,tcp,,wlan0,,,,#</esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.port.forwarding" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	    <esf:property array="false" encrypted="false" name="firewall.nat" type="String">
+                <esf:value></esf:value>
+            </esf:property>
+	</esf:properties>
+    </esf:configuration>
     <esf:configuration pid="org.eclipse.kura.net.admin.NetworkConfigurationService">
         <esf:properties>
             <esf:property name="net.interface.wlan0.config.wifi.master.broadcast" array="false" encrypted="false" type="Boolean">

kura/emulator/org.eclipse.kura.emulator.net/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.kura;version="[1.0,2.0)",
  org.eclipse.kura.core.net;version="[1.0,1.1)",
- org.eclipse.kura.net;version="[1.1,1.2)",
+ org.eclipse.kura.net;version="[1.1,2.0)",
  org.eclipse.kura.net.modem;version="[1.0,2.0)",
  org.eclipse.kura.net.wifi;version="[1.0,2.0)",
  org.osgi.service.component;version="1.2.0",

kura/org.eclipse.kura.api/META-INF/MANIFEST.MF

@@ -19,7 +19,7 @@ Export-Package: org.eclipse.kura;version="1.0.0",
  org.eclipse.kura.db;version="1.0.0",
  org.eclipse.kura.linux.udev;version="1.0.0",
  org.eclipse.kura.message;version="1.0.0",
- org.eclipse.kura.net;version="1.1.0",
+ org.eclipse.kura.net;version="1.2.0",
  org.eclipse.kura.net.dhcp;version="1.0.0",
  org.eclipse.kura.net.dns;version="1.0.0",
  org.eclipse.kura.net.firewall;version="1.0.0",

kura/org.eclipse.kura.api/src/main/java/org/eclipse/kura/net/NetworkAdminService.java

@@ -211,12 +211,14 @@ public void updateModemInterfaceConfig(String interfaceName,
 	 * @return status
 	 * @throws KuraException
 	 */
+	@Deprecated
 	public boolean rollbackDefaultConfiguration() throws KuraException;
 
 	/**
 	 * Rolls back to default firewall configuration. 
 	 * @return status
 	 * @throws KuraException
 	 */
+	@Deprecated
 	public boolean rollbackDefaultFirewallConfiguration() throws KuraException;
 }

kura/org.eclipse.kura.core.configuration/src/main/java/org/eclipse/kura/core/configuration/ConfigurationServiceImpl.java

@@ -287,7 +287,7 @@ public synchronized void updateConfiguration(String pidToUpdate, Map<String, Obj
 		List<ComponentConfigurationImpl> configs = new ArrayList<ComponentConfigurationImpl>();
 		ComponentConfigurationImpl cci = new ComponentConfigurationImpl(pidToUpdate, null, propertiesToUpdate);
 		configs.add(cci);
-		updateConfigurations((List<ComponentConfiguration>) (List<?>) configs);	
+		updateConfigurations((List<ComponentConfiguration>) (List<?>) configs);
 	}
 
 	@Override

kura/org.eclipse.kura.core.net/META-INF/MANIFEST.MF

@@ -10,13 +10,13 @@ Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.kura;version="[1.0,2.0)",
  org.eclipse.kura.configuration;version="[1.0,2.0)",
  org.eclipse.kura.core.util;version="[1.0,2.0)",
- org.eclipse.kura.net;version="[1.1,1.2)",
+ org.eclipse.kura.net;version="[1.1,2.0)",
  org.eclipse.kura.net.dhcp;version="[1.0,2.0)",
  org.eclipse.kura.net.firewall;version="[1.0,2.0)",
  org.eclipse.kura.net.modem;version="[1.1,1.2)",
  org.eclipse.kura.net.wifi;version="[1.2,1.3)",
  org.eclipse.kura.usb;version="[1.0,2.0)",
  org.slf4j;version="1.6.4"
-Export-Package: org.eclipse.kura.core.net; version="1.0.1",org.eclipse
+Export-Package: org.eclipse.kura.core.net; version="1.0.2",org.eclipse
  .kura.core.net.modem; version="1.0.0",org.eclipse.kura.core.net.util;
   version="1.0.0"