| Автор | SHA1 | Сообщение | Дата |
|---|---|---|---|
|
|
4003e31592 | [maven-release-plugin] prepare for next development iteration | 1 месяц назад |
|
|
1f5b8fc991 | [maven-release-plugin] prepare release tomcat11-1.0.34 | 1 месяц назад |
|
|
c093ed6e5c | switched to jakarta servlet as javax.servel is no longer supported after tomcat9 | 1 месяц назад |
| @@ -2,7 +2,7 @@ | |||||
| <modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | ||||
| <groupId>alerttek</groupId> | <groupId>alerttek</groupId> | ||||
| <artifactId>CommEngine</artifactId> | <artifactId>CommEngine</artifactId> | ||||
| <version>1.0.34-SNAPSHOT</version> | |||||
| <version>tomcat-1.0.35-SNAPSHOT</version> | |||||
| <properties> | <properties> | ||||
| <maven.test.skip>true</maven.test.skip> | <maven.test.skip>true</maven.test.skip> | ||||
| </properties> | </properties> | ||||
| @@ -58,12 +58,19 @@ | |||||
| <version>4.5.8</version> | <version>4.5.8</version> | ||||
| </dependency> | </dependency> | ||||
| <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api --> | <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api --> | ||||
| <!-- | |||||
| <dependency> | <dependency> | ||||
| <groupId>javax.servlet</groupId> | <groupId>javax.servlet</groupId> | ||||
| <artifactId>javax.servlet-api</artifactId> | <artifactId>javax.servlet-api</artifactId> | ||||
| <version>4.0.1</version> | <version>4.0.1</version> | ||||
| <scope>provided</scope> | <scope>provided</scope> | ||||
| </dependency> | </dependency> | ||||
| --> | |||||
| <dependency> | |||||
| <groupId>jakarta.servlet</groupId> | |||||
| <artifactId>jakarta.servlet-api</artifactId> | |||||
| <version>6.0.0</version> <scope>provided</scope> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>com.googlecode.json-simple</groupId> | <groupId>com.googlecode.json-simple</groupId> | ||||
| <artifactId>json-simple</artifactId> | <artifactId>json-simple</artifactId> | ||||
| @@ -10,7 +10,6 @@ import java.util.HashMap; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.Queue; | import java.util.Queue; | ||||
| import java.util.Vector; | |||||
| import java.util.concurrent.Executors; | import java.util.concurrent.Executors; | ||||
| import java.util.concurrent.LinkedBlockingQueue; | import java.util.concurrent.LinkedBlockingQueue; | ||||
| import java.util.concurrent.ScheduledExecutorService; | import java.util.concurrent.ScheduledExecutorService; | ||||
| @@ -18,9 +17,6 @@ import java.util.concurrent.ScheduledFuture; | |||||
| import java.util.concurrent.TimeUnit; | import java.util.concurrent.TimeUnit; | ||||
| import java.util.concurrent.atomic.AtomicInteger; | import java.util.concurrent.atomic.AtomicInteger; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import org.apache.log4j.Logger; | import org.apache.log4j.Logger; | ||||
| import org.json.simple.JSONObject; | import org.json.simple.JSONObject; | ||||
| @@ -33,6 +29,8 @@ import altk.comm.engine.exception.BroadcastException; | |||||
| import altk.comm.engine.exception.EngineException; | import altk.comm.engine.exception.EngineException; | ||||
| import altk.comm.engine.exception.PlatformError; | import altk.comm.engine.exception.PlatformError; | ||||
| import altk.comm.engine.exception.PlatformException; | import altk.comm.engine.exception.PlatformException; | ||||
| import jakarta.servlet.http.HttpServletRequest; | |||||
| import jakarta.servlet.http.HttpServletResponse; | |||||
| /** | /** | ||||
| * Broadcast class absorbs what was formerly known as Dispatcher class. | * Broadcast class absorbs what was formerly known as Dispatcher class. | ||||
| @@ -5,8 +5,6 @@ import java.io.FileInputStream; | |||||
| import java.io.FileNotFoundException; | import java.io.FileNotFoundException; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.PrintWriter; | import java.io.PrintWriter; | ||||
| import java.time.LocalTime; | |||||
| import java.time.format.DateTimeFormatter; | |||||
| import java.util.Enumeration; | import java.util.Enumeration; | ||||
| import java.util.HashMap; | import java.util.HashMap; | ||||
| import java.util.Iterator; | import java.util.Iterator; | ||||
| @@ -17,12 +15,6 @@ import java.util.concurrent.ScheduledExecutorService; | |||||
| import java.util.regex.Matcher; | import java.util.regex.Matcher; | ||||
| import java.util.regex.Pattern; | import java.util.regex.Pattern; | ||||
| import javax.servlet.ServletContext; | |||||
| import javax.servlet.ServletException; | |||||
| import javax.servlet.http.HttpServlet; | |||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import org.apache.log4j.Logger; | import org.apache.log4j.Logger; | ||||
| import org.apache.log4j.PropertyConfigurator; | import org.apache.log4j.PropertyConfigurator; | ||||
| import org.json.simple.JSONObject; | import org.json.simple.JSONObject; | ||||
| @@ -30,6 +22,11 @@ import org.json.simple.parser.JSONParser; | |||||
| import org.json.simple.parser.ParseException; | import org.json.simple.parser.ParseException; | ||||
| import altk.comm.engine.Broadcast.BroadcastState; | import altk.comm.engine.Broadcast.BroadcastState; | ||||
| import jakarta.servlet.ServletContext; | |||||
| import jakarta.servlet.ServletException; | |||||
| import jakarta.servlet.http.HttpServlet; | |||||
| import jakarta.servlet.http.HttpServletRequest; | |||||
| import jakarta.servlet.http.HttpServletResponse; | |||||
| @SuppressWarnings("serial") | @SuppressWarnings("serial") | ||||
| public abstract class CommEngine extends HttpServlet | public abstract class CommEngine extends HttpServlet | ||||
| @@ -7,7 +7,7 @@ import java.util.Map; | |||||
| import java.util.Vector; | import java.util.Vector; | ||||
| import java.util.zip.ZipInputStream; | import java.util.zip.ZipInputStream; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| //import javax.servlet.http.HttpServletRequest; | |||||
| import javax.xml.parsers.DocumentBuilder; | import javax.xml.parsers.DocumentBuilder; | ||||
| import javax.xml.parsers.DocumentBuilderFactory; | import javax.xml.parsers.DocumentBuilderFactory; | ||||
| import javax.xml.xpath.XPath; | import javax.xml.xpath.XPath; | ||||
| @@ -33,6 +33,7 @@ import altk.comm.engine.exception.PlatformError; | |||||
| import altk.comm.engine.exception.PlatformException; | import altk.comm.engine.exception.PlatformException; | ||||
| import altk.common.engine.util.LoggingInputStreamReader; | import altk.common.engine.util.LoggingInputStreamReader; | ||||
| import altk.common.engine.util.UTF8BenevolentDecoder; | import altk.common.engine.util.UTF8BenevolentDecoder; | ||||
| import jakarta.servlet.http.HttpServletRequest; | |||||
| /** | /** | ||||
| * Abstract class extending Broadcast by providing an implementation of the decode | * Abstract class extending Broadcast by providing an implementation of the decode | ||||
| @@ -6,7 +6,6 @@ import java.util.HashMap; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.zip.ZipInputStream; | import java.util.zip.ZipInputStream; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.xml.parsers.ParserConfigurationException; | import javax.xml.parsers.ParserConfigurationException; | ||||
| import javax.xml.parsers.SAXParser; | import javax.xml.parsers.SAXParser; | ||||
| import javax.xml.parsers.SAXParserFactory; | import javax.xml.parsers.SAXParserFactory; | ||||
| @@ -20,6 +19,7 @@ import altk.comm.engine.exception.BroadcastMsgException; | |||||
| import altk.comm.engine.exception.EngineException; | import altk.comm.engine.exception.EngineException; | ||||
| import altk.common.engine.util.LoggingInputStreamReader; | import altk.common.engine.util.LoggingInputStreamReader; | ||||
| import altk.common.engine.util.UTF8BenevolentDecoder; | import altk.common.engine.util.UTF8BenevolentDecoder; | ||||
| import jakarta.servlet.http.HttpServletRequest; | |||||
| public abstract class XMLSAXBroadcast extends Broadcast | public abstract class XMLSAXBroadcast extends Broadcast | ||||
| { | { | ||||