Changeset 35247

Timestamp:

2021-08-04T10:58:39+12:00 (20 months ago)

Author:

davidb

Message:

Use correct web 3.0 deployment descriptors
Add log4j web APIs and setup for servlets

Location:

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy

Files:

• build.xml (modified) (3 diffs)
• lib/java/log4j-web-2.12.1-javadoc.jar (added)
• lib/java/log4j-web-2.12.1.jar (added)
• log4j2.xml (deleted)
• src/main/java/org/atea/nlptools/koreromaoriinterface/TranscriptionServlet.java (modified) (1 diff)
• src/main/webapp/WEB-INF/log4j2.xml (added)
• src/main/webapp/WEB-INF/web.xml (modified) (4 diffs)

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/build.xml

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project name="gs3-koreromaori-ext" default="usage" basedir=".">
     <loadproperties prefix="gs3." srcFile="${basedir}/../../../build.properties" />
@@ -57 +59 @@
         <echo message="Creating ${guild.home}/gs3-koreromaori.war" />
 
-        <!-- <copy file="${basedir}/config.properties" todir="${build.classes}" />
-        <echo message="Copied configuration file" /> -->
-        <copy file="${basedir}/log4j2.xml" todir="${build.classes}" />
-        
+        <!-- <copy file="${basedir}/log4j2.xml" todir="${build.classes}" /> -->
+            
         <war destfile="${build.home}/gs3-koreromaori.war" webxml="${web.dir}/WEB-INF/web.xml">
             <fileset dir="${web.dir}/webContent" includes="**" />
@@ -70 +70 @@
             
             <classes dir="${build.classes}" />
+
+            <webinf dir="${web.dir}/WEB-INF" />
         </war>
     </target>

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/java/org/atea/nlptools/koreromaoriinterface/TranscriptionServlet.java

@@ -63 +63 @@
         
         this.transcriptionService = new ReoTuhituhiApiService(jsonSerialiser, apiEndpoint, apiKey);
+
+        logger.info("Initialised!");
     }
 

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/webapp/WEB-INF/web.xml

@@ -1 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE web-app 
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" 
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+                             http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
 
-<web-app>
     <!-- General description of your web application -->
-
-    <display-name>Korero Maori TTS ASR API Interface</display-name>
+    <display-name>Korero Maori TTS ASR API Proxy</display-name>
     <description>
-        A servlet that hosts a web interface to the speech-to-text ASR API of https://koreromaori.io/
+        A servlet that hosts a proxy for the speech-to-text ASR API of https://koreromaori.io/
     </description>
 
@@ -29 +29 @@
          parameters, including zero.
     -->
-
-    <context-param>
-      <param-name>webmaster</param-name>
-      <param-value>myaddress@mycompany.com</param-value>
-      <description>
-        The EMAIL address of the administrator to whom questions
-        and comments about this application should be addressed.
-      </description>
-    </context-param>
 
     <!-- Servlet definitions for the servlets that make up
@@ -65 +56 @@
 
     <servlet>
-      <servlet-name>transcribe</servlet-name>
-      <description>
-        This servlet provides a proxy for https://koreromaori.io 's reo Maori speech-to-text ASR API.
-      </description>
+      <servlet-name>koreroMaoriTranscribe</servlet-name>
       <servlet-class>org.atea.nlptools.koreromaoriinterface.TranscriptionServlet</servlet-class>
       <load-on-startup>0</load-on-startup>
@@ -92 +80 @@
 
     <servlet-mapping>
-      <servlet-name>transcribe</servlet-name>
+      <servlet-name>koreroMaoriTranscribe</servlet-name>
       <url-pattern>/transcribe</url-pattern>
     </servlet-mapping>