Nate Jensen
1926ac3647
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
...
Former-commit-id: accbd46ad6edf51dffc9accbd46ad6edf51dffc93d51d801703d51d801707da95f7b57f07f543cd3a5abd4dad0
2013-11-18 12:50:38 -06:00
Nate Jensen
553a32f5a3
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
...
Former-commit-id: 493cdb287c0dbe79344a493cdb287c0dbe79344a827b7f5a93827b7f5a933de7e3576b6900d4e47fb6fe32de06
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
9fa1dbbfa5
Issue #2543 fix gl buffer formating problems
...
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: 6b6c46afa8105e3e359a6b6c46afa8105e3e359ae7a068e595e7a068e59551c04680e2e605758e579bd35b793d
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
7de35d0111
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 15ae95075de392185d7815ae95075de392185d789ff1751f4e9ff1751f4e0788a82a991875f5669555f26e277f
2013-11-18 11:44:56 -06:00
Nate Jensen
7e76b097c7
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 93e93de7424f47800cae93e93de7424f47800cae0146ae59df0146ae59dfd9d0eb7354a238ba2ba3951c1ff2f3
2013-11-18 11:39:12 -06:00
Steve Harris
87ce579deb
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
...
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: 542a0946f20a36987a01542a0946f20a36987a016d9efac6ef6d9efac6ef3f9df61017869b505f80c26818afe6
2013-11-15 13:15:25 -06:00
Steve Harris
c4e9fe1c94
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: dc4f3b75941015e180f1dc4f3b75941015e180f12f0d53c9b22f0d53c9b2156395b85bd97edb20d17127a1e665
2013-11-15 13:05:40 -06:00
Steve Harris
ed58bc7f71
14.1.1-9 baseline
...
Former-commit-id: a32eadf384f8f995b697a32eadf384f8f995b6975a0a40e67c5a0a40e67ceab5bb11478c136f202dea382798b5
2013-11-15 12:47:49 -05:00
Brad Gonzales
2c7e62ee89
Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
...
Added missing comma to com.raytheon.edex.plugin.text.
Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162
Former-commit-id: 938683ba4daa8fb36fc1938683ba4daa8fb36fc153d4de12d953d4de12d94ec5ee7f74490c95d0104499a8d1de
2013-11-15 08:00:47 -06:00
Nate Jensen
2e81364691
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 757ca42a5fdd99aa3f47757ca42a5fdd99aa3f4778b01f61c478b01f61c4d0d712ec6fd96cdbe761f2c777ff48
2013-11-14 17:41:24 -06:00
Mike Duff
44c4259ccc
Issue #2548 - fix malformed comment
...
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 0d83797a4e414cb1cf680d83797a4e414cb1cf6895fda38cc595fda38cc5a13aa64b657be43c4a520f2626f79f
2013-11-14 17:30:55 -06:00
Richard Peter
8247da7774
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 157e73962314b1e924a1157e73962314b1e924a10bb5e2a61e0bb5e2a61e65e8ad1a621a7dd7723b38d2c6564a
2013-11-14 17:21:48 -06:00
Brian Clements
1a2b934e97
Issue #2361 fixed ncwf hibernate pickup
...
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names
Former-commit-id: 55682480e1cacdf313c555682480e1cacdf313c500490c2db200490c2db2878a677d18ab24330f23e7c355df52
2013-11-14 17:12:02 -06:00
Mike Duff
769e81cd23
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 8cc9c1de5947011a70db8cc9c1de5947011a70db47a047758747a047758744cc3d8776b929b7aa025fdf101af6
2013-11-14 17:07:54 -06:00
Nate Jensen
f6abd529f7
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: 3b11ea8c5bb4bcd14a853b11ea8c5bb4bcd14a85c2aacfc437c2aacfc437f0a0287230a8a1e396fe7ec18ba0b1
2013-11-14 16:34:28 -06:00
Richard Peter
2025e073ef
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 800effdc5a8fb79e7b73800effdc5a8fb79e7b73c42f931118c42f931118e5dc8e20272b95bcfb31e7d8e5e560
2013-11-14 14:56:59 -06:00
Lee Venable
194a6760b7
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: bd81ec8807834c2ac8dabd81ec8807834c2ac8daf0ebee3bb3f0ebee3bb3e9b8ee42c77d04b2e4cead77be1b44
2013-11-14 14:43:18 -06:00
Mike Duff
2b91b4b9ef
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: f6c4ca2bc087a4b1bec4f6c4ca2bc087a4b1bec4a80964bc7ca80964bc7c48093514a64557a06f42cf077ed7f9
2013-11-14 14:40:33 -06:00
Richard Peter
705339a320
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 2c753c427c79bdd34f4f2c753c427c79bdd34f4f0074b774f00074b774f0b4aac09ff496b4944b41e2a16fd876
2013-11-14 14:40:23 -06:00
Lee Venable
ab512eaeb1
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: 6086c06f66d431f3c0f46086c06f66d431f3c0f4bc7f5e556dbc7f5e556d69934b9b3217fef206fc84de0beae4
2013-11-14 14:33:18 -06:00
Richard Peter
7375a3b961
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 5c5e71a01b4d18c7d4935c5e71a01b4d18c7d4933f5c590c5f3f5c590c5f6af248f2123dc0ad184cace2a71092
2013-11-14 13:30:09 -06:00
Nate Jensen
6441290b40
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: a4eb19fc799acda0b9f2a4eb19fc799acda0b9f2c5cf68cc45c5cf68cc45e41f57da67a6be904c69e83a828209
2013-11-14 13:29:30 -06:00
Bryan Kowal
ae5e6b3927
Issue #2540 - pure python module merge implementation
...
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching
Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1
Former-commit-id: 48cc679bce2029c34f2448cc679bce2029c34f247e35ea310f7e35ea310f4759e48c5ca2261b9ff379045d620b
2013-11-14 11:57:11 -06:00
Steve Harris
8307fe3a9f
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 77ea1782c3473488f5b877ea1782c3473488f5b84d25eb11c84d25eb11c8a75acc5499ef852ac12539e8f5ecc1
2013-11-13 23:20:18 -06:00
Richard Peter
0581cc53e5
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: adc30e817e2f3eee1439adc30e817e2f3eee1439e88f5777a7e88f5777a7ed258e942164afe42e7458c8106da8
2013-11-13 16:43:26 -06:00
Greg Armendariz
8809254168
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
...
Former-commit-id: 06e3f849f083ac36721b06e3f849f083ac36721b3f6281fdbe3f6281fdbeb7c3a7e850ce0a05242f977e0fab0e
2013-11-13 15:30:55 -06:00
Brian Clements
09101ca5ac
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 3551b731e095f1621d3e3551b731e095f1621d3e8cbe2c06a88cbe2c06a8d2f0b7362649c8bd5ee9d94f44d406
2013-11-13 13:45:44 -06:00
Bryan Kowal
97c0dff26a
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 178d95e59d86dd200844178d95e59d86dd2008440544b66f4e0544b66f4ea2b1211c5201735ca0c41a905e8a3c
2013-11-13 13:16:55 -06:00
Steve Harris
661dbe2860
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: eb470599f30a37219d2aeb470599f30a37219d2a2e7a594d512e7a594d5180c709b3f4bc45f3668b1fdc64c7e7
2013-11-13 11:34:17 -06:00
Steve Harris
d2104614be
14.1.1-8 baseline
...
Former-commit-id: 90bc008a50aa6c977e7b90bc008a50aa6c977e7bc7d36eb6adc7d36eb6adb7ca6163e30123596fd942ece4fb6a
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
7ae33612c5
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: c294d5d77a5cd030f096c294d5d77a5cd030f0961c46226a111c46226a111a19965daffe7c6886c464a37e7672
2013-11-13 10:52:07 -06:00
Brian Clements
eb9764b77b
Issue #1314 fixed WFS output problem found when testing KeyLocker
...
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 0d80fa7dc1dfd88151e60d80fa7dc1dfd88151e637f4f41d2d37f4f41d2dc3a0ea3400ef2acc6562ac221125f4
2013-11-13 10:04:13 -06:00
Nate Jensen
1c92fc757b
Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
...
Former-commit-id: 51ba5f770c85923b0f7f51ba5f770c85923b0f7fc0ed705dafc0ed705daffad5c6d615a62e415724b7085b0ed4
2013-11-13 09:01:09 -06:00
Brian Clements
1d41861c3c
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: b0a5192dfa191ffc6e63b0a5192dfa191ffc6e63df1542a66cdf1542a66cbca51498110e5d3e9e69b511453153
2013-11-13 08:07:29 -06:00
Bryan Kowal
cfb3717a61
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
...
Former-commit-id: b2272ad695a51231058ab2272ad695a51231058ae3639da703e3639da703b2c63727ba48d5d8c3a1a575f41589
2013-11-12 19:57:25 -06:00
Bryan Kowal
d83504922b
Issue #2297 - update build scripts to complete the full delta build
...
Former-commit-id: 631c03601c7cac007ef1631c03601c7cac007ef1d76033ff3dd76033ff3de9ff5e018b084d7725888867114ff8
2013-11-12 17:43:10 -06:00
Nate Jensen
6b4284ec55
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
...
Former-commit-id: f2f778c042accfefae6df2f778c042accfefae6df0b386b632f0b386b632ec073efd4580227c4750633faf692b
2013-11-12 16:55:31 -06:00
Nate Jensen
abf56dec05
Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
...
Former-commit-id: 8df2c486488cf1b752e08df2c486488cf1b752e0b1d376e238b1d376e238b0cfb6e836645e816d5d983afa0eea
2013-11-12 16:48:32 -06:00
Dave Hladky
fa2238778d
Issue #2542 Jetty upgraded
...
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 5313c8b68d643a1507775313c8b68d643a150777e3a259182ce3a259182cf2f670bc0053866e481a86363574b3
2013-11-12 14:55:41 -06:00
Nate Jensen
73d6499cc0
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
...
Former-commit-id: edb2b6d2175e02427d6eedb2b6d2175e02427d6ec60228c854c60228c854c6e10ebdefa1315f1072a53cf1a079
2013-11-12 14:41:34 -06:00
Greg Armendariz
bbd6cd614b
Issue #2512 - Remove dead code
...
Former-commit-id: 59f8eb93414f4d59aa5259f8eb93414f4d59aa5270c9a3682670c9a36826f878a8e302fbcb810ab33852935abf
2013-11-12 14:20:21 -06:00
Richard Peter
7855a8f000
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: c25ba195149af1de07d4c25ba195149af1de07d4f12839a9e5f12839a9e5502d67591bc8ff79a7f50cf51fce74
2013-11-12 13:47:04 -06:00
Nate Jensen
ec0025a309
Issue #2361 better logging of viz spring initialization of bundles
...
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b
Former-commit-id: 6707d1aadf692ea76d756707d1aadf692ea76d75a4ece1d116a4ece1d1164b329513e52e86520b535c7be238a0
2013-11-12 13:02:49 -06:00
Nate Jensen
db3a33864f
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
...
Former-commit-id: db61d36b4e88af1ddfcbdb61d36b4e88af1ddfcb64aa00bad664aa00bad67a5f716d7039679b0608f618186c69
2013-11-12 12:46:38 -06:00
Brad Gonzales
a626b240ce
Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
...
Amend: Separate update from create notifications in LifecycleManagerImpl.
Refactored notification sending in EdexBandwidthManager.
Fixed error in LifecycleManagerImpl refactor.
Added comment to isRecurringSubscription.
Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77
Former-commit-id: 62e4cafa278f70fb1d0c62e4cafa278f70fb1d0caea0e847aaaea0e847aa7747d901f7866a11a9f0bad9b3242a
2013-11-12 12:42:16 -06:00
Brian Clements
b970c720de
Issue #2539 removed java 7 specific code from exception subclass
...
Former-commit-id: 9f7e85450d8b0e85f82c9f7e85450d8b0e85f82c4050eb5f3e4050eb5f3e4d3c2f488cba12c7467d94a9ea2ff0
2013-11-12 12:41:50 -06:00
Nate Jensen
6185a257df
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
...
Former-commit-id: b71f2463da3f86a3735eb71f2463da3f86a3735eeed4c8604beed4c8604bb0600c60ce18d790a4231f4af0c06a
2013-11-12 12:13:58 -06:00
Richard Peter
24eb06f591
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
...
Former-commit-id: 4d823820548afc87e5704d823820548afc87e57061fc3eba4461fc3eba44d66aaa7746b8b01f6305c60b0849b3
2013-11-12 11:18:56 -06:00
Richard Peter
ef23a8f65b
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 7ba466f5a6306bd6fae17ba466f5a6306bd6fae1460a7b8b5d460a7b8b5d3f68fc6eed59671c1e7dc8ef435295
2013-11-12 11:11:36 -06:00
Nate Jensen
b92c73f16f
Issue #2361 static lazy initialization of SubscriptionOverlapService's
...
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: 6c016a6bb61ee5d91af26c016a6bb61ee5d91af22cdc7e5e632cdc7e5e6398cbafe95c368d73449e66ff41e961
2013-11-12 11:03:51 -06:00
