Richard Peter
c82e143fe1
Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
...
Former-commit-id: b296fd1d024c9bcf718a
2013-11-19 13:18:05 -06:00
Nate Jensen
50590a241f
Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
...
Former-commit-id: 5885d8027b6927e960b2
2013-11-19 11:25:19 -06:00
Steve Harris
920e06b8ff
Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
...
Former-commit-id: 39ab54c912c37908caa8
2013-11-19 10:08:45 -06:00
Mike Duff
f8d5563973
Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
...
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2
Former-commit-id: 665d9e7651c908647259
2013-11-19 08:55:27 -06:00
Nate Jensen
accbd46ad6
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
...
Former-commit-id: 3d51d80170edf51dffc9
2013-11-18 12:50:38 -06:00
Nate Jensen
493cdb287c
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
...
Former-commit-id: 827b7f5a930dbe79344a
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
6b6c46afa8
Issue #2543 fix gl buffer formating problems
...
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: e7a068e595105e3e359a
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
15ae95075d
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 9ff1751f4ee392185d78
2013-11-18 11:44:56 -06:00
Nate Jensen
93e93de742
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 0146ae59df4f47800cae
2013-11-18 11:39:12 -06:00
Steve Harris
542a0946f2
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: 6d9efac6ef0a36987a01
2013-11-15 13:15:25 -06:00
Steve Harris
dc4f3b7594
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: 2f0d53c9b21015e180f1
2013-11-15 13:05:40 -06:00
Steve Harris
a32eadf384
14.1.1-9 baseline
...
Former-commit-id: 5a0a40e67cf8f995b697
2013-11-15 12:47:49 -05:00
Brad Gonzales
938683ba4d
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: 53d4de12d9aa8fb36fc1
2013-11-15 08:00:47 -06:00
Nate Jensen
757ca42a5f
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 78b01f61c4dd99aa3f47
2013-11-14 17:41:24 -06:00
Mike Duff
0d83797a4e
Issue #2548 - fix malformed comment
...
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 95fda38cc5414cb1cf68
2013-11-14 17:30:55 -06:00
Richard Peter
157e739623
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 0bb5e2a61e14b1e924a1
2013-11-14 17:21:48 -06:00
Brian Clements
55682480e1
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: 00490c2db2cacdf313c5
2013-11-14 17:12:02 -06:00
Mike Duff
8cc9c1de59
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 47a047758747011a70db
2013-11-14 17:07:54 -06:00
Nate Jensen
3b11ea8c5b
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: c2aacfc437b4bcd14a85
2013-11-14 16:34:28 -06:00
Bryan Kowal
782675951b
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: ce16efc9a1be78fab116
2013-11-14 15:17:28 -06:00
Richard Peter
800effdc5a
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: c42f9311188fb79e7b73
2013-11-14 14:56:59 -06:00
Lee Venable
bd81ec8807
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: f0ebee3bb3834c2ac8da
2013-11-14 14:43:18 -06:00
Mike Duff
f6c4ca2bc0
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: a80964bc7c87a4b1bec4
2013-11-14 14:40:33 -06:00
Richard Peter
2c753c427c
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: 0074b774f079bdd34f4f
2013-11-14 14:40:23 -06:00
Lee Venable
6086c06f66
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: bc7f5e556dd431f3c0f4
2013-11-14 14:33:18 -06:00
Richard Peter
5c5e71a01b
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 3f5c590c5f4d18c7d493
2013-11-14 13:30:09 -06:00
Nate Jensen
a4eb19fc79
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: c5cf68cc459acda0b9f2
2013-11-14 13:29:30 -06:00
Bryan Kowal
48cc679bce
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: 7e35ea310f2029c34f24
2013-11-14 11:57:11 -06:00
Steve Harris
77ea1782c3
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 4d25eb11c8473488f5b8
2013-11-13 23:20:18 -06:00
Richard Peter
adc30e817e
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: e88f5777a72f3eee1439
2013-11-13 16:43:26 -06:00
Greg Armendariz
06e3f849f0
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
...
Former-commit-id: 3f6281fdbe83ac36721b
2013-11-13 15:30:55 -06:00
Brian Clements
3551b731e0
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 8cbe2c06a895f1621d3e
2013-11-13 13:45:44 -06:00
Bryan Kowal
178d95e59d
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 0544b66f4e86dd200844
2013-11-13 13:16:55 -06:00
Steve Harris
eb470599f3
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 2e7a594d510a37219d2a
2013-11-13 11:34:17 -06:00
Steve Harris
90bc008a50
14.1.1-8 baseline
...
Former-commit-id: c7d36eb6adaa6c977e7b
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
c294d5d77a
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: 1c46226a115cd030f096
2013-11-13 10:52:07 -06:00
Brian Clements
0d80fa7dc1
Issue #1314 fixed WFS output problem found when testing KeyLocker
...
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 37f4f41d2ddfd88151e6
2013-11-13 10:04:13 -06:00
Nate Jensen
51ba5f770c
Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
...
Former-commit-id: c0ed705daf85923b0f7f
2013-11-13 09:01:09 -06:00
Brian Clements
b0a5192dfa
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: df1542a66c191ffc6e63
2013-11-13 08:07:29 -06:00
Bryan Kowal
b2272ad695
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
...
Former-commit-id: e3639da703a51231058a
2013-11-12 19:57:25 -06:00
Bryan Kowal
631c03601c
Issue #2297 - update build scripts to complete the full delta build
...
Former-commit-id: d76033ff3d7cac007ef1
2013-11-12 17:43:10 -06:00
Nate Jensen
f2f778c042
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
...
Former-commit-id: f0b386b632accfefae6d
2013-11-12 16:55:31 -06:00
Nate Jensen
8df2c48648
Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
...
Former-commit-id: b1d376e2388cf1b752e0
2013-11-12 16:48:32 -06:00
Dave Hladky
5313c8b68d
Issue #2542 Jetty upgraded
...
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: e3a259182c643a150777
2013-11-12 14:55:41 -06:00
Nate Jensen
edb2b6d217
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
...
Former-commit-id: c60228c8545e02427d6e
2013-11-12 14:41:34 -06:00
Greg Armendariz
59f8eb9341
Issue #2512 - Remove dead code
...
Former-commit-id: 70c9a368264f4d59aa52
2013-11-12 14:20:21 -06:00
Richard Peter
c25ba19514
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: f12839a9e59af1de07d4
2013-11-12 13:47:04 -06:00
Nate Jensen
6707d1aadf
Issue #2361 better logging of viz spring initialization of bundles
...
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b
Former-commit-id: a4ece1d116692ea76d75
2013-11-12 13:02:49 -06:00
Nate Jensen
db61d36b4e
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
...
Former-commit-id: 64aa00bad688af1ddfcb
2013-11-12 12:46:38 -06:00
Brad Gonzales
62e4cafa27
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: aea0e847aa8f70fb1d0c
2013-11-12 12:42:16 -06:00
