Commit graph

4331 commits

Author SHA1 Message Date
Brad Gonzales
95a1914c71 Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode.  Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events.  Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files.  Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring.  Removed the SBN route from wfo mode.

Amend: Comment updates from peer review.

Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8

Former-commit-id: c245f741b9e78d8e4503698336d9929536e72e0d
2013-11-20 11:58:33 -06:00
Bryan Kowal
0bdb25bf43 Issue #2552 - replace Logger with UFStatus
Former-commit-id: 10971eca8d10817c97073c6142ea7cf08b28fa27
2013-11-19 17:11:36 -06:00
Lee Venable
d42c36f365 Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
Former-commit-id: 6d5026a25af31f0ae8c29d1036d9358366550f75
2013-11-19 15:12:38 -06:00
Nate Jensen
a610825ef9 Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
Former-commit-id: 4ae0820b630f25bda177572ffe77fbea52b4fd82
2013-11-19 14:11:01 -06:00
Richard Peter
b296fd1d02 Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
Former-commit-id: d3559746302f09db933f9b8deecfe410e63d8430
2013-11-19 13:18:05 -06:00
Nate Jensen
5aee685557 Issue #2361 don't initialize derived parameters on shutdown
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

Former-commit-id: 13cc948c57d52261c700157f8e86b6e6c75b4fe1
2013-11-19 12:59:10 -06:00
Mike Duff
71093a685e Issue #1531 - Made bandwidth utilization graph resizable.
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475

Former-commit-id: d6de10ca2c0609899bdb1f4c5f3de22a62d58998
2013-11-19 12:51:06 -06:00
Nate Jensen
5885d8027b Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
Former-commit-id: 59c62c673625d7e87b3b86575b8ebfb9e328ff28
2013-11-19 11:25:19 -06:00
Steve Harris
39ab54c912 Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
Former-commit-id: f0792ba7de783225b4c13970dff87bb7b17f4f94
2013-11-19 10:08:45 -06:00
Mike Duff
665d9e7651 Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: cacc7a8560c589b24ea98191f152c31479c5631e
2013-11-19 08:55:27 -06:00
Nate Jensen
3d51d80170 Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: b6420738e49d37840789c88089ecc8bab1103284
2013-11-18 12:50:38 -06:00
Nate Jensen
827b7f5a93 Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: 3a4eb4f997dd19469e88cff0f873bf7647793b2d
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
e7a068e595 Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: fe32d4ed93b583f0363b39edeb5b715bbe465dd8
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
9ff1751f4e Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: 166957a22c3447fa2407b13362eece24943675c9
2013-11-18 11:44:56 -06:00
Nate Jensen
0146ae59df Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac
2013-11-18 11:39:12 -06:00
Steve Harris
6d9efac6ef 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: 42b0235982d6d03e6e14057a1072842fcadc4b85
2013-11-15 13:15:25 -06:00
Steve Harris
2f0d53c9b2 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: 5388a8206a9f447f2ff9030a9e6cfad76efc4cee
2013-11-15 13:05:40 -06:00
Steve Harris
5a0a40e67c 14.1.1-9 baseline
Former-commit-id: 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5
2013-11-15 12:47:49 -05:00
Brad Gonzales
53d4de12d9 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: f570f6fcd64a96b7c61eecdfae6a765ec643e718
2013-11-15 08:00:47 -06:00
Nate Jensen
78b01f61c4 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 264b7c80cbd0559c175aef0a99d8f8407b6af7d0
2013-11-14 17:41:24 -06:00
Mike Duff
95fda38cc5 Issue #2548 - fix malformed comment
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 52462f299735aacee3db09faa6db9f28ba91f552
2013-11-14 17:30:55 -06:00
Richard Peter
0bb5e2a61e Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: dba301df2f593baa951c14b684e7ce4794e32019
2013-11-14 17:21:48 -06:00
Brian Clements
00490c2db2 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: 4924917e28275d9bb8bb21feceb6016ce2c91c40
2013-11-14 17:12:02 -06:00
Mike Duff
47a0477587 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2
2013-11-14 17:07:54 -06:00
Nate Jensen
c2aacfc437 Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356
2013-11-14 16:34:28 -06:00
Bryan Kowal
ce16efc9a1 Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration

Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0

