Phi sat 2

README.md

@@ -1,6 +1,6 @@
 # NanoSat MO Framework
 
-The [NanoSat MO Framework] is a software framework for nanosatellites based on CCSDS Mission Operations services.
+The [NanoSat MO Framework] is a software framework for small satellites based on CCSDS Mission Operations services.
 
 It introduces the concept of apps in space that can be started and stopped from ground. Apps can retrieve data from the platform through a set of well-defined MO services. Many possibilities for extensions are available due to its modular and flexible design approach which is not limited to the space segment but extends down to ground by providing all the building blocks for a complete and free end-to-end solution.
 
@@ -21,20 +21,39 @@ The research was carried by Graz University of Technology in partnership with th
 ## Release
 The latest NMF SDK release tag can be downloaded in [Releases]. However, the currently recommended distribution channel is directly from Git repository.
 
-## Getting Started
+## Building Prerequisites
+
+1. Install Java SDK 1.8 (will work with higher SDKs but 1.8 is the recommended)
+```bash
+sudo apt-get install openjdk-8-jdk
+```
+2. Install Apache Maven
+```bash
+sudo apt-get install maven
+```
 
-### Building
+## Building Instructions
 
-Prerequisites:
+3. Clone this repository
+```bash
+git clone https://github.com/esa/nanosat-mo-framework.git
+```
 
-- Java SDK 1.8 or higher
-- Apache Maven
+4. Set the environment variable NMF\_HOME with the path to this repository's root directory
+```bash
+export NMF_HOME=path_to_repository
+```
 
-Clone this repository, set the environment variable NMF\_HOME with the path to this repository's root directory and run `mvn install` in the root directory.
+5. Build the cloned NanoSat MO Framework project:
+```bash
+mvn clean install
+```
 
-Note that the errors about missing module descriptors during Javadoc generation are to be expected and non breaking.
+Note that the errors about missing module descriptors during Javadoc generation are to be expected and non-breaking.
 
-In order to produce independently runnable Java executables (JAR artifacts with dependencies - equivalent of statically linked executables), use `mvn install -P assembly-with-dependencies`.
+In order to produce independently runnable Java executables (JAR artifacts with dependencies - equivalent of statically linked executables), use `mvn install -P assembly-with-dependencies`
+
+## Getting Started
 
 ### SDK and examples
 
@@ -56,7 +75,9 @@ Or directly in the respective source code repository.
 
 ## License
 
-The NanoSat MO Framework is **licensed** under the **[European Space Agency Public License (ESA-PL) Weak Copyleft – v2.4]**.
+The NanoSat MO Framework is **licensed** under:
+
+**[European Space Agency Public License (ESA-PL) Weak Copyleft – v2.4]**.
 
 [![][ESAImage]][website]
 

core/helper-tools/src/main/java/esa/mo/helpertools/connections/ConnectionProvider.java

