Commit graph

18 commits

Author SHA1 Message Date
Steve Harris
31c739aec3 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]]
Former-commit-id: 10dc140747
Former-commit-id: 4d58cdca1b [formerly 7fc8cf3d94] [formerly 80cb0b251d26c0d96f2c7ee6601e3e0f30708bf4 [formerly 7bdde9f690]]
Former-commit-id: 3641f7427bca19a3448d6e5ab052df768969a1af [formerly a97a9f80c9]
Former-commit-id: 749ee2f4f4
2012-03-12 13:10:34 -05:00
Steve Harris
85d3d96d4c Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 2dbdc945bf [formerly 73a337bc31] [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]]
Former-commit-id: 9ad2c540c010a2b27f18bb9c98356065c7663bd2 [formerly 21f12bae82]
Former-commit-id: f8ae79c35c
2012-02-27 15:58:49 -06:00
Steve Harris
3a4af24369 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
2012-02-22 11:14:43 -06:00
Steve Harris
5876e9cbd8 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]]
Former-commit-id: 9995d22e25
Former-commit-id: 139d42c594 [formerly 610fdf3f4e] [formerly dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]]
Former-commit-id: e696cc8d41ac682e234429cfacbb076d01f9bf39 [formerly 156ad8471d]
Former-commit-id: 01d72ca3c9
2012-02-22 10:12:49 -06:00
Steve Harris
90432da18a 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: 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]]
Former-commit-id: 496cc6a06b
Former-commit-id: 3371e158a6 [formerly dd3a5a8d88] [formerly 8f3e38d67a9e00af420a14793a365b7fbe9bd292 [formerly 4a93298877]]
Former-commit-id: 745a23d67040229fe246ffa1c83646920a36c89f [formerly 37e57b6588]
Former-commit-id: 7ca623525e
2012-02-20 16:38:06 -06:00
Steve Harris
8c9e581f41 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb]
Former-commit-id: 9a09879521
2012-02-17 10:55:02 -06:00
David Gillingham
4349cccf11 Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Issue #20: Address peer review comments from previous commit.

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly 061966f243 [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]]]
Former-commit-id: 061966f243
Former-commit-id: 9a17298fb6 [formerly 3e42bc7d2d] [formerly 4931a468f096c3bd0bb7f0820c5d10d1c1c224aa [formerly 9f416558fa]]
Former-commit-id: 0be14ae8d9ccc5883f09318f7a66b2bf2cf6b629 [formerly 5a44726c19]
Former-commit-id: 8efd012653
2012-02-13 16:09:36 -06:00
David Gillingham
531c37f6fb Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]]
Former-commit-id: b056e18757
Former-commit-id: f2b58b2f16 [formerly ea7a55ad8d] [formerly 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b]]
Former-commit-id: 2dfb07d58a5928ce4fb055932bcc4ae63a274440 [formerly d85d78f180]
Former-commit-id: e8d336e205
2012-01-26 17:38:43 -06:00
Nate Jensen
1448537aa4 Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

