merge remove of JMS code from local branch rmJMScode

mike-iris · mike-iris · commit ae0eabb2422e · 2021-05-18T08:50:03.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <name>WebServiceShell</name>
     <groupId>edu.iris</groupId>
     <artifactId>webserviceshell</artifactId>
-    <version>2.4.11</version>
+    <version>2.4.12-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <url>http://iris.edu</url>
@@ -120,7 +120,6 @@
 		<jersey.version.2x>2.21</jersey.version.2x>
 		<servlet.version>3.0.1</servlet.version>
 		<sc.seis.seisFile>2.0.0</sc.seis.seisFile>
-        <dmc.usage.log.version>1.0.2</dmc.usage.log.version>
         <dmc_logging.version>1.1.14</dmc_logging.version>
         <hk2.version>2.4.0-b31</hk2.version>
     </properties>
@@ -140,12 +139,6 @@
             <version>${sc.seis.seisFile}</version>
         </dependency>
 
-        <dependency>
-            <groupId>edu.iris.dmc</groupId>
-            <artifactId>dmc-usage-log</artifactId>
-            <version>${dmc.usage.log.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>edu.iris</groupId>
             <artifactId>dmc_logging</artifactId>
@@ -199,13 +192,6 @@
         </dependency>
     </dependencies>
 
-    <!-- Repositories -->
-    <repositories>
-    </repositories>
-
-    <pluginRepositories>
-    </pluginRepositories>
-
     <profiles>
       <profile>
         <id>metrics</id>
@@ -262,22 +248,4 @@
       </profile>
     </profiles>
 
-    <!-- Distribution Management -->
-    <distributionManagement>
-        <repository>
-            <uniqueVersion>false</uniqueVersion>
-            <id>nexus-releases</id>
-            <name>Internal Releases</name>
-            <url>http://marvin2:8080/nexus/content/repositories/releases</url>
-            <layout>default</layout>
-        </repository>
-        <snapshotRepository>
-            <uniqueVersion>true</uniqueVersion>
-            <id>nexus-snapshots</id>
-            <name>Internal Snapshots</name>
-            <url>http://marvin2:8080/nexus/content/repositories/snapshots</url>
-            <layout>default</layout>
-        </snapshotRepository>
-    </distributionManagement>
-
 </project>
diff --git a/src/main/java/edu/iris/wss/framework/AppConfigurator.java b/src/main/java/edu/iris/wss/framework/AppConfigurator.java
@@ -54,7 +54,7 @@
 public class AppConfigurator {
 	public static final Logger logger = Logger.getLogger(AppConfigurator.class);
 
-	public static final String wssVersion = "2.4.11";
+public static final String wssVersion = "2.4.12-SNAPSHOT";
 
 	public static final String wssDigestRealmnameSignature = "wss.digest.realmname";
 
@@ -165,7 +165,7 @@ private class Endpoint {
     private final Endpoint ep_defaults = new Endpoint();
 
 	public static enum LoggingMethod {
-		LOG4J, JMS, RABBIT_ASYNC
+		LOG4J, RABBIT_ASYNC
 	};
 
     /**
@@ -851,7 +851,7 @@ public void loadGlobalParameter(Properties input, Map cfgs, GL_CFGS eKey)
                         throw new Exception("Unrecognized value for paramater: " + key
                               + "  value found: " + newVal
                               + "  should be one of " + LoggingMethod.LOG4J.toString()
-                              + " or " + LoggingMethod.JMS.toString(), ex);
+                              + " or " + LoggingMethod.RABBIT_ASYNC.toString(), ex);
                     }
                 } else if(currentVal instanceof URL) {
                     try {
diff --git a/src/main/java/edu/iris/wss/framework/AppContextListener.java b/src/main/java/edu/iris/wss/framework/AppContextListener.java
@@ -68,18 +68,5 @@ public void contextInitialized(ServletContextEvent arg0) {
     public void contextDestroyed(ServletContextEvent arg0) {
         logger.info("contextDestroyed called, context: "
               + arg0.getServletContext().getContextPath());
-        if (WssSingleton.webLogService != null) {
-            try {
-                // for JMS
-                WssSingleton.webLogService.cleanUp();
-                logger.info("contextDestroyed called, JMS cleanUp finished");
-            } catch (Exception ex) {
-                System.out.println("*** AppContextListener, webLogService"
-                        + " cleanup exception: " + ex
-                        + "  msg: " + ex.getMessage());
-                logger.info("*** AppContextListener, webLogService cleanup"
-                        + " exception: ", ex);
-            }
-        }
     }
 }
diff --git a/src/main/java/edu/iris/wss/framework/WssSingleton.java b/src/main/java/edu/iris/wss/framework/WssSingleton.java
@@ -19,8 +19,6 @@
 
 package edu.iris.wss.framework;
 
-// Reference to support JMS logging option.
-import edu.iris.dmc.jms.service.WebLogService;
 import edu.iris.dmc.logging.rabbitmq.IrisRabbitAsyncPublisher;
 import edu.iris.dmc.logging.rabbitmq.IrisRabbitPublisherFactory;
 
@@ -53,7 +51,6 @@ public class WssSingleton {
 	public StatsKeeper statsKeeper = new StatsKeeper();
 	public IrisSingleton singleton = null;
 
-    public static WebLogService webLogService = null;
     public static IrisRabbitAsyncPublisher rabbitAsyncPublisher = null;
 
     public static final String HEADER_START_IDENTIFIER = "HTTP_HEADERS_START";
@@ -176,9 +173,6 @@ public void configure(String configFileBase) throws Exception {
               AppConfigurator.LoggingMethod.RABBIT_ASYNC)) {
             String fileName = appConfig.getLoggingConfig().toString();
             setupRabbitLogging(fileName);
-        } else if (appConfig.getLoggingType().equals(
-              AppConfigurator.LoggingMethod.JMS)) {
-            setupJMSLogging();
         }
 	}
 
@@ -247,28 +241,4 @@ private void setupRabbitLogging(String rabbitCfgFile) {
             }
         }
     }
-
-    private void setupJMSLogging() {
-        if (webLogService != null) {
-            // should always be null if webLogService is held as a static,
-            // this implies that more than one WssSingleton object is seeing
-            // this class variable. It should be refactored or there should
-            // be different classloaders used to isolate this class from another
-            String msg = "POSSIBLE ERROR, JMS object already exists, null was"
-                  + " expected for webLogService, webLogService: "
-                  + webLogService;
-            System.out.println(msg);
-            logger.error(msg);
-        }
-
-        webLogService = new WebLogService();
-        try {
-            webLogService.init();
-            logger.info("JMS webLogService init finished");
-        } catch (Exception ex) {
-            String msg = "JMS webLogService init ex: ";
-            System.out.println(msg + ex);
-            logger.error(msg, ex);
-        }
-    }
 }
diff --git a/src/main/java/edu/iris/wss/utils/LoggerUtils.java b/src/main/java/edu/iris/wss/utils/LoggerUtils.java
@@ -19,7 +19,6 @@
 
 package edu.iris.wss.utils;
 
-import edu.iris.dmc.jms.WebUsageItem;
 import edu.iris.dmc.logging.usage.WSUsageItem;
 import edu.iris.wss.framework.AppConfigurator;
 import java.text.SimpleDateFormat;
@@ -156,43 +155,6 @@ private static void logWssUsageMessage(Level level, WSUsageItem wsuRabbit,
 				break;
 			}
 
-		} else if (loggingType == LoggingMethod.JMS) {
-
-            WebUsageItem wui = new WebUsageItem();
-
-            wui.setApplication(  olderJMSApplciationName);
-            wui.setHost(         wsuRabbit.getHost());
-            wui.setAccessDate(   wsuRabbit.getAccessDate());
-            wui.setClientName(   wsuRabbit.getClientName());
-            wui.setClientIP(     wsuRabbit.getClientIp());
-            wui.setDataSize(     wsuRabbit.getDataSize());
-            wui.setProcessTime(  wsuRabbit.getProcessTimeMsec());
-            wui.setNetwork(      wsuRabbit.getNetwork());
-            wui.setStation(      wsuRabbit.getStation());
-            wui.setChannel(      wsuRabbit.getChannel());
-            wui.setLocation(     wsuRabbit.getLocation());
-            wui.setQuality(      wsuRabbit.getQuality());
-            wui.setStartTime(    wsuRabbit.getStartTime());
-            wui.setEndTime(      wsuRabbit.getEndTime());
-            wui.setErrorType(    wsuRabbit.getErrorType());
-            wui.setUserAgent(    wsuRabbit.getUserAgent());
-            wui.setHttpStatus(   wsuRabbit.getHttpCode());
-            wui.setUserName(     wsuRabbit.getUserName());
-            wui.setExtra(        wsuRabbit.getExtra());
-
-            try {
-                WssSingleton.webLogService.send(wui);
-			} catch (Exception ex) {
-				logger.error("Error while publishing via JMS ex: " + ex
-                      + "  webLogService: " + WssSingleton.webLogService
-                      + "  ex msg: " + ex.getMessage()
-                      + "  application: " + wui.getApplication()
-                      + "  host: " + wui.getHost()
-                      + "  client IP: " + wui.getClientIP()
-                      + "  ErrorType: " + wui.getErrorType());
-
-//                logger.error("Error while publishing via JMS stack:", ex);
-			}
 
 		} else if (loggingType == LoggingMethod.RABBIT_ASYNC) {
             try {
diff --git a/src/test/resources/StreamEater2Test/tstStreamEat2-service.cfg b/src/test/resources/StreamEater2Test/tstStreamEat2-service.cfg
@@ -6,7 +6,7 @@ version=0.0.0
 # CORS is enabled by default, set to false to disable CORS processing
 ##corsEnabled=true
 
-# LOG4J or JMS
+# LOG4J
 loggingMethod=LOG4J
 
 # time is seconds
