xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33144 commits 31 branches 40 tags 3.8 GiB
Commit graph

270 commits

Author SHA1 Message Date
Ron Anderson
2c5f910f90 Omaha #3296 A few more minor performance tweaks and some addtional logging. 
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: a0384ccfb30a877f14893c6cfa62d92117c0bb87
 2014-07-01 13:56:41 -04:00
Ron Anderson
319819d3a7 Omaha #3296 A few more minor performance tweaks and some addtional logging. 
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: 4123073c4e [formerly 2c5f910f90 [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]
Former-commit-id: 2c5f910f90
Former-commit-id: c7a74ab5b1
 2014-07-01 13:56:41 -04:00
Ron Anderson
d6ffc28779 Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript. 
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)

Former-commit-id: 1f056e7ab9 [formerly 9818d9b485] [formerly beee08c32b] [formerly 1f056e7ab9 [formerly 9818d9b485] [formerly beee08c32b] [formerly 487c7ee30a [formerly beee08c32b [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]]]
Former-commit-id: 487c7ee30a
Former-commit-id: 53c11e062a [formerly 699f2aa9bf] [formerly b61496c3397723d5bba2b477c82852166c411ddf [formerly c16fc8ee7f]]
Former-commit-id: 115b6d514da08606bd90d2de458c294ecc3e8d7e [formerly 8314f40ec3]
Former-commit-id: 2b33bfac7d
 2014-07-01 13:56:05 -04:00
Ron Anderson
beee08c32b Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript. 
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)

Former-commit-id: 49638ba1e9561dea7b318b7adc0f1ab9571170f5
 2014-07-01 13:56:05 -04:00
Ron Anderson
1f056e7ab9 Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript. 
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)

Former-commit-id: 487c7ee30a [formerly beee08c32b [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]
Former-commit-id: beee08c32b
Former-commit-id: 9818d9b485
 2014-07-01 13:56:05 -04:00
Nate Jensen
266d148803 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 0556146804 [formerly 6077794cc9] [formerly 9219e1e254] [formerly 0556146804 [formerly 6077794cc9] [formerly 9219e1e254] [formerly 53633a6ed4 [formerly 9219e1e254 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]]]
Former-commit-id: 53633a6ed4
Former-commit-id: 325e99b711 [formerly 1117e5b995] [formerly 0911e2aed4682ca78820538d0dc0fe963c7ebf04 [formerly 5062338b2d]]
Former-commit-id: e76ebd5fe5ff6d669467f7ad5f3bce7a3a3e32c8 [formerly 3239b1956b]
Former-commit-id: 6d3b2d3119
 2014-06-23 14:13:19 -05:00
Nate Jensen
9219e1e254 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: c91a7d4084be3753ad51afd11b46b621af0bc878
 2014-06-23 14:13:19 -05:00
Nate Jensen
0556146804 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 53633a6ed4 [formerly 9219e1e254 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]
Former-commit-id: 9219e1e254
Former-commit-id: 6077794cc9
 2014-06-23 14:13:19 -05:00
David Gillingham
d6103a9ff1 Omaha #3157: Refactor TPCWatchSrv, SPCWatchSrv, and WCLWatchSrv to correctly handle multiple active GFE sites. Update active table code to allow multiple configured SPC and TPC sites from VTECPartners.py. 
Change-Id: Ie7565f0932054477580baf7e06e26357916fd746

Former-commit-id: ca29043593 [formerly 137dbb9783] [formerly 04557f3854] [formerly ca29043593 [formerly 137dbb9783] [formerly 04557f3854] [formerly 1f1db083ca [formerly 04557f3854 [formerly 9185eea7409452fe004185dfa51d78f5adb656d4]]]]
Former-commit-id: 1f1db083ca
Former-commit-id: aa1ecf1c3d [formerly 76496a18cb] [formerly 794ab4e612fd124c79c424ef5c6e44d42dfbffeb [formerly 0de24e8a44]]
Former-commit-id: 3c1f8513921c670bee034ba7fff2e0a0e8acf786 [formerly 06d487fd52]
Former-commit-id: ca1e1d19cb
 2014-05-19 12:50:10 -05:00
David Gillingham
04557f3854 Omaha #3157: Refactor TPCWatchSrv, SPCWatchSrv, and WCLWatchSrv to correctly handle multiple active GFE sites. Update active table code to allow multiple configured SPC and TPC sites from VTECPartners.py. 
Change-Id: Ie7565f0932054477580baf7e06e26357916fd746

Former-commit-id: 9185eea7409452fe004185dfa51d78f5adb656d4
 2014-05-19 12:50:10 -05:00
David Gillingham
ca29043593 Omaha #3157: Refactor TPCWatchSrv, SPCWatchSrv, and WCLWatchSrv to correctly handle multiple active GFE sites. Update active table code to allow multiple configured SPC and TPC sites from VTECPartners.py. 
Change-Id: Ie7565f0932054477580baf7e06e26357916fd746

Former-commit-id: 1f1db083ca [formerly 04557f3854 [formerly 9185eea7409452fe004185dfa51d78f5adb656d4]]
Former-commit-id: 04557f3854
Former-commit-id: 137dbb9783
 2014-05-19 12:50:10 -05:00
Richard Peter
e748b7c1e5 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
 2014-04-28 16:27:40 -05:00
Richard Peter
44b1782461 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
 2014-04-28 16:27:40 -05:00
Richard Peter
8b1a177110 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
 2014-04-28 16:27:40 -05:00
Brian.Dyke
19b4bb7dcc Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
 2014-04-25 11:06:11 -04:00
Brian.Dyke
fb1f5aa593 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509
 2014-04-25 11:06:11 -04:00
Brian.Dyke
362d882b40 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
 2014-04-25 11:06:11 -04:00
Richard Peter
5350b3eac8 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960 [formerly ff87317bd4] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480]
Former-commit-id: de624d87d3
 2014-04-14 13:10:11 -05:00
