Commit graph

4407 commits

Author SHA1 Message Date
Brian Clements
8ece30944a Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: 6fc85f79c126283eb4dbddfa94943523d9ff0a6d
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
59c6a24b68 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 6f3e621fb69e31cc11b6111fdddc702dee29d33f
2013-12-06 09:14:01 -06:00
Bryan Kowal
187759698b Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: 90958e13e98147130848aad26d077e7a040ddb51
2013-12-05 15:53:51 -06:00
Brad Gonzales
410a00c72a Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
       the edex.core.modes package.  Move EdexMode, DefaultEdexMode, and EdexModesContainer
       to the same package.

Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb

Former-commit-id: 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4
2013-12-05 15:17:14 -06:00
Richard Peter
d0b50eee3c Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: a31695805478d27e072d069d5d3b369001c1d80d
2013-12-05 14:54:46 -06:00
Richard Peter
5286ef0efa Issue #2509: Fix bad merge of DupElimSrv
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322

Former-commit-id: a266d4007bdb58525942ef406d6fd7a4d269bb8c
2013-12-05 14:22:25 -06:00
Mike Duff
4796f43495 Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: 9102f16c8a6409e92ded498b82a6a4e6a531f2c0
2013-12-05 13:35:31 -06:00
Richard Peter
bacfa33301 Merge "Issue #1829 Refactored EBXML registry objects" into development
Former-commit-id: 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9
2013-12-05 13:01:02 -06:00
Nate Jensen
34205de815 Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
Former-commit-id: 18437fb36f9fff510f526ba40b52c4ec4793e18b
2013-12-05 13:00:06 -06:00
Nate Jensen
c47f6546dd Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: 648e5bff2e85d00cf5bcee923f2a137aa76117fc
2013-12-05 12:59:58 -06:00
Richard Peter
73960ce29a Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75

Former-commit-id: 9450ca459d6b2efdea0d0124a6f9e7100eb5472a
2013-12-05 12:33:51 -06:00
Richard Peter
0c4ae068ad Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: b09f1559254f06a82afa91f0cc14c8150f88ce64
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
a567f2af89 Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
Former-commit-id: fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4
2013-12-05 11:27:29 -06:00
Ben Steffensmeier
f682e66e9b Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 91a3fdbc8bd98603a1cda218729d5542dac809ef
2013-12-05 10:54:28 -06:00
Benjamin Phillippe
0b0e70b667 Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: 6eb387e69c2fc4837b58f99e4343a745162fb384
2013-12-05 10:20:24 -06:00
Lee Venable
4f1b663b37 Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07
2013-12-05 08:30:28 -06:00
Lee Venable
266d4884da Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: a1624e9bcf8677d6edd76a68122aa07690383b34
2013-12-05 08:25:46 -06:00
Ron Anderson
b5906249cc Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c
2013-12-04 17:10:48 -06:00
Steve Harris
cc79281795 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)

Former-commit-id: bf9379caa6a1f156997e21a271f27b86d7689ef0
2013-12-04 16:48:47 -06:00
Steve Harris
b24d9c80b0 14.1.1-12 baseline
Former-commit-id: 3b3b8ffbdadc65f41b67f2d649ec18e19521c989
2013-12-04 16:47:59 -05:00
Ron Anderson
7459d65134 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef
2013-12-04 15:29:28 -06:00
Richard Peter
ea7dac5993 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: 2cef3f9742ac0dcff0e9d90507abc30714e8548f
2013-12-04 12:00:40 -06:00
Dave Hladky
483ec5d22f Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 695365c03ac142960a22e6774f3a10fd5e16cd35
2013-12-04 11:58:49 -06:00
Nate Jensen
020c4de47d Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 860ac1873dffff0ea221bde1f898aa93ad25859f
2013-12-04 11:54:11 -06:00
Dave Hladky
25ce37d2d8 Issue #2607 Fixed Nullpointer
Former-commit-id: 6968c9f0a13880fe60e90a84b67a597753cbb175
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
3c8962fb96 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd
2013-12-04 11:22:47 -06:00
Nate Jensen
ca02d9c7e0 Merge "Issue #2170: Fix DataUriRouter Java 1.6 compliance" into development
Former-commit-id: c269247a19c35b4e7f641d30ceb601f07cd9eb65
2013-12-04 10:00:06 -06:00
Nate Jensen
419c690953 Merge "Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. Amend: Remove IDecoderGettable." into development
Former-commit-id: e85be3dba88f7f02564e583b360a5f40a90f95b6
2013-12-04 09:54:13 -06:00
Richard Peter
b02490146a Issue #2170: Fix DataUriRouter Java 1.6 compliance
Change-Id: Iae25b28498f8fec8c76b764c3214f494acdde992

