Author: ggrekhov
Date: Thu May 24 11:34:48 2012
New Revision: 1342202
URL: http://svn.apache.org/viewvc?rev=1342202&view=rev
Log:
NetworkTetsing: Switch servlet to spring controller
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingServlet.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1342202&r1=1342201&r2=1342202&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Thu
May 24 11:34:48 2012
@@ -142,10 +142,6 @@
<display-name>BackupExport</display-name>
<servlet-name>BackupExport</servlet-name>
<servlet-class>org.openmeetings.servlet.outputhandler.BackupExportFacade</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>NetworkTesting</servlet-name>
-
<servlet-class>org.openmeetings.servlet.outputhandler.NetworkTestingServlet</servlet-class>
</servlet>
<servlet-mapping>
@@ -205,10 +201,6 @@
<servlet-name>BackupExport</servlet-name>
<url-pattern>/BackupExport</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>NetworkTesting</servlet-name>
- <url-pattern>/NetworkTesting</url-pattern>
- </servlet-mapping>
<mime-mapping>
<extension>inc</extension>
<mime-type>text/plain</mime-type>
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java?rev=1342202&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
Thu May 24 11:34:48 2012
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.openmeetings.servlet.outputhandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.io.IOException;
+
+@Controller
+public class NetworkTestingController {
+
+ @RequestMapping(value = "/NetworkTesting", method = RequestMethod.POST)
+ public void service(HttpServletRequest request, HttpServletResponse
httpServletResponse)
+ throws ServletException, IOException {
+
+ }
+
+}
Propchange:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
------------------------------------------------------------------------------
svn:eol-style = native