Richard Peter
dbba727f3d Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 6e015b3f61c20635077d6e8271e9b763e5a32fe1
 2014-04-14 13:10:11 -05:00
Richard Peter
909571ebca Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]
Former-commit-id: dbba727f3d
Former-commit-id: e4be1f24e7
 2014-04-14 13:10:11 -05:00
David Gillingham
cb52793865 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]]
Former-commit-id: da31ab2042
Former-commit-id: 969dccd366 [formerly 0385a4395e] [formerly cb9962190ec6d166cbb1fc49f2bf0444ee77d9c4 [formerly 72229cfb94]]
Former-commit-id: fc3f96a9df8963b4b0cfcf9e1a139bf208111b7b [formerly 89046665f6]
Former-commit-id: 2ab21ac335
 2014-04-10 11:24:40 -05:00
David Gillingham
c8a6dc8769 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 6c5e65e538e145d31c84d2f81f7b41202ae41ad0
 2014-04-10 11:24:40 -05:00
David Gillingham
41393ac5a1 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]
Former-commit-id: c8a6dc8769
Former-commit-id: 1c7e650e6a
 2014-04-10 11:24:40 -05:00
Richard Peter
52a54f5e9f Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
 2014-04-09 16:00:54 -05:00
Richard Peter
95eba8dcf6 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
 2014-04-09 16:00:54 -05:00
Richard Peter
efd1003a50 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
 2014-04-09 16:00:54 -05:00
Brian.Dyke
ae3f5dbff6 Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
 2014-04-04 12:57:32 -04:00
Brian.Dyke
6a28fcb156 Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
 2014-04-04 12:57:32 -04:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
 2014-04-04 12:57:32 -04:00
Steve Harris
24c55c616c Merge branch 'omaha_14.2.1' (14.2.1-13) into development 
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
 2014-03-17 15:55:41 -05:00
Steve Harris
d0aeb854f5 Merge branch 'omaha_14.2.1' (14.2.1-13) into development 
Former-commit-id: a2318f04eea89a258400dea526daa4fe67b69271
 2014-03-17 15:55:41 -05:00
Steve Harris
1dd9192564 Merge branch 'omaha_14.2.1' (14.2.1-13) into development 
Former-commit-id: 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]
Former-commit-id: d0aeb854f5
Former-commit-id: 5efb16fa8b
 2014-03-17 15:55:41 -05:00
Brian.Dyke
f95e1ed18b Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 39ef07d49f [formerly 57f7e4b084] [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]]
Former-commit-id: b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4 [formerly 35427557c4]
Former-commit-id: 5fb2fe9266
 2014-03-14 11:13:30 -04:00
Brian.Dyke
d23acbdd48 Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 0ea874227f20f9f7fe19fc8371e10711023c3f53
 2014-03-14 11:13:30 -04:00
Brian.Dyke
e85e3c2e70 Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]
Former-commit-id: d23acbdd48
Former-commit-id: 9f332e938c
 2014-03-14 11:13:30 -04:00
Ron Anderson
b75886fac4 Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled. 
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc

Former-commit-id: aa3418a8ae [formerly dcc068132a] [formerly 883cf26c5f] [formerly aa3418a8ae [formerly dcc068132a] [formerly 883cf26c5f] [formerly 6e6570fd5a [formerly 883cf26c5f [formerly efc59e6541342bfc3e826934e4a9a5d85dc2801b]]]]
Former-commit-id: 6e6570fd5a
Former-commit-id: 1022d5ef82 [formerly 13401793be] [formerly 1c0a3c2990525dbcd7f8e3618855a0958a2768d7 [formerly f93a657fb4]]
Former-commit-id: 10d95ec6d39f96b94beeac3b0d2b691fdda7e756 [formerly 2c8f0c7949]
Former-commit-id: 4ff78789c9
 2014-03-14 10:11:00 -05:00
