Commit graph

770 commits

Author SHA1 Message Date
Dustin Johnson
9346a14482 Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
Former-commit-id: def94b337f [formerly 2262872d2d] [formerly def94b337f [formerly 2262872d2d] [formerly 90b18cc477 [formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]]
Former-commit-id: 90b18cc477
Former-commit-id: ec0e13e509 [formerly c28f99971c]
Former-commit-id: e6fb231413
2013-03-05 15:01:02 -06:00
Steve Harris
2b489e4e40 Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8]
Former-commit-id: 46d0c9fcee
2013-03-05 12:29:44 -06:00
Steve Harris
d842ed88a7 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: b423579e4a [formerly a8e1557c62]
Former-commit-id: b630339eb7
2013-03-05 12:27:49 -06:00
Dustin Johnson
5464463722 Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

Former-commit-id: 2bd62ad4b6 [formerly 8107f76d98] [formerly 2bd62ad4b6 [formerly 8107f76d98] [formerly 547780f9a3 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]]
Former-commit-id: 547780f9a3
Former-commit-id: 8c99bc1f17 [formerly 043f122356]
Former-commit-id: 13db762ae2
2013-03-05 11:39:42 -06:00
Steve Harris
79ff805090 13.3.1-5 baseline
Former-commit-id: 8123d5ac45 [formerly a89221c75b] [formerly 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: a240379588 [formerly a40c9136fe]
Former-commit-id: 1f98e01c57
2013-03-05 10:47:06 -06:00
Steve Harris
153aadc1d7 13.3.1-4 baseline
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: 3e0614b43a [formerly 5e55ded3a9]
Former-commit-id: 0df35cc5ec
2013-03-05 10:39:59 -06:00
Nate Jensen
2f8389cd69 Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
Former-commit-id: c21079cc06 [formerly 75d959f536] [formerly c21079cc06 [formerly 75d959f536] [formerly 8d44b9ea05 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]]
Former-commit-id: 8d44b9ea05
Former-commit-id: 70c75b3bcd [formerly 910b8c7d25]
Former-commit-id: 432a0d1550
2013-03-05 09:10:31 -06:00
Dustin Johnson
b23fe8b9e7 Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
Former-commit-id: 9a6b647989 [formerly c6137e89e7] [formerly 9a6b647989 [formerly c6137e89e7] [formerly ef632b7bfa [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]]
Former-commit-id: ef632b7bfa
Former-commit-id: 9932db9b09 [formerly b3f7f77bf6]
Former-commit-id: a5c331790e
2013-03-05 08:53:09 -06:00
Richard Peter
fa19a76a42 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: e74f6074e7 [formerly 070f62d08e] [formerly e74f6074e7 [formerly 070f62d08e] [formerly 784cd2145f [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: a4bf42628a [formerly 180540eb47]
Former-commit-id: 6b08735982
2013-03-04 17:48:05 -06:00
Dave Hladky
ac69f97305 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 0f3c9ba997 [formerly 1260b40307]
Former-commit-id: fc90d47619
2013-03-04 17:41:11 -06:00
Bryan Kowal
0a60b0f122 Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a

Former-commit-id: eb4d75de7f [formerly 862f97a19b] [formerly eb4d75de7f [formerly 862f97a19b] [formerly cd08f88c43 [formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]]
Former-commit-id: cd08f88c43
Former-commit-id: 8512836953 [formerly d9c1a92b8e]
Former-commit-id: 5dae6fd039
2013-03-04 15:52:07 -06:00
Dustin Johnson
2f7bdb18f9 Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 73f884753a [formerly 1161125c84] [formerly 73f884753a [formerly 1161125c84] [formerly 54c3980cba [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]]
Former-commit-id: 54c3980cba
Former-commit-id: 67d6a4ac99 [formerly c0a1ae396a]
Former-commit-id: 5da3043a97
2013-03-04 14:55:50 -06:00
Steve Harris
04d09aba00 Issue #1744 - Revert "Issue #1744 fix deadlock"
This reverts commit 46ceab84c1 [formerly c990477402] [formerly c5600acf79 [formerly f7ffa22c7c]] [formerly f4cccabc07] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]].


Former-commit-id: 7ffb42d6e6 [formerly 28391884a7] [formerly 7ffb42d6e6 [formerly 28391884a7] [formerly fcb48a7280 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]]
Former-commit-id: fcb48a7280
Former-commit-id: f70ff93d2c [formerly 9e87721b85]
Former-commit-id: 5baddd4678
2013-03-04 13:03:19 -06:00
Steve Harris
b71436dba8 Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
This reverts commit 312e2e07ae [formerly eec5f87ab2] [formerly 348f5f0f41 [formerly 33da766f63]] [formerly 35007e0460] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]].


Former-commit-id: 870972fb90 [formerly 88e633934d] [formerly 870972fb90 [formerly 88e633934d] [formerly bba410a330 [formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]]
Former-commit-id: bba410a330
Former-commit-id: ee2452f5d3 [formerly 7d2286aea7]
Former-commit-id: f92b1e3534
2013-03-04 13:02:32 -06:00
Dustin Johnson
665752eebe Issue #1647 Configure NCF and WFO retrieval tasks
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4

Former-commit-id: 527ed01fec [formerly de7f387248] [formerly 527ed01fec [formerly de7f387248] [formerly bf9eefe961 [formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]]
Former-commit-id: bf9eefe961
Former-commit-id: bbba19a26f [formerly 81fcd0bc65]
Former-commit-id: 680a65490b
2013-03-04 10:22:16 -06:00
Nate Jensen
38e747194a Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
Former-commit-id: 6bf2eefa2a [formerly a90a2fe857] [formerly 6bf2eefa2a [formerly a90a2fe857] [formerly 677908868e [formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]]
Former-commit-id: 677908868e
Former-commit-id: 75366a9e5a [formerly 216e3d6ad3]
Former-commit-id: e7d6ad1036
2013-03-01 13:43:50 -06:00
David Gillingham
861a3d0c44 Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.

Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510

Former-commit-id: ca81ae4a71 [formerly 50744c1f92] [formerly ca81ae4a71 [formerly 50744c1f92] [formerly 9351f33c1c [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]]
Former-commit-id: 9351f33c1c
Former-commit-id: 622700dee9 [formerly 77a3f33fd5]
Former-commit-id: 4f6b2ffcff
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
c28a151884 Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: b0870c55f6 [formerly 86b9a4d8c2] [formerly b0870c55f6 [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]
Former-commit-id: 9263ff1846
Former-commit-id: 8f4c2f2a39 [formerly 5a149c5dfa]
Former-commit-id: 77aef5f955
2013-03-01 11:03:11 -06:00
Nate Jensen
312e2e07ae Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb

Former-commit-id: 3dc69632c1 [formerly 8c84bc5fbb] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]
Former-commit-id: 35007e0460
Former-commit-id: 348f5f0f41 [formerly 33da766f63]
Former-commit-id: eec5f87ab2
2013-03-01 10:48:03 -06:00
Nate Jensen
46ceab84c1 Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f

Former-commit-id: e2f12d16b7 [formerly 2a575a24e7] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]
Former-commit-id: f4cccabc07
Former-commit-id: c5600acf79 [formerly f7ffa22c7c]
Former-commit-id: c990477402
2013-03-01 10:12:56 -06:00
Bryan Kowal
4d50fec21f Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: f806c880d3 [formerly d081a2afcd] [formerly f806c880d3 [formerly d081a2afcd] [formerly 4faf8aefbe [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: c4709b1bfb [formerly 497bf33892]
Former-commit-id: cb5a2677b9
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
2013-02-28 17:00:56 -06:00
Dustin Johnson
d67dead12a Merge "Issue #1673: Moved data delivery specific files from minDB configuration where possible" into development
Former-commit-id: 64cfd1c51d [formerly 44140d1e0f] [formerly 64cfd1c51d [formerly 44140d1e0f] [formerly 59212a8241 [formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]]]
Former-commit-id: 59212a8241
Former-commit-id: ad9d95ef08 [formerly c7d5feb7d6]
Former-commit-id: f5d2e1cdbb
2013-02-28 16:24:21 -06:00
Benjamin Phillippe
b4fb275c29 Issue #1738: Removed unused project com.raytheon.uf.edex.ebxml
Change-Id: I87783b45692c84cf851fb5695dae7efa79308655

Former-commit-id: fd5302a619 [formerly e0033900cf] [formerly fd5302a619 [formerly e0033900cf] [formerly e01ae283f7 [formerly 323bdc5919de9f04849e325dfdeb868ccdb39603]]]
Former-commit-id: e01ae283f7
Former-commit-id: 1314c47acf [formerly 3940bf0a6d]
Former-commit-id: 32a205e880
2013-02-28 15:01:53 -06:00
Benjamin Phillippe
09ed21b306 Issue #1673: Moved data delivery specific files from minDB configuration where possible
Change-Id: I09b34e7c429b4f657e586fc64bcbbcc1ceed3585

Former-commit-id: b2da92ac85 [formerly 29e2b0fd9e] [formerly b2da92ac85 [formerly 29e2b0fd9e] [formerly d3d5886233 [formerly b279ad4cc4401c54cd0e2af8170e254cbbc0e53b]]]
Former-commit-id: d3d5886233
Former-commit-id: aaacef1396 [formerly 3802541578]
Former-commit-id: b03fecc650
2013-02-28 14:56:31 -06:00
Max Schenkelberg
3dcfc90510 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 1769edc026 [formerly ec40d261e5] [formerly 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]
Former-commit-id: 547c593dec
Former-commit-id: fc58e7431a [formerly 13a4056335]
Former-commit-id: 0c8f3d2449
2013-02-27 16:19:58 -06:00
Bryan Kowal
8210c0d984 Issue #1662 - wrapper parameters can now be used to specify the order
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters

Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c

Former-commit-id: 5b3478d6c7 [formerly 8bf5e3ffad] [formerly 5b3478d6c7 [formerly 8bf5e3ffad] [formerly 44349717fb [formerly aae64b29491d8da0001cf1182a357683546d4593]]]
Former-commit-id: 44349717fb
Former-commit-id: 65fb00c3c3 [formerly 4f7fed259c]
Former-commit-id: dc46b8eeb1
2013-02-27 12:46:48 -06:00
Max Schenkelberg
727602f011 Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79

Former-commit-id: c8a5f1a007 [formerly 0f1112fb3e] [formerly c8a5f1a007 [formerly 0f1112fb3e] [formerly 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]
Former-commit-id: 38bba3705f
Former-commit-id: 41706c42f2 [formerly 6ebc058df4]
Former-commit-id: 22a18ffe01
2013-02-27 12:26:32 -06:00
Max Schenkelberg
1073393fbb Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: 5617dfaa67 [formerly 6b1426dd34]
Former-commit-id: 453ac44050
2013-02-27 11:50:38 -06:00
Ron Anderson
59c7ee5120 Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0 [formerly 77fbbb6a61]
Former-commit-id: 92abcad349
2013-02-26 18:44:51 -06:00
Nate Jensen
0ac9146923 Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development
Former-commit-id: a020438c99 [formerly 58957d30e5] [formerly a020438c99 [formerly 58957d30e5] [formerly 24c94ef55b [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]]
Former-commit-id: 24c94ef55b
Former-commit-id: 652ac25d12 [formerly b6fc51a18c]
Former-commit-id: 841ddd8509
2013-02-26 18:00:50 -06:00
Richard Peter
294914b403 Issue #1642: Fix QPID Deadlock scenario
- Address peer review comments

Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462

Former-commit-id: 7d4206420c [formerly 9a0177861f] [formerly 7d4206420c [formerly 9a0177861f] [formerly 5b2650599d [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]]
Former-commit-id: 5b2650599d
Former-commit-id: ea806139d3 [formerly 4deaf372a1]
Former-commit-id: e964d248fe
2013-02-26 16:01:25 -06:00
Dustin Johnson
6bb570ce5c Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 8038b840d8 [formerly 7852f88352] [formerly 8038b840d8 [formerly 7852f88352] [formerly 88a9b953b6 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]
Former-commit-id: 88a9b953b6
Former-commit-id: 94300e0c1d [formerly cc0254ba03]
Former-commit-id: 2d6df74b67
2013-02-26 15:06:04 -06:00
Nate Jensen
360b33b854 Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
Former-commit-id: 15c4c4dfa0 [formerly b062299796] [formerly 15c4c4dfa0 [formerly b062299796] [formerly 36d4eff2c6 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: b173d34ba9 [formerly 5c33098315]
Former-commit-id: c06d4abcee
2013-02-26 13:53:40 -06:00
Matt Nash
2841c495af Issue #1668 add gsd pattern to allow for their plugins to be deployed
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6

Former-commit-id: 41bbd4cf2d [formerly a2fb0db684] [formerly 41bbd4cf2d [formerly a2fb0db684] [formerly 051b36ad73 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]
Former-commit-id: 051b36ad73
Former-commit-id: 32096feba8 [formerly b1fe380c44]
Former-commit-id: 1c51407ffd
2013-02-26 13:29:04 -06:00
Dustin Johnson
fa87f70100 Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: ebf02481f0 [formerly d58d28c636] [formerly ebf02481f0 [formerly d58d28c636] [formerly 722e41b8b0 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]
Former-commit-id: 722e41b8b0
Former-commit-id: 219e882fc5 [formerly cf86c92fad]
Former-commit-id: b62631b9d1
2013-02-26 11:32:03 -06:00
Steve Harris
108abd5e69 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: cd99e680bb [formerly b50e384a0f] [formerly cd99e680bb [formerly b50e384a0f] [formerly e8135b9c14 [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]
Former-commit-id: e8135b9c14
Former-commit-id: 901cbbf56d [formerly 2398ef1e85]
Former-commit-id: 1d8b6e0256
2013-02-25 16:05:22 -06:00
Steve Harris
9db68d0585 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: e46625f8f2 [formerly 0051276ad1]
Former-commit-id: 140ae3191c
2013-02-25 15:58:48 -06:00
Bryan Kowal
e38658e939 Issue #1634 - fix EDEX debug with YAJSW Wrapper
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96

Former-commit-id: 4d160993fb [formerly b05073fbe3] [formerly 4d160993fb [formerly b05073fbe3] [formerly 0d2262c0bf [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: f8c920c6cd [formerly 36a887416f]
Former-commit-id: ebe04d4919
2013-02-25 11:30:13 -06:00
Mike Duff
383f5c075e Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 8a8e8f7a73 [formerly 8bddd467b1] [formerly 8a8e8f7a73 [formerly 8bddd467b1] [formerly 81649d346a [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 01ef273417 [formerly b1a549a99f]
Former-commit-id: a92492ed07
2013-02-25 09:29:16 -06:00
Steve Harris
9da8db0212 13.3.1-3 baseline
Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 05eb25f124 [formerly 8d741715e3]
Former-commit-id: 1ba778753f
2013-02-25 10:24:53 -05:00
Steve Harris
a43233f8c2 13.3.1-2 baseline
Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 370ed98038 [formerly e8a51dc780]
Former-commit-id: 2a2a9e03b7
2013-02-25 10:18:36 -05:00
Dustin Johnson
2e513ab5ac Issue #1543 Make DAOs public
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a

Former-commit-id: d4186178af [formerly 06b7697553] [formerly d4186178af [formerly 06b7697553] [formerly 0743782772 [formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]]
Former-commit-id: 0743782772
Former-commit-id: a1df296e80 [formerly 4e87912a9c]
Former-commit-id: 0d9f121548
2013-02-22 12:22:43 -06:00
Bryan Kowal
dd7eda15aa Issue #1634 - force added wrapper jars in bin directory
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 4cd5453e0a [formerly 7c62991edf] [formerly 4cd5453e0a [formerly 7c62991edf] [formerly d5c8b82941 [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]
Former-commit-id: d5c8b82941
Former-commit-id: 53b9e69868 [formerly 5a5914c010]
Former-commit-id: fd17273cb2
2013-02-22 09:28:37 -06:00
Steve Harris
b5d9e75b95 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Bryan Kowal
b88a24574b Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...


Former-commit-id: 519ce2c0fb [formerly a8fb04f41c] [formerly 519ce2c0fb [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: b2a0a7c148 [formerly 450e8e7a4c]
Former-commit-id: 2a21f2624b
2013-02-21 13:55:28 -06:00
Nate Jensen
d4268d6086 Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
Former-commit-id: b2f7cbcbe3 [formerly 7dbeeb2684] [formerly b2f7cbcbe3 [formerly 7dbeeb2684] [formerly c6896b5676 [formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]]
Former-commit-id: c6896b5676
Former-commit-id: 533deac8d0 [formerly 4f4932b014]
Former-commit-id: 0f92e92c18
2013-02-21 11:47:00 -06:00
Nate Jensen
98e5133a1c Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
Former-commit-id: 033b9e3852 [formerly a9c4e54287] [formerly 033b9e3852 [formerly a9c4e54287] [formerly 73f53bd513 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]
Former-commit-id: 73f53bd513
Former-commit-id: 6f9d3f55e5 [formerly d7a57d2b34]
Former-commit-id: 767596401f
2013-02-21 11:41:52 -06:00
Steve Harris
07e4e4c8fb 13.3.1-1 baseline
Former-commit-id: 96768407a5 [formerly 0563d7ac18] [formerly 96768407a5 [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 0569ff413d [formerly 92e4c7ba19]
Former-commit-id: 654f15be5c
2013-02-21 09:36:59 -05:00
Steve Harris
8c828dbd75 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00