Former-commit-id: 283853ead3588ef8ea296507b11a9ee9a23e9236
2013-11-14 15:17:28 -06:00
Richard Peter
c42f931118 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 13d284277bed2f0f731547ec443a262556df997c
2013-11-14 14:56:59 -06:00
Lee Venable
f0ebee3bb3 Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: 83b799d6d2475898a547fa7763c5613bd1c163d9
2013-11-14 14:43:18 -06:00
Mike Duff
a80964bc7c Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a
2013-11-14 14:40:33 -06:00
Richard Peter
0074b774f0 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: f7f30006cdaf3c8e99d166463c226b504f458b83
2013-11-14 14:40:23 -06:00
Lee Venable
bc7f5e556d Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: dbb67d3e8dd56c057626f499b2e3aa6b06eac41f
2013-11-14 14:33:18 -06:00
Richard Peter
3f5c590c5f Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 3e92bb969aef3508f08eb55a2ef1903030abc525
2013-11-14 13:30:09 -06:00
Nate Jensen
c5cf68cc45 Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d
2013-11-14 13:29:30 -06:00
Bryan Kowal
7e35ea310f 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: c0595b49cab0d0ef636427ed3b31ea805f8adb43
2013-11-14 11:57:11 -06:00
Steve Harris
4d25eb11c8 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 2117af3beb252132a10f44aab162a1ca17ef3abd
2013-11-13 23:20:18 -06:00
Richard Peter
e88f5777a7 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f
2013-11-13 16:43:26 -06:00
Greg Armendariz
3f6281fdbe Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: bb6b56a08a09a01a7e6c5a256c16ac246214818a
2013-11-13 15:30:55 -06:00
Brian Clements
8cbe2c06a8 Issue #2505 removed recco from deployment
added update script to drop recco from db


Former-commit-id: f4e66b8afce682014a0fa1ef9585b7ee6480e1e1
2013-11-13 13:45:44 -06:00
Bryan Kowal
0544b66f4e Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638
2013-11-13 13:16:55 -06:00
Steve Harris
2e7a594d51 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: ebde6dc849a1ca9753f959423109186c836b4525
2013-11-13 11:34:17 -06:00
Steve Harris
c7d36eb6ad 14.1.1-8 baseline
Former-commit-id: 41e87fe87d5074f138649c5ca8053e658488fbd0
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
1c46226a11 Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: ce2db6d930faf1166bec9956fb21ea51e2329d40
2013-11-13 10:52:07 -06:00
Brian Clements
37f4f41d2d Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements


Former-commit-id: d8e8b2323da3444cbff8b625f6b5098850888ee2
2013-11-13 10:04:13 -06:00
Nate Jensen
c0ed705daf Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 8769c4a0596ea2adcab58eb672985b8a1c50dd93
2013-11-13 09:01:09 -06:00
Brian Clements
df1542a66c Issue #2546 added fix for TAFs that contain legacy valid times
added unit test


Former-commit-id: 6d33448f0f6962a3da2a5c51f27253173f40cb93
2013-11-13 08:07:29 -06:00
Bryan Kowal
e3639da703 Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f
2013-11-12 19:57:25 -06:00
Bryan Kowal
d76033ff3d Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: b605c29ae839ca7950bc04426f09eb310587a18f
2013-11-12 17:43:10 -06:00
Nate Jensen
f0b386b632 Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: 833e94630c023f49704c8f4a36054b79e85ce4fe
2013-11-12 16:55:31 -06:00
Nate Jensen
b1d376e238 Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: e8be5c7f9887dde13b97053363e4a9d41f596a24
2013-11-12 16:48:32 -06:00
Dave Hladky
e3a259182c Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 8de606bc467ba4d567bc2825f2aa10211774ff7d
2013-11-12 14:55:41 -06:00