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 --- .../at/gv/egiz/bku/local/stal/LocalBKUWorker.java | 12 +- .../local/stal/LocalGETCertificateSTALFactory.java | 136 --------------------- .../local/stal/LocalGetCertificateSTALFactory.java | 136 +++++++++++++++++++++ .../bku/local/webapp/GETCertificateServlet.java | 133 -------------------- .../bku/local/webapp/GetCertificateServlet.java | 133 ++++++++++++++++++++ .../bku/local/webapp/GetHardwareInfoServlet.java | 6 +- BKULocal/src/main/webapp/WEB-INF/web.xml | 14 +-- 7 files changed, 285 insertions(+), 285 deletions(-) delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java 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') diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java index 7947c117..a7d930b3 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java @@ -26,8 +26,8 @@ package at.gv.egiz.bku.local.stal; import at.gv.egiz.bku.gui.BKUGUIFacade; import at.gv.egiz.bku.smccstal.AbstractBKUWorker; -import at.gv.egiz.bku.smccstal.GETCertificateRequestHandler; -import at.gv.egiz.bku.smccstal.GETHardwareInfoRequestHandler; +import at.gv.egiz.bku.smccstal.GetCertificateRequestHandler; +import at.gv.egiz.bku.smccstal.GetHardwareInfoRequestHandler; import at.gv.egiz.bku.smccstal.PINManagementRequestHandler; import at.gv.egiz.bku.smccstal.IdentityLinkRequestHandler; import at.gv.egiz.stal.QuitRequest; @@ -36,8 +36,8 @@ import at.gv.egiz.stal.STALResponse; import at.gv.egiz.stal.SignRequest; import at.gv.egiz.stal.ext.IdentityLinkRequest; -import at.gv.egiz.stal.ext.GETCertificateRequest; -import at.gv.egiz.stal.ext.GETHardwareInfoRequest; +import at.gv.egiz.stal.ext.GetCertificateRequest; +import at.gv.egiz.stal.ext.GetHardwareInfoRequest; import at.gv.egiz.stal.ext.PINManagementRequest; import java.util.List; import javax.swing.JFrame; @@ -57,8 +57,8 @@ public class LocalBKUWorker extends AbstractBKUWorker { new LocalSignRequestHandler(new LocalSecureViewer(gui))); addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler()); addRequestHandler(IdentityLinkRequest.class, new IdentityLinkRequestHandler()); - addRequestHandler(GETCertificateRequest.class, new GETCertificateRequestHandler()); - addRequestHandler(GETHardwareInfoRequest.class, new GETHardwareInfoRequestHandler()); + addRequestHandler(GetCertificateRequest.class, new GetCertificateRequestHandler()); + addRequestHandler(GetHardwareInfoRequest.class, new GetHardwareInfoRequestHandler()); } /** does not change container's visibility (use quit request to close) */ diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java deleted file mode 100644 index 50c6c632..00000000 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java +++ /dev/null @@ -1,136 +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.stal; - -import at.gv.egiz.bku.viewer.ResourceFontLoader; -import java.awt.Dimension; -import java.awt.Toolkit; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Locale; - - -import at.gv.egiz.bku.gui.BKUGUIFacade; -import at.gv.egiz.bku.gui.BKUIcons; -import at.gv.egiz.bku.gui.GetCertificateGUI; -import at.gv.egiz.bku.gui.GetCertificateGUIFacade; -import at.gv.egiz.bku.local.gui.GUIProxy; -import at.gv.egiz.bku.local.gui.LocalHelpListener; -import at.gv.egiz.stal.STAL; -import at.gv.egiz.stal.STALFactory; -import javax.swing.JFrame; - -import org.apache.commons.configuration.Configuration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** -* -* @author Thomas Lenz -*/ - -public class LocalGETCertificateSTALFactory implements STALFactory { - - private final Logger log = LoggerFactory.getLogger(LocalGETCertificateSTALFactory.class); - protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200); - protected URL helpURL; - protected Locale locale; - - protected Configuration configuration; - - @Override - public STAL createSTAL() { - final LocalBKUWorker stal; - //http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html - // use undecorated JFrame instead of JWindow, - // which creates an invisible owning frame and therefore cannot getFocusInWindow() - JFrame dialog = new JFrame("Bürgerkarte"); - log.debug("AlwaysOnTop supported: {}.", dialog.isAlwaysOnTopSupported()); - // [#439] make mocca dialog alwaysOnTop - dialog.setAlwaysOnTop(true); - dialog.setIconImages(BKUIcons.icons); -// dialog.setUndecorated(true); -// dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE); - - if (locale != null) { - dialog.setLocale(locale); - } - LocalHelpListener helpListener = null; - if (helpURL != null) { - helpListener = new LocalHelpListener(helpURL, locale); - } else { - log.warn("No HELP URL configured, help system disabled."); - } - GetCertificateGUIFacade gui = new GetCertificateGUI(dialog.getContentPane(), - dialog.getLocale(), - null, - new ResourceFontLoader(), - helpListener, - null); - BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { GetCertificateGUIFacade.class, } ); - stal = new LocalBKUWorker(proxy, dialog); - dialog.setPreferredSize(PREFERRED_SIZE); - dialog.pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - Dimension frameSize = dialog.getSize(); - if (frameSize.height > screenSize.height) { - frameSize.height = screenSize.height; - } - if (frameSize.width > screenSize.width) { - frameSize.width = screenSize.width; - } - dialog.setLocation((screenSize.width - frameSize.width) / 2, - (screenSize.height - frameSize.height) / 2); - - return stal; - } - - @Override - public void setLocale(Locale locale) { - this.locale = locale; - } - - /** - * spring injects helpURL - * @param helpURL - * @throws MalformedURLException if helpURL is not a valid URL - */ - public void setHelpURL(String helpURL) throws MalformedURLException { - this.helpURL = new URL(helpURL); - } - - /** - * @return the configuration - */ - public Configuration getConfiguration() { - return configuration; - } - - /** - * @param configuration the configuration to set - */ - public void setConfiguration(Configuration configuration) { - this.configuration = configuration; - } -} diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java new file mode 100644 index 00000000..56d6e251 --- /dev/null +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java @@ -0,0 +1,136 @@ +/* + * 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.stal; + +import at.gv.egiz.bku.viewer.ResourceFontLoader; +import java.awt.Dimension; +import java.awt.Toolkit; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Locale; + + +import at.gv.egiz.bku.gui.BKUGUIFacade; +import at.gv.egiz.bku.gui.BKUIcons; +import at.gv.egiz.bku.gui.GetCertificateGUI; +import at.gv.egiz.bku.gui.GetCertificateGUIFacade; +import at.gv.egiz.bku.local.gui.GUIProxy; +import at.gv.egiz.bku.local.gui.LocalHelpListener; +import at.gv.egiz.stal.STAL; +import at.gv.egiz.stal.STALFactory; +import javax.swing.JFrame; + +import org.apache.commons.configuration.Configuration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** +* +* @author Thomas Lenz +*/ + +public class LocalGetCertificateSTALFactory implements STALFactory { + + private final Logger log = LoggerFactory.getLogger(LocalGetCertificateSTALFactory.class); + protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200); + protected URL helpURL; + protected Locale locale; + + protected Configuration configuration; + + @Override + public STAL createSTAL() { + final LocalBKUWorker stal; + //http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html + // use undecorated JFrame instead of JWindow, + // which creates an invisible owning frame and therefore cannot getFocusInWindow() + JFrame dialog = new JFrame("Bürgerkarte"); + log.debug("AlwaysOnTop supported: {}.", dialog.isAlwaysOnTopSupported()); + // [#439] make mocca dialog alwaysOnTop + dialog.setAlwaysOnTop(true); + dialog.setIconImages(BKUIcons.icons); +// dialog.setUndecorated(true); +// dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE); + + if (locale != null) { + dialog.setLocale(locale); + } + LocalHelpListener helpListener = null; + if (helpURL != null) { + helpListener = new LocalHelpListener(helpURL, locale); + } else { + log.warn("No HELP URL configured, help system disabled."); + } + GetCertificateGUIFacade gui = new GetCertificateGUI(dialog.getContentPane(), + dialog.getLocale(), + null, + new ResourceFontLoader(), + helpListener, + null); + BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { GetCertificateGUIFacade.class, } ); + stal = new LocalBKUWorker(proxy, dialog); + dialog.setPreferredSize(PREFERRED_SIZE); + dialog.pack(); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + Dimension frameSize = dialog.getSize(); + if (frameSize.height > screenSize.height) { + frameSize.height = screenSize.height; + } + if (frameSize.width > screenSize.width) { + frameSize.width = screenSize.width; + } + dialog.setLocation((screenSize.width - frameSize.width) / 2, + (screenSize.height - frameSize.height) / 2); + + return stal; + } + + @Override + public void setLocale(Locale locale) { + this.locale = locale; + } + + /** + * spring injects helpURL + * @param helpURL + * @throws MalformedURLException if helpURL is not a valid URL + */ + public void setHelpURL(String helpURL) throws MalformedURLException { + this.helpURL = new URL(helpURL); + } + + /** + * @return the configuration + */ + public Configuration getConfiguration() { + return configuration; + } + + /** + * @param configuration the configuration to set + */ + public void setConfiguration(Configuration configuration) { + this.configuration = configuration; + } +} 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()); diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml index 41d5ab37..136905b6 100644 --- a/BKULocal/src/main/webapp/WEB-INF/web.xml +++ b/BKULocal/src/main/webapp/WEB-INF/web.xml @@ -52,11 +52,11 @@ at.gv.egiz.bku.local.webapp.IdentityLinkServlet - GETCertificateServlet - at.gv.egiz.bku.local.webapp.GETCertificateServlet + GetCertificateServlet + at.gv.egiz.bku.local.webapp.GetCertificateServlet - GETHardwareInfoServlet + GetHardwareInfoServlet at.gv.egiz.bku.local.webapp.GetHardwareInfoServlet @@ -77,12 +77,12 @@ /IdentityLink - GETCertificateServlet - /GETCertificate + GetCertificateServlet + /GetCertificate - GETHardwareInfoServlet - /GETHardwareinfo + GetHardwareInfoServlet + /GetHardwareinfo index.html -- cgit v1.2.3