diff options
Diffstat (limited to 'simpleSigning/src/main/java/at/gv/egiz/simpleSigning')
7 files changed, 87 insertions, 14 deletions
diff --git a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/ErrorSignature.java b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/ErrorSignature.java index c8128b0..0ebeeab 100644 --- a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/ErrorSignature.java +++ b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/ErrorSignature.java @@ -5,7 +5,6 @@ import java.io.OutputStream; import java.net.URLDecoder; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -16,7 +15,6 @@ import org.slf4j.LoggerFactory; import at.gv.egiz.simpleSigning.helper.SessionHelper; -@WebServlet("/Error") public class ErrorSignature extends HttpServlet { /** diff --git a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/FinishSignature.java b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/FinishSignature.java index 33ad8fd..f8cc26a 100644 --- a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/FinishSignature.java +++ b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/FinishSignature.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.OutputStream; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -15,7 +14,6 @@ import org.slf4j.LoggerFactory; import at.gv.egiz.simpleSigning.helper.SessionHelper; -@WebServlet("/Finish") public class FinishSignature extends HttpServlet { /** diff --git a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/JQueryServlet.java b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/JQueryServlet.java index 87693b5..96a8cc3 100644 --- a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/JQueryServlet.java +++ b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/JQueryServlet.java @@ -4,14 +4,12 @@ import java.io.IOException; import java.io.OutputStream; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FileUtils; -@WebServlet("/jquery.js") public class JQueryServlet extends HttpServlet { /** diff --git a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/PDFASJsServlet.java b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/PDFASJsServlet.java index 4ea456e..b2a6201 100644 --- a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/PDFASJsServlet.java +++ b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/PDFASJsServlet.java @@ -1,6 +1,5 @@ package at.gv.egiz.simpleSigning; -import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/Provider.java b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/Provider.java index 7cde301..918956e 100644 --- a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/Provider.java +++ b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/Provider.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.OutputStream; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -14,7 +13,6 @@ import org.slf4j.LoggerFactory; import at.gv.egiz.simpleSigning.helper.SessionHelper; -@WebServlet("/Provide") public class Provider extends HttpServlet { /** * diff --git a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/StartSignature.java b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/StartSignature.java index e88e85a..e018499 100644 --- a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/StartSignature.java +++ b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/StartSignature.java @@ -4,14 +4,11 @@ import java.io.IOException; import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; -import java.util.Iterator; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; import org.apache.commons.fileupload.FileItemIterator; import org.apache.commons.fileupload.FileItemStream; @@ -21,12 +18,11 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.gv.egiz.simpleSigning.helper.SessionHelper.Type; import at.gv.egiz.simpleSigning.cfg.Configuration; import at.gv.egiz.simpleSigning.helper.PDFHelper; import at.gv.egiz.simpleSigning.helper.SessionHelper; +import at.gv.egiz.simpleSigning.helper.SessionHelper.Type; -@WebServlet(urlPatterns = { "/Start" }) public class StartSignature extends HttpServlet { private static final Logger logger = LoggerFactory diff --git a/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/VersionServlet.java b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/VersionServlet.java new file mode 100644 index 0000000..4e03834 --- /dev/null +++ b/simpleSigning/src/main/java/at/gv/egiz/simpleSigning/VersionServlet.java @@ -0,0 +1,86 @@ +package at.gv.egiz.simpleSigning; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.jar.Attributes; +import java.util.jar.Manifest; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class VersionServlet extends HttpServlet { + + /** + * + */ + private static final long serialVersionUID = 6716170050447201588L; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + this.doProcess(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + this.doProcess(req, resp); + } + + protected void doProcess(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + StringBuilder sb = new StringBuilder(); + sb.append("{\"version\": \""); + sb.append(getVersion()); + sb.append("\", \"scm\": \""); + sb.append(getSCMRevision()); + sb.append("\"}"); + + resp.setContentType("application/json"); + OutputStream os = resp.getOutputStream(); + os.write(sb.toString().getBytes()); + os.close(); + } + + /** + * Gets the PDF-AS SCM Revision + * + * @return + */ + public String getSCMRevision() { + try { + ServletContext application = getServletConfig().getServletContext(); + InputStream inputStream = application + .getResourceAsStream("/META-INF/MANIFEST.MF"); + Manifest manifest = new Manifest(inputStream); + Attributes attributes = manifest.getMainAttributes(); + String impVersion = attributes.getValue("Specification-Version"); + return impVersion; + } catch (Throwable e) { + return "UNKOWN"; + } + } + + /** + * Gets the PDF-AS Version + * + * @return PDF-AS Verison string + */ + public String getVersion() { + try { + ServletContext application = getServletConfig().getServletContext(); + InputStream inputStream = application + .getResourceAsStream("/META-INF/MANIFEST.MF"); + Manifest manifest = new Manifest(inputStream); + Attributes attributes = manifest.getMainAttributes(); + String impVersion = attributes.getValue("Implementation-Version"); + return impVersion; + } catch (Throwable e) { + return "UNKOWN"; + } + } +} |