Ready for release..

PolaricServer · Jan 9, 2021 · b38ea72 · b38ea72
1 parent 0a98605
commit b38ea72
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 41 deletions.
diff --git a/Changelog b/Changelog
@@ -282,5 +282,16 @@ V.2.5
 * Varius fixes..
 
 
+V.2.6
+-----
+
+* Implement API for short messaging and generic APRS messaging.
+* Remote control fixes..
+* User management improvements and API. Get logged-in users, including on remote systems. 
+* Allow callsigns in user-accounts
+* Channels code - refactoring        
+* API for editing signs.
+* Various fixes...
+
 
 
diff --git a/TODO b/TODO
@@ -1,47 +1,29 @@
 
+FOR RELEASE 2.7
 
-FOR RELEASE 2.6
-
+* Draw tool: Radius for circles. Measurement info while drawing. 
 
-* Allow user-accounts to be set up with callsigns. 
-    DONE.
+* Draw tool: Get features that are moved to layers. 
 
-* Generic APRS messaging with notifications. 
-    DONE.
-
-* APRS messaging REST API and client. 
-    DONE.
+* Draw tool: Can this be done more intuitive? 
 
-* "Clear all" for alias/icons.
-    DONE.
+* Share layers etc. with other users
 
-* Fix backup channel behaviour 
-    DONE.
+* Allow backup remotectl parent.
 
-* Implement short messaging API and client
-    DONE.
-
-* Allow callsigns in user-accounts
-    DONE.
-
-* API to get logged-in users, including on remote systems. 
-    DONE.
-
-* Channels - refactoring
-    DONE.
-
+* Missions, incidents: Manage trackers, tracks... Replace SAR mode. Replace "My trackers"? 
 
+* Confirm-popup when deleting items. 
 
-FOR RELEASE 2.7
-
-* Draw tool: Radius for circles. Measurement info while drawing. 
+* Signs editor: Handle owners.. 
 
-* Allow backup remotectl parent.
 
 
 
 LATER RELEASES
 
+* Groups of users? Roles? 
+
 * Server failover?
 
 * Item info as REST? Polymorphism? AIS plugin. 
@@ -62,8 +44,6 @@ LATER RELEASES
 * Bulletin board send REST API and client. 
 
 * Reset to default - button/link in config screen
-
-* Develop signs. Channels? 
 
 * APRS-IS server (plugin or standalone)
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,13 @@
-polaric-aprsd (2.5+) UNRELEASED; urgency=medium
+polaric-aprsd (2.6) stable; urgency=medium
 
-  * Development 
+  * API for short messaging and APRS messaging
+  * API for editing signs
+  * User management improvements and API
+  * Work on remote control mechanism.. Update logged in users. 
+  * Channel refactoring
+  * Various fixes
 
- -- Øyvind Hanssen <ohanssen@acm.org>  Sat, 23 May 2020 21:50:41 +0200
+ -- Oyvind Hanssen <ohanssen@acm.org>  Sat, 09 Jan 2021 20:30:56 +0100
 
 polaric-aprsd (2.5) stable; urgency=medium
 

diff --git a/debian/control b/debian/control
@@ -11,9 +11,9 @@ Architecture: all
 Depends: openjdk-11-jre-headless|openjdk-12-jre-headless|openjdk-13-headless|openjdk-14-jdk, libslf4j-java, librxtx-java, scala-library (>> 2.11.12), scala-xml, scala-parser-combinators, gettext-base, libgettext-commons-java, libcommons-codec-java, libjackson2-core-java, libjackson2-databind-java, adduser, apache2-utils, sudo, lsb-base, ${misc:Depends}
 Conflicts: polaric-database-plugin (<= 2.1), polaric-ais-plugin (<= 2.1.0) 
 Recommends:
-Suggests: polaric-webapp2 (>= 1.3)
+Suggests: polaric-webapp2 (>= 1.4)
 Description: Polaric Server: APRS daemon part. 
- The "Polaric Server" which is mainly a web based service to present APRS 
+ The "Polaric Server" is mainly a web based service to present APRS 
  tracking information on maps and where the information is updated at real-
  time. It is originally targeted for use by radio amateurs in voluntary search
  and rescue service in Norway. It consists of a web application and a server 

diff --git a/debian/postinst b/debian/postinst
@@ -26,8 +26,9 @@ case "$1" in
         fi
         echo
         echo "******* Polaric-aprsd *******"
-        echo "To configure server, point your browser to http://<hostname>:8081/config_menu"
-        echo "Please set your CALLSIGN and restart server!" 
+        echo "To configure server, point your browser to http://localhost:8081/config_menu"
+        echo "If this is the first time installataion, please set your CALLSIGN and restart server!" 
+        echo "Use the command 'polaric-restart' to restart server" 
         echo "Use command 'polaric-password' to change password or add new users"
         echo 
     ;;

diff --git a/src/ServerAPI.java b/src/ServerAPI.java
@@ -59,6 +59,7 @@ public interface Web {
         public void notifyUser(String user, Notification not);
         public PubSub getPubSub();
         public void protectUrl(String prefix);
+        public void protectUrl(String prefix, String level);
 
         public void start() throws Exception; 
         public void stop() throws Exception;

diff --git a/src/aprsd/Main.java b/src/aprsd/Main.java
@@ -29,8 +29,8 @@
 
 public class Main implements ServerAPI
 {
-   public  static String version = "2.5+";
-   public static String toaddr  = "APPS25";
+   public  static String version = "2.6";
+   public static String toaddr  = "APPS26";
 
    private static StationDB db = null;
    private static AprsParser parser = null;
@@ -310,7 +310,7 @@ public void start()
 
            /* Igate */
            igate = new Igate(api);
-           
+
            /* Own position */
            if (getBoolProperty("ownposition.gps.on", false)) {
                log.info("Main", "Activate GPS");