Commit graph

15 commits

Author SHA1 Message Date
Ben Steffensmeier
d1cdfbec7d Issue #189 clean up unneeded references to grib.
Former-commit-id: 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 7e1463f328 [formerly 7226decbe2 [formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]]]
Former-commit-id: 7e1463f328
Former-commit-id: 3c47e2bc6f [formerly f0c1fcae31] [formerly 623f130b6c25d38fa4d4e0a2c769c9011f96f103 [formerly 9b1b658f42]]
Former-commit-id: 81c76cfda13aded66ad0c485bb85ba568420a3f6 [formerly 08df92cccd]
Former-commit-id: 63f751fa7b
2012-11-19 13:33:02 -06:00
Benjamin Phillippe
46cbdc741d Issue #1335 Fixed EHCache warnings. Changes to necessary config files
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 1fa596463d [formerly 44519995ee] [formerly 5bf46d468d] [formerly 1fa596463d [formerly 44519995ee] [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 5bf46d468d [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]]
Former-commit-id: 5c31b34e12
Former-commit-id: 41647b0274 [formerly 43b94988c8] [formerly d2f70d8685a2cd0f6ca4f66510f619573250a39a [formerly 6b1b73429b]]
Former-commit-id: e5d6b1e32304c3b9436510d0224ab4073c0f9011 [formerly 688e19acc1]
Former-commit-id: debdd584fd
2012-11-15 13:35:25 -06:00
Max Schenkelberg
ecde93e6fc 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: 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]]
Former-commit-id: 28e61c8285
Former-commit-id: 91607fb03e [formerly 5aa26e4f13] [formerly 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799]]
Former-commit-id: 2d176fd248163b3e85988708b437bfc1e899b487 [formerly 429ddc7312]
Former-commit-id: eec401909b
2012-11-14 16:19:37 -06:00
Dustin Johnson
f4fc1060be Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: f1cfa9a60d [formerly afd9a767ea] [formerly 7d9e7567bd] [formerly f1cfa9a60d [formerly afd9a767ea] [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 7d9e7567bd [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 21dc859b85 [formerly 5d410ff934] [formerly caae98dd9803817a99d22d4cbbe38eccdaeff2f9 [formerly c0c60c2488]]
Former-commit-id: 0453e709fd374f851f35d3dfd273d46e8e3bbc65 [formerly 3129d3bd3a]
Former-commit-id: 0c5a52f3b1
2012-11-14 12:19:10 -06:00
Max Schenkelberg
3a1cefc612 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: 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]
Former-commit-id: ca4177dd08
Former-commit-id: f9e6347863 [formerly 5a5bd522a1] [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]]
Former-commit-id: 0f95dc114844e36c224300902fd5c26ef83108c0 [formerly 50625b0453]
Former-commit-id: 2345861756
2012-11-07 10:44:42 -06:00
Dustin Johnson
4bc4d95b21 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: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
2012-11-01 13:36:06 -05:00
Max Schenkelberg
5ecd46d9f5 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: b5a198a27d [formerly ab120dfec6] [formerly fffe220e05] [formerly b5a198a27d [formerly ab120dfec6] [formerly fffe220e05] [formerly c4398c09a4 [formerly fffe220e05 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]]]]
Former-commit-id: c4398c09a4
Former-commit-id: 197e66e51f [formerly 7d5c82ebfd] [formerly e9cbdce4b29b44a0103e0ad9a4d1f9761738853d [formerly a513b5830a]]
Former-commit-id: c5480b714cb10bcfa877019fbc22b08e3f70d4da [formerly 6c5d3637e1]
Former-commit-id: 3a0d62686a
2012-09-11 14:04:14 -05:00
Max Schenkelberg
376809e2b4 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: f7abe9ee39 [formerly 6d78afd423] [formerly 80439b309b] [formerly f7abe9ee39 [formerly 6d78afd423] [formerly 80439b309b] [formerly 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]]
Former-commit-id: 84658dd03a
Former-commit-id: 827ef7301b [formerly d2d74fac20] [formerly f9f8eef104b9eb8e02ca5321a8ca3396d4878105 [formerly 20f5d966db]]
Former-commit-id: 9672b8f584873397fefa3457c0a7bc7d4ea457b1 [formerly 264bc403d6]
Former-commit-id: 29ab00a4cb
2012-09-10 10:45:37 -05:00
Steve Harris
c7356570ae Revert "12.6.1-10 baseline"
This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].


Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418]
Former-commit-id: e77a15c047
2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88 12.6.1-10 baseline
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]
Former-commit-id: 95e7f4fc0c
2012-06-21 08:38:48 -05:00
Steve Harris
883d66bc46 12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
2012-06-11 16:23:47 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Ben Steffensmeier
5c42485acd Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Former-commit-id: 0c8da60976 [formerly e2141b574e] [formerly 100b4c4ba0] [formerly 0c8da60976 [formerly e2141b574e] [formerly 100b4c4ba0] [formerly 2995d2b29b [formerly 100b4c4ba0 [formerly 32b8f723ebf64d97636705911c0b7b22a9cd2148]]]]
Former-commit-id: 2995d2b29b
Former-commit-id: 52353717ec [formerly 132f023a06] [formerly bb0cc9e70a0e959720588a30e73d2981fdded634 [formerly 7914496c96]]
Former-commit-id: 488657067522f2c7ac803b59a89335c66054d318 [formerly a8b2e65a7c]
Former-commit-id: 4d0ddd50dc
2012-02-14 12:59:42 -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