Former-commit-id: 6f38a006d33217389975a3cfeeda9c1bed928c13
2013-12-04 09:53:00 -06:00
Nate Jensen
cc53373478 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: 947196e8ac4bb82536102bb56413d94589569599
2013-12-03 17:44:55 -06:00
Richard Peter
98117b4093 Issue #2551: Update NCEP objects to extend PersistablePluginDataObject.
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 0778a7f0123dd150894458fef6958fcdd9da39b6
2013-12-03 17:24:01 -06:00
Richard Peter
f5f75ec629 Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 039d9ecb587338801cdab9cad11b06890517d6a4
2013-12-03 16:25:31 -06:00
Jonathan Sanchez
88f7b75df4 Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6
2013-12-03 13:00:47 -06:00
Richard Peter
ce4a95a082 Merge "Issue #2537 Serialize empty enum sets. Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2" into development
Former-commit-id: ba1eadae31abadb655d3752a06c726aaf8f9adc5
2013-12-03 12:53:26 -06:00
Ben Steffensmeier
f460896552 Issue #2537 Serialize empty enum sets.
Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2

Former-commit-id: 0dabccd03145857b75fe90260b4d52e1541c5591
2013-12-03 12:17:01 -06:00
Richard Peter
97fe8bd24b Issue #2051: Fix Shef PurgeText
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac

Former-commit-id: f6d47991f62e99fa72ffafc2b6175eff8a0a83ac
2013-12-03 11:41:22 -06:00
Richard Peter
2085a9cd33 Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: 081a19d5cfca3d717a332357dbaead199767e0b8
2013-12-03 11:41:21 -06:00
Nate Jensen
ece38c85c0 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: 2be1427cdcd61d47a5463f6e4e85910200fda931
2013-12-03 09:41:02 -06:00
Lee Venable
deb003184f Merge "Issue #2387. Added system status refresh." into development
Former-commit-id: 3bb2756cd854c029d0656803efdcc686ccbae01f
2013-12-03 09:05:04 -06:00
Nate Jensen
622cc1b223 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: 36621eb21598f3730d0aa88973932e877367fecf
2013-12-02 17:28:09 -06:00
Richard Peter
10f32b5fc7 Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development
Former-commit-id: 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b
2013-12-02 16:52:40 -06:00
Steve Harris
65d5f13864 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 361e9942cf804578fb3e873229c1cd6fd6689fdf
2013-12-02 16:17:38 -06:00
Nate Jensen
6bf1fd8d3c Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 148e7113abefd684dcacb5ccc28bb77192ff45c8
2013-12-02 16:10:26 -06:00
Steve Harris
70a6f1936e 14.1.1-11 baseline
Former-commit-id: c32b2b2037c84cc074e7dc5a5a13b93223640d7d
2013-12-02 17:10:10 -05:00
Steve Harris
a58f1f8d76 Issue #2422 - Fix edexBridge like in RHEL6
Former-commit-id: de5cf0cd69ddcd92bcb1e1ff9ea2c2b0253b36bd
2013-12-02 15:16:42 -06:00
Slav Korolev
1be43bc76c Issue #2387. Added system status refresh.
Former-commit-id: f3530467b1845a488fa0996ee7100a2dc145394a
2013-12-02 16:14:45 -05:00
Steve Harris
193f06f545 Issue #2297 - fixing build scripts
Former-commit-id: 3725a48cbdec19842d7c4e3facf737fc507e69dc
2013-12-02 14:57:20 -06:00
Brad Gonzales
dc7e255d43 Issue #2541 Added exclude patterns to RequestPatterns.
Added an exclude pattern to grib.xml to exclude data delivery sbn files.

Change-Id: Id92865e1b58bdcf3744328bd0362636093a03521

Former-commit-id: 396a9a99863ce9a616eecde6466f1c4d43b8d566
2013-12-02 11:44:09 -06:00
Benjamin Phillippe
212bbeb379 Issue #2534 Added reciprocated registry replication subscriptions
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: 2c52a6ee6f7d491d484c423359b8440975ad6d1e
2013-11-27 12:07:59 -06:00
Nate Jensen
9a4a4fba2d Merge "Issue #2537 point data code cleanup." into development
Former-commit-id: 8ccafcec9155bdab49d4d41c3a463323946f1850
2013-11-26 17:48:53 -06:00