xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'omaha_16.1.1' into ncep_16.1.1

Browse source 
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 0fac6077e5271987758340751887d32c8b055ed3
This commit is contained in:
Joshua Huber 2015-06-05 00:27:22 +00:00
commit 9dc8690d49
4348 changed files with 48464 additions and 1339853 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/config/awips1/Awips1ProdDistInfoBuilder.java
View file

@ -143,12 +143,13 @@ public class Awips1ProdDistInfoBuilder {
// Because the radar ingest system uses zero as the value that stands for the
// null tilt, any bin including 0.0 must have 0.0 as the primary tilt.
// ... not sure if this applies to us
// 02/27/2015 DR17099 zwang For TLAS, the first elev 0.8 should match to 0.5
// Sequence of (group-rep1, min1, max1, group-rep2, min2, max2, ...)
protected static int[] angleGroups = {
0, 0, 3,
5, 4, 7,
9, 8, 11,
5, 4, 8,
9, 9, 11,
15, 12, 16,
18, 17, 20,
24, 21, 26,

17
build/deploy.edex.awips2/.project Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>deploy.edex.awips2</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.python.pydev.pythonNature</nature>
</natures>
</projectDescription>

5
build/deploy.edex.awips2/.pydevproject Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</pydev_project>

0
edexOsgi/build.edex/deploy-common/deploy-esb-configuration.xml → build/deploy.edex.awips2/deploy/deploy-esb-configuration.xml
View file

2
edexOsgi/build.edex/deploy-common/deploy-esb.xml → build/deploy.edex.awips2/deploy/deploy-esb.xml
View file

@ -1,5 +1,5 @@
<project name="deploy.esb" default="main">
<import file="deploy-web.xml" />
<!-- <import file="deploy-web.xml" /> -->
<target name="main">
<!-- on a developer machine, the following directories should

0
edexOsgi/build.edex/esb/bin/daminfotranslator.sh → build/deploy.edex.awips2/esb/bin/daminfotranslator.sh
View file

0
edexOsgi/build.edex/esb/bin/findEmptyLocalizationDirs.sh → build/deploy.edex.awips2/esb/bin/findEmptyLocalizationDirs.sh
View file

0
edexOsgi/build.edex/esb/bin/ndmMenuIngester.sh → build/deploy.edex.awips2/esb/bin/ndmMenuIngester.sh
View file

0
edexOsgi/build.edex/esb/bin/setup.env → build/deploy.edex.awips2/esb/bin/setup.env
View file

9
edexOsgi/build.edex/esb/bin/start.sh → build/deploy.edex.awips2/esb/bin/start.sh
View file

@ -129,15 +129,6 @@ fi
export CONSOLE_LOGLEVEL
# determine whether we are running a 32-bit or 64-bit version of EDEX -
# based on the AWIPS II Java that has been installed
EDEX_BITS="32"
EXPECTED_ARCH=`file ${JAVA_INSTALL}/bin/java | awk '{ print $3; }'`
if [ "${EXPECTED_ARCH}" = "64-bit" ]; then
EDEX_BITS="64"
fi
export EDEX_BITS=${EDEX_BITS}
# source environment files
. $EDEX_HOME/etc/default.sh

0
edexOsgi/build.edex/esb/conf/banner.txt → build/deploy.edex.awips2/esb/conf/banner.txt
View file

0
edexOsgi/build.edex/esb/conf/cache/ebxmlRegistryCache.xml → build/deploy.edex.awips2/esb/conf/cache/ebxmlRegistryCache.xml vendored
View file

0
edexOsgi/build.edex/esb/conf/db/hibernateConfig/damCatalog/hibernate.cfg.xml → build/deploy.edex.awips2/esb/conf/db/hibernateConfig/damCatalog/hibernate.cfg.xml
View file

0
edexOsgi/build.edex/esb/conf/db/hibernateConfig/fxa/hibernate.cfg.xml → build/deploy.edex.awips2/esb/conf/db/hibernateConfig/fxa/hibernate.cfg.xml
View file

0
edexOsgi/build.edex/esb/conf/db/hibernateConfig/hmdb/hibernate.cfg.xml → build/deploy.edex.awips2/esb/conf/db/hibernateConfig/hmdb/hibernate.cfg.xml
View file

0
edexOsgi/build.edex/esb/conf/db/hibernateConfig/ihfs/hibernate.cfg.xml → build/deploy.edex.awips2/esb/conf/db/hibernateConfig/ihfs/hibernate.cfg.xml
View file

0
edexOsgi/build.edex/esb/conf/db/hibernateConfig/maps/hibernate.cfg.xml → build/deploy.edex.awips2/esb/conf/db/hibernateConfig/maps/hibernate.cfg.xml
View file

0
edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml → build/deploy.edex.awips2/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
View file

0
edexOsgi/build.edex/esb/conf/db/hibernateConfig/ncep/hibernate.cfg.xml → build/deploy.edex.awips2/esb/conf/db/hibernateConfig/ncep/hibernate.cfg.xml
View file

21
build/deploy.edex.awips2/esb/conf/logback-dataprovideragent.xml Normal file
View file

@ -0,0 +1,21 @@
<configuration debug="false" scan="true">
<include file="${edex.home}/conf/logback-edex-properties.xml"/>
<include file="${edex.home}/conf/logback-edex-appenders.xml" />
<include file="${edex.home}/conf/logback-edex-loggers.xml" />
<include file="${edex.home}/conf/logback-edex-hibernate-logger.xml" />
<!-- <logger name="com.raytheon.uf.edex.datadelivery.provideragent" additivity="false">
<level value="INFO"/>
<appender-ref ref="ProviderAgent"/>
</logger>-->
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="console"/>
<!--
<appender-ref ref="ThreadBasedLog"/>
-->
</root>
</configuration>

35
build/deploy.edex.awips2/esb/conf/logback-ebxmlRegistry.xml Normal file
View file

@ -0,0 +1,35 @@
<configuration debug="false" scan="true">
<include file="${edex.home}/conf/logback-edex-properties.xml"/>
<include file="${edex.home}/conf/logback-edex-appenders.xml" />
<!-- BandwidthManager log -->
<appender name="RegistryLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>ebxmlRegistry</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
<defaultAppenderName>console</defaultAppenderName>
<appender-ref ref="console"/>
</appender>
<include file="${edex.home}/conf/logback-edex-loggers.xml" />
<include file="${edex.home}/conf/logback-edex-hibernate-logger.xml" />
<logger name="edu">
<level value="WARN" />
</logger>
<logger name="com.raytheon.uf.edex.registry.ebxml.services.notification" additivity="false">
<level value="INFO"/>
<appender-ref ref="NotificationLog"/>
</logger>
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="ThreadBasedLog"/>
</root>
</configuration>

23
build/deploy.edex.awips2/esb/conf/logback-edex-appenders.xml Normal file
View file

@ -0,0 +1,23 @@
<included>
<!-- 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"/>
</appender>
<appender name="asyncConsole" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="console" />
</appender>
<!-- Performance log -->
<appender name="PerformanceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>performance</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="PerformanceLogAsync" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="PerformanceLog" />
</appender>
</included>

17
build/deploy.edex.awips2/esb/conf/logback-edex-hibernate-logger.xml Normal file
View file

@ -0,0 +1,17 @@
<included>
<!-- hibernate log -->
<appender name="HibernateLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>hibernate</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder">
<trace>false</trace>
</encoder>
</appender>
<logger name="org.hibernate" additivity="false">
<level value="ERROR"/>
<appender-ref ref="HibernateLog" />
</logger>
</included>

7
build/deploy.edex.awips2/esb/conf/logback-edex-limited-loggers.xml Normal file
View file

@ -0,0 +1,7 @@
<included>
<!-- Loggers shared only by logback-request.xml and logback-ingest.xml -->
<logger name="com.raytheon.edex.services.NotifySrv">
<level value="WARN"/>
</logger>
</included>

49
build/deploy.edex.awips2/esb/conf/logback-edex-loggers.xml Normal file
View file

@ -0,0 +1,49 @@
<included>
<!-- Logger's shared by all EDEX logback files. -->
<logger name="com.raytheon">
<level value="INFO"/>
</logger>
<logger name="PerformanceLogger" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="PerformanceLogAsync" />
</logger>
<!-- used by c3p0 -->
<logger name="com.mchange">
<level value="ERROR"/>
</logger>
<logger name="mx4j">
<level value="ERROR"/>
</logger>
<logger name="org.apache">
<level value="INFO"/>
</logger>
<logger name="org.apache.camel.impl.converter.DefaultTypeConverter">
<level value="ERROR"/>
</logger>
<logger name="org.apache.camel.core.xml">
<level value="WARN"/>
</logger>
<logger name="org.apache.qpid">
<level value="INFO"/>
</logger>
<logger name="org.apache.qpid.client.BasicMessageProducer_0_10">
<level value="WARN"/>
</logger>
<logger name="org.apache.xbean.spring">
<level value="WARN"/>
</logger>
<logger name="org.quartz">
<level value="ERROR"/>
</logger>
<logger name="org.springframework">
<level value="ERROR"/>
</logger>
<logger name="org.geotools">
<level value="WARN"/>
</logger>
<logger name="org.apache.cxf">
<level value="ERROR"/>
</logger>
</included>

8
build/deploy.edex.awips2/esb/conf/logback-edex-properties.xml Normal file
View file

@ -0,0 +1,8 @@
<included>
<property scope="context" name="log.dir.home" value="${edex.home}"/>
<property scope="context" name="log.file.base" value ="edex"/>
<property scope="context" name="log.file.mode" value="${edex.run.mode}"/>
<!-- Only define when not wanting to use the UF Standard.
<property scope="context" name="log.message.pattern" value="%-5p %d [%t] %c{0}: %m%n"/>
-->
</included>

153
build/deploy.edex.awips2/esb/conf/logback-ingest.xml Normal file
View file

@ -0,0 +1,153 @@
<configuration debug="false" scan="true">
<include file="${edex.home}/conf/logback-edex-properties.xml"/>
<include file="${edex.home}/conf/logback-edex-appenders.xml" />
<!-- shef log -->
<appender name="shef" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>shef</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<!-- activeTableChange log -->
<appender name="activeTableChangeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>activeTableChange</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="activeTableChangeLogAsync" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="activeTableChangeLog" />
</appender>
<!-- Purge log -->
<appender name="purge" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>purge</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<!-- RouteFailedLog log -->
<appender name="RouteFailedLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>unrecognized-files</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<!-- ShefPerformanceLog log -->
<appender name="ShefPerfLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>shef-performance</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.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">
<name>gen_areal_ffg</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.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">
<name>gen_areal_qpe</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<!-- Trigger log -->
<appender name="FailedTriggerLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>trigger</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<!-- ohd log -->
<appender name="OhdLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>ohd</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
<defaultAppenderName>asyncConsole</defaultAppenderName>
<appender-ref ref="asyncConsole"/>
<appender-ref ref="shef"/>
<appender-ref ref="purge"/>
</appender>
<include file="${edex.home}/conf/logback-edex-loggers.xml" />
<include file="${edex.home}/conf/logback-edex-limited-loggers.xml"/>
<include file="${edex.home}/conf/logback-edex-hibernate-logger.xml"/>
<logger name="ActiveTableChange" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="activeTableChangeLogAsync" />
</logger>
<logger name="com.raytheon.edex.plugin.shef" additivity="false">
<level value="INFO"/>
<appender-ref ref="shef" />
</logger>
<logger name="com.raytheon.uf.edex.purgesrv" additivity="false">
<level value="INFO"/>
<appender-ref ref="purge"/>
</logger>
<logger name="com.raytheon.uf.edex.database.purge" additivity="false">
<level value="INFO"/>
<appender-ref ref="purge"/>
</logger>
<logger name="com.raytheon.edex.db.purge.DataPurgeRegistry" additivity="false">
<level value="INFO"/>
<appender-ref ref="purge"/>
</logger>
<logger name="RouteFailedLog" additivity="false">
<level value="WARN"/>
<appender-ref ref="RouteFailedLog"/>
</logger>
<logger name="ShefPerfLog" additivity="false">
<level value="INFO"/>
<appender-ref ref="ShefPerfLog"/>
</logger>
<logger name="GenArealFFG" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="GenArealFFG"/>
</logger>
<logger name="GenArealQPE" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="GenArealQPE"/>
</logger>
<logger name="FailedTriggerLog" additivity="false">
<level value="ERROR"/>
<appender-ref ref="FailedTriggerLog"/>
</logger>
<logger name="com.raytheon.uf.edex.ohd" additivity="false">
<level value="INFO"/>
<appender-ref ref="OhdLog" />
<appender-ref ref="console" />
</logger>
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="ThreadBasedLog"/>
</root>
</configuration>

140
build/deploy.edex.awips2/esb/conf/logback-registry.xml Normal file
View file

@ -0,0 +1,140 @@
<configuration debug="false" scan="true">
<include file="${edex.home}/conf/logback-edex-properties.xml"/>
<include file="${edex.home}/conf/logback-edex-appenders.xml" />
<!-- BandwidthManager log -->
<appender name="BandwidthManagerLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>bandwidth</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<!-- data delivery log -->
<appender name="DataDeliveryLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>datadelivery</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.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">
<name>notification</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.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">
<name>retrieval</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<!-- Purge log -->
<appender name="PurgeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>purge</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
<defaultAppenderName>console</defaultAppenderName>
<appender-ref ref="console"/>
</appender>
<include file="${edex.home}/conf/logback-edex-loggers.xml" />
<include file="${edex.home}/conf/logback-edex-hibernate-logger.xml" />
<logger name="edu">
<level value="WARN" />
</logger>
<logger name="org.apache.cxf">
<level value="ERROR"/>
</logger>
<logger name="org.apache.cxf.interceptor.LoggingOutInterceptor" additivity="false">
<level value="WARN"/>
<appender-ref ref="DataDeliveryLog"/>
</logger>
<logger name="org.apache.cxf.interceptor.LoggingInInterceptor" additivity="false">
<level value="WARN"/>
<appender-ref ref="DataDeliveryLog"/>
</logger>
<logger name="com.raytheon.uf.common.datadelivery" additivity="false">
<level value="INFO"/>
<appender-ref ref="DataDeliveryLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.service" additivity="false">
<level value="INFO"/>
<appender-ref ref="DataDeliveryLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.request" additivity="false">
<level value="INFO"/>
<appender-ref ref="DataDeliveryLog"/>
</logger>
<logger name="com.raytheon.uf.common.datadelivery.event" additivity="false">
<level value="INFO"/>
<appender-ref ref="NotificationLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.event" additivity="false">
<level value="INFO"/>
<appender-ref ref="NotificationLog"/>
</logger>
<logger name="com.raytheon.uf.edex.registry.ebxml.services.notification" additivity="false">
<level value="INFO"/>
<appender-ref ref="NotificationLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.registry.federation" additivity="false">
<level value="INFO"/>
<appender-ref ref="NotificationLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.registry.replication" additivity="false">
<level value="INFO"/>
<appender-ref ref="NotificationLog"/>
</logger>
<logger name="com.raytheon.uf.common.datadelivery.retrieval" additivity="false">
<level value="INFO"/>
<appender-ref ref="RetrievalLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.retrieval" additivity="false">
<level value="INFO"/>
<appender-ref ref="RetrievalLog"/>
</logger>
<logger name="com.raytheon.uf.common.datadelivery.bandwidth" additivity="false">
<level value="INFO"/>
<appender-ref ref="BandwidthManagerLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.bandwidth" additivity="false">
<level value="INFO"/>
<appender-ref ref="BandwidthManagerLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.harvester.purge" additivity="false">
<level value="INFO"/>
<appender-ref ref="PurgeLog"/>
</logger>
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="ThreadBasedLog"/>
</root>
</configuration>

68
build/deploy.edex.awips2/esb/conf/logback-request.xml Normal file
View file

@ -0,0 +1,68 @@
<configuration debug="false" scan="true">
<include file="${edex.home}/conf/logback-edex-properties.xml"/>
<include file="${edex.home}/conf/logback-edex-appenders.xml" />
<!-- ProductSrvRequest log -->
<appender name="ProductSrvRequestLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>productSrvRequest</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="ProductSrvRequestLogAsync" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="ProductSrvRequestLog" />
</appender>
<!-- TextDBSrvRequest log -->
<appender name="TextDBSrvRequestLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>textdbSrvRequest</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="TextDBSrvRequestLogAsync" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="TextDBSrvRequestLog" />
</appender>
<!-- ThriftSrv (RemoteRequestRouteWrapper) request log -->
<appender name="ThriftSrvRequestLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>thriftSrv</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="ThriftSrvRequestLogAsync" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="ThriftSrvRequestLog" />
</appender>
<include file="${edex.home}/conf/logback-edex-loggers.xml" />
<include file="${edex.home}/conf/logback-edex-limited-loggers.xml"/>
<logger name="ProductSrvRequestLogger" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="ProductSrvRequestLogAsync"/>
</logger>
<logger name="TextDBSrvRequestLogger" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="TextDBSrvRequestLogAsync"/>
</logger>
<logger name="ThriftSrvRequestLogger" additivity="false">
<level value="Info"/>
<appender-ref ref="ThriftSrvRequestLogAsync" />
</logger>
<logger name="org.hibernate">
<level value="ERROR"/>
</logger>
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="asyncConsole"/>
</root>
</configuration>

31
build/deploy.edex.awips2/esb/conf/logback.xml Normal file
View file

@ -0,0 +1,31 @@
<configuration debug="false" scan="true">
<include file="${edex.home}/conf/logback-edex-properties.xml"/>
<include file="${edex.home}/conf/logback-edex-appenders.xml" />
<!-- Simple default logback. -->
<include file="${edex.home}/conf/logback-edex-loggers.xml" />
<include file="${edex.home}/conf/logback-edex-hibernate-logger.xml" />
<!-- activeTableChange log -->
<appender name="activeTableChangeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.status.logback.StdTimeBasedRollingPolicy">
<name>activeTableChange</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.status.logback.UFStdEncoder"/>
</appender>
<appender name="activeTableChangeLogAsync" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="activeTableChangeLog" />
</appender>
<logger name="ActiveTableChange" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="activeTableChangeLogAsync" />
</logger>
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="asyncConsole"/>
</root>
</configuration>

0
edexOsgi/build.edex/esb/conf/logging.properties → build/deploy.edex.awips2/esb/conf/logging.properties
View file

0
edexOsgi/build.edex/esb/conf/modes/README.txt → build/deploy.edex.awips2/esb/conf/modes/README.txt
View file

0
edexOsgi/build.edex/esb/conf/res/tablelookup.xml → build/deploy.edex.awips2/esb/conf/res/tablelookup.xml
View file

170
edexOsgi/build.edex/esb/conf/security/keystoreUtil.sh → build/deploy.edex.awips2/esb/conf/security/keystoreUtil.sh
View file

@ -1,8 +1,30 @@
#!/bin/bash
# rewrite from 16.1.1
SETUP_ENV=/awips2/edex/bin/setup.env
source $SETUP_ENV
if [[ -z $JAR_LIB ]]
then
JAR_LIB="/awips2/edex/lib"
fi
FIND_JAR_COMMAND="find $JAR_LIB -name *.jar"
JAR_FOLDERS=`$FIND_JAR_COMMAND`
#Recursively search all library directories for jar files and add them to the local classpath
addSep=false
for i in $JAR_FOLDERS;
do
if [[ "$addSep" == true ]];
then
LOCAL_CLASSPATH=$LOCAL_CLASSPATH":"$i
else
LOCAL_CLASSPATH=$i
addSep=true
fi
done
JAVA_BIN=/awips2/java/jre/bin/java
securityDir=/awips2/edex/conf/security
@ -12,31 +34,38 @@ publicKeyFile=PublicKey.cer
keystore=keystore.jks
truststore=truststore.jks
orgUnit=
org=
loc=
state=
country=
ext=
keystorePw=
truststorePw=
keyPw=
cn=
encryptionKey=encrypt
truststorePw=password
function usage {
echo "Usage:"
echo -e "\t-h\t\tDisplays usage"
echo -e "\t-g\t\tGenerate keystore, truststore, and security properties file"
echo -e "\t-a [keyFile]\tAdds a public key to the trust store"
echo -e "\t-d [keyFile]\tDeletes a public key from the trust store"
}
function generateKeystores() {
echo "Generating keystores"
if [ -z $CLUSTER_ID ]
if [[ -z $CLUSTER_ID ]]
then
echo "CLUSTER_ID undefined. Determining from hostname..."
HOST=$(hostname -s)
CLUSTER_ID=${HOST:$(expr index "$HOST" -)} | tr '[:lower:]' '[:upper:]'
fi
if [ -z $CLUSTER_ID ]
if [[ -z $CLUSTER_ID ]]
then
echo "CLUSTER_ID could not be determined from hostname. Using site as CLUSTER_ID"
CLUSTER_ID=$AW_SITE_IDENTIFIER
@ -48,50 +77,49 @@ keyAlias=$CLUSTER_ID
# Write the cluster ID to the setup.env file
sed -i "s@^export CLUSTER_ID.*@export CLUSTER_ID=$CLUSTER_ID@g" $SETUP_ENV
if [ ! -d "$securityDir" ]; then
if [[ ! -d $securityDir ]]; then
mkdir $securityDir
fi
if [ ! -d "$securityPropertiesDir" ]; then
if [[ ! -d $securityPropertiesDir ]]; then
mkdir -p $securityPropertiesDir
fi
while [ -z $keystorePw ];
while [[ -z $keystorePw ]];
do
echo -n "Enter desired password for keystore [$keystore]: "
read keystorePw
if [ -z $keystorePw ];
if [[ -z $keystorePw ]];
then
echo "Keystore password cannot be empty!"
fi
done
while [ -z $keyAlias ];
while [[ -z $keyAlias ]];
do
echo -n "Enter alias: "
read keyAlias
if [ -z $keyAlias ];
if [[ -z $keyAlias ]];
then
echo "Alias cannot be empty!"
fi
done
while [ -z $keyPw ];
while [[ -z $keyPw ]];
do
echo -n "Enter desired password for key [$keyAlias]: "
read keyPw
if [ -z $keyPw ];
if [[ -z $keyPw ]];
then
echo "Key password cannot be empty!"
fi
done
while [ -z $truststorePw ];
while [[ -z $truststorePw ]];
do
echo -n "Enter password for trust store [$truststore]: "
read truststorePw
if [ -z $truststorePw ];
if [[ -z $truststorePw ]];
then
echo "TrustStore password cannot be empty!"
fi
@ -108,27 +136,92 @@ do
fi
done
while [[ -z $orgUnit ]];
do
echo -n "Enter Organizational Unit for cert [(OU)]: "
read orgUnit
if [[ -z $orgUnit ]];
then
echo "Organizational Unit cannot be empty!"
fi
done
while [[ -z $org ]];
do
echo -n "Organization for cert [(O)]: "
read org
if [[ -z $org ]];
then
echo "Organization cannot be empty!"
fi
done
while [[ -z $loc ]];
do
echo -n "Location for cert (underscores for spaces please!) [(L)]: "
read loc
if [[ -z $loc ]];
then
echo "Location cannot be empty!"
fi
done
while [[ -z $state ]];
do
echo -n "State for cert (2 letter ID) [(ST)]: "
read state
if [[ -z $state ]];
then
echo "State cannot be empty!"
fi
done
while [[ -z $country ]];
do
echo -n "Country for cert (2 letter ID) [(C)]: "
read country
if [[ -z $country ]];
then
echo "Country cannot be empty!"
fi
done
while [[ -z $ext ]];
do
echo "Subject Alternative Names (SAN): Comma Delimited!"
echo "for FQDN enter: dns:host1.mydomain.com,host2.mydomain.com, etc"
echo "for IP enter: ip:X.X.X.X,Y.Y.Y.Y, etc"
echo -n "[SAN]: "
read ext
if [[ -z $ext ]];
then
echo "Subject Alternative Names cannot be empty!"
fi
done
cn=$(hostname)
echo "Generating keystore..."
# get rid of an existing key with same name
echo "Check to see if a key with this alias exists.....[$keyAlias]!"
echo "Checking to see if a key with this alias exists in keystore.....[$keyAlias]!"
keytool -delete -alias $keyAlias -keystore $securityDir/$keystore
# create and add key
keytool -genkeypair -alias $keyAlias -keypass $keyPw -keystore $keystore -storepass $keystorePw -validity 360 -dname "CN=$cn, OU=AWIPS, O=Raytheon, L=Silver Spring, ST=MD, C=US" -keyalg RSA
keytool -genkeypair -alias $keyAlias -keypass $keyPw -keystore $keystore -storepass $keystorePw -validity 360 -dname "CN=$cn, OU=$orgUnit, O=$org, L=$loc, ST=$state, C=$country" -keyalg RSA -ext san=$ext
echo -n "Exporting public key..."
exportOutput=`keytool -exportcert -alias $keyAlias -keystore $keystore -file $keyAlias$publicKeyFile -storepass $keystorePw 2>&1`
echo "Done!"
obfuscatedKeystorePassword=`$JAVA_BIN -cp /awips2/edex/lib/dependencies/org.apache.commons.codec/commons-codec-1.4.jar:/awips2/edex/lib/plugins/com.raytheon.uf.common.security.jar com.raytheon.uf.common.security.encryption.AESEncryptor encrypt $encryptionKey $keystorePw 2>&1`
echo "Generating trust store..."
obfuscatedKeystorePassword=`$JAVA_BIN -cp $LOCAL_CLASSPATH com.raytheon.uf.common.security.encryption.AESEncryptor encrypt $encryptionKey $keystorePw 2>&1`
echo "Check to see if a trusted CA with this alias exists.....[$keyAlias]!"
echo "Generating trust store..."
echo "Checking to see if a trusted CA with this alias exists in truststore.....[$keyAlias]!"
keytool -delete -alias $keyAlias -keystore $securityDir/$truststore
keytool -genkey -alias tmp -keypass tempPass -dname CN=foo -keystore $truststore -storepass $truststorePw
keytool -delete -alias tmp -keystore $truststore -storepass $truststorePw
keytool -import -trustcacerts -file $keyAlias$publicKeyFile -alias $keyAlias -keystore $truststore -storepass $truststorePw
jettyObscuredPassword=`$JAVA_BIN -cp /awips2/edex/lib/dependencies/org.eclipse.jetty/jetty-http-8.1.15.v20140411.jar:/awips2/edex/lib/dependencies/org.eclipse.jetty/jetty-util-8.1.15.v20140411.jar org.eclipse.jetty.util.security.Password $keystorePw 2>&1 | grep OBF`
jettyObscuredPassword=`$JAVA_BIN -cp $LOCAL_CLASSPATH org.eclipse.jetty.util.security.Password $keystorePw 2>&1 | grep OBF`
obfuscatedTruststorePassword=`$JAVA_BIN -cp /awips2/edex/lib/dependencies/org.apache.commons.codec/commons-codec-1.4.jar:/awips2/edex/lib/plugins/com.raytheon.uf.common.security.jar com.raytheon.uf.common.security.encryption.AESEncryptor encrypt $encryptionKey $truststorePw 2>&1`
obfuscatedTruststorePassword=`$JAVA_BIN -cp $LOCAL_CLASSPATH com.raytheon.uf.common.security.encryption.AESEncryptor encrypt $encryptionKey $truststorePw 2>&1`
echo -n "Generating security properties file..."
@ -166,7 +259,7 @@ echo "Done!"
echo "Keystores are located at $securityDir"
echo "The public key for this server is located at $(pwd)/$keyAlias$publicKeyFile"
echo "This file may be disseminated to other registry federation memebers who wish to interact with this server"
echo "This file may be disseminated to other registry federation members who wish to interact with this server"
}
@ -185,13 +278,30 @@ do
done
# delete any existing cert in the truststore for this alias
echo "Check to see if a certificate with this alias exists.....[$userAlias]!"
echo "Checking to see if a certificate with this alias exists to replace.....[$userAlias]!"
keytool -delete -alias $userAlias -keystore $securityDir/$truststore
# add the cert as a Self Signed CA to truststore
keytool -import -trustcacerts -file $keyfile -alias $userAlias -keystore $securityDir/$truststore
}
function deleteKey() {
echo "Deleting $keyfile from trust store..."
userAlias=
while [ -z $userAlias ];
do
echo -n "Enter alias for [$keyfile]: "
read userAlias
if [ -z $userAlias ];
then
echo "Alias cannot be empty!"
fi
done
keytool -delete -alias $userAlias -keystore $securityDir/$truststore
}
if [ $# -eq 0 ]
then
@ -216,6 +326,20 @@ then
addKey
fi
exit 0
elif [ "$1" = "-d" ]
then
if [ $# -lt 2 ]
then
echo "No key file supplied"
usage
elif [ ! -e $securityDir/$truststore ]
then
echo "Trust store [$securityDir/$truststore] does not exist!"
else
keyfile=$2
deleteKey
fi
exit 0
elif [ "$1" = "-usage" ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]
then
usage

0
edexOsgi/build.edex/esb/conf/security/realms.properties → build/deploy.edex.awips2/esb/conf/security/realms.properties
View file

3
edexOsgi/build.edex/esb/conf/spring/edex-db.xml → build/deploy.edex.awips2/esb/conf/spring/edex-db.xml
View file

@ -22,7 +22,8 @@
<list>
<value>com.raytheon.uf.common.dataplugin.text</value>
<value>com.raytheon.uf.common.dataplugin.shef</value>
<value>com.raytheon.edex.plugin.shef</value>
<value>com.raytheon.edex.plugin.shef</value>
<value>com.raytheon.uf.common.bmh</value>
</list>
</property>
</bean>

0
edexOsgi/build.edex/esb/conf/spring/edex.xml → build/deploy.edex.awips2/esb/conf/spring/edex.xml
View file

16
edexOsgi/build.edex/esb/conf/wrapper.conf → build/deploy.edex.awips2/esb/conf/wrapper.conf
View file

@ -57,12 +57,11 @@ wrapper.search.java.classpath.2=${EDEX_HOME}/lib/plugins
wrapper.java.umask=0002
# Java Library Path
wrapper.java.library.path.1=${EDEX_HOME}/lib/dependencies/org.jep.linux${EDEX_BITS}/
wrapper.java.library.path.2=${LD_LIBRARY_PATH}
wrapper.java.library.path.3=${EDEX_HOME}/lib/native/linux32/
# this path will not exist for 32-bit EDEX; however, both the 32-bit and 64-bit
# paths are needed for 64-bit EDEX
wrapper.java.library.path.4=${EDEX_HOME}/lib/native/linux64/
wrapper.java.library.path.1=${LD_LIBRARY_PATH}
# both the 32-bit and 64-bit paths are needed for 64-bit EDEX
# presumably due to the 32-bit hydro libraries
wrapper.java.library.path.2=${EDEX_HOME}/lib/native/linux32/
wrapper.java.library.path.3=${EDEX_HOME}/lib/native/linux64/
# Java Additional Parameters
# note that n is the parameter number starting from 1.
@ -117,9 +116,6 @@ wrapper.java.additional.site.1=-Daw.site.identifier=${AW_SITE_IDENTIFIER}
# the archive root directory, also where the edex/data/manual endpoint will place files
wrapper.java.additional.archive.1=-Ddata.archive.root=${DATA_ARCHIVE_ROOT}
# determines which architecture.properties file to use
wrapper.java.additional.arch.1=-Dedex.arch=${EDEX_BITS}-bit
# determines which log config file to use
wrapper.java.additional.log.1=-Dlogback.configurationFile=${LOG_CONF}
@ -139,7 +135,7 @@ wrapper.java.additional.log.5=-Djava.util.logging.config.file=${EDEX_HOME}/conf/
# errors reported by thrift sometimes when the stream is corrupt/incorrect
wrapper.java.additional.thrift.maxStreamSize=-Dthrift.stream.maxsize=200
wrapper.java.additional.retain.failed=-Dretain.failed.data=${RETAIN_FAILED}
#wrapper.java.additional.retain.failed=-Dretain.failed.data=${RETAIN_FAILED}
# enables yourkit profiling, determined by flag to start.sh
wrapper.java.additional.profile.1=${PROFILER_PARAM_1}

0
edexOsgi/build.edex/esb/data/static/map scales/GOES_EAST.xml → build/deploy.edex.awips2/esb/data/static/map scales/GOES_EAST.xml
View file

0
edexOsgi/build.edex/esb/data/static/map scales/GOES_WEST.xml → build/deploy.edex.awips2/esb/data/static/map scales/GOES_WEST.xml
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 205.wkt → build/deploy.edex.awips2/esb/data/static/map scales/grid 205.wkt
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 205.xml → build/deploy.edex.awips2/esb/data/static/map scales/grid 205.xml
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 208.wkt → build/deploy.edex.awips2/esb/data/static/map scales/grid 208.wkt
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 208.xml → build/deploy.edex.awips2/esb/data/static/map scales/grid 208.xml
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 211.wkt → build/deploy.edex.awips2/esb/data/static/map scales/grid 211.wkt
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 211.xml → build/deploy.edex.awips2/esb/data/static/map scales/grid 211.xml
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 244.wkt → build/deploy.edex.awips2/esb/data/static/map scales/grid 244.wkt
View file

0
edexOsgi/build.edex/esb/data/static/map scales/grid 244.xml → build/deploy.edex.awips2/esb/data/static/map scales/grid 244.xml
View file

0
edexOsgi/build.edex/esb/data/static/spatial/radar/fsl-w88d.dbf → build/deploy.edex.awips2/esb/data/static/spatial/radar/fsl-w88d.dbf
View file

0
edexOsgi/build.edex/esb/data/static/spatial/radar/fsl-w88d.shp → build/deploy.edex.awips2/esb/data/static/spatial/radar/fsl-w88d.shp
View file

0
edexOsgi/build.edex/esb/data/static/spatial/radar/fsl-w88d.shx → build/deploy.edex.awips2/esb/data/static/spatial/radar/fsl-w88d.shx
View file

0
edexOsgi/build.edex/esb/data/static/spatial/satellite/GOES.dbf → build/deploy.edex.awips2/esb/data/static/spatial/satellite/GOES.dbf
View file

0
edexOsgi/build.edex/esb/data/static/spatial/satellite/GOES.fix → build/deploy.edex.awips2/esb/data/static/spatial/satellite/GOES.fix
View file

0
edexOsgi/build.edex/esb/data/static/spatial/satellite/GOES.grx → build/deploy.edex.awips2/esb/data/static/spatial/satellite/GOES.grx
View file

0
edexOsgi/build.edex/esb/data/static/spatial/satellite/GOES.shp → build/deploy.edex.awips2/esb/data/static/spatial/satellite/GOES.shp
View file

0
edexOsgi/build.edex/esb/data/static/spatial/satellite/GOES.shx → build/deploy.edex.awips2/esb/data/static/spatial/satellite/GOES.shx
View file

0
edexOsgi/build.edex/esb/data/static/spatial/scales/grids.dbf → build/deploy.edex.awips2/esb/data/static/spatial/scales/grids.dbf
View file

0
edexOsgi/build.edex/esb/data/static/spatial/scales/grids.fix → build/deploy.edex.awips2/esb/data/static/spatial/scales/grids.fix
View file

0
edexOsgi/build.edex/esb/data/static/spatial/scales/grids.grx → build/deploy.edex.awips2/esb/data/static/spatial/scales/grids.grx
View file

0
edexOsgi/build.edex/esb/data/static/spatial/scales/grids.qix → build/deploy.edex.awips2/esb/data/static/spatial/scales/grids.qix
View file

0
edexOsgi/build.edex/esb/data/static/spatial/scales/grids.shp → build/deploy.edex.awips2/esb/data/static/spatial/scales/grids.shp
View file

0
edexOsgi/build.edex/esb/data/static/spatial/scales/grids.shx → build/deploy.edex.awips2/esb/data/static/spatial/scales/grids.shx
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml → build/deploy.edex.awips2/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py → build/deploy.edex.awips2/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
View file

0
edexOsgi/build.edex/esb/etc/centralRegistry.sh → build/deploy.edex.awips2/esb/etc/centralRegistry.sh
View file

0
edexOsgi/build.edex/esb/etc/datadeliveryonly.sh → build/deploy.edex.awips2/esb/etc/datadeliveryonly.sh
View file

0
edexOsgi/build.edex/esb/etc/dataprovideragent.sh → build/deploy.edex.awips2/esb/etc/dataprovideragent.sh
View file

0
edexOsgi/build.edex/esb/etc/default.sh → build/deploy.edex.awips2/esb/etc/default.sh
View file

0
edexOsgi/build.edex/esb/etc/devRegistry.sh → build/deploy.edex.awips2/esb/etc/devRegistry.sh
View file

16
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/__init__.py → build/deploy.edex.awips2/esb/etc/ebxmlRegistry.sh
View file

@ -1,3 +1,4 @@
#!/bin/bash
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
@ -18,11 +19,14 @@
# further licensing information.
##
# File auto-generated by PythonFileGenerator
export MAX_MEM=1536 # in Meg
export MAX_PERM_SIZE=192m
export EDEX_DEBUG_PORT=5012
export EDEX_JMX_PORT=1620
export LOG_CONF=logback-ebxmlRegistry.xml
export MGMT_PORT=9605
__all__ = [
'DeleteAllModelDataRequest'
]
from DeleteAllModelDataRequest import DeleteAllModelDataRequest
export METADATA_POOL_MAX=20
export METADATA_POOL_TIMEOUT=60
export SOFT_REF_LRU_POLICY_MS_PER_MB=50

0
edexOsgi/build.edex/esb/etc/ingest.sh → build/deploy.edex.awips2/esb/etc/ingest.sh
View file

0
edexOsgi/build.edex/esb/etc/ingestDat.sh → build/deploy.edex.awips2/esb/etc/ingestDat.sh
View file

0
edexOsgi/build.edex/esb/etc/ingestGrib.sh → build/deploy.edex.awips2/esb/etc/ingestGrib.sh
View file

0
edexOsgi/build.edex/esb/etc/ingestHydro.sh → build/deploy.edex.awips2/esb/etc/ingestHydro.sh
View file

0
edexOsgi/build.edex/esb/etc/profiler.sh → build/deploy.edex.awips2/esb/etc/profiler.sh
View file

0
edexOsgi/build.edex/esb/etc/registry.sh → build/deploy.edex.awips2/esb/etc/registry.sh
View file

8
edexOsgi/build.edex/esb/etc/request.sh → build/deploy.edex.awips2/esb/etc/request.sh
View file

@ -19,11 +19,8 @@
# further licensing information.
##
export INIT_MEM=128 # in Meg
if [ "$EDEX_ARCH" == "64-bit" ]; then
export MAX_MEM=2144 # in Meg
else
export MAX_MEM=1376 # in Meg
fi
export MAX_MEM=2144 # in Meg
export SERIALIZE_POOL_MAX_SIZE=24
export SERIALIZE_STREAM_INIT_SIZE_MB=2
export SERIALIZE_STREAM_MAX_SIZE_MB=8
@ -31,4 +28,5 @@ export SERIALIZE_STREAM_MAX_SIZE_MB=8
export EDEX_DEBUG_PORT=5005
export EDEX_JMX_PORT=1616
export LOG_CONF=logback-request.xml
export MGMT_PORT=9601

0
edexOsgi/build.edex/esb/etc/requestHydro.sh → build/deploy.edex.awips2/esb/etc/requestHydro.sh
View file

0
edexOsgi/build.edex/esb/lib/lib_illusion/README → build/deploy.edex.awips2/esb/lib/lib_illusion/README
View file

0
edexOsgi/build.edex/esb/lib/lib_illusion/x86/libpython.so → build/deploy.edex.awips2/esb/lib/lib_illusion/x86/libpython.so
View file

0
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so → build/deploy.edex.awips2/esb/lib/lib_illusion/x86_64/libpython.so
View file

0
edexOsgi/build.edex/esb/lib/native/linux32/libgfortran.so → build/deploy.edex.awips2/esb/lib/native/linux32/libgfortran.so
View file

0
edexOsgi/build.edex/esb/lib/native/linux32/libjhdf5.so → build/deploy.edex.awips2/esb/lib/native/linux32/libjhdf5.so
View file

0
edexOsgi/build.edex/esb/lib/native/linux32/libpgc.so → build/deploy.edex.awips2/esb/lib/native/linux32/libpgc.so
View file

0
edexOsgi/build.edex/esb/lib/native/linux32/libtcnative-1.so → build/deploy.edex.awips2/esb/lib/native/linux32/libtcnative-1.so
View file

BIN
build/deploy.edex.awips2/lib/ant/ant-contrib-1.0b3.jar Normal file
View file

Binary file not shown.

29
cave/build/alertviz/customTargets.xml
View file

@ -180,21 +180,32 @@
excludes="cave/**" />
</zip>
<!-- Temp zip file including all the license files -->
<zip destfile="/tmp/alertviz/FOSS_licenses.zip">
<fileset dir="${buildDirectory}/../../../rpms/legal/FOSS_licenses"/>
</zip>
<!-- Update the 32-bit win32 AlertViz zip with static files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/win32.x86"
excludes="cave/**" />
<fileset dir="${buildDirectory}/../../static/win32.x86"
excludes="cave/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="alertviz"/>
<zipfileset dir="/tmp/alertviz" includes="FOSS_licenses.zip" prefix="alertviz"/>
</zip>
<!-- Update the 64-bit (amd64) win32 CAVE zip with static files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
update="true">
<!-- Update the 64-bit (amd64) win32 CAVE zip with static files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/win32.amd64"
excludes="cave/**" />
</zip>
<fileset dir="${buildDirectory}/../../static/win32.amd64"
excludes="cave/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="alertviz"/>
<zipfileset dir="/tmp/alertviz" includes="FOSS_licenses.zip" prefix="alertviz"/>
</zip>
</target>

17
cave/build/cave/customTargets.xml
View file

@ -190,20 +190,33 @@
<fileset dir="${buildDirectory}/../../static/linux.x86_64" />
</zip>
<!-- Update the 32-bit win32 CAVE zip with static files -->
<!-- Temp zip file including all the license files -->
<zip destfile="/tmp/cave/FOSS_licenses.zip">
<fileset dir="${buildDirectory}/../../../rpms/legal/FOSS_licenses"/>
</zip>
<!-- Update the 32-bit win32 CAVE zip with static and license files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/win32.x86"
excludes="alertviz/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="cave"/>
<zipfileset dir="/tmp/cave" includes="FOSS_licenses.zip" prefix="cave"/>
</zip>
<!-- Update the 64-bit (amd64) win32 CAVE zip with static files -->
<!-- Update the 64-bit (amd64) win32 CAVE zip with static and license files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/win32.amd64"
excludes="alertviz/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="cave"/>
<zipfileset dir="/tmp/cave" includes="FOSS_licenses.zip" prefix="cave"/>
</zip>
</target>
<!-- ===================================================================== -->

2
cave/build/cave/memorySettings.xml
View file

@ -420,7 +420,7 @@
<site-type>ncep</site-type>
<ini-substitutions>
<max-memory>
<value>2048M</value>
<value>3072M</value>
</max-memory>
<max-perm>

656
cave/build/p2-build.xml
View file

@ -1,134 +1,112 @@
<project default="main" basedir=".">
<!-- TODO: Verify These Properties References An Actual Directory. -->
<property name="eclipse.dir"
value="/opt/uframe-eclipse" />
<property name="build.version"
value="1.0.0" />
<property name="build.os"
value="linux" />
<property name="build.ws"
value="gtk" />
<property name="build.arch"
value="x86" />
<property name="eclipse.dir" value="/opt/uframe-eclipse" />
<property name="build.version" value="1.0.0" />
<property name="build.os" value="linux" />
<property name="build.ws" value="gtk" />
<property name="build.arch" value="x86" />
<property name="workspace.dir" value="${basedir}/../" />
<property name="pde.build.script"
value="org.eclipse.pde.build_3.8.2.v20121114-140810/scripts/build.xml" />
<property name="eclipse.launcher.jar"
value="org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar" />
<property name="pde.build.script" value="org.eclipse.pde.build_3.8.2.v20121114-140810/scripts/build.xml" />
<property name="eclipse.launcher.jar" value="org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar" />
<!-- Verify That We Have Access To A Copy Of Eclipse -->
<target name="verify">
</target>
<!-- Creates The Temporary Directories That We Will Need To Build
The P2 Repositories. -->
<target name="init" depends="verify">
<!-- We Will Use A Temporary p2 Directory And Leave The
cave/tmp Directory For The Original PDE Build. -->
<mkdir dir="${basedir}/cave/p2" />
<!-- Copy The P2 Build build.properties File. -->
<copy tofile="${basedir}/cave/p2/build.properties"
file="${basedir}/build.properties.p2" verbose="true" />
<copy tofile="${basedir}/cave/p2/build.properties" file="${basedir}/build.properties.p2" verbose="true" />
<!-- We Will Copy The Plugins Here Eventually. -->
<mkdir dir="${basedir}/cave/p2/plugins" />
<!-- We Will Copy The Features Here Eventually. -->
<mkdir dir="${basedir}/cave/p2/features" />
<mkdir dir="${basedir}/cave/p2/repository" />
<mkdir dir="${basedir}/cave/p2/dist" />
<!-- BEGIN: Copy The Plugins -->
<echo message="PLUGINS: com.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="com.*/**" />
</copy>
<echo message="PLUGINS: ucar.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="ucar.*/**" />
</copy>
<echo message="PLUGINS: *.feature*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="*.feature*/**" />
</copy>
<echo message="PLUGINS: ncsa.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="ncsa.*/**" />
</copy>
<echo message="PLUGINS: org.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="org.*/**" />
</copy>
<echo message="PLUGINS: net.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="net.*/**" />
</copy>
<echo message="PLUGINS: ohd*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="ohd*/**" />
</copy>
<echo message="PLUGINS: javax.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="javax.*/**" />
</copy>
<echo message="PLUGINS: gov.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="gov.*/**" />
</copy>
<echo message="PLUGINS: edu.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="edu.*/**" />
</copy>
<echo message="PLUGINS: de.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="de.*/**" />
</copy>
<echo message="PLUGINS: it.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="it.*/**" />
</copy>
<echo message="PLUGINS: v*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="v*/**" />
<fileset dir="${workspace.dir}" includes="com.*/**" />
</copy>
<echo message="PLUGINS: ch.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="ch.*/**" />
</copy>
<echo message="PLUGINS: ucar.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="ucar.*/**" />
</copy>
<echo message="PLUGINS: *.feature*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="*.feature*/**" />
</copy>
<echo message="PLUGINS: ncsa.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="ncsa.*/**" />
</copy>
<echo message="PLUGINS: org.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="org.*/**" />
</copy>
<echo message="PLUGINS: net.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="net.*/**" />
</copy>
<echo message="PLUGINS: ohd*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="ohd*/**" />
</copy>
<echo message="PLUGINS: javax.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="javax.*/**" />
</copy>
<echo message="PLUGINS: gov.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="gov.*/**" />
</copy>
<echo message="PLUGINS: edu.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="edu.*/**" />
</copy>
<echo message="PLUGINS: de.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="de.*/**" />
</copy>
<echo message="PLUGINS: it.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="it.*/**" />
</copy>
<echo message="PLUGINS: v*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="v*/**" />
</copy>
<echo message="PLUGINS: ch.*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}" includes="ch.*/**" />
</copy>
<!-- END: Copy The Plugins -->
</target>
<!-- Cleans Up Any Temporary Directories -->
<target name="clean">
<if>
@ -140,296 +118,240 @@
</then>
</if>
</target>
<tstamp>
<format property="build.timestamp"
pattern="yyyyMMddHHmm" />
<format property="build.timestamp" pattern="yyyyMMddHHmm" />
</tstamp>
<target name="p2.build" depends="clean, init">
<target name="p2.build" depends="clean, init">
<!-- We Need To Build The p2 Repos In A Certain Order Due To
Dependencies. -->
<!-- copy the com.raytheon.uf.viz.application.feature feature.
Used by the com.raytheon.viz.feature.awips feature. -->
<copy todir="${basedir}/cave/p2/features" verbose="true">
<fileset dir="${workspace.dir}"
includes="com.raytheon.uf.viz.application.feature/**" />
</copy>
<copy todir="${basedir}/cave/p2/features" verbose="true">
<fileset dir="${workspace.dir}" includes="com.raytheon.uf.viz.application.feature/**" />
</copy>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.feature.awips" />
<param name="omit"
value="true" />
<param name="feature" value="com.raytheon.viz.feature.awips" />
<param name="omit" value="true" />
</antcall>
<!--
we will still build this for the MSFT Windows CAVE.
-->
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.common.base.feature" />
<param name="feature" value="com.raytheon.uf.common.base.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.base.feature" />
<param name="feature" value="com.raytheon.uf.viz.base.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.cots.feature" />
<param name="feature" value="com.raytheon.uf.viz.cots.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.common.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.localization.perspective.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.core.feature" />
<param name="feature" value="com.raytheon.uf.viz.common.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.core.maps.feature" />
<param name="feature" value="com.raytheon.uf.viz.localization.perspective.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.sounding.feature" />
<param name="feature" value="com.raytheon.uf.viz.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.dataplugin.obs.feature" />
<param name="feature" value="com.raytheon.uf.viz.core.maps.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.dataplugins.feature" />
<param name="feature" value="com.raytheon.uf.viz.sounding.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.d2d.core.feature" />
<param name="feature" value="com.raytheon.uf.viz.dataplugin.obs.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.radar.feature" />
<param name="feature" value="com.raytheon.uf.viz.dataplugins.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.text.feature" />
<param name="feature" value="com.raytheon.uf.viz.d2d.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.warngen.feature" />
<param name="feature" value="com.raytheon.viz.radar.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.grib.feature" />
<param name="feature" value="com.raytheon.viz.text.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.warngen.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.grib.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.kml.export.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.nwsauth.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.gfe.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.displays.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.satellite.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.ncep.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.aviation.advisory.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.ncep.dataplugins.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.hydro.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.d2d.xy.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.ncep.displays.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.ncep.nsharp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.d2d.nsharp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.archive.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.ncep.perspective.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.thinclient.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.useradmin.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.registry.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.datadelivery.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.npp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.d2d.skewt.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.volumebrowser.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.acarssounding.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.avnfps.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.dat.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.d2d.gfe.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.collaboration.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.kml.export.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.gfe.feature" />
<param name="feature" value="com.raytheon.uf.viz.d2d.damagepath.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.displays.feature" />
<param name="feature" value="com.raytheon.uf.viz.gisdatastore.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.satellite.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.ncep.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.aviation.advisory.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.ncep.dataplugins.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.hydro.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.d2d.xy.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.ncep.displays.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.ncep.nsharp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.d2d.nsharp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.archive.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.ncep.perspective.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.nwsauth.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.thinclient.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.useradmin.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.registry.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.datadelivery.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.npp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.d2d.skewt.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.volumebrowser.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.acarssounding.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.avnfps.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.dat.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.d2d.gfe.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.collaboration.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.gisdatastore.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.d2d.ui.awips.feature" />
<param name="feature" value="com.raytheon.uf.viz.d2d.ui.awips.feature" />
</antcall>
<antcall target="cleanup.features" />
</target>
<target name="wa-build" depends="p2.build" description="Builds work assignment specific features after the main build">
<for param="wa.feature.list.file">
<fileset dir="${basedir}" includes="*-wa-build.properties" />
<sequential>
<var name="wa.features" unset="true" />
<property file="@{wa.feature.list.file}" />
<for list="${wa.features}" param="wa.feature">
<sequential>
<antcall target="p2.build.repo">
<param name="feature" value="@{wa.feature}" />
</antcall>
</sequential>
</for>
</sequential>
</for>
<for param="wa.feature.list.file">
<fileset dir="${basedir}" includes="*-wa-build.properties" />
<sequential>
<var name="wa.features" unset="true" />
<property file="@{wa.feature.list.file}" />
<for list="${wa.features}" param="wa.feature">
<sequential>
<antcall target="p2.build.repo">
<param name="feature" value="@{wa.feature}" />
</antcall>
</sequential>
</for>
</sequential>
</for>
</target>
<target name="wa-cleanup" depends="wa-build" description="Removes references to WA-specific features that should not be built as an RPM.">
<for param="wa.feature.list.file">
<fileset dir="${basedir}" includes="*-wa-build.properties" />
<sequential>
<var name="wa.features.ignore" unset="true" />
<property file="@{wa.feature.list.file}" />
<for list="${wa.features.ignore}" param="wa.feature">
<sequential>
<if>
<available file="${basedir}/cave/p2/features/@{wa.feature}" type="dir" />
<then>
<!-- Remove the feature directory. -->
<delete includeemptydirs="true">
<fileset dir="${basedir}/cave/p2/features/@{wa.feature}" />
</delete>
<!-- Remove references to the feature from features.txt -->
<exec executable="/bin/sed" output="${basedir}/cave/p2/dist/features.txt.tmp">
<arg value="/@{wa.feature}/d" />
<arg value="${basedir}/cave/p2/dist/features.txt" />
</exec>
<move file="${basedir}/cave/p2/dist/features.txt.tmp"
tofile="${basedir}/cave/p2/dist/features.txt" />
</then>
</if>
</sequential>
</for>
</sequential>
</for>
<for param="wa.feature.list.file">
<fileset dir="${basedir}" includes="*-wa-build.properties" />
<sequential>
<var name="wa.features.ignore" unset="true" />
<property file="@{wa.feature.list.file}" />
<for list="${wa.features.ignore}" param="wa.feature">
<sequential>
<if>
<available file="${basedir}/cave/p2/features/@{wa.feature}" type="dir" />
<then>
<!-- Remove the feature directory. -->
<delete includeemptydirs="true">
<fileset dir="${basedir}/cave/p2/features/@{wa.feature}" />
</delete>
<!-- Remove references to the feature from features.txt -->
<exec executable="/bin/sed" output="${basedir}/cave/p2/dist/features.txt.tmp">
<arg value="/@{wa.feature}/d" />
<arg value="${basedir}/cave/p2/dist/features.txt" />
</exec>
<move file="${basedir}/cave/p2/dist/features.txt.tmp" tofile="${basedir}/cave/p2/dist/features.txt" />
</then>
</if>
</sequential>
</for>
</sequential>
</for>
</target>
<target name="main" depends="clean, p2.build, wa-build, wa-cleanup" />
<target name="main" depends="clean, p2.build, wa-build, wa-cleanup" />
<target name="p2.build.repo">
<!-- Copy The Feature -->
<copy todir="${basedir}/cave/p2/features">
<fileset dir="${workspace.dir}"
includes="${feature}/**" />
<fileset dir="${workspace.dir}" includes="${feature}/**" />
</copy>
<!-- Update The Feature -->
<property name="process.feature.tool"
value="${workspace.dir}/build/tools/ProcessFeature.jar" />
<java
jar="${process.feature.tool}"
fork="true"
failonerror="false"
resultproperty="feature.tool.exitcode">
<property name="process.feature.tool" value="${workspace.dir}/build/tools/ProcessFeature.jar" />
<java jar="${process.feature.tool}" fork="true" failonerror="false" resultproperty="feature.tool.exitcode">
<arg value="-u" />
<arg value="${basedir}/cave/p2/features/${feature}" />
<arg value="${build.version}" />
</java>
<if>
<equals arg1="${feature.tool.exitcode}"
arg2="255" />
<equals arg1="${feature.tool.exitcode}" arg2="255" />
<then>
<fail message="${process.feature.tool} FAILED." />
</then>
</if>
<!-- Build The Repository -->
<java
classname="org.eclipse.core.launcher.Main"
fork="true"
failonerror="true">
<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true">
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-buildfile" />
@ -440,30 +362,25 @@
<arg value="-DtopLevelElementId=${feature}" />
<arg value="-DforceContextQualifier=${build.timestamp}" />
<arg value="-Dconfigs=${build.os},${build.ws},${build.arch}" />
<classpath>
<pathelement
location="${eclipse.dir}/plugins/${eclipse.launcher.jar}" />
<pathelement location="${eclipse.dir}/plugins/${eclipse.launcher.jar}" />
</classpath>
</java>
<!-- Record that the feature has been built (for now) -->
<if>
<not>
<isset property="omit" />
</not>
<then>
<echo message="${feature}${line.separator}"
file="${basedir}/cave/p2/dist/features.txt"
append="true" />
<echo message="${feature}${line.separator}" file="${basedir}/cave/p2/dist/features.txt" append="true" />
</then>
</if>
<!-- Package The Repository -->
<zip
destfile="${basedir}/cave/p2/dist/${feature}-repo-${build.os}.${build.arch}.zip"
basedir="${basedir}/cave/p2/repository" />
<zip destfile="${basedir}/cave/p2/dist/${feature}-repo-${build.os}.${build.arch}.zip" basedir="${basedir}/cave/p2/repository" />
<!-- Cleanup The Current Build -->
<if>
<available file="${basedir}/cave/p2/I.CAVE" type="dir" />
@ -483,77 +400,56 @@
</if>
<mkdir dir="${basedir}/cave/p2/repository" />
</target>
<target name="cleanup.features">
<!-- Remove 'com.raytheon.viz.feature.awips' -->
<if>
<available
file="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips"
type="dir" />
<available file="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips" type="dir" />
<then>
<delete includeemptydirs="true">
<fileset
dir="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips"
/>
<fileset dir="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips" />
</delete>
</then>
</if>
<!-- Remove 'com.raytheon.uf.viz.feature.alertviz' -->
<if>
<available
file="${basedir}/cave/p2/features/com.raytheon.uf.viz.feature.alertviz"
type="dir" />
<available file="${basedir}/cave/p2/features/com.raytheon.uf.viz.feature.alertviz" type="dir" />
<then>
<delete includeemptydirs="true">
<fileset
dir="${basedir}/cave/p2/features/com.raytheon.uf.viz.feature.alertviz"
/>
<fileset dir="${basedir}/cave/p2/features/com.raytheon.uf.viz.feature.alertviz" />
</delete>
</then>
</if>
<!-- Remove 'com.raytheon.viz.feature.awips.developer' -->
<if>
<available
file="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips.developer"
type="dir" />
<available file="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips.developer" type="dir" />
<then>
<delete includeemptydirs="true">
<fileset
dir="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips.developer"
/>
<fileset dir="${basedir}/cave/p2/features/com.raytheon.viz.feature.awips.developer" />
</delete>
</then>
</if>
<!-- Remove 'com.raytheon.uf.common.base.feature' -->
<if>
<available
file="${basedir}/cave/p2/features/com.raytheon.uf.common.base.feature"
type="dir" />
<available file="${basedir}/cave/p2/features/com.raytheon.uf.common.base.feature" type="dir" />
<then>
<delete includeemptydirs="true">
<fileset
dir="${basedir}/cave/p2/features/com.raytheon.uf.common.base.feature"
/>
<fileset dir="${basedir}/cave/p2/features/com.raytheon.uf.common.base.feature" />
</delete>
</then>
</if>
<!-- Remove 'com.raytheon.uf.viz.collaboration.product.feature' -->
<if>
<available file="${basedir}/cave/p2/features/com.raytheon.uf.viz.collaboration.product.feature" type="dir" />
<then>
<delete includeemptydirs="true">
<fileset dir="${basedir}/cave/p2/features/com.raytheon.uf.viz.collaboration.product.feature" />
</delete>
</then>
</if>
<!-- Remove 'com.raytheon.uf.viz.collaboration.product.feature' -->
<if>
<available
file="${basedir}/cave/p2/features/com.raytheon.uf.viz.collaboration.product.feature"
type="dir" />
<then>
<delete includeemptydirs="true">
<fileset
dir="${basedir}/cave/p2/features/com.raytheon.uf.viz.collaboration.product.feature"
/>
</delete>
</then>
</if>
</target>
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>
<taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>

1
cave/com.raytheon.uf.viz.acarssounding/META-INF/MANIFEST.MF
View file

@ -28,3 +28,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
com.raytheon.uf.common.derivparam;bundle-version="1.14.0"
Import-Package: com.raytheon.uf.common.inventory.exception,
com.raytheon.uf.viz.datacube
Bundle-ClassPath: com.raytheon.uf.viz.acarssounding.jar

9
cave/com.raytheon.uf.viz.acarssounding/build.properties
View file

@ -1,6 +1,5 @@
source.. = src/
output.. = bin/
output.com.raytheon.uf.viz.acarssounding.jar = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
res/
res/,\
com.raytheon.uf.viz.acarssounding.jar
source.com.raytheon.uf.viz.acarssounding.jar = src/

5
cave/com.raytheon.uf.viz.alertviz.ui/META-INF/MANIFEST.MF
View file

@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Ui Plug-in
Bundle-Name: AlertViz UI Plugin
Bundle-SymbolicName: com.raytheon.uf.viz.alertviz.ui
Bundle-Version: 1.14.0.qualifier
Bundle-Version: 1.15.0.qualifier
Bundle-Activator: com.raytheon.uf.viz.alertviz.ui.Activator
Bundle-Vendor: Raytheon
Require-Bundle: org.eclipse.ui,
@ -18,3 +18,4 @@ Export-Package: com.raytheon.uf.viz.alertviz.ui,
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.raytheon.uf.common.alertmonitor,
javax.jms
Bundle-ClassPath: com.raytheon.uf.viz.alertviz.ui.jar

8
cave/com.raytheon.uf.viz.alertviz.ui/build.properties
View file

@ -1,5 +1,5 @@
source.. = src/
output.. = bin/
output.com.raytheon.uf.viz.alertviz.ui.jar = bin/
bin.includes = META-INF/,\
.,\
localization/
localization/,\
com.raytheon.uf.viz.alertviz.ui.jar
source.com.raytheon.uf.viz.alertviz.ui.jar = src/

18
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertPopupMessageDlg.java
View file

@ -67,6 +67,8 @@ import com.raytheon.uf.viz.alertviz.config.AlertMetadata;
* and store previous location.
* 13 Jan 2011 7375 cjeanbap Commented out shell.setVisible(...) in
* acknowledgeLastMessage().
* 20 Apr 2015 4311 lvenable Fixed text field to accept really long text strings.
*
* </pre>
*
* @author lvenable
@ -158,18 +160,18 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
/**
* Date format.
*/
private SimpleDateFormat dateFormat = new SimpleDateFormat(
private final SimpleDateFormat dateFormat = new SimpleDateFormat(
"MMM dd yy HH:mm:ss z");
/**
* Time format.
*/
private SimpleDateFormat timeFormat = new SimpleDateFormat("hh:mm a");
private final SimpleDateFormat timeFormat = new SimpleDateFormat("hh:mm a");
/**
* Array of status messages.
*/
private ArrayList<StatusMessage> statMsgArray = new ArrayList<StatusMessage>();
private final ArrayList<StatusMessage> statMsgArray = new ArrayList<StatusMessage>();
/**
* Source label.
@ -204,7 +206,7 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
/**
* Maximum messages to acknowledge.
*/
private int maxMessages = 100;
private final int maxMessages = 100;
/**
* Move label.
@ -259,14 +261,14 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
/**
* Listens for "Hide Dialog" event, implemented by AlertVisualization class
*/
private Listener hideListener;
private final Listener hideListener;
/**
* Initialized flag indicating if the control have been initialized.
*/
private boolean initialized = false;
private AlertVisualization av;
private final AlertVisualization av;
/**
* Constructor.
@ -464,8 +466,10 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
messageComp.setBackground(display.getSystemColor(SWT.COLOR_RED));
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
gd.heightHint = 20;
gd.widthHint = 920;
messageTF = new Text(messageComp, SWT.BORDER | SWT.MULTI | SWT.WRAP);
messageTF = new Text(messageComp, SWT.BORDER | SWT.MULTI | SWT.WRAP
| SWT.V_SCROLL);
messageTF.setLayoutData(gd);
messageTF.setText(statMsgArray.get(0).getMessage());
messageTF.setEditable(false);

49
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
View file

@ -19,7 +19,6 @@
package com.raytheon.uf.viz.alertviz.ui.dialogs;
import java.io.File;
import java.io.FileNotFoundException;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.jface.dialogs.MessageDialog;
@ -49,7 +48,6 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.message.StatusMessage;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.alertviz.AlertVizPython;
import com.raytheon.uf.viz.alertviz.AlertvizJob;
import com.raytheon.uf.viz.alertviz.ConfigContext;
import com.raytheon.uf.viz.alertviz.ConfigurationManager;
@ -92,6 +90,11 @@ import com.raytheon.uf.viz.core.VizApp;
* 03 May 2011 9101 cjeanbap Pass a clone object into AlertVizPython class.
* 31 May 2011 8058 cjeanbap Kill sound based on TextMsgBox id.
* 17 Jan 2012 27 rferrel Refactored to allow override of createTrayMenuItems
* 09 Mar 2015 3856 lvenable Added a check to determine if the timer is running before
* changing the icon on the timer action. If it isn't running
* then set the icon to the default image.
* 18 Mar 2015 4234 njensen Remove reference to non-working python
*
* </pre>
*
* @author lvenable
@ -221,7 +224,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
private ConfigContext configContext;
private Configuration prevConfigFile;
private Integer exitStatus = IApplication.EXIT_OK;
/**
@ -320,6 +323,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
alertMessageDlg = new AlertMessageDlg(shell, this, showAlertDlg,
configData, audioMgr);
display.asyncExec(new Runnable() {
@Override
public void run() {
alertMessageDlg.open();
}
@ -361,6 +365,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
// Right click action
trayItem.addMenuDetectListener(new MenuDetectListener() {
@Override
public void menuDetected(MenuDetectEvent de) {
trayItemMenu.setVisible(true);
}
@ -526,7 +531,11 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
blinkCount = 0;
}
trayItem.setImage(blinkImages[blinkCount]);
if (this.trayAlertTimer.timerIsRunning()) {
trayItem.setImage(blinkImages[blinkCount]);
} else {
trayItem.setImage(alertVizImg);
}
}
/**
@ -548,6 +557,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
}
}
@Override
public void cancelAudio(int numTextMsgBoxId) {
audioMgr.stopTimer(numTextMsgBoxId);
}
@ -617,17 +627,6 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
return;
}
// Run python script (this is done early since this will not block)
if (amd.isPythonEnabled() == true) {
try {
AlertVizPython.enqueue(statMsg, amd.clone(), gConfig);
} catch (FileNotFoundException e) {
Container.logInternal(Priority.ERROR,
"AlertVizualization: exception python script not found: "
+ amd.getPythonScript(), e);
}
}
boolean isGdnAdminMessage = statMsg.getCategory().equals("GDN_ADMIN")
|| statMsg.getSourceKey().equals("GDN_ADMIN");
@ -637,7 +636,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
&& (statMsg.getDetails().contains("Error")
|| statMsg.getDetails().contains("Exception")
|| statMsg.getDetails().contains("Throwable") || Container
.hasMissing(statMsg))) {
.hasMissing(statMsg))) {
Source source = configData.lookupSource("GDN_ADMIN");
RGB backgroundRBG = null;
if (source == null || source.getConfigurationItem() == null) {
@ -815,9 +814,9 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
}
public Integer getExitStatus() {
return exitStatus;
return exitStatus;
}
/**
* This is the button click event for the alertPopupDialog. This function is
* called when "Hide Dialog" is clicked.
@ -833,13 +832,13 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
@Override
public void restart() {
if (runningStandalone) {
// Must use EXIT_RELAUNCH. EXIT_RESTART causes the
// executable to do a restart without returning to
// the shell/bat script. This fails. Any other value
// such as Integer(1) the executable attempts to bring
// up an error screen before exiting with the error code.
exitStatus = IApplication.EXIT_RELAUNCH;
display.dispose();
// Must use EXIT_RELAUNCH. EXIT_RESTART causes the
// executable to do a restart without returning to
// the shell/bat script. This fails. Any other value
// such as Integer(1) the executable attempts to bring
// up an error screen before exiting with the error code.
exitStatus = IApplication.EXIT_RELAUNCH;
display.dispose();
}
}

46
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/PriorityControls.java
View file

@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.alertviz.AlertVizPython;
import com.raytheon.uf.viz.alertviz.INeedsSaveListener;
import com.raytheon.uf.viz.alertviz.config.AlertMetadata;
@ -63,7 +62,8 @@ import com.raytheon.uf.viz.alertviz.config.AlertMetadata;
* 08 Sep 2012 13528 Xiaochuan Run setNewConfig to update priorities
* setting.
* 14 Dec 2012 4827 Xiaochuan Set toolTip on changeActionBtn.
*
* 18 Mar 2015 4234 njensen Remove reference to dead code
*
* </pre>
*
* @author lvenable
@ -74,7 +74,7 @@ public class PriorityControls {
/**
* Parent composite.
*/
private Composite parentComp;
private final Composite parentComp;
/**
* Canvas displaying the priority.
@ -99,7 +99,7 @@ public class PriorityControls {
/**
* Priority number.
*/
private int priority = 0;;
private int priority = 0;
/**
* Text message check box.
@ -144,7 +144,7 @@ public class PriorityControls {
/**
* Control font.
*/
private Font controlFont;
private final Font controlFont;
/**
* Canvas width.
@ -169,11 +169,11 @@ public class PriorityControls {
/**
* Parent shell.
*/
private Shell parentShell;
private final Shell parentShell;
private Button actionChk;
private AlertVisConfigDlg configDialog;
private final AlertVisConfigDlg configDialog;
/**
* Button used to change the audio file.
@ -184,7 +184,7 @@ public class PriorityControls {
private FileSelectDlg audioDlg;
private INeedsSaveListener needsSaveListener;
private final INeedsSaveListener needsSaveListener;
/**
* Constructor.
@ -197,12 +197,13 @@ public class PriorityControls {
* Priority number.
*/
public PriorityControls(Shell parentShell, Composite parentComp,
int priority, INeedsSaveListener needsSaveListener, AlertVisConfigDlg configDialog ) {
int priority, INeedsSaveListener needsSaveListener,
AlertVisConfigDlg configDialog) {
this.parentComp = parentComp;
this.priority = priority;
this.parentShell = parentShell;
this.configDialog = configDialog;
createPriorityColor();
this.controlFont = new Font(parentComp.getDisplay(), "Monospace", 10,
@ -222,12 +223,14 @@ public class PriorityControls {
priorityCanvas.setSize(CANVAS_WIDTH, CANVAS_HEIGHT);
priorityCanvas.setLayoutData(gd);
priorityCanvas.addPaintListener(new PaintListener() {
@Override
public void paintControl(PaintEvent e) {
drawCanvas(e.gc);
}
});
priorityCanvas.addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
priorityColor.dispose();
controlFont.dispose();
@ -247,6 +250,7 @@ public class PriorityControls {
textChk = new Button(parentComp, SWT.CHECK);
textChk.setLayoutData(gd);
textChk.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
updateBlinkButton();
configDialog.setNewConfig();
@ -266,8 +270,9 @@ public class PriorityControls {
blinkChk.setEnabled(false);
blinkChk.setLayoutData(gd);
blinkChk.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
alertMetadata.setBlink(blinkChk.getSelection());
alertMetadata.setBlink(blinkChk.getSelection());
configDialog.setNewConfig();
needsSaveListener.saveNeeded(true);
}
@ -284,6 +289,7 @@ public class PriorityControls {
popupChk = new Button(parentComp, SWT.CHECK);
popupChk.setLayoutData(gd);
popupChk.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
alertMetadata.setPopup(popupChk.getSelection());
configDialog.setNewConfig();
@ -310,8 +316,9 @@ public class PriorityControls {
audioChk.setLayoutData(gd);
audioChk.setToolTipText("");
audioChk.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
updateAudioChangeButton();
updateAudioChangeButton();
alertMetadata.setAudioEnabled(audioChk.getSelection());
configDialog.setNewConfig();
needsSaveListener.saveNeeded(true);
@ -322,6 +329,7 @@ public class PriorityControls {
changeAudioBtn.setText("...");
changeAudioBtn.setToolTipText("Change audio file");
changeAudioBtn.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
selectAudioFile();
configDialog.setNewConfig();
@ -346,6 +354,7 @@ public class PriorityControls {
actionChk.setLayoutData(gd);
actionChk.setToolTipText("Action File not available...");
actionChk.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
updateActionChangeButton();
alertMetadata.setPythonEnabled(actionChk.getSelection());
@ -358,6 +367,7 @@ public class PriorityControls {
changeActionBtn.setText("...");
changeActionBtn.setToolTipText("Change action file");
changeActionBtn.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
selectActionFile();
configDialog.setNewConfig();
@ -377,6 +387,7 @@ public class PriorityControls {
logChk = new Button(parentComp, SWT.CHECK);
logChk.setLayoutData(gd);
logChk.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
alertMetadata.setLog(logChk.getSelection());
configDialog.setNewConfig();
@ -417,8 +428,9 @@ public class PriorityControls {
changeTextColorBtn.setText("...");
changeTextColorBtn.setToolTipText("Change foreground/background color");
changeTextColorBtn.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
showColorDialog();
showColorDialog();
configDialog.setNewConfig();
}
@ -764,8 +776,8 @@ public class PriorityControls {
filteredExtensions.put(".py~", ".py~");
actionDlg = new FileSelectDlg(parentComp.getShell(),
SWT.APPLICATION_MODAL, AlertVizPython.ALERTVIZ_PYTHON_PATH,
new String[] { ".py", "*", "*.*" }, false, filteredExtensions);
SWT.APPLICATION_MODAL, "alertViz/python", new String[] { ".py",
"*", "*.*" }, false, filteredExtensions);
actionDlg.setSelectedFile(actionFile);
Boolean retVal = (Boolean) actionDlg.open("Action Selection File",
@ -784,7 +796,7 @@ public class PriorityControls {
saveNeeded = !selectedFileName.equals(actionFile);
alertMetadata.setPythonScript(selectedFileName);
changeActionBtn.setToolTipText(selectedFileName);
} else {
alertMetadata.setAudioFile(null);
alertMetadata.setAudioEnabled(false);

22
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/timer/AlertTimer.java
View file

@ -34,6 +34,8 @@ import org.eclipse.swt.widgets.Display;
* ------------ ---------- ----------- --------------------------
* 05 Oct 2008 lvenable Initial creation.
* 02 Apr 2009 lvenable TTR fixes.
* 02 Mar 2015 3856 lvenable Cancel the job if the timer is being canceled.
* 09 Mar 2015 3856 lvenable Cleaned up the cancel logic.
*
* </pre>
*
@ -45,12 +47,12 @@ public class AlertTimer {
/**
* Callback called when the timer fires or when the timer is finished.
*/
private ITimerAction actionCB;
private final ITimerAction actionCB;
/**
* Parent display.
*/
private Display parentDisplay;
private final Display parentDisplay;
/**
* Time in milliseconds between executions.
@ -74,7 +76,7 @@ public class AlertTimer {
*/
private boolean blinkText;
private Job job = new Job("AlertTimer") {
private final Job job = new Job("AlertTimer") {
@Override
protected IStatus run(IProgressMonitor monitor) {
@ -87,6 +89,7 @@ public class AlertTimer {
if (isRunning) {
parentDisplay.syncExec(new Runnable() {
@Override
public void run() {
actionCB.timerAction(blinkText);
}
@ -224,22 +227,19 @@ public class AlertTimer {
* Setting alertPopupDlg Cancel the timer.
*/
public void cancelTimer() {
// only synchronize on cancelling the timer, don't do the syncExec in
// only synchronize on canceling the timer, don't do the syncExec in
// the sync block.
boolean cancel = false;
synchronized (this) {
if (isRunning) {
isRunning = false;
cancel = true;
job.cancel();
}
}
if (cancel) {
if (parentDisplay.isDisposed() == true) {
return;
}
if (parentDisplay.isDisposed() == false) {
parentDisplay.syncExec(new Runnable() {
@Override
public void run() {
actionCB.timerCompleted();
}

11
cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF
View file

@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Notification Plug-in
Bundle-Name: AlertViz Plugin
Bundle-SymbolicName: com.raytheon.uf.viz.alertviz;singleton:=true
Bundle-Version: 1.14.0.qualifier
Bundle-Version: 1.15.0.qualifier
Bundle-Activator: com.raytheon.uf.viz.alertviz.Activator
Bundle-Vendor: Raytheon
Require-Bundle: org.eclipse.ui,
@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.serialization;visibility:=reexport,
com.raytheon.uf.viz.core;visibility:=reexport,
com.raytheon.uf.common.status,
org.jep;bundle-version="1.0.0",
com.raytheon.uf.common.message;bundle-version="1.11.11",
com.raytheon.uf.common.alertviz,
javax.jms;bundle-version="1.0.0",
@ -22,10 +21,8 @@ Require-Bundle: org.eclipse.ui,
Export-Package: com.raytheon.uf.viz.alertviz,
com.raytheon.uf.viz.alertviz.config
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.raytheon.uf.common.python,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.python.swt,
com.raytheon.uf.viz.python.swt.widgets,
Import-Package: com.raytheon.uf.common.time,
org.apache.log4j
Bundle-ActivationPolicy: lazy
Eclipse-RegisterBuddy: ch.qos.logback
Bundle-ClassPath: com.raytheon.uf.viz.alertviz.jar,.

9
cave/com.raytheon.uf.viz.alertviz/build.properties
View file

@ -1,10 +1,9 @@
source.. = src/
output.. = bin/
output.com.raytheon.uf.viz.alertviz.jar = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
statusMessage.xsd,\
config.xml,\
localization/,\
lib/,\
logback-alertviz.xml
logback-alertviz.xml,\
com.raytheon.uf.viz.alertviz.jar
source.com.raytheon.uf.viz.alertviz.jar = src/

Some files were not shown because too many files have changed in this diff Show more