Merge pull request #1441 from parallaxinc/0.100

Release 0.100

Author: zfi

.gitignore

@@ -5,6 +5,12 @@ build.properties
 #################
 # /src/main/**/logback.xml
 nb*
+#
+# The JooQ package generates all of the classes referenced
+# by the BlocklyProp code to access database services.
+#
+# /src/main/java/com/parallax/server/blocklyprop/db/generated/*
+#
 
 #################
 ## NetBeans

db-updates/0003-rich-text-editor.sql

@@ -1,5 +1,5 @@
 /*
  *  Add a description field to the project that supports HTML
  */
-ALTER TABLE project
+ALTER TABLE blocklyprop.project
   ADD description_html LONGTEXT NULL AFTER description;

db-updates/0009-motd.sql

@@ -0,0 +1,20 @@
+/*
+ * Create a message of the day table
+ */
+
+CREATE TABLE IF NOT EXISTS blocklyprop.motd
+(
+  id BIGINT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  message_text VARCHAR(2000) NOT NULL,
+  message_html VARCHAR(2000),
+  notes VARCHAR(4000),
+  enabled BOOLEAN DEFAULT FALSE NOT NULL,
+  is_deleted BOOLEAN DEFAULT FALSE NOT NULL,
+  enable_datetime DATETIME,
+  disable_datetime DATETIME,
+  create_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  last_change_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+) COMMENT 'Customer-facing alerts'
+  ENGINE=InnoDB
+  AUTO_INCREMENT=0
+  DEFAULT CHARSET=utf8;

db-updates/0010-project-link-active.sql

@@ -0,0 +1,22 @@
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+/**
+ * Author:  J. Ewald
+ * Created: Mar 20, 2018
+ *
+ * Add an active field to the project link table. This will allow a user to
+ * enable/disable their shared project without destroying the shared project
+ * key.
+ */
+
+ALTER TABLE blocklyprop.project_sharing ADD active BIT DEFAULT 0 NULL AFTER sharekey;
+
+/* 
+ * All of the current rows in the project_sharing table are active. Set the
+ * active flag for all records to match that state.
+ */
+UPDATE blocklyprop.project_sharing
+    SET active = true;

db-updates/0011-project-code-block-version.sql

@@ -0,0 +1,17 @@
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Author:  J. Ewald
+ * Created: May 21, 2018
+ *
+ * Add an field to record the version of the block library that the was last
+ * used to validate the project code block.This will allow the app to bypass
+ * the block scanning routines each time a project is loaded, once it has been
+ * scanned against the current block version.
+ */
+
+ALTER TABLE blocklyprop.project ADD code_block_version SMALLINT DEFAULT 0 NOT NULL AFTER code;

pom.xml

@@ -60,6 +60,8 @@
                     <files>
                         <file>build.properties</file>
                     </files>
+                    <properties combine.self="append" />
+                    <outputFile combine.self="append" />
                 </configuration>
             </plugin>
 
@@ -95,15 +97,22 @@
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
                 <version>${jooq-version}</version>
+                
                 <!--
-                                <executions>
-                                    <execution>
-                                        <goals>
-                                            <goal>generate</goal>
-                                        </goals>
-                                    </execution>
-                                </executions>
+                    Include the <execution> element to generate a new set of 
+                    source files that represent the current state of the 
+                    target database schema.
+                <executions>
+                    <execution>
+                        <id>jooq-codegen</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 -->
+                
                 <dependencies>
                     <dependency>
                         <groupId>mysql</groupId>
@@ -119,7 +128,7 @@
                         <user>${mysql.username}</user>
                         <password>${mysql.password}</password>
                     </jdbc>
-
+                    
                     <generator>
                         <name>org.jooq.util.DefaultGenerator</name>
                         <database>
@@ -309,6 +318,14 @@
             <artifactId>guice-persist-jooq</artifactId>
             <version>0.1.2</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.9.9</version>
+        </dependency>
+        
         <!-- END JOOQ Dependencies -->
 
         <!-- Dependencies for Shiro -->

src/main/java/com/parallax/server/blocklyprop/config/DaoModule.java

@@ -6,14 +6,18 @@
 package com.parallax.server.blocklyprop.config;
 
 import com.google.inject.AbstractModule;
+
 import com.parallax.server.blocklyprop.db.dao.ProjectDao;
 import com.parallax.server.blocklyprop.db.dao.ProjectSharingDao;
 import com.parallax.server.blocklyprop.db.dao.SessionDao;
 import com.parallax.server.blocklyprop.db.dao.UserDao;
