Merge pull request #38 from MatzElectronics/parallaxinc-develop

Clean and merge into develop branch

Author: MatzElectronics

docs/java_issues.md

@@ -0,0 +1,20 @@
+2019-05-19 Timezone Issue in Oracle J-Connector
+
+
+After upgrading the MySql J-Connector, the following error occurs when an attempt is made to connect to a MySQL server:
+
+``
+The server time zone value 'PST' is unrecognized or represents more than one time zone. You must
+configure either the server or JDBC driver (via the serverTimezone configuration property) to use
+a more specifc time zone value if you want to utilize time zone support.
+```
+
+Affected versions:
+ 5.1.33+, 8.0.*
+ 
+ Bug Report link:
+ https://bugs.mysql.com/bug.php?id=85816
+ 
+ Online documentation that addresses this issue:
+ https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-other-changes.html
+ 

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

@@ -25,21 +25,21 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.servlet.GuiceServletContextListener;
-
 import com.parallax.server.blocklyprop.jsp.Properties;
 import com.parallax.server.blocklyprop.monitoring.Monitor;
-
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Enumeration;
-import javax.servlet.ServletContextEvent;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.servlet.ServletContextEvent;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Enumeration;
+
 
 
 /**
@@ -49,7 +49,8 @@
 public class SetupConfig extends GuiceServletContextListener {
 
     // Application logging connector
-    private final Logger LOG = LoggerFactory.getLogger(SetupConfig.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SetupConfig.class);
+
 
     // Application-specific configuration options
     private Configuration configuration;

src/main/webapp/editor/blocklyc.jsp

@@ -180,10 +180,10 @@
                                                     <li class="auth-true online-only" data-displayas="list-item"><a href="my/projects.jsp" class="url-prefix"><span class="keyed-lang-string" data-key="menu_my_projects"></span></a></li>
                                                     <li class="online-only"><a href="projects.jsp" class="url-prefix"><span class="keyed-lang-string" data-key="menu_community_projects"></span></a></li>
                                                     <li class="online-only divider"></li>
-                                                    <li><a href="public/help" target="_blank" class="url-prefix"><span class="keyed-lang-string" data-key="menu_help_reference"></span></a></li>
+                                                    <li><a href="https://learn.parallax.com/ab-blocks" target="_blank" class="url-prefix"><span class="keyed-lang-string" data-key="menu_help_reference"></span></a></li>
                                                     <li class="divider"></li>
                                                     <li><a id="download-side" href="#"><span class="keyed-lang-string" data-key="menu_download_simpleide"></span></a></li>
-                                                    <li><a id="download-project" href="#"><span class="keyed-lang-string" data-key="editor_download"></span></a></li>
+                                                    <li class="online-only divider" data-displayas="list-item"><a id="download-project" href="#"><span class="keyed-lang-string" data-key="editor_download"></span></a></li>
                                                     <li class="auth-true" data-displayas="list-item"><a id="upload-project"><span class="keyed-lang-string" data-key="editor_upload"></span></a></li>
                                                     <li class="auth-true divider" data-displayas="list-item"></li>
                                                     <li class="auth-true" data-displayas="list-item"><a id="client-setup"><span class="keyed-lang-string" data-key="editor_run_configure"></span></a></li>