sdt.app.homemonitoring: remove useless servlet.
Signed-off-by: BOLLE Sebastien <sebastien.bolle@orange.com>
Signed-off-by: BONNARDEL Gregory <gbonnardel.ext@orange.com>
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java
index 35eef35..a63419e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java
@@ -1,13 +1,8 @@
package org.eclipse.om2m.sdt.home.monitoring;
-import java.io.IOException;
-import java.net.URL;
import java.util.Dictionary;
import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.om2m.core.service.CseService;
@@ -17,7 +12,6 @@
import org.eclipse.om2m.sdt.home.monitoring.servlet.InCseContextServlet;
import org.eclipse.om2m.sdt.home.monitoring.servlet.LoginServlet;
import org.eclipse.om2m.sdt.home.monitoring.servlet.LogoutServlet;
-import org.eclipse.om2m.sdt.home.monitoring.servlet.MonitorHomeServlet;
import org.eclipse.om2m.sdt.home.monitoring.util.AeRegistration;
import org.eclipse.om2m.sdt.home.monitoring.util.Constants;
import org.eclipse.om2m.sdt.home.monitoring.util.ResourceDiscovery;
@@ -27,7 +21,6 @@
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
-import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
import org.osgi.util.tracker.ServiceTracker;
@@ -70,12 +63,6 @@
LOGGER.info("Register test " + uiContext + sep + "Home_Monitoring_Application http context");
httpService.registerServlet(uiContext + sep + Constants.APPNAME,
new HomeServlet(context), null, null);
- httpService.registerServlet(uiContext + sep + Constants.APPNAME + "/monitor/home",
- new MonitorHomeServlet(context), null, null);
-// httpService.registerServlet(uiContext + sep + Constants.APPNAME + "/monitor/control/device",
-// new DeviceControlServlet(context), null, null);
-// httpService.registerServlet(uiContext + sep + Constants.APPNAME + "/monitor/devices",
-// new DevicesServlet(context), null, null);
httpService.registerServlet(uiContext + sep + Constants.APPNAME + "/in-cse/context",
new InCseContextServlet(), null, null);
httpService.registerServlet(uiContext + sep + Constants.APPNAME + "/security/login",
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java
index 78ca30a..5514831 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java
@@ -27,7 +27,7 @@
SessionManager.Session session = null;
if ((session = AuthFillter.validateUserCredentials(request, response)) != null) {
- response.sendRedirect("/" + Constants.APPNAME + "/monitor/home?" + SessionManager.SESSION_ID_PARAMETER + "=" + session.getId());
+ response.sendRedirect("/" + Constants.APPNAME + "/webapps/monitor.html?" + SessionManager.SESSION_ID_PARAMETER + "=" + session.getId());
} else {
response.sendRedirect("/" + Constants.APPNAME + "/webapps/login.html?message=error");
}
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/MonitorHomeServlet.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/MonitorHomeServlet.java
deleted file mode 100644
index a613ca4..0000000
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/MonitorHomeServlet.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.om2m.sdt.home.monitoring.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.om2m.sdt.home.monitoring.util.Constants;
-import org.eclipse.om2m.sdt.home.monitoring.util.FileUtil;
-import org.osgi.framework.BundleContext;
-
-public class MonitorHomeServlet extends HttpServlet {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- private BundleContext context;
-
- public MonitorHomeServlet(BundleContext context) {
- this.context = context;
- }
-
- @Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- String sessionId = request.getParameter(SessionManager.SESSION_ID_PARAMETER);
-
- if ((sessionId == null) || (!SessionManager.getInstance().checkTokenExists(sessionId))) {
- response.sendRedirect("/" + Constants.APPNAME + "/webapps/login.html");
- return;
- }
-
- SessionManager.Session currentSession = SessionManager.getInstance().getSession(sessionId);
- if (currentSession == null) {
- response.sendRedirect("/" + Constants.APPNAME + "/webapps/login.html");
- return;
- }
-
- String monitorHome = FileUtil.getFileAsString("webapps/monitor.html", context);
- monitorHome = monitorHome.replace("%USERNAME%", currentSession.getName());
- response.setContentType("text/html");
- PrintWriter out = response.getWriter();
- out.println(monitorHome);
-
- }
-
-}
