From 239ec1a50524e2380d778956bbb75a539f468e2c Mon Sep 17 00:00:00 2001 From: tkellner Date: Mon, 2 Apr 2012 16:39:18 +0000 Subject: Case change git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1056 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../bku/local/webapp/GETCertificateServlet.java | 133 --------------------- .../bku/local/webapp/GetCertificateServlet.java | 133 +++++++++++++++++++++ .../bku/local/webapp/GetHardwareInfoServlet.java | 6 +- 3 files changed, 136 insertions(+), 136 deletions(-) delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java (limited to 'BKULocal/src/main/java/at/gv/egiz/bku/local/webapp') diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java deleted file mode 100644 index d23937f9..00000000 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright 2011 by Graz University of Technology, Austria - * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint - * initiative of the Federal Chancellery Austria and Graz University of Technology. - * - * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by - * the European Commission - subsequent versions of the EUPL (the "Licence"); - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * http://www.osor.eu/eupl/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * - * This product combines work with different licenses. See the "NOTICE" text - * file for details on the various modules and licenses. - * The "NOTICE" text file is part of the distribution. Any derivative works - * that you distribute must include a readable copy of the "NOTICE" text file. - */ - -package at.gv.egiz.bku.local.webapp; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collections; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.bku.local.stal.LocalGETCertificateSTALFactory; -import at.gv.egiz.stal.QuitRequest; -import at.gv.egiz.stal.STAL; -import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.ext.GETCertificateRequest; - -/** -* -* @author Thomas Lenz -*/ - -public class GETCertificateServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - private final Logger log = LoggerFactory.getLogger(GETCertificateServlet.class); - - LocalGETCertificateSTALFactory stalFactory; - - public GETCertificateServlet() { - log.debug("Constuctor: " + GETCertificateServlet.class); - stalFactory = new LocalGETCertificateSTALFactory(); - try { - stalFactory.setHelpURL("http://localhost:3495/help/"); - } catch (MalformedURLException e) { - log.info("Failed to set help URL.", e); - } - } - - /** - * Processes requests for both HTTP GET and POST methods. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - STAL getCerTificateSTAL = stalFactory.createSTAL(); - - List stalResps = getCerTificateSTAL.handleRequest(Collections.singletonList(new GETCertificateRequest())); - - log.debug("Received STAL reponse {}.", stalResps.get(0).getClass()); - - getCerTificateSTAL.handleRequest(Collections.singletonList(new QuitRequest())); - - String redirect = request.getParameter("redirect"); - if (redirect != null) { - String referer = request.getHeader("Referer"); - if (referer != null) { - redirect = new URL(new URL(referer), redirect).toExternalForm(); - } - response.sendRedirect(redirect); - } else { - response.setStatus(HttpServletResponse.SC_OK); - } - } - - // - /** - * Handles the HTTP GET method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Returns a short description of the servlet. - * @return a String containing servlet description - */ - @Override - public String getServletInfo() { - return "Short description"; - } -} diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java new file mode 100644 index 00000000..23c08bd5 --- /dev/null +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java @@ -0,0 +1,133 @@ +/* + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. + */ + +package at.gv.egiz.bku.local.webapp; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collections; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egiz.bku.local.stal.LocalGetCertificateSTALFactory; +import at.gv.egiz.stal.QuitRequest; +import at.gv.egiz.stal.STAL; +import at.gv.egiz.stal.STALResponse; +import at.gv.egiz.stal.ext.GetCertificateRequest; + +/** +* +* @author Thomas Lenz +*/ + +public class GetCertificateServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + private final Logger log = LoggerFactory.getLogger(GetCertificateServlet.class); + + LocalGetCertificateSTALFactory stalFactory; + + public GetCertificateServlet() { + log.debug("Constuctor: " + GetCertificateServlet.class); + stalFactory = new LocalGetCertificateSTALFactory(); + try { + stalFactory.setHelpURL("http://localhost:3495/help/"); + } catch (MalformedURLException e) { + log.info("Failed to set help URL.", e); + } + } + + /** + * Processes requests for both HTTP GET and POST methods. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + STAL getCerTificateSTAL = stalFactory.createSTAL(); + + List stalResps = getCerTificateSTAL.handleRequest(Collections.singletonList(new GetCertificateRequest())); + + log.debug("Received STAL reponse {}.", stalResps.get(0).getClass()); + + getCerTificateSTAL.handleRequest(Collections.singletonList(new QuitRequest())); + + String redirect = request.getParameter("redirect"); + if (redirect != null) { + String referer = request.getHeader("Referer"); + if (referer != null) { + redirect = new URL(new URL(referer), redirect).toExternalForm(); + } + response.sendRedirect(redirect); + } else { + response.setStatus(HttpServletResponse.SC_OK); + } + } + + // + /** + * Handles the HTTP GET method. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Handles the HTTP POST method. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Returns a short description of the servlet. + * @return a String containing servlet description + */ + @Override + public String getServletInfo() { + return "Short description"; + } +} diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java index dc7762a8..51ed2d8d 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java @@ -41,7 +41,7 @@ import at.gv.egiz.bku.local.stal.LocalGetHardwareInfoSTALFactory; import at.gv.egiz.stal.QuitRequest; import at.gv.egiz.stal.STAL; import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.ext.GETHardwareInfoRequest; +import at.gv.egiz.stal.ext.GetHardwareInfoRequest; /** * @@ -56,7 +56,7 @@ public class GetHardwareInfoServlet extends HttpServlet { LocalGetHardwareInfoSTALFactory stalFactory; public GetHardwareInfoServlet() { - log.debug("Constuctor: " + GetHardwareInfoServlet.class); + log.debug("Constructor: " + GetHardwareInfoServlet.class); stalFactory = new LocalGetHardwareInfoSTALFactory(); try { stalFactory.setHelpURL("http://localhost:3495/help/"); @@ -77,7 +77,7 @@ public class GetHardwareInfoServlet extends HttpServlet { STAL getHardwareInfoSTAL = stalFactory.createSTAL(); - List stalResps = getHardwareInfoSTAL.handleRequest(Collections.singletonList(new GETHardwareInfoRequest())); + List stalResps = getHardwareInfoSTAL.handleRequest(Collections.singletonList(new GetHardwareInfoRequest())); log.debug("Received STAL reponse {}.", stalResps.get(0).getClass()); -- cgit v1.2.3