Merge branch 'release-1.2.0' of https://github.com/eclipse/kura into …

…release-1.2.0
claus78ro · Jun 4, 2015 · 3e9574b · 3e9574b
2 parents 20c0f1d + f838e7b
commit 3e9574b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.../org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/ssl/SslManagerServiceImpl.java b/.../org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/ssl/SslManagerServiceImpl.java
@@ -134,13 +134,6 @@ protected void activate(ComponentContext componentContext, Map<String,Object> pr
 
 		decryptProperties(properties);
 
-		File f = new File(m_options.getSslTrustStore());
-		String defaultTrustStoreLocation= m_options.getPropDefaultTrustStore();
-		if(!f.exists() && !f.isDirectory() && !m_options.getSslTrustStore().equals(defaultTrustStoreLocation)) {
-			s_logger.info("Upgrade process: keystore reference needs to be updated...");
-			m_properties.put(m_options.getPropTrustStore(), defaultTrustStoreLocation);
-		}
-
 		char[] keystorePassword= m_cryptoService.getKeyStorePassword(m_options.getSslTrustStore());
 
 		m_timer = new Timer(true);
@@ -193,7 +186,7 @@ public void updated(Map<String,Object> properties)
 				newPassword = oldPassword;
 				m_properties.put(m_options.getPropTrustPassword(), newPassword);
 				s_logger.warn("Null keystore password. Using the password stored in the previous configuration snapshot");
-				s_logger.warn("Null keystore password. A new password will be randomly generated at the next ESF start");
+				s_logger.warn("Null keystore password. A new password will be randomly generated at next restart");
 			}
 
 			if(oldPassword != null && !Arrays.equals(oldPassword, newPassword)){

diff --git a/...g.eclipse.kura.core/src/main/java/org/eclipse/kura/core/ssl/SslManagerServiceOptions.java b/...g.eclipse.kura.core/src/main/java/org/eclipse/kura/core/ssl/SslManagerServiceOptions.java
@@ -23,6 +23,7 @@ public class SslManagerServiceOptions
 
     private static final String  PROP_DEFAULT_PROTOCOL    = "TLSv1";
     private static final Boolean PROP_DEFAULT_HN_VERIFY   = true;
+    //:TODO Move hardcoded string in kura.properties and retrieve using SystemService
     private static final String  PROP_DEFAULT_TRUST_STORE = "/opt/eurotech/esf/security/cacerts.ks";
 
     private Map<String,Object> m_properties;

diff --git a/...g.eclipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/NetworkServiceImpl.java b/...g.eclipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/NetworkServiceImpl.java
@@ -547,7 +547,7 @@ public void handleEvent(Event event) {
             if(modemInfo != null) {
             	//Found one - see if we have some info for it.
             	//Also check if we are getting more devices than expected.
-            	//This can happen if all the modem resources cannot be removed from the OS or from ESF.
+            	//This can happen if all the modem resources cannot be removed from the OS or from Kura.
             	//In this case we did not receive an UsbDeviceRemovedEvent and we did not post
             	//an ModemRemovedEvent. Should we do it here?
             	UsbModemDevice usbModem = m_usbModems.get(event.getProperty(UsbDeviceEvent.USB_EVENT_USB_PORT_PROPERTY));