Richard Peter
786b68279d
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: 25d49055705287a3296b25d49055705287a3296bb75ceeeeb3b75ceeeeb36923e10550f99242f53933c602b13e
2013-03-26 20:55:42 -05:00
Steve Harris
0bd1d5bdef
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 4e54025fcd5fcfaf43604e54025fcd5fcfaf436065df96a41965df96a4195bb29627dc346b97a39afdd07bd72c
2013-03-26 12:47:40 -05:00
David Gillingham
3b29423947
Issue #1823 : Trigger SAT smart inits based only on sector id and physical element.
...
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: ad357638b31df8d39919ad357638b31df8d39919bebfc60317bebfc60317bf196a778207487a27dc45bf26aa00
2013-03-26 10:33:42 -05:00
Steve Harris
feba54ac83
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: b0621d90bcfd71e44f0fb0621d90bcfd71e44f0fa23cecdb26a23cecdb2602105701a0e96e95b565e6ab1deba2
2013-03-26 10:12:34 -05:00
Mike Duff
493014d466
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
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/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: c1f7d33bb85d72795e1bc1f7d33bb85d72795e1b9ebc7606b19ebc7606b1b366778df04c3011edceefec4d0365
2013-03-26 09:19:39 -05:00
Richard Peter
af956fe92d
Merge "Issue #1802 Refactored DD transaction management" into development
...
Former-commit-id: b3631390d2c3268aa02cb3631390d2c3268aa02c5c921400245c92140024072bc7affc351f08dba3bcb5b0b73e
2013-03-25 15:37:18 -05:00
Bryan Kowal
d5c958b2f8
Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
...
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment
Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc
Former-commit-id: 09263dbf8c9e647beded09263dbf8c9e647beded6758a9a50d6758a9a50d1eba8622d44c02dabb3de41f926ac2
2013-03-25 15:23:32 -05:00
Bryan Kowal
3728413ecf
Issue #1661 - yajsw will now log to both the console and log file indefinitely
...
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm
Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0
Former-commit-id: 541d096fafc55efaadb0541d096fafc55efaadb0a6cd17feeba6cd17feeb2093c6a495c4cec34e4799a3e25b3d
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
5e50d32bdb
Issue #1802 Refactored DD transaction management
...
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: 4675bed4c2b10b1150be4675bed4c2b10b1150beaf05feb5a7af05feb5a7541646148b4d1a8805abc250bda12b
2013-03-25 15:15:38 -05:00
Steve Harris
120fc26670
13.3.1-12 baseline
...
Former-commit-id: be962822070be473728abe962822070be473728aaaac0b51e5aaac0b51e5f80f98cee2bc439aee4ff1d156779a
2013-03-25 13:27:13 -05:00
Steve Harris
961c0b56a7
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 0055a3213de2496455b20055a3213de2496455b20379be06d20379be06d28db98c2d714fc2bb7bbaa91fcf98a2
2013-03-20 16:09:26 -05:00
Steve Harris
c129fed15e
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: a9ced3a7effa15f03e1ba9ced3a7effa15f03e1bdc419068f0dc419068f0f4e26fd94d31044eabd18065161896
2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26
13.3.1-10 baseline
...
Former-commit-id: 57f4676b6c073687d9a957f4676b6c073687d9a97078eec1b17078eec1b1e9f03288087c2e617d26f2cc967a4f
2013-03-20 15:53:01 -05:00
Steve Harris
352c267fc9
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 310474ae9b36df63be5c310474ae9b36df63be5ccb5ea76f98cb5ea76f98d00dc0d174104e6e79e86d4512fa3a
2013-03-20 13:45:11 -05:00
Dave Hladky
1aef08f449
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: dc7b231bf090f7f2110bdc7b231bf090f7f2110b3cdbfa3f253cdbfa3f2501c6ff12a0bd17b99bd18299b2872a
2013-03-20 12:41:33 -05:00
Steve Harris
37beeaab69
13.3.1-9 baseline
...
Former-commit-id: c7b2ef2d8c468ae82305c7b2ef2d8c468ae82305f2b3fddfe2f2b3fddfe27e96d841d90375805e7965f522fc87
2013-03-19 14:22:56 -05:00
Dustin Johnson
17fe9aee59
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: bc323d3f255b4035fb11bc323d3f255b4035fb118363eba4098363eba4093c8e14edc7e0b6e6187e889953c712
2013-03-19 13:09:48 -05:00
Dave Hladky
af0898807b
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: d7e8709cdeddb23ae59fd7e8709cdeddb23ae59f81ad1ce2ed81ad1ce2ed618f737fabf0244f54a464f8c46e64
2013-03-19 13:08:14 -05:00
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
Bryan Kowal
851eb395f7
Issue #1772 - remove references to the DEV_MODE jvm parameter
...
- removed ScriptLibraryManager.java
Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e
Former-commit-id: 19b26c9f04dd811f674b19b26c9f04dd811f674b58316907ae58316907ae8c91869c8e86c287bb3339ff5c7945
2013-03-14 09:54:11 -05:00
David Gillingham
34a1c7b784
Issue #1759 : Convert ifpnetCDF and iscMosaic to use more robust request
...
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.
Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152
Former-commit-id: 87013aad897c7451072387013aad897c74510723566927980a566927980ad8dd50f2ba90b8c80837b121f99015
2013-03-13 17:14:59 -05:00
Dave Hladky
b85e19282b
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb38b952a220765be278bb38b952a2205dc454c7ef5dc454c7ef9e97fc9efe160e1594b8cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Steve Harris
88b28c39c1
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4a72254cc7597d2f521e4a72254cc75e12ed113aee12ed113aeed5f1dbab631c0a97dca3084a860cd
2013-03-13 09:50:28 -05:00
Steve Harris
346b22b196
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 36261cb095753a5213ab36261cb095753a5213ab0cd7e56e650cd7e56e65bca46a1354d5bcdb00155232592cfa
2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: 5c65862b8fa1006667e05c65862b8fa1006667e04b084918804b08491880155903d1356ea95002de29ed641a13
2013-03-12 15:48:34 -05:00
Steve Harris
c28f3aeb02
13.3.1-6 baseline
...
Former-commit-id: 2e110bd1513a4c7931e12e110bd1513a4c7931e1566b677d09566b677d096fe4b169244ed21b702bc6f379f59a
2013-03-12 08:35:45 -05:00
Nate Jensen
d0bed867b0
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 5d9778a8d65e3d6df7e05d9778a8d65e3d6df7e05c59a61cef5c59a61cef21863c5db5d7902aba68a2f804350a
2013-03-07 16:49:40 -06:00
Steve Harris
2b489e4e40
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 6b13492420d5b80f92256b13492420d5b80f9225aa0e9acefdaa0e9acefd4a0b8772ecb9563da8a846d0c9fcee
2013-03-05 12:29:44 -06:00
Steve Harris
d842ed88a7
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b305dd7296961a19a460b305dd7296957f42761d757f42761d7b423579e4aa8e1557c62b630339eb7
2013-03-05 12:27:49 -06:00
Steve Harris
153aadc1d7
13.3.1-4 baseline
...
Former-commit-id: d79303de138c0b90f292d79303de138c0b90f2922edca909022edca909023e0614b43a5e55ded3a90df35cc5ec
2013-03-05 10:39:59 -06:00
David Gillingham
861a3d0c44
Issue #1447 : Initial commit of VTEC table sharing functionality: port A1 changes to
...
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: ca81ae4a7150744c1f92ca81ae4a7150744c1f929351f33c1c9351f33c1c622700dee977a3f33fd54f6b2ffcff
2013-03-01 11:05:02 -06:00
Bryan Kowal
8210c0d984
Issue #1662 - wrapper parameters can now be used to specify the order
...
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters
Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c
Former-commit-id: 5b3478d6c78bf5e3ffad5b3478d6c78bf5e3ffad44349717fb44349717fb65fb00c3c34f7fed259cdc46b8eeb1
2013-02-27 12:46:48 -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
59c7ee5120
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: d43afc8c67bfe3c684dfd43afc8c67bfe3c684dff37999b1ebf37999b1eb541557e0b077fbbb6a6192abcad349
2013-02-26 18:44:51 -06:00
Dustin Johnson
fa87f70100
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: ebf02481f0d58d28c636ebf02481f0d58d28c636722e41b8b0722e41b8b0219e882fc5cf86c92fadb62631b9d1
2013-02-26 11:32:03 -06:00
Steve Harris
108abd5e69
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: cd99e680bbb50e384a0fcd99e680bbb50e384a0fe8135b9c14e8135b9c14901cbbf56d2398ef1e851d8b6e0256
2013-02-25 16:05:22 -06:00
Steve Harris
9db68d0585
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 0a4564eb9767f090638f0a4564eb9767f090638f6ec9e730356ec9e73035e46625f8f20051276ad1140ae3191c
2013-02-25 15:58:48 -06:00
Bryan Kowal
e38658e939
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: 4d160993fbb05073fbe34d160993fbb05073fbe30d2262c0bf0d2262c0bff8c920c6cd36a887416febe04d4919
2013-02-25 11:30:13 -06:00
Steve Harris
a43233f8c2
13.3.1-2 baseline
...
Former-commit-id: 3e60b23072df6d6f598e3e60b23072df6d6f598e3d115ed3be3d115ed3be370ed98038e8a51dc7802a2a9e03b7
2013-02-25 10:18:36 -05:00
Bryan Kowal
dd7eda15aa
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 4cd5453e0a7c62991edf4cd5453e0a7c62991edfd5c8b82941d5c8b8294153b9e698685a5914c010fd17273cb2
2013-02-22 09:28:37 -06:00
Steve Harris
b5d9e75b95
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 64744fdb19a0573644c464744fdb19a0573644c42641d578e22641d578e24f155a183a33dd2589f1f3c3191a1c
2013-02-21 15:41:39 -06:00
Bryan Kowal
b88a24574b
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 519ce2c0fba8fb04f41c519ce2c0fba8fb04f41c803397c7c7803397c7c7b2a0a7c148450e8e7a4c2a21f2624b
2013-02-21 13:55:28 -06:00
Steve Harris
07e4e4c8fb
13.3.1-1 baseline
...
Former-commit-id: 96768407a50563d7ac1896768407a50563d7ac18cabc8cf8b4cabc8cf8b40569ff413d92e4c7ba19654f15be5c
2013-02-21 09:36:59 -05:00
Steve Harris
8c828dbd75
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e71e89900218ae397085e71e8990021d2a654625fd2a654625fe4435815c946d28be4a4b3b56830b0
2013-02-20 16:19:40 -06:00
Dustin Johnson
2565df8435
Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO
...
- Change new registry modes to explicitly list includes/excludes.
- Add separate bandwidth manager creation capabilities for NCF and WFO.
- Add deltaScript to add a "route" slot to subscriptions.
- Remove unnecessary schemas from Spring files.
Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa
Former-commit-id: d4afef2cabd8659e742ed4afef2cabd8659e742ec8760e5699c8760e56995a8b6459d4ca721863be5ffa5f410e
2013-02-20 10:42:51 -06:00
Dustin Johnson
0f1fcc9b5b
Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
...
Amend:
Use ref syntax with uri.
Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062
Former-commit-id: 2a588688b1cc598094fa2a588688b1cc598094fa116809346b116809346b5ff63873683585482cad992a02d000
2013-02-18 15:47:17 -06:00
Ben Steffensmeier
e6fc131343
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: e7710762751393f3e3cfe7710762751393f3e3cf0933a5f5960933a5f59691bbdc3337f0f3c71d50f868f66f76
2013-02-15 11:39:56 -06:00
