Steve Harris
481cee4c74
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: 28ef804e1bb8f0635ad628ef804e1bb8f0635ad67fcf9f1cb27fcf9f1cb22a26783ba7900b9aadde22bb7ecd33
2013-03-18 16:52:00 -05:00
Steve Harris
9d4d1baefe
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: 27c418812f1a999fee5a27c418812f1a999fee5ac18b96dc4cc18b96dc4cea27f9cd17245afb28c8fc6748cb3e
2013-03-18 16:43:22 -05:00
Steve Harris
1c2dffd66d
13.3.1-8 baseline
...
Former-commit-id: bc9df0a8f9f97d78994bbc9df0a8f9f97d78994bc15b3ffe20c15b3ffe2081a3f29afc5f492500ea0c94cc97fb
2013-03-18 15:43:32 -05:00
Dustin Johnson
83034c3f43
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: fff7e7983fecb0d2c826fff7e7983fecb0d2c82643a9f608ef43a9f608ef7adf94e9f61b82ad0dc4a08059dd34
2013-03-15 11:51:58 -05:00
Ben Steffensmeier
866c873f71
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: d27d30c2dbf46686a6e2d27d30c2dbf46686a6e22ca86633d62ca86633d6334af0001b5068b18c6a0778375180
2013-02-28 17:00:56 -06:00
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: c8a5f1a0070f1112fb3ec8a5f1a0070f1112fb3e38bba3705f38bba3705f41706c42f26ebc058df422a18ffe01
2013-02-27 12:26:32 -06:00
Max Schenkelberg
1073393fbb
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: 2611980ca44ed4ef8d712611980ca44ed4ef8d71e0ba97d547e0ba97d5475617dfaa676b1426dd34453ac44050
2013-02-27 11:50:38 -06:00
Ron Anderson
80df624bb3
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87a2a89fb4e7dc7c9edb87a2a89fb4e77c0a5d74bf7c0a5d74bfd69d628450e952a4f17945627edcc7
2013-02-15 09:03:41 -06:00
Steve Harris
2779f5c6d9
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd81683e9157df733bc5fd81683e9157df7328c6dccad328c6dccadd9be4dce2147cc08ac79547c1dedd1
2013-01-23 11:18:44 -05: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: fba28ea69be2a12845d3fba28ea69be2a12845d34db9c6c3214db9c6c32138480e46b1c1330e8121290167ac16
2013-01-15 14:56:01 -06:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515c0c1d56f3a51208e5515c0c1d56f3a4ba416aeb34ba416aeb3cd4185ef5c941337c553b6fa9b4858
2013-01-06 14:32:24 -06:00
Dave Hladky
9a6d4d4f01
Issue #1372 Make Ingest DAT log stats.
...
Change-Id: Icf9914a53ea384fe51c28c995b8834dfa9071612
Former-commit-id: b24402b21d0b250b2483b24402b21d0b250b2483502d3d7b47502d3d7b47d7c963dd601658a589e9df88de9f75
2012-11-30 16:03:10 -06:00
Ben Steffensmeier
63f751fa7b
Issue #189 clean up unneeded references to grib.
...
Former-commit-id: 9dd5c8d5457226decbe29dd5c8d5457226decbe27e1463f3287e1463f328f0c1fcae319b1b658f4208df92cccd
2012-11-19 13:33:02 -06:00
Benjamin Phillippe
debdd584fd
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 44519995ee5bf46d468d44519995ee5bf46d468d5c31b34e125c31b34e1243b94988c86b1b73429b688e19acc1
2012-11-15 13:35:25 -06:00
Max Schenkelberg
eec401909b
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: fe11e31bfbdcde9e8951fe11e31bfbdcde9e895128e61c828528e61c82855aa26e4f132e20c3e799429ddc7312
2012-11-14 16:19:37 -06:00
Dustin Johnson
0c5a52f3b1
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: afd9a767ea7d9e7567bdafd9a767ea7d9e7567bd7c59f9ea417c59f9ea415d410ff934c0c60c24883129d3bd3a
2012-11-14 12:19:10 -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: f069f34a962f90120248f069f34a962f90120248ca4177dd08ca4177dd085a5bd522a1747ab974e950625b0453
2012-11-07 10:44:42 -06: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: 8e69107b5a98d7beae508e69107b5a98d7beae5031d7d09c1031d7d09c10e7a0f96a9abcf575966b4d9c945388
2012-11-01 13:36:06 -05:00
Steven Harris
2f855322f6
12.11.1-1 baseline
...
Former-commit-id: 0e86bfd1d3618aa3f3160e86bfd1d3618aa3f316feec28f274feec28f274f5e63d5f938843ffd022a544be6d83
2012-09-27 15:57:45 -05:00
Max Schenkelberg
3a0d62686a
Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions.
...
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546
Former-commit-id: ab120dfec6fffe220e05ab120dfec6fffe220e05c4398c09a4c4398c09a47d5c82ebfda513b5830a6c5d3637e1
2012-09-11 14:04:14 -05:00
Max Schenkelberg
29ab00a4cb
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: 6d78afd42380439b309b6d78afd42380439b309b84658dd03a84658dd03ad2d74fac2020f5d966db264bc403d6
2012-09-10 10:45:37 -05:00
Steve Harris
37f2b6e138
12.6.1-9 baseline
...
Former-commit-id: 7c064b68682c0ff851ca7c064b68682c0ff851ca27afa6034527afa60345dc50bc84434f7bb90bb0d5fa61041b
2012-07-10 07:53:49 -05:00
Steve Harris
e77a15c047
Revert "12.6.1-10 baseline"
...
This reverts commit 95e7f4fc0caecc6a8474f8497470fcb33c5bdfcfa2c0893d1a06f1c7b73cddde63eee006f1c7b73cddde63eee0a2c0893d1a62cf6a9f92b4b1f6975f62cf6a9f92b4b1f6975f25198a5cd625198a5cd6333fd9c64e8367fb50f575f77df418
2012-06-21 08:51:08 -05:00
Steve Harris
95e7f4fc0c
12.6.1-10 baseline
...
Former-commit-id: 06f1c7b73cddde63eee006f1c7b73cddde63eee0a2c0893d1aa2c0893d1af8497470fcb33c5bdfcfaecc6a8474
2012-06-21 08:38:48 -05:00
Steve Harris
3b468d9f50
12.6.1-5 baseline
...
Former-commit-id: 09f73b0601c99afab05f09f73b0601c99afab05f8947efbc7f8947efbc7fb69fa75919a945ed8e6d91e65230ad
2012-06-11 16:23:47 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd67a5a68300750b7543dd67a5a683002a216f333c2a216f333ca2a6a18faea4e519f3cd8cd5974f4c
2012-04-18 15:18:16 -05:00
Ben Steffensmeier
4d0ddd50dc
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: e2141b574e100b4c4ba0e2141b574e100b4c4ba02995d2b29b2995d2b29b132f023a067914496c96a8b2e65a7c
2012-02-14 12:59:42 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d766be3bec40580e2938d766be3bec40c83e5ff474c83e5ff47482300ccdcf1faae4248421d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c9f19e3f712a02aeb236c9f19e3f71206a8b51d6d06a8b51d6d8e80217e593360eb6c5f377dcd10b9
2012-01-06 08:55:05 -06:00