+import com.parallax.server.blocklyprop.db.dao.MotdDao;
+
 import com.parallax.server.blocklyprop.db.dao.impl.ProjectDaoImpl;
 import com.parallax.server.blocklyprop.db.dao.impl.ProjectSharingDaoImpl;
 import com.parallax.server.blocklyprop.db.dao.impl.SessionDaoImpl;
 import com.parallax.server.blocklyprop.db.dao.impl.UserDaoImpl;
+import com.parallax.server.blocklyprop.db.dao.impl.MotdDaoImpl;
 
 
 /**
@@ -44,6 +48,7 @@ protected void configure() {
         bind(UserDao.class).to(UserDaoImpl.class);
         bind(SessionDao.class).to(SessionDaoImpl.class);
         bind(ProjectSharingDao.class).to(ProjectSharingDaoImpl.class);
+        bind(MotdDao.class).to(MotdDaoImpl.class);        
     }
 
 }

src/main/java/com/parallax/server/blocklyprop/config/ServletsModule.java

@@ -6,6 +6,7 @@
 package com.parallax.server.blocklyprop.config;
 
 import com.google.inject.servlet.ServletModule;
+
 import com.parallax.server.blocklyprop.servlets.AuthenticationServlet;
 import com.parallax.server.blocklyprop.servlets.PrivacyPolicyServlet;
 import com.parallax.server.blocklyprop.servlets.ConfirmRequestServlet;
@@ -32,6 +33,8 @@
 import com.parallax.server.blocklyprop.servlets.TextileLibrariesServlet;
 import com.parallax.server.blocklyprop.servlets.TextileLicenseServlet;
 
+import com.parallax.server.blocklyprop.servlets.MessageOfTheDayServlet;
+
 /**
  * Map each URI to a class that will handle the request
  * 
@@ -41,29 +44,68 @@ public class ServletsModule extends ServletModule {
 
     @Override
     protected void configureServlets() {
+        // Verify the app is alive
         serve("/ping").with(PingServlet.class);
+        
+        
+        // Return the active Message of the Day, if one is active
+        // This is currently throwing a NPE
+        serve("/motd").with(MessageOfTheDayServlet.class);
 
+        
+        // Authentication service
+        // TODO: Verify that this is used somewhere.The IDE says that
+        // there are no references to it in the app.
         serve("/authenticate").with(AuthenticationServlet.class);
 
-        serve("/project").with(ProjectServlet.class);
-        
+                
         // Register a new user account
         serve("/register").with(RegisterServlet.class);
 
+        
+        // User profile
         serve("/profile").with(ProfileServlet.class);
 
+        
+        // Confirm user account from email URL
         serve("/confirmrequest").with(ConfirmRequestServlet.class);
+        
+        
+        // Confirm account registration request. Not sure how this is different
+        // than the confirmrequest uri.
+        // ---------------------------------------------------------------------
         serve("/confirm").with(ConfirmServlet.class);
-
+        
+        
+        // Reset password request via email
         serve("/resetrequest").with(PasswordResetRequestServlet.class);
+        
+        
+        // Reset user account password via the UI
+        // ---------------------------------------------------------------------
         serve("/reset").with(PasswordResetServlet.class);
 
+        
+        // Manage project details
+        serve("/project").with(ProjectServlet.class);
+        
+        
+        //Create a new project record
         serve("/createproject").with(ProjectCreationServlet.class);
+        
+        
+        // Maintain a publicly accessible URI for any specific projet
         serve("/projectlink").with(ProjectLinkServlet.class);
+        
+        
+        // Load a project into the canvas
         serve("/projecteditor").with(ProjectEditorServlet.class);
 
+        
+        // Get public attributes of a user's profile
         serve("/public/profile").with(PublicProfileServlet.class);
 
+        
         // Textile pages
         serve("/index", "/").with(TextileIndexServlet.class);
         serve("/public/license").with(TextileLicenseServlet.class);

src/main/java/com/parallax/server/blocklyprop/config/SetupConfig.java

@@ -9,6 +9,7 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.servlet.GuiceServletContextListener;
+
 import com.parallax.server.blocklyprop.SessionData;
 import com.parallax.server.blocklyprop.jsp.Properties;
 import com.parallax.server.blocklyprop.monitoring.Monitor;
@@ -32,8 +33,14 @@
  */
 public class SetupConfig extends GuiceServletContextListener {
 
+    /**
+     * Application-specific configuration options
+     */
     private Configuration configuration;
 
+    /**
+     * Application logging connector
+     */
     private final Logger LOG = LoggerFactory.getLogger(SetupConfig.class);
 
     @Override