Former-commit-id: 6418e0edda [formerly f3875948e8] [formerly ca923b9475] [formerly 6418e0edda [formerly f3875948e8] [formerly ca923b9475] [formerly 15e0a5e68d [formerly ca923b9475 [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]]]
Former-commit-id: 15e0a5e68d
Former-commit-id: b0c285c305 [formerly 637a516ae5] [formerly e0dbbff654bb803f9a78bd56c5fbd86943f2b93e [formerly 29be9b82bd]]
Former-commit-id: 5b7227de3276d8f0c708380cff967fd25a1f20b6 [formerly 076ceafddf]
Former-commit-id: 12e15993ea
2012-01-26 17:28:06 -06:00
Roger Ferrel
05e5d62fa4 Issue #181
new files not indexed


Former-commit-id: 5fe3d78cb2 [formerly 732004d9cd] [formerly 472e788dba] [formerly 5fe3d78cb2 [formerly 732004d9cd] [formerly 472e788dba] [formerly 69f8daedff [formerly 472e788dba [formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]]]]
Former-commit-id: 69f8daedff
Former-commit-id: 84fc2cf17c [formerly 2be2e8478f] [formerly ef41863ce82e3fa3eeb978a1d320f1286ca06bae [formerly c6f2b90560]]
Former-commit-id: 4dc33abac816137b201539d9f7ab70c8ba33cf7d [formerly df778176a5]
Former-commit-id: 7f4f111729
2012-01-26 14:37:19 -06:00
Roger Ferrel
628a6e15d1 Issue #181
The January ncep_build/build.cave changes

Former-commit-id: 4444d34d91 [formerly c5f7cfb665] [formerly f00f3dd332] [formerly 4444d34d91 [formerly c5f7cfb665] [formerly f00f3dd332] [formerly 750b17a81c [formerly f00f3dd332 [formerly 29b4a3313d4cefd56f9697a31a767a9780de75a1]]]]
Former-commit-id: 750b17a81c
Former-commit-id: f9f27d4a3f [formerly 9ed05c45c0] [formerly 02ee0c47b8425f7ab330d991f5e22a6b3fa5a4e0 [formerly cbd8827872]]
Former-commit-id: b4b9d133c7583f8adc166c8a317d9c460fd1a1d8 [formerly e20f37b19b]
Former-commit-id: b48a31df21
2012-01-26 11:25:39 -06:00
Roger Ferrel
c42448a8d5 Issue #181
Changes from January ncep_cave

Former-commit-id: aa10b2f656 [formerly ae0981ac0f] [formerly 7427aeaf29] [formerly aa10b2f656 [formerly ae0981ac0f] [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 38f1182c6e [formerly 9475b22c54] [formerly f688e047f0ccf0adc31f824c5e1224b8d1c1598b [formerly 376f6868b6]]
Former-commit-id: 16e6613039d30140d16a08ef42c054c08fe5a737 [formerly 0d2ef82d19]
Former-commit-id: 80b5a2049b
2012-01-26 09:26:07 -06:00
Dave Hladky
92cce91d94 Issue #15 Wes2Bridge time settings
Former-commit-id: bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly b03b324ead [formerly 594412a5b5 [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]]]
Former-commit-id: b03b324ead
Former-commit-id: 36d48978af [formerly 4e8acfaba3] [formerly 2479f0c7510c79fa38a277d7f43ba5ff441b9d5a [formerly 2d53cfbe41]]
Former-commit-id: 89a6fd5528f6dc78ffeaa8483a1da240cdbab071 [formerly 8553b8a654]
Former-commit-id: 1061ccbc4c
2012-01-25 10:53:51 -06:00
mpduff
8f6196d8c4 Issue #16 - data/manual now uses subdirectories
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: ba3656aebd [formerly 6b70dd6462] [formerly 59c8cbf1f3] [formerly ba3656aebd [formerly 6b70dd6462] [formerly 59c8cbf1f3] [formerly 24efc2ee93 [formerly 59c8cbf1f3 [formerly 3619411519db0fe5df90e47ca478f083931817ec]]]]
Former-commit-id: 24efc2ee93
Former-commit-id: c0bb08e04d [formerly b1887fbdb8] [formerly 029cab0fd8e2390b796b6d2ef9a36da598fd8654 [formerly 5deccb8bf5]]
Former-commit-id: a98caac945ef546b7e6280b735a43406d0b2b8ec [formerly e66ce50272]
Former-commit-id: 38d3969023
2012-01-24 12:27:11 -06:00
Nate Jensen
a2bcb9d289 Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly 33756de9c8 [formerly fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]]
Former-commit-id: 33756de9c8
Former-commit-id: bf2e1850f3 [formerly 7301ad5c66] [formerly 2cdd1911db9699c1da43ed376abd9ca94f036c25 [formerly 3b7a082f41]]
Former-commit-id: 378c9f2dfbf1104a0ce3d7135ab45d92a28d77a0 [formerly ef5349fb63]
Former-commit-id: 532df5ba35
2012-01-24 09:59:50 -06:00
Bryan Kowal
5609d47b35 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 4c4fc64253 [formerly a1dbdff475] [formerly e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91]]
Former-commit-id: 9e6a3f061015a2573aab1ed70eb6bcd887a1fb1a [formerly 3bcecdfe66]
Former-commit-id: 7afea63245
2012-01-20 11:37:38 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00