Ron Anderson
883cf26c5f Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled. 
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc

Former-commit-id: efc59e6541342bfc3e826934e4a9a5d85dc2801b
 2014-03-14 10:11:00 -05:00
Ron Anderson
aa3418a8ae Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled. 
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc

Former-commit-id: 6e6570fd5a [formerly 883cf26c5f [formerly efc59e6541342bfc3e826934e4a9a5d85dc2801b]]
Former-commit-id: 883cf26c5f
Former-commit-id: dcc068132a
 2014-03-14 10:11:00 -05:00
Brian.Dyke
f417ded1bb OB_14.1.1-23 baseline 
Former-commit-id: b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: 6c021d0eec [formerly e78e030b7c] [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d [formerly 8f72db144b]]
Former-commit-id: 15a710f2de86297f2fae98fe2c109c5d01b1953d [formerly c7fbd5dfe4]
Former-commit-id: be8f052cff
 2014-03-14 08:18:16 -04:00
Brian.Dyke
dcc2e4fd61 OB_14.1.1-23 baseline 
Former-commit-id: b3292d88eee345fca27d9ca645ec2686d0114e5c
 2014-03-14 08:18:16 -04:00
Brian.Dyke
b24e7a66d8 OB_14.1.1-23 baseline 
Former-commit-id: bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]
Former-commit-id: dcc2e4fd61
Former-commit-id: 55918ee421
 2014-03-14 08:18:16 -04:00
Ron Anderson
fa6cdeede5 Merge "Issue #2824 Fix null at end of validation message." into development 
Former-commit-id: 7525a8e0db [formerly bf7a958302] [formerly f7f49ef1cb] [formerly 7525a8e0db [formerly bf7a958302] [formerly f7f49ef1cb] [formerly 199b6eb3fd [formerly f7f49ef1cb [formerly 2b79c54340f7a2bb9492435117db77bb9c6d01a3]]]]
Former-commit-id: 199b6eb3fd
Former-commit-id: 52053c561d [formerly bc0d3ca667] [formerly a18b650f52c9d3a5dfddfb3b77ecd007f4076c30 [formerly fb5036b1d4]]
Former-commit-id: 287375338265b2a029d4f943b8ad508ec6510cf9 [formerly 110a505353]
Former-commit-id: 4c63d6802f
 2014-03-10 17:54:51 -05:00
Ron Anderson
f7f49ef1cb Merge "Issue #2824 Fix null at end of validation message." into development 
Former-commit-id: 2b79c54340f7a2bb9492435117db77bb9c6d01a3
 2014-03-10 17:54:51 -05:00
Ron Anderson
7525a8e0db Merge "Issue #2824 Fix null at end of validation message." into development 
Former-commit-id: 199b6eb3fd [formerly f7f49ef1cb [formerly 2b79c54340f7a2bb9492435117db77bb9c6d01a3]]
Former-commit-id: f7f49ef1cb
Former-commit-id: bf7a958302
 2014-03-10 17:54:51 -05:00
Ron Anderson
c13288510b Issue #2824 Fix null at end of validation message. 
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1

Former-commit-id: f4f807d03b [formerly 61148935cf] [formerly ac39b1accb] [formerly f4f807d03b [formerly 61148935cf] [formerly ac39b1accb] [formerly f0294a3ff8 [formerly ac39b1accb [formerly 24ae011033b851364e4c6efe98488c4066cfd042]]]]
Former-commit-id: f0294a3ff8
Former-commit-id: c30e9abcb6 [formerly f2f1f95863] [formerly d1cf1221c983278d85a6b32924946a49f715a34f [formerly b3b6d93b4c]]
Former-commit-id: 197029db23adee198333f2dfb3c1156c7a3c71f3 [formerly 4494ed5b20]
Former-commit-id: 6eb48ac9cc
 2014-03-10 17:42:55 -05:00
Ron Anderson
ac39b1accb Issue #2824 Fix null at end of validation message. 
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1

Former-commit-id: 24ae011033b851364e4c6efe98488c4066cfd042
 2014-03-10 17:42:55 -05:00
Ron Anderson
f4f807d03b Issue #2824 Fix null at end of validation message. 
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1

Former-commit-id: f0294a3ff8 [formerly ac39b1accb [formerly 24ae011033b851364e4c6efe98488c4066cfd042]]
Former-commit-id: ac39b1accb
Former-commit-id: 61148935cf
 2014-03-10 17:42:55 -05:00
Steve Harris
9c0f484340 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
 2014-03-07 15:43:40 -06:00
Steve Harris
873bd6b889 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c
 2014-03-07 15:43:40 -06:00
Steve Harris
865fef97b1 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: 873bd6b889
Former-commit-id: 51b755a476
 2014-03-07 15:43:40 -06:00