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

113 commits

Author SHA1 Message Date
Richard Peter
516bb024bb Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development 
Former-commit-id: c7dd6365d2 [formerly 7b8931ed16] [formerly 3239c176fa [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]
Former-commit-id: 3239c176fa
Former-commit-id: 911a371329
 2013-03-25 14:45:06 -05:00
Max Schenkelberg
850c8995cc 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: 07ae94c499 [formerly ea26d0de84] [formerly 126be0cfe5 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: 126be0cfe5
Former-commit-id: d20958ae92
 2013-03-22 10:54:44 -05:00
Richard Peter
4b386ccd1c Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client 
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: ead48007cb [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: 704bc86cf5
 2013-03-21 18:21:53 -05:00
Steve Harris
8db98c2d71 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: 0379be06d2
Former-commit-id: 4fc2bb7bba
 2013-03-20 16:09:26 -05:00
Steve Harris
f4e26fd94d Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: dc419068f0
Former-commit-id: 31044eabd1
 2013-03-20 16:06:20 -05:00
Steve Harris
e9f0328808 13.3.1-10 baseline 
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
 2013-03-20 15:53:01 -05:00
Steve Harris
2a26783ba7 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
 2013-03-18 16:52:00 -05:00
Steve Harris
ea27f9cd17 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: c18b96dc4c
Former-commit-id: 245afb28c8
 2013-03-18 16:43:22 -05:00
Steve Harris
81a3f29afc 13.3.1-8 baseline 
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
 2013-03-18 15:43:32 -05:00
Nate Jensen
4ea1508baa Issue #1795 speed up publish by optimizing publish time updates in grid histories 
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: 30ddd909bf [formerly e65267d5f3] [formerly 235952a115 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]
Former-commit-id: 235952a115
Former-commit-id: dad08657aa
 2013-03-15 16:10:11 -05:00
Dustin Johnson
7adf94e9f6 Issue #1794 Consolidate common filename filters into FilenameFilters class 
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]
Former-commit-id: 43a9f608ef
Former-commit-id: 1b82ad0dc4
 2013-03-15 11:51:58 -05:00
David Gillingham
d8dd50f2ba Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request 
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Former-commit-id: 87013aad89 [formerly 7c74510723] [formerly 566927980a [formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]
Former-commit-id: 566927980a
Former-commit-id: 90b8c80837
 2013-03-13 17:14:59 -05:00
Dave Hladky
9e97fc9efe Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
 2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6 13.3.1-7 baseline 
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
 2013-03-13 09:50:28 -05:00
Dustin Johnson
f5a3b57107 Issue #1784 Move NCF bandwidth manager code to data delivery repo 
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 2983ed29e4 [formerly 71365cd945] [formerly 1930183036 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]
Former-commit-id: 1930183036
Former-commit-id: 48a96911c8
 2013-03-13 08:39:08 -05:00
Steve Harris
bca46a1354 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
 2013-03-12 16:04:23 -05:00
Roger Ferrel
0deb290c24 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. 
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 70bd9aafa7 [formerly 4deb731bd0] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: b421c97d86
Former-commit-id: 334f2c4a57
 2013-03-11 13:00:44 -05:00
Roger Ferrel
7e5bb824d9 Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. 
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: a73687c1b8 [formerly 6744238fce] [formerly 9e8472bab6 [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]
Former-commit-id: 9e8472bab6
Former-commit-id: 3684c7efed
 2013-03-11 11:16:22 -05:00
David Gillingham
b0665586e1 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use 
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Former-commit-id: 6b695c6a5e [formerly 4459ecfa78] [formerly 1518c0b53c [formerly a3918b30452a829a8f0cd562021959246bf1144a]]
Former-commit-id: 1518c0b53c
Former-commit-id: 251da90765
 2013-03-07 17:25:14 -06:00
Nate Jensen
21863c5db5 Issue #1773 log publish times 
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 5d9778a8d6 [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 392feade3f36680edcdb135f7c061be172210c26]]
Former-commit-id: 5c59a61cef
Former-commit-id: d7902aba68
 2013-03-07 16:49:40 -06:00
David Gillingham
94bccc87a3 Issue #1447: Implement active table fetching, make bug fixes 
to active table sharing from testing.

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: 75e82d9fca [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 5ad72e2a7f
 2013-03-06 14:23:00 -06:00
Steve Harris
4a0b8772ec Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
 2013-03-05 12:29:44 -06:00
David Gillingham
622700dee9 Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to 
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.

Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510

Former-commit-id: ca81ae4a71 [formerly 50744c1f92] [formerly 9351f33c1c [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 9351f33c1c
Former-commit-id: 77a3f33fd5
 2013-03-01 11:05:02 -06:00
Max Schenkelberg
5617dfaa67 Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects 
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: e0ba97d547
Former-commit-id: 6b1426dd34
 2013-02-27 11:50:38 -06:00
Ron Anderson
541557e0b0 Issue #1597 Code cleanup and logging improvement for GFE Performance metrics 
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: f37999b1eb
Former-commit-id: 77fbbb6a61
 2013-02-26 18:44:51 -06:00
Steve Harris
4f155a183a Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
 2013-02-21 15:41:39 -06:00
Steve Harris
e4435815c9 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
 2013-02-20 16:19:40 -06:00
Ben Steffensmeier
cde7275a2a Issue #1598 fix GridParamInfo keys. 
Former-commit-id: 7d4b065a23 [formerly 1ab9f7bd1f] [formerly c1b8ceecf1 [formerly 33da1c48a76b468b9fee4e05de835295c7393672]]
Former-commit-id: c1b8ceecf1
Former-commit-id: 48e6ffe392
 2013-02-19 14:06:26 -06:00
Steve Harris
81f1fb83a0 Merge branch 'omaha_13.2.1' (13.2.1-8) into development 
Former-commit-id: c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: d123c044c3
Former-commit-id: 1c08acab38
 2013-02-19 12:22:00 -06:00
Richard Peter
d42a0b9f0d Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development 
Former-commit-id: 83d12549bf [formerly 77157e3c6c] [formerly f364af584d [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]
Former-commit-id: f364af584d
Former-commit-id: 623020926e
 2013-02-18 15:36:41 -06:00
Ben Steffensmeier
47090eccc1 Issue #1598 Make GridParamInfoLookup filter on extension. 
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744

Former-commit-id: efc1335b1f [formerly 63a725718d] [formerly d2e17d1473 [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]
Former-commit-id: d2e17d1473
Former-commit-id: 5ada0b2c2a
 2013-02-18 10:36:47 -06:00
Steve Harris
8cffb55371 13.2.1-8 baseline 
Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
 2013-02-18 09:09:41 -06:00
Ron Anderson
d69d628450 Issue #1608 Fixed group deletes in H5pyDataStore.py 
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: e952a4f179
 2013-02-15 09:03:41 -06:00
Ron Anderson
c862db5513 Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging. 
Change-Id: I820a780dcbaa3e6ffefd56737bac7dbc13c2e485

Former-commit-id: 95d18f9283 [formerly 771296a845] [formerly b6a9b42094 [formerly 39282e6528aeb01a40a01df477f4579afab79ca3]]
Former-commit-id: b6a9b42094
Former-commit-id: 12b0fbdab8
 2013-02-11 17:16:48 -06:00
Steve Harris
bbe92e6824 13.2.1-6 baseline 
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
 2013-02-07 16:00:39 -06:00
Brad Gonzales
8fc5c18ebd Issue #1517 Added SPC Prob menu changes. 
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 35cc853c74 [formerly f459554e33] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]
Former-commit-id: 5bc6dd5498
Former-commit-id: f3ef309293
 2013-02-04 08:52:33 -06:00
Steve Harris
73d9455c65 Merge branch '13.2.1_delivery' into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: ec56acde81
Former-commit-id: 6383bf8ed2
 2013-01-31 10:19:14 -06:00
Steve Harris
75f6e61e6f Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery 
Former-commit-id: e655d297f7 [formerly 0505ed0a72] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 6040272573
Former-commit-id: 513d49939f
 2013-01-29 15:57:21 -06:00
Steve Harris
daca1c3e73 13.2.1-3 baseline 
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 3edfa1e0be
 2013-01-29 15:52:43 -06:00
Steve Harris
27725703d5 Merge branch '13.2.1_delivery' into development 
Former-commit-id: ef2526ed44 [formerly 6bd7e027b6] [formerly b5b1823104 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]
Former-commit-id: b5b1823104
Former-commit-id: 0a31815c66
 2013-01-28 16:28:58 -06:00
Richard Peter
74b80fdc81 Issue #1408: Merge branch 'ss_builds' (13.2.1) into 13.2.1_delivery 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.datadelivery.feature/feature.xml
	cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/UserSelectComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/services/DataDeliveryServices.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/DeleteGroupDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/GroupAddDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/RequestFromServerPermissionsService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubApprovalTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/presenter/CreateSubscriptionDlgPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/VerticalSubsetTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/presenter/GriddedTimingSelectionPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/xml/SubsetXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/OperatorAdapter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/CreateEditRuleDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/Operator.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemLatencyTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemManagementDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemPriorityTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemRuleManager.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataSetFrequency.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/NotificationHandler.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/ImageLegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFELegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/DiscreteColorbar.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/MenuLoader.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.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.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.bandwidth/utility/common_static/base/datadelivery/systemManagement/rules/latencyRules.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Ensemble.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSet.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSetMetaData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Parameter.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Provider.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/DataSizeUtils.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/LookupManager.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/ExtensibleObjectType.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/SubscriptionNotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/Crawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/MainSequenceCrawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/OPENDAPServiceConfig.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/harvester/NOMADS-harvester.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtility.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRequestBuilder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalGenerator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	nativeLib/org.apache.qpid/lib/libqpidclient.so
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	tests/.classpath
	tests/unit/com/raytheon/uf/common/datadelivery/registry/OpenDapGriddedDataSetFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderTest.java
	tests/unit/com/raytheon/uf/common/localization/TestPathManager.java
	tests/unit/com/raytheon/uf/common/registry/RegistryManagerTest.java
	tests/unit/com/raytheon/uf/common/stats/data/DataPointTest.java
	tests/unit/com/raytheon/uf/common/stats/data/StatsDataTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/harvester/CrawlerTest.java
	tests/unit/com/raytheon/uf/edex/stats/data/StatsDataAccumulatorTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXMLTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/utils/DataSizeUtilTest.java

Former-commit-id: 094fab7d16 [formerly 116ed10973] [formerly 81f14729ae [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]
Former-commit-id: 81f14729ae
Former-commit-id: d0e3bbf826
 2013-01-25 15:54:27 -06:00
Steve Harris
251a9c0195 13.2.1-2 baseline 
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
 2013-01-25 09:07:12 -06:00
Steve Harris
9d248cff7a 13.2.1-3 baseline 
Former-commit-id: a5a0da5c02 [formerly 7435527b25] [formerly 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 2b6ac028bd
Former-commit-id: cc0fdef15c
 2013-01-23 11:24:17 -05:00
Steve Harris
d9be4dce21 13.2.1-2 baseline 
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
 2013-01-23 11:18:44 -05:00
Ron Anderson
cfeab572a2 Issue #1504 Fix merge error 
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: c165cd4e3b [formerly b5fd4e6226] [formerly cac86a904d [formerly 71aca907a76084392402160005bbeb157cfddfc4]]
Former-commit-id: cac86a904d
Former-commit-id: 68af35c524
 2013-01-22 18:22:19 -06:00
Ron Anderson
cb3e710d4c Issue #1504 Fix merge error 
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: 5c6af0d0a1 [formerly c83667e9b5] [formerly 2f4badad98 [formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]
Former-commit-id: 2f4badad98
Former-commit-id: 8e15531e08
 2013-01-22 16:54:04 -06:00
Steve Harris
8b578c10dc Merge branch '13.2.1_delivery' into development 
Former-commit-id: cf384edfbb [formerly 11b9bfc187] [formerly 1af055a04b [formerly 920b282de84def082dac82832d80e67f7bff2b19]]
Former-commit-id: 1af055a04b
Former-commit-id: 29b9077291
 2013-01-22 16:45:48 -06:00
Ron Anderson
8e575db69c Issue #1504 GFE: Model data not always appearing automatically without CAVE restart 
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 74cb9aeb53 [formerly 62671efc2a] [formerly 20b0761048 [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]
Former-commit-id: 20b0761048
Former-commit-id: 44807ba0d5
 2013-01-22 14:47:37 -06:00
Bryan Kowal
38480e46b1 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: fba28ea69b [formerly e2a12845d3] [formerly 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: 4db9c6c321
Former-commit-id: c1330e8121
 2013-01-15 14:56:01 -06:00
Richard Peter
e23ffee8bd Issue #1472: Fix GFE queryByD2DParmId to include required level in query 
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: f9e89ee518 [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: 7e4a0f1377
 2013-01-11 11:03:42 -06:00