Omaha #4473 update references to moved logback classes

Change-Id: I68ac77c7f6f74dacac0d70a6155a93cf37a1873a

Former-commit-id: 339bea8a304cec0afad5b363709689e55fe744c5

build/deploy.edex.awips2/esb/conf/logback-activeTableChange.xml

@@ -1,10 +1,10 @@
 <included>
    <!-- activeTableChange log --> 
    <appender name="activeTableChangeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>activeTableChange</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
 
    <appender name="activeTableChangeLogAsync" class="ch.qos.logback.classic.AsyncAppender">            

build/deploy.edex.awips2/esb/conf/logback-ebxmlRegistry.xml

@@ -4,13 +4,13 @@
    
    <!-- BandwidthManager log --> 
    <appender name="RegistryLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>ebxmlRegistry</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
 
-   <appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
+   <appender name="ThreadBasedLog" class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender">
       <defaultAppenderName>console</defaultAppenderName>
       <appender-ref ref="console"/>
    </appender>

build/deploy.edex.awips2/esb/conf/logback-edex-appenders.xml

@@ -2,7 +2,7 @@
    <!-- Appenders shared by all EDEX logback files. -->
    <!-- general application log --> 
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-       <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
+       <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/>
    </appender>
 
    <appender name="asyncConsole" class="ch.qos.logback.classic.AsyncAppender">
@@ -11,10 +11,10 @@
 
    <!-- Performance log --> 
    <appender name="PerformanceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>performance</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>
 
    <appender name="PerformanceLogAsync" class="ch.qos.logback.classic.AsyncAppender">            

build/deploy.edex.awips2/esb/conf/logback-edex-hibernate-logger.xml

@@ -1,11 +1,11 @@
 <included>
    <!-- hibernate log -->
    <appender name="HibernateLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>hibernate</name>
       </rollingPolicy>
 
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder">
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder">
           <trace>false</trace>
       </encoder>
    </appender>

build/deploy.edex.awips2/esb/conf/logback-ingest.xml

@@ -4,10 +4,10 @@
    
    <!-- shef log --> 
    <appender name="shef" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>shef</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
 
    <!-- activeTableChange log --> 
@@ -15,61 +15,61 @@
 
    <!-- Purge log --> 
    <appender name="purge" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>purge</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
    
    <!-- RouteFailedLog log --> 
    <appender name="RouteFailedLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>unrecognized-files</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
 
    <!-- ShefPerformanceLog log --> 
    <appender name="ShefPerfLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>shef-performance</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
 
    <!-- Gen Areal FFG log --> 
    <appender name="GenArealFFG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>gen_areal_ffg</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>
    
    <!-- Gen Areal QPE log --> 
    <appender name="GenArealQPE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>gen_areal_qpe</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
    
    <!-- Trigger log --> 
    <appender name="FailedTriggerLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>trigger</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>
    
    <!-- ohd log --> 
    <appender name="OhdLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>ohd</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>
 
-   <appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
+   <appender name="ThreadBasedLog" class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender">
       <defaultAppenderName>asyncConsole</defaultAppenderName>
       <appender-ref ref="asyncConsole"/>
       <appender-ref ref="shef"/>

build/deploy.edex.awips2/esb/conf/logback-registry.xml

@@ -4,45 +4,45 @@
    
    <!-- BandwidthManager log --> 
    <appender name="BandwidthManagerLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>bandwidth</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
 
    <!-- data delivery log --> 
    <appender name="DataDeliveryLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>datadelivery</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
    
    <!-- data delivery Notification log --> 
    <appender name="NotificationLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>notification</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
    
    <!-- data delivery Retrieval log --> 
    <appender name="RetrievalLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>retrieval</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
 
    <!-- Purge log -->
    <appender name="PurgeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>purge</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>
 
-   <appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
+   <appender name="ThreadBasedLog" class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender">
       <defaultAppenderName>console</defaultAppenderName>
       <appender-ref ref="console"/>
    </appender>

build/deploy.edex.awips2/esb/conf/logback-request.xml

@@ -4,10 +4,10 @@
 
    <!-- ProductSrvRequest log --> 
    <appender name="ProductSrvRequestLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>productSrvRequest</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>    
    
    <appender name="ProductSrvRequestLogAsync" class="ch.qos.logback.classic.AsyncAppender">            
@@ -16,11 +16,11 @@
 
    <!-- TextDBSrvRequest log --> 
    <appender name="TextDBSrvRequestLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>textdbSrvRequest</name>
       </rollingPolicy>
 
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>    
    
    <appender name="TextDBSrvRequestLogAsync" class="ch.qos.logback.classic.AsyncAppender">            
@@ -29,10 +29,10 @@
 
    <!-- ThriftSrv (RemoteRequestRouteWrapper) request log --> 
    <appender name="ThriftSrvRequestLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
          <name>thriftSrv</name>
       </rollingPolicy>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>
 
    <appender name="ThriftSrvRequestLogAsync" class="ch.qos.logback.classic.AsyncAppender">            

