Commit graph

78 commits

Author SHA1 Message Date
Ben Steffensmeier
0f41447004 Omaha #3093 add hprof output for grid cached data.
Former-commit-id: 5ad9828170 [formerly 68c8895ee3] [formerly 202321d897] [formerly 5ad9828170 [formerly 68c8895ee3] [formerly 202321d897] [formerly 405eabac07 [formerly 202321d897 [formerly d509822129823efcdf67dd9c028bc72af99b1039]]]]
Former-commit-id: 405eabac07
Former-commit-id: 6dff3cdf27 [formerly 6fbadff061] [formerly 8ed47756959fd525bac51117ce1b2f5c5c187205 [formerly 402693a5c4]]
Former-commit-id: 6304823768b9874fe71e68fc68a3ce72d018cfcb [formerly 1e0868826d]
Former-commit-id: ca1d7cb08d
2014-05-21 14:48:45 -05:00
Ben Steffensmeier
7b2b305edd Omaha #3093 Add option to hprof tool to zero primitive arrays for compression.
Former-commit-id: 15c7e3bb2d [formerly ede28797fd] [formerly 5554946186] [formerly 15c7e3bb2d [formerly ede28797fd] [formerly 5554946186] [formerly df62609973 [formerly 5554946186 [formerly 6a80964572cf331b433ae8dc222ac209dd35bf63]]]]
Former-commit-id: df62609973
Former-commit-id: f23007e32b [formerly 0e8bd044cf] [formerly 958eb5b1366c7a3444b58acbc50cd6f3390ced96 [formerly b165082aad]]
Former-commit-id: 286f85ae0a2f5c98d85c5a85f9a58fde208d0bfb [formerly 2ddde07e7f]
Former-commit-id: 4a08127782
2014-05-21 12:30:57 -05:00
Brian Clements
20cb82cc98 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: c885bf9426 [formerly c55124bcc7] [formerly 5b5295e5ad] [formerly c885bf9426 [formerly c55124bcc7] [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5b5295e5ad [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]]
Former-commit-id: da7d5888b0
Former-commit-id: 39ab0e1a08 [formerly e4bb70cbe9] [formerly 909b50360144c1b7aaf549971a4592d7aee00d9c [formerly 003917f0ed]]
Former-commit-id: 21b6858b7cb89d1d240688b3c00b569a7c69d267 [formerly 30fb567666]
Former-commit-id: ebc9bfa351
2014-05-20 16:07:20 -05:00
Nate Jensen
efb6e80251 Omaha #3160 remove OBE ncep util plugins
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808

Former-commit-id: ba596d4848 [formerly 548d5ec519] [formerly bb1414677e] [formerly ba596d4848 [formerly 548d5ec519] [formerly bb1414677e] [formerly 5353d06ab6 [formerly bb1414677e [formerly d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0]]]]
Former-commit-id: 5353d06ab6
Former-commit-id: 0a9d07c03e [formerly c7a0638666] [formerly ff4d9e2a307083ca04a656b025dc3e8ffe1dc55f [formerly 06d07c9ca4]]
Former-commit-id: 8032d883831f12af35b0cccd9de51d93925f2d2c [formerly 1d94867dd6]
Former-commit-id: aff00030d5
2014-05-13 13:28:20 -05:00
Ben Steffensmeier
0e15da7d1b Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
Former-commit-id: 5a52d61636 [formerly 462ec63608] [formerly 18ec643a30] [formerly 5a52d61636 [formerly 462ec63608] [formerly 18ec643a30] [formerly 973c6fdb55 [formerly 18ec643a30 [formerly 3bd0a076add20c38fad41461295fb430e8ceb5cb]]]]
Former-commit-id: 973c6fdb55
Former-commit-id: efd43c399e [formerly 3e9e6abde2] [formerly 458e8bf278ed316f4bc7434b69cdf0bf5245ba6c [formerly 0bd28752bc]]
Former-commit-id: a45623b2202b018c7b2e5d56a8d61b06105a071a [formerly ed9993067e]
Former-commit-id: d02dfbb11f
2014-05-06 18:06:44 -05:00
Ben Steffensmeier
f66f703565 Issue #2648 Update hprof info to match grid changes in 14.3
Former-commit-id: 582af8d74f [formerly 2dcc596c83] [formerly a608d3a7e9] [formerly 582af8d74f [formerly 2dcc596c83] [formerly a608d3a7e9] [formerly 2c82f5ea7a [formerly a608d3a7e9 [formerly c391a6fbb543e467030f45a494e00bc4246c6a36]]]]
Former-commit-id: 2c82f5ea7a
Former-commit-id: 49ba8c2a49 [formerly 8f3ad535c6] [formerly 2f37c55d5cc4cd56ed0f5114ace2859273222e14 [formerly 17dfcd8c70]]
Former-commit-id: 83cef96255e49c4141cf866a05b7d409c69f478f [formerly de10019851]
Former-commit-id: bb04f26de0
2014-04-23 15:42:33 -05:00
Brad Gonzales
7e57799f28 Issue #3001 Renamed com.raytheon.edex.plugin.ccfp to com.raytheon.uf.edex.plugin.ccfp.
Amend: Updates from peer review.

Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b

Former-commit-id: 8a6655cb35 [formerly c267d077c3] [formerly 1a43f04b16] [formerly 8a6655cb35 [formerly c267d077c3] [formerly 1a43f04b16] [formerly 6c7e2ac2a7 [formerly 1a43f04b16 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]]]
Former-commit-id: 6c7e2ac2a7
Former-commit-id: 4c463adc7e [formerly b2a95e4f12] [formerly f7b416cc828835e0d7166283f219d0f260c3e42e [formerly b796120ec9]]
Former-commit-id: bd7ac9c4128007fd4aa7a72e720880171ea0abd3 [formerly 2a7aae659c]
Former-commit-id: e0245983cf
2014-04-18 15:16:41 -05:00
Nate Jensen
4c5fe0b79f Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: cd6754fe7f [formerly 8a4e3b8088] [formerly 0845eef927] [formerly cd6754fe7f [formerly 8a4e3b8088] [formerly 0845eef927] [formerly 7e19d70363 [formerly 0845eef927 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]]]]
Former-commit-id: 7e19d70363
Former-commit-id: 83e3028473 [formerly cdf8aeef79] [formerly 55452996b3a7cbca5069dc64642b3235e7c3d3b1 [formerly 27cfffb1ea]]
Former-commit-id: 56d54227251b4e4b65bfe037aa45bd57e9e1d607 [formerly 4b8bda3abf]
Former-commit-id: 2eccbcf3fe
2014-04-15 10:54:39 -05:00
Brad Gonzales
22395cc880 Issue #2937 Moved presence/site determination from feed log to feed listener.
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: 10a8b59e4e [formerly 45264a2cde] [formerly 189282166d] [formerly 10a8b59e4e [formerly 45264a2cde] [formerly 189282166d] [formerly 535611f556 [formerly 189282166d [formerly e975a825046c8d0505223093e5765d5283425b2f]]]]
Former-commit-id: 535611f556
Former-commit-id: c67332f5c8 [formerly b18cefb6bd] [formerly 31d35028c1bb41e7e74a7a5b46e8631cb1b8dfcd [formerly 7384a458eb]]
Former-commit-id: 367c707f1bd822d87a28e02e2aab93478cdbc4b7 [formerly a347010ad4]
Former-commit-id: 7876b83c15
2014-04-14 14:30:18 -05:00
Brad Gonzales
8034ad83c3 Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: 496a56dccb [formerly 98476d4813] [formerly 023622a2c5] [formerly 496a56dccb [formerly 98476d4813] [formerly 023622a2c5] [formerly f76e4e8fea [formerly 023622a2c5 [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]]]]
Former-commit-id: f76e4e8fea
Former-commit-id: 886d42182e [formerly 2812984f88] [formerly 272e6f46892b04f72888134b64bcf72189d571a5 [formerly 1f1806de88]]
Former-commit-id: 42f92b4b0b332859a72f27a74183f3c06841a34c [formerly 5f5ac23d05]
Former-commit-id: 7f09051250
2014-04-14 14:30:18 -05:00
Brad Gonzales
c091089ad7 Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: 19f4b1b64a [formerly fe95275a34] [formerly 056dbdbdff] [formerly 19f4b1b64a [formerly fe95275a34] [formerly 056dbdbdff] [formerly d50f39e98d [formerly 056dbdbdff [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]]]
Former-commit-id: d50f39e98d
Former-commit-id: ce28c5b32a [formerly 7472fb8084] [formerly fdd1fbec562ec709c2e1ddc6bf77a84a8df0074a [formerly 178e4fe8bb]]
Former-commit-id: 594fbd7a5cd20c9d9e2c10b81e484a4e90c1d0e0 [formerly ebcb2cb414]
Former-commit-id: 60f66cda85
2014-04-09 18:47:09 -05:00
Brad Gonzales
350514f204 Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
rpm to replace it.  Changed dependency references to httpd-collaboration to refer to collab-dataserver.

Amend:  Updated call to status in init script.
        Redirect start.sh error output to an error file.
        Use macro to define ant opts in component.spec.

Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4

Former-commit-id: 9ff7dd12aa [formerly fe8e6a1fa1] [formerly 4fa60427b4] [formerly 9ff7dd12aa [formerly fe8e6a1fa1] [formerly 4fa60427b4] [formerly f0189d61ca [formerly 4fa60427b4 [formerly d7466d36140c94b5ef4e57fea25526231912e018]]]]
Former-commit-id: f0189d61ca
Former-commit-id: efb4981a15 [formerly 907d09bc20] [formerly 7c33a8781ee872ff0c5e225ac1d343ecd2c0eaee [formerly 3954cd6bae]]
Former-commit-id: 2291558778d560b4564dfd6237e7c32f3bb038d2 [formerly 69f7034551]
Former-commit-id: cd22105a5e
2014-04-03 17:47:58 -05:00
Brad Gonzales
2637e3c237 Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 85911a9d01 [formerly d4659c48a6] [formerly 404faeeca0] [formerly 85911a9d01 [formerly d4659c48a6] [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 404faeeca0 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: c12c4cf7e2 [formerly 1c685a9eb6] [formerly f8fc71ad10a4d9dbd3464113660b2d2d68675fd5 [formerly 2f56fd3c9d]]
Former-commit-id: 742e4cc46d2a1218def59e841a9507b8581e81ce [formerly 4940c40a7f]
Former-commit-id: 5506e9362a
2014-03-31 11:45:22 -05:00
Brian Clements
05ddcce572 Issue #2827 fixed collab dataserver returning empty body with 200
we check if a file exists in and out of the lock when reading
if the file is deleted between checks, the inner check attempts to return an error
we had already access the output stream from the response object so it is committed to 200
fixed by waiting to get the output stream until after the second check


Former-commit-id: 2aa9dcb248 [formerly ce1038723d] [formerly bfde9c37ce] [formerly 2aa9dcb248 [formerly ce1038723d] [formerly bfde9c37ce] [formerly d44c55e976 [formerly bfde9c37ce [formerly 31c42d161146b0367435c66535d4da700a572f24]]]]
Former-commit-id: d44c55e976
Former-commit-id: fb6be670b1 [formerly ab86cda554] [formerly 1b8f3ce536ab968c6e5e63d5bfe2ffc91722e548 [formerly d693c07bb4]]
Former-commit-id: 199f3f09805b232480df05d4c222e11bab11f4ce [formerly 22d6302151]
Former-commit-id: 560f51d226
2014-03-12 08:27:22 -05:00
Brad Gonzales
e7295b16d2 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly dea17a19da [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]
Former-commit-id: dea17a19da
Former-commit-id: 09c083ce1f [formerly 4ba60d8a6f] [formerly f2869efb05c763771e03bc02057aa196d29b6d1a [formerly 78d35d4033]]
Former-commit-id: f70dd002a68a434eb5e81131bb0b82d4784e717e [formerly c4064160ec]
Former-commit-id: 4cbc3b1b05
2014-03-06 16:29:37 -06:00
Brian Clements
ab62759518 Issue #2756 reworked collaboration dataserver build
replaced install ant script with build script that also deploys
new build uses feature explorer, but handles its own compile stage
updated deployment and start script to match new build
added logging level control argument


Former-commit-id: a97d1a1fb5 [formerly acbd4910fe] [formerly fac33a8915] [formerly a97d1a1fb5 [formerly acbd4910fe] [formerly fac33a8915] [formerly cde0d05820 [formerly fac33a8915 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]]]]
Former-commit-id: cde0d05820
Former-commit-id: eab142e86d [formerly 2b3aaeff26] [formerly 697372d2b5104a735c926c344d998b56abd81e2a [formerly eb54c46b3c]]
Former-commit-id: 6b56107fae632a677b51c2edb24a65ae6832f176 [formerly db510daf06]
Former-commit-id: f962ac4159
2014-03-06 11:49:57 -06:00
Brian Clements
6e79ad72ad Issue #2702 replaced openfire source tarball with 3.9.1
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: e4d22971bd [formerly bc8ac5e051] [formerly ad3d10074a] [formerly e4d22971bd [formerly bc8ac5e051] [formerly ad3d10074a] [formerly e1819cd4e2 [formerly ad3d10074a [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]]]
Former-commit-id: e1819cd4e2
Former-commit-id: 2267c2bb0b [formerly 410ebf65f5] [formerly 3beb79dabe2b4fee26bcf793ea28d3ef4e8cebb4 [formerly 3f0115d329]]
Former-commit-id: df339242e5ac9d41f04d641662b3a15d2535f802 [formerly 544c713135]
Former-commit-id: 4a9c85e7ac
2014-03-05 15:29:27 -06:00
Brian Clements
3aaee14c5f Issue #2756 added security toggle to collaboration
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly f44f1212dd [formerly 7b085f62de [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]]
Former-commit-id: f44f1212dd
Former-commit-id: 19bb5d8de9 [formerly c446513912] [formerly c63989e0c0ae952f12584b6484f4cc133f757e99 [formerly 0790849f03]]
Former-commit-id: ac49a09e913b78ca7f067ef864505a1f0acc5ede [formerly 8b1a00fb2f]
Former-commit-id: 8d9da2b63e
2014-03-04 16:02:25 -06:00
Brian Clements
08c686bfa7 Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 769ee18145 [formerly a738448825] [formerly 3b6121b9fa] [formerly 769ee18145 [formerly a738448825] [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 3b6121b9fa [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 11b30001d5 [formerly 75c179b06f] [formerly 066c81f999fa0b82f0f2cf806a4411393bd5ac3c [formerly a44c5f8d48]]
Former-commit-id: 0e0bd6fdd76a9a44b31ab23824202bfa97b827e6 [formerly a36f303646]
Former-commit-id: 861716341a
2014-03-03 14:07:01 -06:00
Brian Clements
e9604a9700 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: 43c19f09ba [formerly f56cbac9fb] [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]]
Former-commit-id: 667a1021c89300b5befe11701d18fc1d06fbb6bb [formerly 6d4abdc37c]
Former-commit-id: f00f8eb1d9
2014-02-28 16:15:17 -06:00
Nate Jensen
879743ba05 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: b64a89eff1 [formerly 5b2f17826e] [formerly 7fb97ffad0] [formerly b64a89eff1 [formerly 5b2f17826e] [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly 7fb97ffad0 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]]
Former-commit-id: 39e167fc76
Former-commit-id: 0e29ec5bb4 [formerly f3de646859] [formerly 76c109bc0aaf7a0a1405976cdefd262abdaf71dc [formerly 8bf8302811]]
Former-commit-id: 0a41af5b8c365750116c369470ba9b31fd6bc188 [formerly f325498ec3]
Former-commit-id: b051dab483
2014-02-27 17:14:32 -06:00
Richard Peter
ef2ff1d0f7 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
2014-02-27 15:18:26 -06:00
Brian Clements
c0da4f94d4 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 74d08f1d19 [formerly 02319f36e4] [formerly 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4]]
Former-commit-id: 30b1054d786354e5944fa7b6968a4b2cddf1c07a [formerly 5889341612]
Former-commit-id: f866ac4365
2014-02-18 10:03:12 -06:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
2014-02-13 10:10:34 -06:00
Ben Steffensmeier
9d8d45edb4 Issue #2648 Add AlertMessage output.
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e

Former-commit-id: f910b9277c [formerly ca109598ec] [formerly f45ec64979] [formerly f910b9277c [formerly ca109598ec] [formerly f45ec64979] [formerly c96be7613c [formerly f45ec64979 [formerly 47826e8d3e4570c9f970fc30f5dac462611b91bf]]]]
Former-commit-id: c96be7613c
Former-commit-id: 325cc8f289 [formerly 91eaba54df] [formerly c0cfb61f8fb09bae1bcec3cb6646ccc305150c1a [formerly 4cffeac65f]]
Former-commit-id: 0de1cdb7041a8c9c09da681bf298db272978e687 [formerly 27165c51b8]
Former-commit-id: b59ea9ac5a
2014-02-12 17:08:23 -06:00
Greg Armendariz
eaeee421e5 Issue #2754 - Remove logging calls
Change-Id: Ic95b84691dc5cf6cea454f2a70acc9da301eaf05

Former-commit-id: 09c7b0827a [formerly 47347f42ca] [formerly e0394c649c] [formerly 09c7b0827a [formerly 47347f42ca] [formerly e0394c649c] [formerly 2ec1248fcc [formerly e0394c649c [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]]]]
Former-commit-id: 2ec1248fcc
Former-commit-id: d78463d7c0 [formerly 2e03bcff4b] [formerly ed894f91fabab3ccbfd771bbeb3fe7a4650f8144 [formerly e02caca466]]
Former-commit-id: 248c754464869a119f9931cb70528b695817d09a [formerly 47d3f2e498]
Former-commit-id: cad35882f8
2014-02-03 09:29:47 -06:00
Steve Harris
fb3a30b3b3 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly 1aea63a1f6 [formerly 1738185503 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: cdb99cc3e0 [formerly d9cd003a5a] [formerly 5d9047e5063900e85cef179c5be76057b8ca6cd1 [formerly 1fd5b2255f]]
Former-commit-id: 50ad78f33f6b09f52d5450f88139cd7ee524d3fd [formerly ec69a2c4f7]
Former-commit-id: e3d1abe909
2014-01-29 09:41:57 -06:00
Nate Jensen
ea71b2a4bc Issue #2359 remove ignore threads capability since it was a hack to stop
shef and there's a better way to stop shef

Change-Id: I8c2fc8279937aca4e15ea52197081c8271d0c55c

Former-commit-id: 1d5b9cd648 [formerly 5e2636809d] [formerly d5239174f6] [formerly 1d5b9cd648 [formerly 5e2636809d] [formerly d5239174f6] [formerly 52eaaa17d0 [formerly d5239174f6 [formerly 99f45c9a2ae2e82ba88dd8df7e2c008bda863a9e]]]]
Former-commit-id: 52eaaa17d0
Former-commit-id: f91884acf4 [formerly 1ac92d7135] [formerly c826d27daf80c25ce6eadb12bf21d4fd5060b7fe [formerly 4d51cd6d86]]
Former-commit-id: 0066e6fb2857febccf3aa6c59b6d20c93ca820c3 [formerly 69e4c10344]
Former-commit-id: a9c17cd6db
2014-01-23 18:09:50 -06:00
Nate Jensen
2cb7388e4a Issue #2359 updated readme with bscalio suggestions
Change-Id: I25356e9c6e89473a5442ca1bfdab29b41a996694

Former-commit-id: 0353f43d54 [formerly e2c9407815] [formerly 90a7339f6d] [formerly 0353f43d54 [formerly e2c9407815] [formerly 90a7339f6d] [formerly b08d9d4932 [formerly 90a7339f6d [formerly 2c9c6f8aee77f96911d698bc2031af5e01f03ee0]]]]
Former-commit-id: b08d9d4932
Former-commit-id: 0dc8c42f79 [formerly 2b54a41e8d] [formerly 8ef8108641d6f4ff98dde53bba62abfb54e59fe6 [formerly 3f4c9a1d05]]
Former-commit-id: 133d60fcb7a0f2c395fc77ce6622830d2849fb25 [formerly f3b1369a32]
Former-commit-id: 4581c9c2bd
2014-01-23 09:25:37 -06:00
Nate Jensen
8b9e688f96 Issue #2359 clean up log service for distribution, build everything
necessary into tar.gz file

Change-Id: I22a0b7d37694e523356c6f5ea0ad567bd6d32c15

Former-commit-id: 03ab1f9b8b [formerly 5aa4811368] [formerly c015cb1653] [formerly 03ab1f9b8b [formerly 5aa4811368] [formerly c015cb1653] [formerly be30d6c94e [formerly c015cb1653 [formerly 9bde0e7f917cde0bb4aeec6c92427729c007dabf]]]]
Former-commit-id: be30d6c94e
Former-commit-id: 28b408db85 [formerly 48171d03c2] [formerly 8ebfcb68cad8a0bc2b35528946a9fa0515aaf732 [formerly 2732368f17]]
Former-commit-id: 9e14c09009773ba4785a4149493109d2ad387731 [formerly e1ed0ed33d]
Former-commit-id: 5cf728a04f
2014-01-20 17:46:47 -06:00
Ben Steffensmeier
11ac88548a Issue #2648 Enhance hprof output for grids and UI activity.
Former-commit-id: aae0dd9677 [formerly 31bbdb3d4d] [formerly 91270be4f7] [formerly aae0dd9677 [formerly 31bbdb3d4d] [formerly 91270be4f7] [formerly a401c4bed0 [formerly 91270be4f7 [formerly 80e4b1bdff46f8e1c77ba50b696e8bef5e53d51e]]]]
Former-commit-id: a401c4bed0
Former-commit-id: 49f2f26f3b [formerly eccaf37aee] [formerly bbe5ca014327b356aa992a01543461da5e29ab6e [formerly f4075f5fa5]]
Former-commit-id: 3cd7e963f7ba31f81b8582945e23b631917ba9b3 [formerly 911994f3ec]
Former-commit-id: f88b3b7455
2014-01-20 13:00:54 -06:00
Ben Steffensmeier
d45cad301f Issue #2648 Hprof analysis utility.
Change-Id: Ib450c48a88e8a485a2461e1f4a5c81e1be4fee68

Former-commit-id: b64ac87d9c [formerly 51a7dfb438] [formerly de58f318cb] [formerly b64ac87d9c [formerly 51a7dfb438] [formerly de58f318cb] [formerly 30ac7d37a5 [formerly de58f318cb [formerly 1bfc1a31ed9052795e1ab0e83cd4bede3eb8e17c]]]]
Former-commit-id: 30ac7d37a5
Former-commit-id: ecaea29201 [formerly 76561f48b8] [formerly 4a73f7b07a78c95dd7db67c94ba1568ce519628c [formerly 3f7a5c135f]]
Former-commit-id: 2bcc199e67893e47e8ed4a8cd5de59e326b93bf2 [formerly 00ed5a277c]
Former-commit-id: 909594029e
2014-01-08 16:47:03 -06:00
Brian Clements
72f7b68456 Issue #2563 added packet extension to openfire plugin
openfire plugin now sends configuration in packet extension
legacy method of putting config in chat message still supported by default
added configuration to web gui to toggle legacy message method


Former-commit-id: 023e384ae4 [formerly 04e7c2f749] [formerly 2e53fcbccb] [formerly 023e384ae4 [formerly 04e7c2f749] [formerly 2e53fcbccb] [formerly a2c709fb34 [formerly 2e53fcbccb [formerly a26eeaae28de6e41fdc49a2b75ad6814ece478cd]]]]
Former-commit-id: a2c709fb34
Former-commit-id: eef311027b [formerly b366f38199] [formerly c779fb82246f5c8083bb1cff8aef500a5b9d57bb [formerly b42d2f5528]]
Former-commit-id: 9a282267169c3a1f12184104c174bf56b4923bc3 [formerly d028af1800]
Former-commit-id: 55467fe96e
2014-01-07 10:33:37 -06:00
Bryan Kowal
c8e49142f2 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Nate Jensen
995990107f Issue #2359 add ability to ignore messages based on threads, ie ignore
shef

Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48

Former-commit-id: 00a1b179a5 [formerly db842ce2e6] [formerly 4a4f50155c] [formerly 00a1b179a5 [formerly db842ce2e6] [formerly 4a4f50155c] [formerly ed1b94ea07 [formerly 4a4f50155c [formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]]]
Former-commit-id: ed1b94ea07
Former-commit-id: a190895819 [formerly c836673ac6] [formerly fd493067b795f91fd360af45d144c60e8d2248cb [formerly 3b0ed49de4]]
Former-commit-id: 383fc00f4fd1d3c931d0e68ab958eba924870aaa [formerly 493f51eae7]
Former-commit-id: a858617b6c
2013-11-22 15:54:22 -06:00
Bryan Kowal
6a0ddf11e4 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
2013-10-31 15:34:46 -05:00
Steve Harris
ba80e5f206 Merge branch 'development' into development_on_RHEL6
Former-commit-id: f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: 0be97d503a [formerly 3b29cf6790] [formerly c51eafcb852c1a8282b6694b8e25e7101b5a76bb [formerly eced243e6a]]
Former-commit-id: 23f5786872767a023465fd464ca03603e3e984fb [formerly 75cdf331b6]
Former-commit-id: 8982d892ba
2013-10-28 15:58:12 -05:00
Steve Harris
cbf859daf6 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Nate Jensen
f13c5a2135 Issue #2359 fix for extra long messages
Former-commit-id: ea89d218a8 [formerly e7763c0864] [formerly 665e224c75] [formerly ea89d218a8 [formerly e7763c0864] [formerly 665e224c75] [formerly 3abe5b9f18 [formerly 665e224c75 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]]]
Former-commit-id: 3abe5b9f18
Former-commit-id: 3cfbcbed91 [formerly 3d10b22fe1] [formerly e27bb5daa3af459b5fe7294e0931b9bea19a9c01 [formerly 8ad85c297c]]
Former-commit-id: 2a93a20eea98767d6799ee1c4a4d0667ae6f5c60 [formerly e96edbb80a]
Former-commit-id: 91cb555abd
2013-10-28 09:15:20 -05:00
Richard Peter
0a7c1f2fd7 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: 9b5d2fa69f [formerly f69bbf7952] [formerly cb33f5ada7] [formerly 9b5d2fa69f [formerly f69bbf7952] [formerly cb33f5ada7] [formerly 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]]
Former-commit-id: 14d5b8656e
Former-commit-id: b29e037e05 [formerly a49c67203e] [formerly e43a9bab4c68a481f2c9959d56447b4b556d21ba [formerly 6ecb80e892]]
Former-commit-id: eeadb56d97d16e80b358cd1042a03be4d25aa4bb [formerly e27a298e62]
Former-commit-id: 9b381e593d
2013-10-23 15:50:25 -05:00
Nate Jensen
6e06e2852f Issue #2359 better email addresses
Former-commit-id: 55fd890223 [formerly fd55a9792d] [formerly a609706b5e] [formerly 55fd890223 [formerly fd55a9792d] [formerly a609706b5e] [formerly b56c67a8fb [formerly a609706b5e [formerly 03be0960bfbbd8072166bc0a06e4100538dbc7ca]]]]
Former-commit-id: b56c67a8fb
Former-commit-id: 60421b1896 [formerly e56a3b633d] [formerly 2293b6b5e3573279b7874a10055d6a27b5e5eb3a [formerly cf4f6c3d4b]]
Former-commit-id: 6c6283d43385bc53c04932cc857731c743617f10 [formerly e36fef6dba]
Former-commit-id: 4b379c871a
2013-10-23 14:02:31 -05:00
Steve Harris
90889f8aa3 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7]
Former-commit-id: e1f7463a41
2013-10-04 11:30:03 -04:00
Bryan Kowal
87750ddaef Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]
Former-commit-id: 9829477ced
Former-commit-id: f7009e8d15 [formerly 0f825df590] [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912]]
Former-commit-id: 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531 [formerly 0efd4c7c50]
Former-commit-id: 7bd9ea3d30
2013-09-30 18:00:31 -05:00
Nate Jensen
ed80aaf209 Issue #2359 initial checkin of remote log service
Change-Id: Idd48062f204002956f63c6d449868a7bd9695263

Former-commit-id: 1c344d7f6d [formerly 74c1e60ad2] [formerly 3162ae260b] [formerly 1c344d7f6d [formerly 74c1e60ad2] [formerly 3162ae260b] [formerly f148663bd1 [formerly 3162ae260b [formerly 12988c63aeccc678f25f4210ad484a080ddd8aa7]]]]
Former-commit-id: f148663bd1
Former-commit-id: fa5a09cd4f [formerly dc369018c3] [formerly 66ad50559daae315ed1a243c360ee5c9fa2c6a22 [formerly ebf89475c5]]
Former-commit-id: 73e791de93b7d5d0ce8043989c628609bc759596 [formerly d70275ed1c]
Former-commit-id: ba65c8a3e5
2013-09-12 11:50:16 -05:00
Bryan Kowal
cb7e87d9a4 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]]
Former-commit-id: 94eacfc460
Former-commit-id: 33b6f03899 [formerly 53124c5e02] [formerly b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6]]
Former-commit-id: e3b28978c51f9031cb777d8427d123b55b738085 [formerly eab659f961]
Former-commit-id: 2e6116a952
2013-08-15 15:30:05 -05:00
Steve Harris
dded20dc93 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
Everett Kladstrup
43814b2bfb Issue #2231 Make edex startup more configurable
* Allow for skipping the RPM check
* Allow for using system java in wrapper instead of hard-coded /awips2/java
* Allow for configuring wrapper process actions with system variables
  e.g. RESTART vs. SHUTDOWN on crash

Change-Id: Icaa3b3e388013a8106db6e29fd999aa5824c72bc

Former-commit-id: 2c518b816d [formerly 3bb1b03cb7] [formerly e056592ba9] [formerly 2c518b816d [formerly 3bb1b03cb7] [formerly e056592ba9] [formerly 9515d45e9d [formerly e056592ba9 [formerly 7834360e8c56ac74b29a585eeda8c0387067250b]]]]
Former-commit-id: 9515d45e9d
Former-commit-id: 5e5504d664 [formerly 37ce990b54] [formerly 96047241098de435c61202b2dde98576c53cbe5e [formerly b9dda179a0]]
Former-commit-id: 9007806deec2984a2810679a8328709844d63980 [formerly eec23b6971]
Former-commit-id: 33693f1903
2013-07-25 12:22:32 -05:00
Richard Peter
1d08e54d43 Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00
Richard Peter
69af3f93ca Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d [formerly eefaf2c836] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256]
Former-commit-id: 374879df01
2013-07-18 21:46:25 -05:00