Max Schenkelberg
727602f011
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: c8a5f1a007
[formerly 0f1112fb3e
] [formerly c8a5f1a007
[formerly 0f1112fb3e
] [formerly 38bba3705f
[formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]
Former-commit-id: 38bba3705f
Former-commit-id: 41706c42f2
[formerly 6ebc058df4
]
Former-commit-id: 22a18ffe01
2013-02-27 12:26:32 -06:00
Ron Anderson
80df624bb3
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87
[formerly a2a89fb4e7
] [formerly dc7c9edb87
[formerly a2a89fb4e7
] [formerly 7c0a5d74bf
[formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: d69d628450
[formerly e952a4f179
]
Former-commit-id: 45627edcc7
2013-02-15 09:03:41 -06:00
Dustin Johnson
1d80262cf9
Issue #1543 Serialize DODS response rather than plugin data objects directly
...
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.
Amend:
Peer review comments.
Set retrieval status to failed when payload is null.
Change-Id: I458b13856302c8faceeef985c1c41115644520b7
Former-commit-id: 25faaa2af0
[formerly dd8ca33fc4
] [formerly 25faaa2af0
[formerly dd8ca33fc4
] [formerly d143735ea8
[formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]]
Former-commit-id: d143735ea8
Former-commit-id: 6f821ed8c9
[formerly 9783dc4d9f
]
Former-commit-id: 922da948eb
2013-02-14 09:49:22 -06:00
Dustin Johnson
35b13ba973
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: 0d548bd66f
[formerly 8307af022c
] [formerly 0d548bd66f
[formerly 8307af022c
] [formerly ef32853dc1
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]
Former-commit-id: ef32853dc1
Former-commit-id: 73a5667256
[formerly e504a474f9
]
Former-commit-id: e48bf48821
2013-02-11 14:21:57 -06:00
Max Schenkelberg
b085fddff2
Issue #1500 Sped up warngen text creation by calculating hatched polygon and area in Job when polygon or area changes, initializing velocity for template running when warngen starts, only requesting full warning records when they are requested for use from CurrentWarnings, and only requesting partial ActivateTableRecords for determining active watch info.
...
Change-Id: Ia120f2d20b99e4d152554727597b22af762413ac
Former-commit-id: f73d55e920
[formerly bb68c95589
] [formerly f73d55e920
[formerly bb68c95589
] [formerly fdc5759b53
[formerly 26af6badfffd930b8051af8e33ff6897d6c87073]]]
Former-commit-id: fdc5759b53
Former-commit-id: f186c355ac
[formerly 014eaa1666
]
Former-commit-id: e736a5d5b7
2013-02-06 17:21:13 -06:00
Bryan Kowal
f99ad00934
Issue #1414 - adding Satellite to the Data Access Framework
...
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions
Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9
Former-commit-id: a315e4461b
[formerly 4939e96872
] [formerly a315e4461b
[formerly 4939e96872
] [formerly 789359a779
[formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]]
Former-commit-id: 789359a779
Former-commit-id: 03ccca567a
[formerly 53a280116b
]
Former-commit-id: e443218bfb
2013-01-15 18:08:17 -06:00
Bryan Kowal
89cc2bdf57
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 fba28ea69b
[formerly e2a12845d3
] [formerly 4db9c6c321
[formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 38480e46b1
[formerly c1330e8121
]
Former-commit-id: 290167ac16
2013-01-15 14:56:01 -06:00
Richard Peter
9b15f27832
Issue #1421 : Make hdf5 and database purge the same, update H5pyDataStore
...
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7
Former-commit-id: 3d4fb31161
[formerly 513dd75a23
] [formerly 3d4fb31161
[formerly 513dd75a23
] [formerly 08919e73c3
[formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]
Former-commit-id: 08919e73c3
Former-commit-id: e2007e61e1
[formerly f7859723e5
]
Former-commit-id: bf19dcd216
2012-12-13 11:02:07 -06:00
Ben Steffensmeier
9f2f2591ee
Merge branch 'ss_builds'(12.12.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: ed4f88aa22
[formerly 69fc030bb4
] [formerly ed4f88aa22
[formerly 69fc030bb4
] [formerly e8090e654b
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778
[formerly 60f78c22e3
]
Former-commit-id: 7761060a12
2012-11-13 16:00:19 -06:00
Dustin Johnson
1ac34361b4
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 1220f5167e
[formerly ddaa681d8a
] [formerly 1220f5167e
[formerly ddaa681d8a
] [formerly 9784b563cf
[formerly 217a17fe79d9156f03597d72e51ab47325b00991]]]
Former-commit-id: 9784b563cf
Former-commit-id: d0867fedef
[formerly 9bb53555a9
]
Former-commit-id: cd392c40bf
2012-11-08 12:00:15 -06:00
Dustin Johnson
b4a13190ad
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: efd3d3735a
[formerly 064ef82d1e
] [formerly efd3d3735a
[formerly 064ef82d1e
] [formerly 1dbeb22893
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3
[formerly 4222b24d09
]
Former-commit-id: 6613c51d3b
2012-11-08 09:57:16 -06:00
Steve Harris
af59663a99
12.12.1-1 baseline
...
Former-commit-id: c2839cc86d
[formerly e4bd20a515
] [formerly c2839cc86d
[formerly e4bd20a515
] [formerly e1498006c7
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928
[formerly 214fcd3b63
]
Former-commit-id: a5be98d6de
2012-11-07 12:41:20 -06:00
Max Schenkelberg
2345861756
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
...
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: f069f34a96
[formerly 2f90120248
] [formerly f069f34a96
[formerly 2f90120248
] [formerly ca4177dd08
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1
[formerly 747ab974e9
]
Former-commit-id: 50625b0453
2012-11-07 10:44:42 -06:00
Richard Peter
6789b4d3af
Issue #1257 : Fix Tropical Test Tool
...
Change-Id: I50c1d7e703d0d5e825ab9825f7fdbcd17ac0e49b
Former-commit-id: 449ad67f82
[formerly 45b25ead66
] [formerly 449ad67f82
[formerly 45b25ead66
] [formerly e3da5faf40
[formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]]]
Former-commit-id: e3da5faf40
Former-commit-id: 76102aa826
[formerly 415cc64c14
]
Former-commit-id: d1b406ed52
2012-11-06 08:47:41 -06:00
Richard Peter
03c9846293
Issue #1257 : Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"
...
Change-Id: I984bb34f88ecda1e57ccac462acbced7240846a0
Former-commit-id: bb475bdbf3
[formerly 023bed9bcf
] [formerly bb475bdbf3
[formerly 023bed9bcf
] [formerly 170e205c88
[formerly 3d04fdb509db0a5d46e215bdc2595c07d15575b2]]]
Former-commit-id: 170e205c88
Former-commit-id: c1003242ae
[formerly c91ee014f7
]
Former-commit-id: 74b9df6f68
2012-11-05 15:19:04 -06:00
Richard Peter
5f23128428
Issue #1257 : Fix hdf5 purge
...
Change-Id: I90c54ad6494f7ff3bdf576f12098e8bafddfee95
Former-commit-id: 8e215f3397
[formerly da5a8fc3d9
] [formerly 8e215f3397
[formerly da5a8fc3d9
] [formerly 93697faeb1
[formerly 9b4e8adccfdc94e9f8cfb7705855b1376b892cdd]]]
Former-commit-id: 93697faeb1
Former-commit-id: d536edf512
[formerly 8096b2f6fb
]
Former-commit-id: fd56cb6475
2012-11-02 11:06:27 -05:00
Richard Peter
520db142f2
Issue #1257 : Address peer review comment and cleanup bufrmos.
...
Change-Id: I37f4714a3b350924fd86c016dea7de8aff023def
Former-commit-id: 4910120217
[formerly ed20220923
] [formerly 4910120217
[formerly ed20220923
] [formerly 12323c1f4e
[formerly 2fbcf67a963c3a174a5bd096e3dc11550cdff723]]]
Former-commit-id: 12323c1f4e
Former-commit-id: c0dbf3dd23
[formerly dd20288dbf
]
Former-commit-id: 8ef557934d
2012-11-01 16:23:41 -05:00
Dustin Johnson
931d94d1de
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: 8e69107b5a
[formerly 98d7beae50
] [formerly 8e69107b5a
[formerly 98d7beae50
] [formerly 31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a
[formerly bcf575966b
]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Richard Peter
7df04375f1
Issue #1257 : Update PurgeRules to not be hard linked to path keys
...
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: 5787d6278d
[formerly 275398778f
] [formerly 5787d6278d
[formerly 275398778f
] [formerly 886375172b
[formerly 73bca27407552c864765d5924e8609a253493f4c]]]
Former-commit-id: 886375172b
Former-commit-id: 998278caf7
[formerly bd1d87363a
]
Former-commit-id: 940d986f6d
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
1931b503a2
merge branch Unifeid_Grid into developement
...
Former-commit-id: 272e057bf1
[formerly d0a2ed32b5
] [formerly 272e057bf1
[formerly d0a2ed32b5
] [formerly b6a1563bb2
[formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 1d94435220
[formerly 92fd247ccc
]
Former-commit-id: 38b0dafe0b
2012-10-30 12:24:54 -05:00
Brad Gonzales
673749c4b9
Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
...
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats
update the edex feature and edex build.xml to include the edex stat projects.
Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4
Former-commit-id: d26119c383
[formerly b2656df2f8
] [formerly d26119c383
[formerly b2656df2f8
] [formerly 24fc32ee14
[formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: 781265a6a8
[formerly 5949c8b09c
]
Former-commit-id: e1a106fdbb
2012-10-26 14:00:55 -05:00
Ben Steffensmeier
86562637f0
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: 4f503d3a1e
[formerly 6a9ff88b33
] [formerly 4f503d3a1e
[formerly 6a9ff88b33
] [formerly c2934ae7a5
[formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 9b8f2bcdbd
[formerly a77d2097f8
]
Former-commit-id: dd5ab10b61
2012-10-25 12:22:11 -05:00
Steve Harris
13cdd55545
12.11.1-5 baseline
...
Former-commit-id: 362d6ffaca
[formerly 03f3f3c36a
] [formerly 362d6ffaca
[formerly 03f3f3c36a
] [formerly a0eaf651ff
[formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70
[formerly e31c1e5bba
]
Former-commit-id: dff8d5de9c
2012-10-18 15:46:42 -05:00
Richard Peter
61892fee88
Issue #1257 : Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path.
...
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f
Former-commit-id: 12bcfbda80
[formerly ca0c9b7502
] [formerly 12bcfbda80
[formerly ca0c9b7502
] [formerly bcb0560291
[formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]]
Former-commit-id: bcb0560291
Former-commit-id: 46870808e0
[formerly ce85c8e1a6
]
Former-commit-id: 881582885c
2012-10-15 09:52:14 -05:00
Ben Steffensmeier
9509d72ef9
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
...
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 4fe2127bfb
[formerly bd8eb7fc15
] [formerly 4fe2127bfb
[formerly bd8eb7fc15
] [formerly 05849f634d
[formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]
Former-commit-id: 05849f634d
Former-commit-id: 6b058ace34
[formerly b547d9dd8f
]
Former-commit-id: a28984c40c
2012-09-18 15:19:05 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5
[formerly 72824561cb
]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
James Korman
c901590446
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 1166a7cbb1
[formerly 38a2e426d9
] [formerly 1166a7cbb1
[formerly 38a2e426d9
] [formerly 4cbbc59278
[formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 16643cb1bc
[formerly 5df52e38f9
]
Former-commit-id: 41a80adfb1
2012-07-31 13:38:23 -05:00
Nate Jensen
e1321b8bc9
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 6f90bfa61c
[formerly a65e9608fd
] [formerly 6f90bfa61c
[formerly a65e9608fd
] [formerly 4a2841b287
[formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]
Former-commit-id: 4a2841b287
Former-commit-id: 7d478ac74c
[formerly 8fa0eb70db
]
Former-commit-id: 04a7e5a8c0
2012-07-31 08:57:54 -05:00
David Gillingham
19b62a3711
Issue #828 : Ensure all baseline PurgeRules files live in only COMMON_STATIC, modify
...
PluginDao.getPurgeRulesForPlugin to search just COMMON_STATIC.
Change-Id: If0e9b37d423a5cdfe317194f952bbfb9697b9581
Former-commit-id: aa0ba41cf9
[formerly 3fffc47ba5
] [formerly aa0ba41cf9
[formerly 3fffc47ba5
] [formerly abdcc32b2c
[formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]]]
Former-commit-id: abdcc32b2c
Former-commit-id: 32d5f7d347
[formerly ee57b63a0c
]
Former-commit-id: 4b2e1f9f23
2012-06-29 13:01:42 -05:00
Bryan Kowal
9d984deb1f
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: a1ba6c10be
[formerly e32406ca8a
] [formerly a1ba6c10be
[formerly e32406ca8a
] [formerly a4c6095b76
[formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]]
Former-commit-id: a4c6095b76
Former-commit-id: 76afa5d4b6
[formerly 3b2d570834
]
Former-commit-id: f4346e7e01
2012-06-19 13:17:17 -05:00
Bryan Kowal
96e82f60e5
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: cb16805e7e
[formerly 95a5887b06
] [formerly cb16805e7e
[formerly 95a5887b06
] [formerly 25e20ad89c
[formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 5db24885ba
[formerly fd8be91fed
]
Former-commit-id: f390151c0b
2012-06-19 13:15:53 -05:00
Nate Jensen
05a77b1536
Issue #765 fix so data can be retrieved with or without hdfFileId
...
Former-commit-id: 619b70f7fc
[formerly ae384ddf24
] [formerly 619b70f7fc
[formerly ae384ddf24
] [formerly bb1ea105d2
[formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]]
Former-commit-id: bb1ea105d2
Former-commit-id: d7841cef54
[formerly 244ca1b88b
]
Former-commit-id: 31160b8485
2012-06-18 17:20:48 -05:00
Steve Harris
c01b096242
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: c7024992a3
[formerly 37793c86b1
] [formerly c7024992a3
[formerly 37793c86b1
] [formerly d325d496f5
[formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 23c34c469a
[formerly cf3c768213
]
Former-commit-id: 3dd5b84aa2
2012-06-11 15:24:03 -05:00
Steve Harris
39ff9954f8
12.5.1-15 baseline
...
Former-commit-id: 8552902906
[formerly b13cbb7e00
] [formerly 8552902906
[formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e
[formerly 676ea3192f
]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Steve Harris
d040b14742
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: d7f7c26582
[formerly 092efd6072
] [formerly d7f7c26582
[formerly 092efd6072
] [formerly 31b3e87ffa
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329
[formerly 98447412f8
]
Former-commit-id: 7ee04eb560
2012-05-09 13:19:47 -05:00
Dave Hladky
7fc0c65ef4
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 42a12fa7a5
[formerly 1b7473572f
] [formerly 42a12fa7a5
[formerly 1b7473572f
] [formerly 5b7ecea866
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: a1a3a361dd
[formerly 61e31c62ff
]
Former-commit-id: d2e16d486b
2012-04-30 13:43:34 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae
[formerly a4e519f3cd
]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
David Gillingham
e8d336e205
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: b31f40ec9d
[formerly 845e6c19af
] [formerly b31f40ec9d
[formerly 845e6c19af
] [formerly b056e18757
[formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]
Former-commit-id: b056e18757
Former-commit-id: ea7a55ad8d
[formerly 87b15de88b
]
Former-commit-id: d85d78f180
2012-01-26 17:38:43 -06:00
Dave Hladky
1061ccbc4c
Issue #15 Wes2Bridge time settings
...
Former-commit-id: 66fbee3e04
[formerly 594412a5b5
] [formerly 66fbee3e04
[formerly 594412a5b5
] [formerly b03b324ead
[formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]]
Former-commit-id: b03b324ead
Former-commit-id: 4e8acfaba3
[formerly 2d53cfbe41
]
Former-commit-id: 8553b8a654
2012-01-25 10:53:51 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf
[formerly 1faae42484
]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59
[formerly 3360eb6c5f
]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00