@@ -46,15 +46,16 @@
  */
 public class ConnectionProvider {
 
+    private final static ServicesConnectionDetails GLOBAL_PROVIDERS_DETAILS_PRIMARY = new ServicesConnectionDetails();
+    private final static ServicesConnectionDetails GLOBAL_PROVIDERS_DETAILS_SECONDARY = new ServicesConnectionDetails();
+
+    private final SingleConnectionDetails primaryConnectionDetails = new SingleConnectionDetails();
     private MALContextFactory malFactory;
     private MALContext mal;
     private MALProviderManager providerMgr;
     private MALProvider primaryMALServiceProvider = null;
     private MALProvider secondaryMALServiceProvider = null;
-    private final SingleConnectionDetails primaryConnectionDetails = new SingleConnectionDetails();
     private SingleConnectionDetails secondaryConnectionDetails = null;
-    private static ServicesConnectionDetails globalProvidersDetailsPrimary = new ServicesConnectionDetails();
-    private static ServicesConnectionDetails globalProvidersDetailsSecondary = new ServicesConnectionDetails();
 
     /**
      * Getter for the primaryConnectionDetails object.
@@ -120,8 +121,8 @@ public MALProvider startService(String serviceName, MALService malService, MALIn
      * @return MALProvider
      * @throws MALException On error.
      */
-    public MALProvider startService(String serviceName, MALService malService, boolean isPublisher,
-        MALInteractionHandler handler) throws MALException {
+    public MALProvider startService(String serviceName, MALService malService,
+            boolean isPublisher, MALInteractionHandler handler) throws MALException {
         return startService(serviceName, malService, isPublisher, handler, null);
     }
 
@@ -188,9 +189,14 @@ public MALProvider startService(String serviceName, MALService malService, boole
                                                                                                          serviceKey});
 
         if (shouldInitUriFiles()) {
-            this.writeURIsOnFile(primaryConnectionDetails, serviceName, HelperMisc.PROVIDER_URIS_PROPERTIES_FILENAME);
+            String path = System.getProperty(HelperMisc.PROP_PROVIDERURIS_PATH,
+                    HelperMisc.PROVIDER_URIS_PROPERTIES_FILENAME);
+
+            this.writeURIsOnFile(primaryConnectionDetails,
+                    serviceName,
+                    path);
         }
-        globalProvidersDetailsPrimary.add(serviceName, primaryConnectionDetails);
+        GLOBAL_PROVIDERS_DETAILS_PRIMARY.add(serviceName, primaryConnectionDetails);
 
         primaryMALServiceProvider = serviceProvider;
 
@@ -222,11 +228,14 @@ public MALProvider startService(String serviceName, MALService malService, boole
                                                                                                              serviceKey});
 
             if (shouldInitUriFiles()) {
-                this.writeURIsOnFile(secondaryConnectionDetails, serviceName,
-                    HelperMisc.PROVIDER_URIS_SECONDARY_PROPERTIES_FILENAME);
-            }
-            globalProvidersDetailsSecondary.add(serviceName, secondaryConnectionDetails);
+                String pathSec = System.getProperty(HelperMisc.PROP_PROVIDERURIS_SEC_PATH,
+                        HelperMisc.PROVIDER_URIS_SECONDARY_PROPERTIES_FILENAME);
 
+                this.writeURIsOnFile(secondaryConnectionDetails,
+                        serviceName,
+                        pathSec);
+            }
+            GLOBAL_PROVIDERS_DETAILS_SECONDARY.add(serviceName, secondaryConnectionDetails);
             secondaryMALServiceProvider = serviceProvider2;
         }
 
@@ -286,8 +295,7 @@ public void closeAll() {
     }
 
     /**
-     * Indicates whether the URI Files should be initialised.
-     * Defaults to false.
+     * Indicates whether the URI Files should be initialised. Defaults to false.
      *
      * @return true if URI Files should be initialised
      */
