Dustin Johnson
4d9c945388
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: 98d7beae50
[formerly 98d7beae50
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Richard Peter
efdd09b5d6
Issue #1257 : Revert radar file name changes. Change grib path to just be by master level name.
...
Change-Id: If3515614408906a5dc0e54b4c8d261fae5fcaf26
Former-commit-id: 85eb3b7598
[formerly 85eb3b7598
[formerly ca23e50157bb0c381dbcd6bf4d4f08bbd0a35f6f]]
Former-commit-id: 72acca2422
Former-commit-id: 8cb830c1c6
2012-10-17 13:22:00 -05:00
Richard Peter
881582885c
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: ca0c9b7502
[formerly ca0c9b7502
[formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]
Former-commit-id: bcb0560291
Former-commit-id: ce85c8e1a6
2012-10-15 09:52:14 -05:00
Ben Steffensmeier
7e9eb91232
Issue #704 fixes to random resources and optimization of radar projection transforms
...
Former-commit-id: 601d46661c
[formerly 601d46661c
[formerly 7619165ce45efe9dbad045adfaaf978acee782be]]
Former-commit-id: 16e4fe8ce2
Former-commit-id: cf35d99036
2012-06-20 18:07:17 -05:00
Bryan Kowal
f390151c0b
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: 95a5887b06
[formerly 95a5887b06
[formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]
Former-commit-id: 25e20ad89c
Former-commit-id: fd8be91fed
2012-06-19 13:15:53 -05:00
Bryan Kowal
cbc8964e5b
Merge branch '11-Collaboration' into development
...
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: f528e10391
[formerly f528e10391
[formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
0bf066fc5e
Issue #704 create a radial bin and azimuth range map projection so radar data can use standard api.
...
Change-Id: If5bba07e679881188b190363cc234ba145ce9f23
Former-commit-id: f63d2bc7c2
[formerly f63d2bc7c2
[formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]
Former-commit-id: dd353747d0
Former-commit-id: af82c0a52a
2012-06-14 16:30:34 -05:00
David Gillingham
c0f47ec357
Issue #646 : Ensure radar obs use TimeTools to set reftime.
...
Former-commit-id: 4f9061fcea
[formerly 4f9061fcea
[formerly c6c83792c753be9c248e951462830983d5a3ee2e]]
Former-commit-id: 091e0325ea
Former-commit-id: ea06b163b9
2012-05-18 16:31:16 -05:00
Steve Harris
7ee04eb560
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: 092efd6072
[formerly 092efd6072
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
David Gillingham
aeba62a5d9
Issue #473 : Properly archive text plugin records,
...
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: 526abfd36e
[formerly 526abfd36e
[formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 04ab5d619b
Former-commit-id: 36717c7a3e
2012-04-25 17:08:21 -05:00
Steve Harris
8cd5974f4c
12.4.1-4 baseline
...
Former-commit-id: 67a5a68300
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Steve Harris
37e57b6588
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: b89ebc5e01
[formerly b89ebc5e01
[formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: 496cc6a06b
Former-commit-id: 4a93298877
2012-02-20 16:38:06 -06:00
Steve Harris
acd7845ebd
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: cabf9fd956
[formerly cabf9fd956
[formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
895404abeb
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd8
[formerly 93f6535bd8
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
3e5612ffac
Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
...
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4
Former-commit-id: f016be988e
[formerly f016be988e
[formerly 500f3f03f5260cff3417021776204ccf6c035415]]
Former-commit-id: 73f6e9e322
Former-commit-id: 7bcbf3e3bc
2012-02-03 17:33:32 -06:00
David Gillingham
d85d78f180
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: 845e6c19af
[formerly 845e6c19af
[formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: b056e18757
Former-commit-id: 87b15de88b
2012-01-26 17:38:43 -06:00
Matt Nash
21d2361f00
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
377dcd10b9
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 9f19e3f712
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00