build/deploy.edex.awips2/esb/conf/wrapper.conf

@@ -122,7 +122,7 @@ wrapper.java.additional.log.1=-Dlogback.configurationFile=${LOG_CONF}
 # only allows warn and error status messages from logback's internal status logger
 # Note that setting the debug="true" flag on a logback configuration file will override this
 # and allow info/debug messages through.
-wrapper.java.additional.log.2=-Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
+wrapper.java.additional.log.2=-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
 
 # to keep c3p0 from filling up logs since they just had to not use a standard logging API
 wrapper.java.additional.log.3=-Dcom.mchange.v2.log.MLog=com.mchange.v2.log.FallbackMLog

cave/com.raytheon.uf.viz.alertviz/logback-alertviz.xml

@@ -4,8 +4,8 @@
    -->
    <!-- general application log --> 
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> 
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
-      <filter class="com.raytheon.uf.common.status.logback.InvertedThresholdFilter">
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
+      <filter class="com.raytheon.uf.common.logback.filter.InvertedThresholdFilter">
          <level>INFO</level>         
       </filter>
    </appender>
@@ -15,14 +15,14 @@
       <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
         <level>WARN</level>
       </filter> 
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender>
    
-   <appender name="AlertVizAdminLogAppender" class="com.raytheon.uf.common.status.logback.EnvConfigurableRollingFileAppender">
+   <appender name="AlertVizAdminLogAppender" class="com.raytheon.uf.common.logback.appender.EnvConfigurableRollingFileAppender">
       <!--  file and fileNamePattern will be overridden by the env variable if present, but are required by logback -->
       <file>alertviz-admin.log</file>
       <envLogVar>LOGFILE_ALERTVIZ</envLogVar>
-      <rollingPolicy class="com.raytheon.uf.common.status.logback.EnvConfigurableFixedWindowRollingPolicy">
+      <rollingPolicy class="com.raytheon.uf.common.logback.policy.EnvConfigurableFixedWindowRollingPolicy">
          <fileNamePattern>alertviz-admin.log%i</fileNamePattern>
          <envLogVar>LOGFILE_ALERTVIZ</envLogVar>
          <minIndex>1</minIndex>
@@ -32,7 +32,7 @@
          <maxFileSize>2GB</maxFileSize>
       </triggeringPolicy>
       <append>true</append>
-      <encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/> 
+      <encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/> 
    </appender> 
    
    <logger name="AlertVizAdminLogger" additivity="false">

cave/com.raytheon.uf.viz.product.alertviz/alertviz.product

@@ -31,7 +31,7 @@ Developed on the Raytheon Visualization Environment (viz)
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
 -Dqpid.dest_syntax=BURL
 -Dlogback.configurationFile=logback-alertviz.xml
--Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
+-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
 -Dthrift.stream.maxsize=200</vmArgs>
    </launcherArgs>
 

cave/com.raytheon.viz.product.awips/awips.product

@@ -23,7 +23,7 @@
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
 -Dqpid.dest_syntax=BURL
 -Dlogback.configurationFile=logback-viz-core.xml
--Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
+-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
 -Dthrift.stream.maxsize=200
 -Dviz.memory.warn.threshold=98
 -Dhttps.certificate.check=false

cave/com.raytheon.viz.product.awips/developer.product

@@ -22,7 +22,7 @@
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme 
 -Dqpid.dest_syntax=BURL 
 -Dlogback.configurationFile=logback-viz-core-developer.xml
--Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
+-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
 -Dthrift.stream.maxsize=200
 -Dviz.memory.warn.threshold=99
 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false

edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml

@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+    <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="smartInit" />
         <constructor-arg value="smartInit.*" />
     </bean>

edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+    <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="radar" />
         <constructor-arg value="Ingest.Radar.*" />
     </bean>

edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml

@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+    <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="shef" />
         <constructor-arg value="Ingest.Shef.*" />
     </bean>

edexOsgi/com.raytheon.uf.edex.archive/res/spring/archive-spring.xml

@@ -2,7 +2,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+    <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="archive" />
         <constructor-arg value="Archive.*" />
     </bean>

edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/res/spring/satellite-gini-ingest.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+    <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="satellite" />
         <constructor-arg value="Ingest.Gini.*" />
     </bean>

edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml

@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+    <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="text" />
         <constructor-arg value="Ingest.Text.*" />
     </bean>

edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/build.properties

@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/

edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/res/spring/lma-ingest.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-	<bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+	<bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="sportlma" />
         <constructor-arg value="Ingest.SportLma.*" />
     </bean>

ost/gov.noaa.nws.ost.edex.plugin.regionalsat/build.properties

@@ -2,6 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/
 bin.excludes = res/scripts2/,\
                res/scripts/

ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+    <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="satellite" />
         <constructor-arg value="Ingest.regionalsat.*" />
     </bean>