@@ -299,20 +307,24 @@ public static boolean shouldInitUriFiles() {
      * Clears the URI links file if its generation is enabled
      */
     public static void resetURILinks() {
-        globalProvidersDetailsPrimary.reset();
-        globalProvidersDetailsSecondary.reset();
+        GLOBAL_PROVIDERS_DETAILS_PRIMARY.reset();
+        GLOBAL_PROVIDERS_DETAILS_SECONDARY.reset();
 
         if (shouldInitUriFiles()) {
-            try (BufferedWriter wrt = new BufferedWriter(new FileWriter(HelperMisc.PROVIDER_URIS_PROPERTIES_FILENAME,
-                false))) {
+            String path = System.getProperty(HelperMisc.PROP_PROVIDERURIS_PATH,
+                    HelperMisc.PROVIDER_URIS_PROPERTIES_FILENAME);
+
+            try (BufferedWriter wrt = new BufferedWriter(new FileWriter(path, false))) {
             } catch (IOException ex) {
                 Logger.getLogger(ConnectionProvider.class.getName()).log(Level.WARNING,
                     "Unable to reset URI information from properties file {0}", ex);
             }
 
             if (System.getProperty(HelperMisc.SECONDARY_PROTOCOL) != null) {
-                try (BufferedWriter wrt2 = new BufferedWriter(new FileWriter(
-                    HelperMisc.PROVIDER_URIS_SECONDARY_PROPERTIES_FILENAME, false))) {
+                String pathSec = System.getProperty(HelperMisc.PROP_PROVIDERURIS_SEC_PATH,
+                        HelperMisc.PROVIDER_URIS_SECONDARY_PROPERTIES_FILENAME);
+
+                try (BufferedWriter wrt2 = new BufferedWriter(new FileWriter(pathSec, false))) {
                 } catch (IOException ex) {
                     Logger.getLogger(ConnectionProvider.class.getName()).log(Level.WARNING,
                         "Unable to reset URI information from properties file {0}", ex);
@@ -322,28 +334,38 @@ public static void resetURILinks() {
     }
 
     /**
-     * Get primary connection interface details of all providers in the application.
-     * 
+     * Get primary connection interface details of all providers in the
+     * application.
+     *
      * @return Primary connection details of all providers in the application.
      */
     public static ServicesConnectionDetails getGlobalProvidersDetailsPrimary() {
-        return globalProvidersDetailsPrimary;
+        return GLOBAL_PROVIDERS_DETAILS_PRIMARY;
     }
 
     /**
-     * Get secondary connection interface details of all providers in the application.
-     * 
+     * Get secondary connection interface details of all providers in the
+     * application.
+     *
      * @return Secondary connection details of all providers in the application.
      */
     public static ServicesConnectionDetails getGlobalProvidersDetailsSecondary() {
-        return globalProvidersDetailsSecondary;
+        return GLOBAL_PROVIDERS_DETAILS_SECONDARY;
     }
 
     /**
      * Writes the URIs on a text file
      */
     private void writeURIsOnFile(SingleConnectionDetails connectionDetails, String serviceName, String filename) {
+        StringBuilder str = new StringBuilder();
+        str.append(serviceName).append(HelperConnections.SUFFIX_URI).append("=").append(connectionDetails.getProviderURI()).append("\n");
+        str.append(serviceName).append(HelperConnections.SUFFIX_BROKER).append("=").append(connectionDetails.getBrokerURI()).append("\n");
+        str.append(serviceName).append(HelperConnections.SUFFIX_DOMAIN).append("=").append(HelperMisc.domain2domainId(connectionDetails.getDomain())).append("\n");
+        str.append(serviceName).append(HelperConnections.SUFFIX_SERVICE_KEY).append("=").append(connectionDetails.getServiceKey()).append("\n");
+
         try (BufferedWriter wrt = new BufferedWriter(new FileWriter(filename, true))) {
+            wrt.append(str.toString());
+            /*
             wrt.append(serviceName + HelperConnections.SUFFIX_URI + "=" + connectionDetails.getProviderURI());
             wrt.newLine();
             wrt.append(serviceName + HelperConnections.SUFFIX_BROKER + "=" + connectionDetails.getBrokerURI());
@@ -353,6 +375,7 @@ private void writeURIsOnFile(SingleConnectionDetails connectionDetails, String s
             wrt.newLine();
             wrt.append(serviceName + HelperConnections.SUFFIX_SERVICE_KEY + "=" + connectionDetails.getServiceKey());
             wrt.newLine();
+            */
         } catch (IOException ex) {
             Logger.getLogger(ConnectionProvider.class.getName()).log(Level.WARNING,
                 "Unable to write URI information to properties file {0}", ex);

core/helper-tools/src/main/java/esa/mo/helpertools/connections/ConnectionSharedBroker.java

@@ -25,7 +25,7 @@
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.ccsds.moims.mo.mal.MALContext;
@@ -72,9 +72,14 @@ public MALBrokerBinding startBroker(String brokerName, Blob authenticationId) th
         brokerMgr = mal.createBrokerManager();
 
         MALBroker sharedBroker = brokerMgr.createBroker();
-        MALBrokerBinding brokerBinding = brokerMgr.createBrokerBinding(sharedBroker, brokerName, System.getProperties()
-            .getProperty("org.ccsds.moims.mo.mal.transport.default.protocol"), null == authenticationId ? new Blob(""
-                .getBytes()) : authenticationId, new QoSLevel[]{QoSLevel.ASSURED}, new UInteger(1), new Hashtable());
+        MALBrokerBinding brokerBinding = brokerMgr.createBrokerBinding(
+                sharedBroker,
+                brokerName,
+                System.getProperties().getProperty("org.ccsds.moims.mo.mal.transport.default.protocol"),
+                null == authenticationId ? new Blob("".getBytes()) : authenticationId,
+                new QoSLevel[]{QoSLevel.ASSURED},
+                new UInteger(1),
+                new HashMap());
 
         Logger.getLogger(ConnectionSharedBroker.class.getName()).log(Level.INFO, "Shared Broker URI: {0}", brokerBinding
             .getURI());