Correct merge error in code to reference new help URL in editor menu.

pjewald · pjewald · commit b23dcce6a5d6 · 2019-01-30T01:07:20.000-08:00
diff --git a/src/main/java/com/parallax/server/blocklyprop/config/ServletsModule.java b/src/main/java/com/parallax/server/blocklyprop/config/ServletsModule.java
@@ -27,8 +27,6 @@
 import com.parallax.server.blocklyprop.servlets.PrivacyPolicyServlet;
 import com.parallax.server.blocklyprop.servlets.ConfirmRequestServlet;
 import com.parallax.server.blocklyprop.servlets.ConfirmServlet;
-import com.parallax.server.blocklyprop.servlets.HelpSearchServlet;
-import com.parallax.server.blocklyprop.servlets.HelpServlet;
 import com.parallax.server.blocklyprop.servlets.NewOAuthUserServlet;
 import com.parallax.server.blocklyprop.servlets.OAuthGoogleServlet;
 import com.parallax.server.blocklyprop.servlets.PasswordResetRequestServlet;
@@ -130,9 +128,6 @@ protected void configureServlets() {
         serve("/public/clientinstructions").with(TextileClientInstructionsServlet.class);
         serve("/public/changelog").with(TextileChangeLogServlet.class);
 
-        // Help
-        serve("/public/help").with(HelpServlet.class);
-        serve("/public/helpsearch").with(HelpSearchServlet.class);
 
         // OAuth
         serve("/oauth/newuser").with(NewOAuthUserServlet.class);
diff --git a/src/main/java/com/parallax/server/blocklyprop/config/SetupConfig.java b/src/main/java/com/parallax/server/blocklyprop/config/SetupConfig.java
@@ -29,7 +29,6 @@
 import com.parallax.server.blocklyprop.SessionData;
 import com.parallax.server.blocklyprop.jsp.Properties;
 import com.parallax.server.blocklyprop.monitoring.Monitor;
-import com.parallax.server.blocklyprop.utils.HelpFileInitializer;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.util.Enumeration;
@@ -40,9 +39,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// import java.sql.SQLException;
-// import ch.qos.logback.classic.LoggerContext;
-
 
 /**
  *
@@ -73,7 +69,6 @@ protected void configure() {
                 bind(SessionData.class);
                 bind(Properties.class).asEagerSingleton();
 
-                bind(HelpFileInitializer.class).asEagerSingleton();
                 bind(Monitor.class).asEagerSingleton();
 
                 // Configure the backend data store
diff --git a/src/main/java/com/parallax/server/blocklyprop/servlets/HelpSearchServlet.java b/src/main/java/com/parallax/server/blocklyprop/servlets/HelpSearchServlet.java
@@ -33,7 +33,11 @@
 /**
  *
  * @author Michel
+ *
+ * @deprecated The help system has been moved to learn.parallax.com
+ *
  */
+@Deprecated
 @Singleton
 public class HelpSearchServlet extends HttpServlet {
 
diff --git a/src/main/java/com/parallax/server/blocklyprop/servlets/HelpServlet.java b/src/main/java/com/parallax/server/blocklyprop/servlets/HelpServlet.java
@@ -23,7 +23,10 @@
 /**
  *
  * @author Michel
+ *
+ * @deprecated  Help system is now hosted on learn.parallax.com
  */
+@Deprecated
 @Singleton
 public class HelpServlet extends HttpServlet {
 
diff --git a/src/main/java/com/parallax/server/blocklyprop/utils/HelpFileInitializer.java b/src/main/java/com/parallax/server/blocklyprop/utils/HelpFileInitializer.java
@@ -37,7 +37,10 @@
 /**
  *
  * @author Michel
+ *
+ * @deprecated The help system has been moved to learn.parallax.com
  */
+@Deprecated
 @Singleton
 public class HelpFileInitializer {
 
diff --git a/src/main/webapp/my/projects.jsp b/src/main/webapp/my/projects.jsp
@@ -5,8 +5,7 @@
 --%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@ include file="/WEB-INF/includes/include.jsp"%>
-<!DOCTYPE html!>
-<html>
+<!DOCTYPE html>
     <head>
         <meta name="application-name" content="BlocklyProp"/>
         <meta name="msapplication-TileColor" content="#FFFFFF" />
