xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4987 commits 31 branches 40 tags 3.8 GiB
Commit graph

37 commits

Author SHA1 Message Date
Nate Jensen
c0d1fe1bd8 Issue #3372 make LocalizationStreamHandler thread safe 
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88

Former-commit-id: aaa0ed7ed7 [formerly 47bf21d7b5 [formerly 87d5faa03ea63759a6805ed063174fb09ca4800a]]
Former-commit-id: 47bf21d7b5
Former-commit-id: 801ed7154f
 2014-07-14 09:18:16 -05:00
Richard Peter
efd1003a50 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
 2014-04-09 16:00:54 -05:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
 2014-04-04 12:57:32 -04:00
Steve Harris
21ff310620 14.1.1-7 baseline 
Former-commit-id: 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 3328e2dd1d
Former-commit-id: 80614c0e52
 2013-11-06 14:16:14 -05:00
Richard Peter
1af5b95d92 Merge branch 'omaha_13.5.3' (13.5.2-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml

Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371

Former-commit-id: b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]
Former-commit-id: 9adbe25ceb
Former-commit-id: f141fdd5ab
 2013-10-08 10:59:50 -05:00
Bryan Kowal
763aad00be Issue #2295 - CAVE updates for ALR 
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc

Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76

Former-commit-id: 4e4405b0f5 [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]
Former-commit-id: aa8691edfd
Former-commit-id: 4342c463b2
 2013-10-02 15:49:17 -05:00
Nate Jensen
3d226c0e69 Issue #2032 moving localization edex_static files to respective plugins, except colormaps 
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: b7ea2ae30b [formerly da311b00a8 [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]
Former-commit-id: da311b00a8
Former-commit-id: 2ee87452db
 2013-07-18 17:20:27 -05:00
Nate Jensen
338b0ae310 Issue #2142 initial cutover from log4j to SLF4J and logback 
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]
Former-commit-id: 316d6c09c6
Former-commit-id: a4de603bcf
 2013-07-01 14:41:05 -05:00
Steve Harris
2487a8b435 13.5.1-4 baseline 
Former-commit-id: e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
 2013-06-28 09:46:25 -04:00
Steve Harris
5d99df9969 13.5.1-1 baseline 
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
 2013-06-10 15:17:17 -04:00
Nate Jensen
04d6f6654d Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh 
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
 2013-05-29 14:49:43 -05:00
Nate Jensen
cf705759bd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables 
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]
Former-commit-id: 82d6c03669
Former-commit-id: 808ab352c5
 2013-05-29 09:20:53 -05:00
Nate Jensen
e8ebe1a123 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc 
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
 2013-05-23 11:20:40 -05:00
Steve Harris
02dba50c00 13.4.1-8 baseline 
Former-commit-id: c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: 19866e7032
Former-commit-id: 576a74fe0b
 2013-05-14 09:21:41 -04:00
Richard Peter
207c17d5af Merge branch 'omaha_13.4.1' (13.4.1-7) into development 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]
Former-commit-id: a12830f762
Former-commit-id: 2c009eb618
 2013-05-13 17:11:05 -05:00
Richard Peter
c2dcbedf63 Issue #1814: Remove slow consumer disconnect. Add time to live to all topics 
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: 697297803c [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]
Former-commit-id: 4f3e86574b
Former-commit-id: ae84ced7be
 2013-05-08 17:28:01 -05:00
Steve Harris
6f374b35d0 13.3.1-12 baseline 
Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
 2013-03-25 13:27:13 -05:00
Max Schenkelberg
2da689223f Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe. 
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 126be0cfe5 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: ea26d0de84
Former-commit-id: 07ae94c499
 2013-03-22 10:54:44 -05:00
Steve Harris
52f48669f6 13.2.1-6 baseline 
Former-commit-id: a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: d0752de66c
Former-commit-id: d66ad2f77b
 2013-02-07 16:00:39 -06:00
Steve Harris
0a728f6550 Merge branch '13.2.1_delivery' into development 
Former-commit-id: 9b6cc68601 [formerly 1718a19f2d [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]
Former-commit-id: 1718a19f2d
Former-commit-id: cbffccc58e
 2013-01-22 21:47:09 -06:00
Max Schenkelberg
1944f4f81d Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized. 
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390

Former-commit-id: 6fd6b2e42d [formerly 5c51083f35 [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]
Former-commit-id: 5c51083f35
Former-commit-id: 8058260830
 2013-01-21 14:58:16 -06:00
Bryan Kowal
1414f0415b Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict. 
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: e2a12845d3
Former-commit-id: fba28ea69b
 2013-01-15 14:56:01 -06:00
Steve Harris
1d4d25b49b 13.1.2-6 baseline 
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
 2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031 13.1.2-2 baseline 
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
 2013-01-06 14:32:24 -06:00
Max Schenkelberg
8b497d5900 Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed 
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7

Former-commit-id: 71367ef5bb [formerly 0daa22064b [formerly a7386c6570455fe6f9175eaeae1225923124cce8]]
Former-commit-id: 0daa22064b
Former-commit-id: 34c4ec44c3
 2012-11-16 14:12:27 -06:00
Max Schenkelberg
61f0c0501b Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors. 
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]
Former-commit-id: dcde9e8951
Former-commit-id: fe11e31bfb
 2012-11-14 16:19:37 -06:00
Dustin Johnson
acd4cf94d8 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
 2012-11-08 09:57:16 -06:00
Dustin Johnson
7d0e4a6e75 Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
 2012-11-01 13:36:06 -05:00
Steven Harris
ffe3641057 12.11.1-1 baseline 
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
 2012-09-27 15:57:45 -05:00
Max Schenkelberg
f7abe9ee39 Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view. 
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]
Former-commit-id: 80439b309b
Former-commit-id: 6d78afd423
 2012-09-10 10:45:37 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline 
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
 2012-08-21 15:27:03 -05:00
Bryan Kowal
d25012ee75 Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly. 
Former-commit-id: 25e20ad89c [formerly 95a5887b06 [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]
Former-commit-id: 95a5887b06
Former-commit-id: cb16805e7e
 2012-06-19 13:15:53 -05:00
Steve Harris
2f10c7a1e4 12.5.1-15 baseline 
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
 2012-06-08 13:39:48 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline 
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
 2012-04-18 15:18:16 -05:00
Ben Steffensmeier
07d98eb7dc Issue #353 add logic to syncronize times for thin client data updates.. 
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: 5c303ed189
Former-commit-id: 56d97c95d5
 2012-02-29 15:49:47 -06:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync 
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
 2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
 2012-01-06 08:55:05 -06:00