Commit graph

148 commits

Author SHA1 Message Date
Bryan Kowal
76afb30fc9 Issue #2851 - 64-bit Windows Jep DLL
cots/org.jep.win64/jep.dll: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: 3ea4a759ed [formerly aa83fbe567] [formerly a758bbdfaa] [formerly a758bbdfaa [formerly 5871d767db]] [formerly 3ea4a759ed [formerly aa83fbe567] [formerly a758bbdfaa] [formerly a758bbdfaa [formerly 5871d767db]] [formerly 1feefeb41b [formerly a758bbdfaa [formerly 5871d767db] [formerly 1feefeb41b [formerly c03701dbe9e78dcd72a08a579329be9b4408295f]]]]]
Former-commit-id: 1feefeb41b
Former-commit-id: ffc53cd866 [formerly ea67a997f6] [formerly 278ff3c00a] [formerly 3d2879ea5b069e3c3ee6da2352c8a95faa309683 [formerly a02f1e3bc84b917182117b2f562502f1f22a9e07] [formerly 278ff3c00a [formerly a02cf1f5df]]]
Former-commit-id: 29ff670eb376cbb6a7d6e61c3504b84e5517525c [formerly a5023b761e0b37f2491c40fe890db51bf84322da] [formerly 8c8a0539ce [formerly 116711b64f]]
Former-commit-id: 8c8a0539ce
Former-commit-id: 03a99a0883
2014-03-25 10:27:53 -05:00
Brad Gonzales
443bced631 Issue #2873 Removed 32 bit native libraries and references.
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: db912336bb [formerly 25050d57f6] [formerly de508133ff] [formerly de508133ff [formerly 08dde4824f]] [formerly db912336bb [formerly 25050d57f6] [formerly de508133ff] [formerly de508133ff [formerly 08dde4824f]] [formerly 189234f162 [formerly de508133ff [formerly 08dde4824f] [formerly 189234f162 [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]]]
Former-commit-id: 189234f162
Former-commit-id: 1f95639767 [formerly 02a20c0e37] [formerly 0022633626] [formerly 5d8c778479fd0fc4c8c6228dafc860c6ec6b6cb1 [formerly b1f2574d3b73438b586d2b8edcd4477283696b6d] [formerly 0022633626 [formerly d303662a51]]]
Former-commit-id: 304a78242efe8bb46109233e6f2c2d151788b33f [formerly 9d6f627b3d954f1806f2ed939de355f3fe6bafcb] [formerly 412262edcf [formerly f859a625d0]]
Former-commit-id: 412262edcf
Former-commit-id: b404e07694
2014-03-20 13:27:39 -05:00
Brian Clements
2907bdab69 Issue #2905 added ucar bufr parser
added netcdf 4.2 bufr library to ucar.nc2 foss
added backported 4.3 bufr splitter library
created a parser wrapper for ease of use


Former-commit-id: 78049d1e87 [formerly 46513ea27c] [formerly 5b69e9b21c] [formerly 5b69e9b21c [formerly 199701def9]] [formerly 78049d1e87 [formerly 46513ea27c] [formerly 5b69e9b21c] [formerly 5b69e9b21c [formerly 199701def9]] [formerly 5348f0a29d [formerly 5b69e9b21c [formerly 199701def9] [formerly 5348f0a29d [formerly 5ddf9be7105dbd8d1fb76ce28a4e6e3f03240974]]]]]
Former-commit-id: 5348f0a29d
Former-commit-id: 60510fe32e [formerly 6825bac664] [formerly 420b48c8ea] [formerly 277d0cc0113b99d8829eb2b3f507c2d995da98c4 [formerly a6b2df11d2b1e116738bfd3b8c4f5f2d90e354d4] [formerly 420b48c8ea [formerly 0e11ca3cfe]]]
Former-commit-id: a3ebcfbe2c936694af130e1207720692f0ac2197 [formerly 691021e7718ee50a16e8b6be21a574fab364502d] [formerly f673684948 [formerly c203e2d631]]
Former-commit-id: f673684948
Former-commit-id: de70728f68
2014-03-20 11:11:53 -05:00
Nate Jensen
f98c139204 Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
Former-commit-id: acded532b8 [formerly 10f1070f26] [formerly 3d7de2ad9a] [formerly 3d7de2ad9a [formerly 6ddf9a2ee7]] [formerly acded532b8 [formerly 10f1070f26] [formerly 3d7de2ad9a] [formerly 3d7de2ad9a [formerly 6ddf9a2ee7]] [formerly 6148c00ed2 [formerly 3d7de2ad9a [formerly 6ddf9a2ee7] [formerly 6148c00ed2 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]]]]]
Former-commit-id: 6148c00ed2
Former-commit-id: 78689d7fbb [formerly d8ca3106d8] [formerly d2fbbdc147] [formerly f61301c0a28fe0a65054feb452eafba6217cdbe7 [formerly a7bd6dd1d051c37aac2ec1554b89736a07412ca4] [formerly d2fbbdc147 [formerly e77738ef65]]]
Former-commit-id: 70dfe92b8b990b295775d42fdd7923bf3a4b52cc [formerly 3293da246be92d8771ace8f218803af1dff37492] [formerly f609b46ec5 [formerly c363fc886c]]
Former-commit-id: f609b46ec5
Former-commit-id: db470217e9
2014-03-18 09:20:16 -05:00
Ron Anderson
c2611c0f9b Issue #2908 Update org.apache.commons.pool to 1.5.4. Change GeoTools to use the separate org.apache.commons projects that are in the baseline.
Change-Id: I05de2eaadc2766a8a0deee6ac816f29119800774

Former-commit-id: b4a2da42b3 [formerly 3ac978316a] [formerly ef8a3b2581] [formerly ef8a3b2581 [formerly 0a6630a84d]] [formerly b4a2da42b3 [formerly 3ac978316a] [formerly ef8a3b2581] [formerly ef8a3b2581 [formerly 0a6630a84d]] [formerly 107daf22ae [formerly ef8a3b2581 [formerly 0a6630a84d] [formerly 107daf22ae [formerly 60ace911a0b1496d3bb74a85ff3c6b89ca70c267]]]]]
Former-commit-id: 107daf22ae
Former-commit-id: 23113237bc [formerly 3b36bda0b9] [formerly c1cfe962c5] [formerly 563df6e3572645e4cca92fba53e500646af82011 [formerly a324770d2d9c3cc29077362f1c9fe283000cbf44] [formerly c1cfe962c5 [formerly 211e0427e4]]]
Former-commit-id: 35c069ec7f5acba6d962b11209c561b90ccc8ae3 [formerly 0e688b49e5e6e84b7cee4c016143bd98d4bd1908] [formerly c14cdeca70 [formerly c399d2a176]]
Former-commit-id: c14cdeca70
Former-commit-id: ea2fa38523
2014-03-13 18:01:22 -05:00
Bryan Kowal
4756c3da19 Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
Former-commit-id: 7e25d848a9 [formerly 0e4fbed3ef] [formerly 3e90c26b14] [formerly 3e90c26b14 [formerly 9b2af366c1]] [formerly 7e25d848a9 [formerly 0e4fbed3ef] [formerly 3e90c26b14] [formerly 3e90c26b14 [formerly 9b2af366c1]] [formerly 6ba13b2b44 [formerly 3e90c26b14 [formerly 9b2af366c1] [formerly 6ba13b2b44 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]]]]]
Former-commit-id: 6ba13b2b44
Former-commit-id: 2ae9007535 [formerly 35d9056fee] [formerly f0ff052afc] [formerly d66205df307cf829d4764ba067c62c0f74b7e435 [formerly 816b374f58a9d0828d47626217f16d7f05d481b6] [formerly f0ff052afc [formerly 2b053a3bc8]]]
Former-commit-id: 3a0eed897ea5f1aed8b5899ff74cd0f4dcc71f2b [formerly a303233de138617fede7bf0b42801e75a29b7e04] [formerly a099c8d647 [formerly 9cfde0458f]]
Former-commit-id: a099c8d647
Former-commit-id: 6fe29d2c4a
2014-03-13 17:39:32 -05:00
Ron Anderson
05f4df9ae0 Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: 778001a035 [formerly d752e068c7] [formerly ab69d3e318] [formerly ab69d3e318 [formerly 1c727465ee]] [formerly 778001a035 [formerly d752e068c7] [formerly ab69d3e318] [formerly ab69d3e318 [formerly 1c727465ee]] [formerly bcfaf40ebf [formerly ab69d3e318 [formerly 1c727465ee] [formerly bcfaf40ebf [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: 8dfd2f2c7a [formerly cbd408ce4e] [formerly 06b0b5b684] [formerly e4634298a5e490a03e4933559cb0ff075da790bc [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66] [formerly 06b0b5b684 [formerly 4b2a388628]]]
Former-commit-id: 3690a965a5b6406fd20f8fd1793d16752aebdb3c [formerly cfe7b7159bee965bab52438c7b1f622e5351016b] [formerly 98e22f6e59 [formerly 4ffc16ce53]]
Former-commit-id: 98e22f6e59
Former-commit-id: 9accd00e1f
2014-03-13 11:11:53 -05:00
Brian Clements
137ca3118d 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: 66840a1bdd [formerly e4d22971bd] [formerly bc8ac5e051] [formerly bc8ac5e051 [formerly ad3d10074a]] [formerly 66840a1bdd [formerly e4d22971bd] [formerly bc8ac5e051] [formerly bc8ac5e051 [formerly ad3d10074a]] [formerly e1819cd4e2 [formerly bc8ac5e051 [formerly ad3d10074a] [formerly e1819cd4e2 [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]]]]
Former-commit-id: e1819cd4e2
Former-commit-id: 911d6407e6 [formerly 2267c2bb0b] [formerly 410ebf65f5] [formerly 01db24e1fbcc79bebe3149dc25ef088e84469a1b [formerly 3beb79dabe2b4fee26bcf793ea28d3ef4e8cebb4] [formerly 410ebf65f5 [formerly 3f0115d329]]]
Former-commit-id: 2c6dbc923dfcb8ff83d53dbefc1515d8f787b3b7 [formerly df339242e5ac9d41f04d641662b3a15d2535f802] [formerly 4a9c85e7ac [formerly 544c713135]]
Former-commit-id: 4a9c85e7ac
Former-commit-id: 6e79ad72ad
2014-03-05 15:29:27 -06:00
Brian Clements
057a274d86 Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: d0e2bfb894 [formerly bd410b2529] [formerly 4e2cb3f7ae] [formerly 4e2cb3f7ae [formerly 3e585945d6]] [formerly d0e2bfb894 [formerly bd410b2529] [formerly 4e2cb3f7ae] [formerly 4e2cb3f7ae [formerly 3e585945d6]] [formerly 3250eb34f5 [formerly 4e2cb3f7ae [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 702b04f16f [formerly 35b53a61cd] [formerly 4190b13ae2] [formerly 5ac2faecdcb11cb65a9f77b603ef9ce3b1510517 [formerly 15ea8433323667869df6df396f6377d11f2a7079] [formerly 4190b13ae2 [formerly 4f4d5c5d69]]]
Former-commit-id: 7c8728bb3981780f91d28570377137dbe5daca3f [formerly bfcea1a4566d36807b6744b7f53ddc0082dc12da] [formerly cf8b85f3d2 [formerly e04cb11154]]
Former-commit-id: cf8b85f3d2
Former-commit-id: 3c70c9ff9c
2014-01-31 09:44:31 -06:00
Steve Harris
63af4664f2 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 261b4709df [formerly 56f5ae9f48] [formerly a465718a0d] [formerly a465718a0d [formerly 24ab7cff49]] [formerly 261b4709df [formerly 56f5ae9f48] [formerly a465718a0d] [formerly a465718a0d [formerly 24ab7cff49]] [formerly 69dc3d835b [formerly a465718a0d [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 71ee956b9d [formerly 6cb92b1f57] [formerly b62efa9387] [formerly e2a897e591e4f75dcb9349f928b85e3f3a2f6f5a [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02] [formerly b62efa9387 [formerly 252c7ee40a]]]
Former-commit-id: 6a4ae7a56b4b35a315d7ffb5427dd6a128fbdd2e [formerly 800d6b432a0b97ae5f3b770d37e08ca17eb7e05a] [formerly 69626ab704 [formerly 2a967fc9b5]]
Former-commit-id: 69626ab704
Former-commit-id: 0a5772e795
2014-01-21 12:36:54 -06:00
Max Schenkelberg
e14d497936 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 259ef77ce4 [formerly 7073ea5e90] [formerly 1256748c42] [formerly 1256748c42 [formerly 68aa666045]] [formerly 259ef77ce4 [formerly 7073ea5e90] [formerly 1256748c42] [formerly 1256748c42 [formerly 68aa666045]] [formerly 87a6db7853 [formerly 1256748c42 [formerly 68aa666045] [formerly 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]]]
Former-commit-id: 87a6db7853
Former-commit-id: 15ccdd2ac4 [formerly 33a28153bf] [formerly 424f2282f0] [formerly fca0e918c4a045752e4617ca2fa8a8385451d948 [formerly d89b6e6e6de809f0a3a0a97dbbdaa5ada41e70fd] [formerly 424f2282f0 [formerly 2574685291]]]
Former-commit-id: 55a0192f472fcf57d95a62b00bcf5e42c97d2523 [formerly ffa17b4375fc8065e9645d70c0e80c40a61fec8f] [formerly d99c6b49e3 [formerly 9903335f77]]
Former-commit-id: d99c6b49e3
Former-commit-id: d0abdecaed
2014-01-20 13:54:27 -06:00
Max Schenkelberg
ab0b0d0239 Issue #2620 Removed unused commons.logging project, removed dependency in apache.http build path
Change-Id: I4c6156080784c5fe9d2f9e9b8f8ea1594b919fb1

Former-commit-id: 47eb845718 [formerly bcc3b9f3df] [formerly aad907e0b3] [formerly aad907e0b3 [formerly b2e5968d97]] [formerly 47eb845718 [formerly bcc3b9f3df] [formerly aad907e0b3] [formerly aad907e0b3 [formerly b2e5968d97]] [formerly 65bbc5d6d5 [formerly aad907e0b3 [formerly b2e5968d97] [formerly 65bbc5d6d5 [formerly 02ae43dcc86c7154af5629c20813bb542eb6cd6b]]]]]
Former-commit-id: 65bbc5d6d5
Former-commit-id: df7f3bf090 [formerly f2cc66447c] [formerly bb03f8707f] [formerly 6bc522ac98beb38a6c4afc05941c346f94673171 [formerly 111592ced8aaa872d54b3587e2b5e2f318d79540] [formerly bb03f8707f [formerly 6e1d5b070f]]]
Former-commit-id: ce6b08df8096cf0fcb0242d9e5b9229da8cb6bef [formerly 520cc7fec1c5584952b33cb0c6a11b1892fa7b2b] [formerly 74125016e0 [formerly 8b5cb15ad2]]
Former-commit-id: 74125016e0
Former-commit-id: f858418c10
2014-01-16 14:50:34 -06:00
Nate Jensen
ace65c4337 Issue #2581 fix local storm report delta script and unique constraint
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809

Former-commit-id: f6bf9ccac8 [formerly 16d01f1ca7] [formerly 562e85e45b] [formerly 562e85e45b [formerly e6feb413f7]] [formerly f6bf9ccac8 [formerly 16d01f1ca7] [formerly 562e85e45b] [formerly 562e85e45b [formerly e6feb413f7]] [formerly 059e057cdb [formerly 562e85e45b [formerly e6feb413f7] [formerly 059e057cdb [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]]]]
Former-commit-id: 059e057cdb
Former-commit-id: 9210e824b6 [formerly f58034617d] [formerly d4236a7fc0] [formerly 76517e160958530803c7f89bcb63e8c7c4476308 [formerly eb6b4892671bdfa9f3570ac483b6bc6a075ba84b] [formerly d4236a7fc0 [formerly bc2f099cc6]]]
Former-commit-id: ffe6dded2e13ec2a4f9f8577868b3b6e438243c2 [formerly 20d520612f8768a8f88dbd545ab39da3abd62969] [formerly 31ce99c9f1 [formerly 47f20fb577]]
Former-commit-id: 31ce99c9f1
Former-commit-id: 01e92b31e4
2014-01-15 09:50:35 -06:00
Max Schenkelberg
f794d5eb29 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 4adb40e333 [formerly 30059d255c] [formerly b3aed99142] [formerly b3aed99142 [formerly 16046a4dde]] [formerly 4adb40e333 [formerly 30059d255c] [formerly b3aed99142] [formerly b3aed99142 [formerly 16046a4dde]] [formerly cc2080449c [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]]
Former-commit-id: cc2080449c
Former-commit-id: 96f972a617 [formerly 257553461b] [formerly 0ceaa43902] [formerly e16937349bd8e68e34180a13f051ca191ec3a50a [formerly d612c358920d902e7385e86659fc1d050de57dd4] [formerly 0ceaa43902 [formerly f58795f460]]]
Former-commit-id: 0cd5cbe22dea8105d0396734a0dfcadaa585f2c6 [formerly e6116ab5b34627162fc751f613c0b7f4743d9668] [formerly 783391423f [formerly 789a279475]]
Former-commit-id: 783391423f
Former-commit-id: e0b7ba7058
2014-01-06 17:03:45 -06:00
Brian Clements
5230f7e483 Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: c1a03ca6c4 [formerly c2b759b38e] [formerly 2c20a87634] [formerly 2c20a87634 [formerly 80650337ce]] [formerly c1a03ca6c4 [formerly c2b759b38e] [formerly 2c20a87634] [formerly 2c20a87634 [formerly 80650337ce]] [formerly ce0a34b53c [formerly 2c20a87634 [formerly 80650337ce] [formerly ce0a34b53c [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]]]
Former-commit-id: ce0a34b53c
Former-commit-id: c9d50f0757 [formerly 64dda165db] [formerly d58f8d7134] [formerly cfe34230cd7006a5076afb83e5fbe2d8c8a713cb [formerly 698a51437531736c124a805026ea7ca5cd199699] [formerly d58f8d7134 [formerly 4015dc23ee]]]
Former-commit-id: fa863d17eccb11455f3f7b63731b71d2d7f4cde8 [formerly 29642bf8db563174d87d99cd43c522c3dc419a43] [formerly 5ede797e27 [formerly aa8d869635]]
Former-commit-id: 5ede797e27
Former-commit-id: 5ab073884a
2013-12-19 12:08:21 -06:00
Brian Clements
0ec7b7f385 Issue #2562 fixed smack buid properties
removed src folder


Former-commit-id: e3f0728938 [formerly 7779bb7da2] [formerly b175049eb0] [formerly b175049eb0 [formerly fdb5504f33]] [formerly e3f0728938 [formerly 7779bb7da2] [formerly b175049eb0] [formerly b175049eb0 [formerly fdb5504f33]] [formerly f4c657de4d [formerly b175049eb0 [formerly fdb5504f33] [formerly f4c657de4d [formerly e844d36335795a022a6d2180c0a38bfea6f3eac4]]]]]
Former-commit-id: f4c657de4d
Former-commit-id: 7a5f1ffc58 [formerly 0ee093500b] [formerly 5826f6a006] [formerly 7eb54aa2ed2ef541c3cf33420b716979fcee80d4 [formerly fb6e9c5e5b8e30d509de2531ae54cab53d1b2b4b] [formerly 5826f6a006 [formerly 92f1087bcf]]]
Former-commit-id: 068064e261c3525dc23eb44a33a07db267bad8f7 [formerly f817ef58875e71788d447cb8d350099196bcaa5b] [formerly 95e1a1dac7 [formerly 110b7c67dc]]
Former-commit-id: 95e1a1dac7
Former-commit-id: 0fff727a1c
2013-12-17 10:55:28 -06:00
Brian Clements
943f2a769e 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: c870aa7591 [formerly d0d14ec091] [formerly 5d1d44b60d] [formerly 5d1d44b60d [formerly 8ece30944a]] [formerly c870aa7591 [formerly d0d14ec091] [formerly 5d1d44b60d] [formerly 5d1d44b60d [formerly 8ece30944a]] [formerly e6c4b39aca [formerly 5d1d44b60d [formerly 8ece30944a] [formerly e6c4b39aca [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]]]
Former-commit-id: e6c4b39aca
Former-commit-id: b795b3a2cf [formerly 4d04f6edbf] [formerly 5a7fca6352] [formerly f12856a41d719689053d06c22088cbb53f886ff8 [formerly ea97705eee929964d9b775519d5de735e490a0d4] [formerly 5a7fca6352 [formerly b8df043202]]]
Former-commit-id: 175e603739315ada1e03b4c7adbaaeb03f31c8ef [formerly ebcbc592123de417dee62c72e2708e136768fd8e] [formerly d7ddaa295d [formerly 0cf7b822ce]]
Former-commit-id: d7ddaa295d
Former-commit-id: 1197d89ded
2013-12-06 17:07:16 -06:00
Steve Harris
f6ae1155cf Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
Former-commit-id: df36a9304b [formerly ad200adacd] [formerly 920e06b8ff] [formerly 920e06b8ff [formerly c37908caa8]] [formerly df36a9304b [formerly ad200adacd] [formerly 920e06b8ff] [formerly 920e06b8ff [formerly c37908caa8]] [formerly 39ab54c912 [formerly 920e06b8ff [formerly c37908caa8] [formerly 39ab54c912 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]]]]
Former-commit-id: 39ab54c912
Former-commit-id: de494d928b [formerly 69710c8f63] [formerly 7b9bc1ae90] [formerly d302781e93bb4b0360b5a330909faeb1f05e9096 [formerly f2b3feeb03238e38bba68b87041e15e6592d811b] [formerly 7b9bc1ae90 [formerly 94a60728ca]]]
Former-commit-id: 53452c17bad91e3d28caade3d4fcfd882a220639 [formerly 0dbdb8b56bcd9a174076ebaf21e6fcc45d778e86] [formerly 99232f6c6c [formerly 77d9b628fe]]
Former-commit-id: 99232f6c6c
Former-commit-id: e167208631
2013-11-19 10:08:45 -06:00
Steve Harris
dcd4d6e1c2 Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 4781b8585d [formerly f7878c44cb] [formerly 542a0946f2] [formerly 542a0946f2 [formerly 0a36987a01]] [formerly 4781b8585d [formerly f7878c44cb] [formerly 542a0946f2] [formerly 542a0946f2 [formerly 0a36987a01]] [formerly 6d9efac6ef [formerly 542a0946f2 [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 39240930ec [formerly 3b074763ab] [formerly 3f9df61017] [formerly 61ed3c79d54ba4186ccc6e5a840ab4172543b160 [formerly 1978596c628755147b84f2d7e363ca602a98cedf] [formerly 3f9df61017 [formerly 869b505f80]]]
Former-commit-id: 78f8956df98c8a008522545fd82e8b2a6bb53c9d [formerly aff5d0abe267c4419bbecd159b29ef6d6ca51480] [formerly 87ce579deb [formerly c26818afe6]]
Former-commit-id: 87ce579deb
Former-commit-id: 2d3311aace
2013-11-15 13:15:25 -06:00
Steve Harris
841401a7d2 14.1.1-9 baseline
Former-commit-id: 2429f3f613 [formerly ba884f2a27] [formerly a32eadf384] [formerly a32eadf384 [formerly f8f995b697]] [formerly 2429f3f613 [formerly ba884f2a27] [formerly a32eadf384] [formerly a32eadf384 [formerly f8f995b697]] [formerly 5a0a40e67c [formerly a32eadf384 [formerly f8f995b697] [formerly 5a0a40e67c [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7150fadbf9 [formerly 7977f24d77] [formerly eab5bb1147] [formerly 9b3569687980222f25c3148fbacdb583dd8e6041 [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211] [formerly eab5bb1147 [formerly 8c136f202d]]]
Former-commit-id: d8aba88e455fc1a4abf95947942f24314e078990 [formerly 7d3151fa65482d7fe7a3ae91e52a20bb86097b97] [formerly ed58bc7f71 [formerly ea382798b5]]
Former-commit-id: ed58bc7f71
Former-commit-id: e3de9e104e
2013-11-15 12:47:49 -05:00
Bryan Kowal
0ed5d2ebb0 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 8a30e2c46a [formerly 1d519f9778] [formerly 178d95e59d] [formerly 178d95e59d [formerly 86dd200844]] [formerly 8a30e2c46a [formerly 1d519f9778] [formerly 178d95e59d] [formerly 178d95e59d [formerly 86dd200844]] [formerly 0544b66f4e [formerly 178d95e59d [formerly 86dd200844] [formerly 0544b66f4e [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]]]
Former-commit-id: 0544b66f4e
Former-commit-id: 62e8aa6db7 [formerly ce40d40304] [formerly a2b1211c52] [formerly ea5dfc2ea72cf9e9da7eee4e6db6b4533e11c6d4 [formerly 9fef8ee66c8d7456504fc2bc5dcebeba0b756974] [formerly a2b1211c52 [formerly 01735ca0c4]]]
Former-commit-id: adca024c05293f40bb85dd887b5d239285d18e74 [formerly 52598106710ffd4583947f5428f98b7eb89170c3] [formerly 97c0dff26a [formerly 1a905e8a3c]]
Former-commit-id: 97c0dff26a
Former-commit-id: 89b9e26156
2013-11-13 13:16:55 -06:00
Dave Hladky
5e49cb6411 Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: fda0e8261f [formerly 80ce7ec3e7] [formerly 5313c8b68d] [formerly 5313c8b68d [formerly 643a150777]] [formerly fda0e8261f [formerly 80ce7ec3e7] [formerly 5313c8b68d] [formerly 5313c8b68d [formerly 643a150777]] [formerly e3a259182c [formerly 5313c8b68d [formerly 643a150777] [formerly e3a259182c [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]]]
Former-commit-id: e3a259182c
Former-commit-id: bcff8fda2f [formerly b467763805] [formerly f2f670bc00] [formerly 233316cd9623243e93d01b95052261393cfb9276 [formerly a4fec8aeeb03e65d82a83a1808e0fa6530ced21e] [formerly f2f670bc00 [formerly 53866e481a]]]
Former-commit-id: fac1b723bce96f320231a2d9837f2256377da806 [formerly 454826e2ebc64df06b520cf75175b5fe9f328956] [formerly fa2238778d [formerly 86363574b3]]
Former-commit-id: fa2238778d
Former-commit-id: 6ee91eff8a
2013-11-12 14:55:41 -06:00
Richard Peter
123f276fe4 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: bbcdf49b38 [formerly 061fa07147] [formerly 7ba466f5a6] [formerly 7ba466f5a6 [formerly 306bd6fae1]] [formerly bbcdf49b38 [formerly 061fa07147] [formerly 7ba466f5a6] [formerly 7ba466f5a6 [formerly 306bd6fae1]] [formerly 460a7b8b5d [formerly 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 26df6d6e8c [formerly 112816a54c] [formerly 3f68fc6eed] [formerly e4907f5885a36a91d1b65e6e0a89871cb695adee [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d] [formerly 3f68fc6eed [formerly 59671c1e7d]]]
Former-commit-id: 7f344e9740b2837f8eeb9555c3f79116a0bdd426 [formerly 8b93a7813019963981a150f64ec44daf5d188cde] [formerly ef23a8f65b [formerly c8ef435295]]
Former-commit-id: ef23a8f65b
Former-commit-id: ff729f46b5
2013-11-12 11:11:36 -06:00
Brian Clements
2d622e9438 Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround


Former-commit-id: 659c7a6054 [formerly b21233ec65] [formerly 6f0630aa55] [formerly 6f0630aa55 [formerly 4f374688c8]] [formerly 659c7a6054 [formerly b21233ec65] [formerly 6f0630aa55] [formerly 6f0630aa55 [formerly 4f374688c8]] [formerly ea6b162369 [formerly 6f0630aa55 [formerly 4f374688c8] [formerly ea6b162369 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]]]
Former-commit-id: ea6b162369
Former-commit-id: 1441d8ac50 [formerly 8feab3c298] [formerly 83edfb5349] [formerly 12f82ba3c0ed0ede7fefed66b7a7d26aa8d70c21 [formerly 82443edd368b60c7bbdfdc3a561f8cc96b1eb818] [formerly 83edfb5349 [formerly a5b61b6d22]]]
Former-commit-id: ce73a1659708ddf49caaf2c8e6ab929f4df41afd [formerly b12cec907353dc39ab55060375f514735f428cb0] [formerly 1369b5d57a [formerly 6772e50e80]]
Former-commit-id: 1369b5d57a
Former-commit-id: 01b43748e3
2013-11-07 16:56:25 -06:00
Steve Harris
93c74a10ef 14.1.1-7 baseline
Former-commit-id: 211f3689a7 [formerly 21ff310620] [formerly 80614c0e52] [formerly 80614c0e52 [formerly 3328e2dd1d]] [formerly 211f3689a7 [formerly 21ff310620] [formerly 80614c0e52] [formerly 80614c0e52 [formerly 3328e2dd1d]] [formerly 4fff87723f [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4aea32d141 [formerly 4d2f53ebc6] [formerly b694612fe0] [formerly 2873fe4e1e4e66b054a889fbda9a12e814d0a88c [formerly d44a91d984ae1d600e17c54655b8255108cade35] [formerly b694612fe0 [formerly 48df058653]]]
Former-commit-id: 55876cf2fce397c2db51e2f966a7943eb67f433f [formerly 39afc27726ae906146c56faa8073b17caaeb711d] [formerly cfb3194426 [formerly 647b908fed]]
Former-commit-id: cfb3194426
Former-commit-id: 2608595d90
2013-11-06 14:16:14 -05:00
Steve Harris
939d22afa0 Merge branch 'development' into development_on_RHEL6
Former-commit-id: d0257cd67c [formerly 354a736ed5] [formerly 1a9ff8df10] [formerly 1a9ff8df10 [formerly 2e0db025f3]] [formerly d0257cd67c [formerly 354a736ed5] [formerly 1a9ff8df10] [formerly 1a9ff8df10 [formerly 2e0db025f3]] [formerly a956fd7f4d [formerly 1a9ff8df10 [formerly 2e0db025f3] [formerly a956fd7f4d [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]]]
Former-commit-id: a956fd7f4d
Former-commit-id: 2daec6df77 [formerly 89bf1adcf5] [formerly 02907147b6] [formerly fd42330a9b7b03baa55628052e151e1500d7b866 [formerly ab6310aa243dfb8185d05a0491fd0532879e343a] [formerly 02907147b6 [formerly 6d20cd89ff]]]
Former-commit-id: 34428f8cecea11057c4d541b2118b787f59f9f74 [formerly 606add2f1c8ffb454a9b5974ada8971cbce12c65] [formerly 280de5fb9e [formerly 999fd5433c]]
Former-commit-id: c7f67709fb06b779b7a650965da779a55480f96f [formerly 280de5fb9e]
Former-commit-id: 77ce162114
2013-11-04 20:29:07 -06:00
Dave Hladky
6932d5a0eb Issue #2472 Replacing lost commit
Former-commit-id: 6f500e58d4 [formerly a6182c2af0] [formerly 62d08dbe93] [formerly 62d08dbe93 [formerly 1f1469fe82]] [formerly 6f500e58d4 [formerly a6182c2af0] [formerly 62d08dbe93] [formerly 62d08dbe93 [formerly 1f1469fe82]] [formerly 9c6a430d40 [formerly 62d08dbe93 [formerly 1f1469fe82] [formerly 9c6a430d40 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]]]
Former-commit-id: 9c6a430d40
Former-commit-id: 31da9a6660 [formerly aaa709a11d] [formerly 2a2b35d62c] [formerly 14bd7a7ac32611439dc56718f91a5dde6cb5e0f8 [formerly 5ba22e77f9a88fb32b78daae0e95bb5adceda6ea] [formerly 2a2b35d62c [formerly 47b946fc3b]]]
Former-commit-id: fffce98611bebd227474693380326c77746188c0 [formerly ded942728a3b08cb39f24160cce93702bdc3e92e] [formerly 5eefed071f [formerly d5a1042ba3]]
Former-commit-id: 52ab5e9f2d101c28aaa91b1b6fd13410599a36ad [formerly 5eefed071f]
Former-commit-id: 02a0a1170c
2013-11-04 16:24:14 -06:00
Bryan Kowal
2fed0e1122 Issue #2476 - re-compile jep for RHEL6 64-bit
Former-commit-id: 9cbb942b5d [formerly 4a22b3ce5f] [formerly fc05fd7140] [formerly fc05fd7140 [formerly 5b99b99d3c]] [formerly 9cbb942b5d [formerly 4a22b3ce5f] [formerly fc05fd7140] [formerly fc05fd7140 [formerly 5b99b99d3c]] [formerly d034d82744 [formerly fc05fd7140 [formerly 5b99b99d3c] [formerly d034d82744 [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]]]]]
Former-commit-id: d034d82744
Former-commit-id: 100ae76cd3 [formerly ea5b64b722] [formerly bde48968ca] [formerly ba9b5632402f936facd948e143058e05641e8a40 [formerly 5af137f626136247835c40325feecbdfe2991c62] [formerly bde48968ca [formerly 7e94e4cd78]]]
Former-commit-id: 603a44499411743999f09f98ef2e69e08872ab13 [formerly 208a3b4fc0e99b4f630a6b5853a5b910b30552a1] [formerly 9bf7652dbd [formerly 4006fd8f54]]
Former-commit-id: 9bf7652dbd
Former-commit-id: fde1c7e23f
2013-10-31 15:56:34 -05:00
Bryan Kowal
9403013491 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: 445757cae2 [formerly fd5a5096de] [formerly 04bcd7e6dc] [formerly 04bcd7e6dc [formerly 49422aea62]] [formerly 445757cae2 [formerly fd5a5096de] [formerly 04bcd7e6dc] [formerly 04bcd7e6dc [formerly 49422aea62]] [formerly d08a652e23 [formerly 04bcd7e6dc [formerly 49422aea62] [formerly d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]]]
Former-commit-id: d08a652e23
Former-commit-id: 23ca241c20 [formerly 874bd8aa36] [formerly d53ec9c750] [formerly c05964b1ea687d4367b363dd45238330c64e9e69 [formerly 2f7241bd44af27a962760419963b91198396fa99] [formerly d53ec9c750 [formerly adb62df96a]]]
Former-commit-id: 891ce1f66496da23a0b0a1bd8ed80fc3248b0a89 [formerly 7bb259e517c1ed9b9182d1d9842aa0cc9ad29f26] [formerly 0d8ab84604 [formerly 70d4374ce8]]
Former-commit-id: 0d8ab84604
Former-commit-id: 7cd17382dc
2013-10-31 15:43:29 -05:00
Bryan Kowal
a7c2090e38 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: e1fcf67a5d [formerly 5164a7c0b1] [formerly 38464427d3] [formerly 38464427d3 [formerly feaacd9356]] [formerly e1fcf67a5d [formerly 5164a7c0b1] [formerly 38464427d3] [formerly 38464427d3 [formerly feaacd9356]] [formerly c8d7a32e2e [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: dcc3e85e23 [formerly d3062ea58f] [formerly f02d4b7a0b] [formerly 277c1bc520156ebcec2d5d08f4dd4bd272688ae2 [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f] [formerly f02d4b7a0b [formerly d366e70934]]]
Former-commit-id: 2e7c504a2a9e9829e8a0d93acae2c2159e685c7a [formerly a385091a8de68d44ac589d69363d2af9bd0275a7] [formerly f5bb76a01e [formerly eaaa3d022c]]
Former-commit-id: f5bb76a01e
Former-commit-id: 6a0ddf11e4
2013-10-31 15:34:46 -05:00
Bryan Kowal
6f38033e05 Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: 4d4b991b7b [formerly 60904307b5] [formerly ecda7100be] [formerly ecda7100be [formerly c74123f5a8]] [formerly 4d4b991b7b [formerly 60904307b5] [formerly ecda7100be] [formerly ecda7100be [formerly c74123f5a8]] [formerly e9b76cf185 [formerly ecda7100be [formerly c74123f5a8] [formerly e9b76cf185 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]]]]
Former-commit-id: e9b76cf185
Former-commit-id: 6739ff6a17 [formerly df0ae3ba94] [formerly 02cdbe0173] [formerly d7c8209139a3a871fe5dc667d27cb088dda2bc66 [formerly 9902031682720d70e9b58e2fde57c57da41262d1] [formerly 02cdbe0173 [formerly d08a1af457]]]
Former-commit-id: 0332046e895161a442188b8f45bb3240ca14d1b2 [formerly 2287564d3c4d6587a1fef7d747e5c4b647a3d562] [formerly 44d773b663 [formerly 71b5ef4733]]
Former-commit-id: 9461844b93079417453791df6d6129e40a0e907a [formerly 44d773b663]
Former-commit-id: a89b081ba5
2013-10-31 14:53:27 -05:00
Greg Armendariz
9e1d049bfc Merge branch 'development' into development_on_RHEL6
Former-commit-id: 64db26455a [formerly 795d6cf541] [formerly 0daf07742e] [formerly 0daf07742e [formerly f6d98d6317]] [formerly 64db26455a [formerly 795d6cf541] [formerly 0daf07742e] [formerly 0daf07742e [formerly f6d98d6317]] [formerly 64dd62005b [formerly 0daf07742e [formerly f6d98d6317] [formerly 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]]]
Former-commit-id: 64dd62005b
Former-commit-id: 2eab86232d [formerly 83262b6cc4] [formerly 5cf091c499] [formerly 4f6bd05c294fd89fe6a308911dc57e0a7630f97f [formerly 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b] [formerly 5cf091c499 [formerly 4fb0e0bd2f]]]
Former-commit-id: 6a3e019289cc03544ed607565066310698b50be2 [formerly cc39f166545faa38560a0e3c8a7dafc13408d077] [formerly c846280439 [formerly eefcbf7dcb]]
Former-commit-id: c846280439
Former-commit-id: a7d7c6447f
2013-10-30 14:52:16 -05:00
Nate Jensen
a33d8f930a Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: ff0cdcf86d [formerly a18df07586] [formerly 554a9cddf3] [formerly 554a9cddf3 [formerly f3143ba7b4]] [formerly ff0cdcf86d [formerly a18df07586] [formerly 554a9cddf3] [formerly 554a9cddf3 [formerly f3143ba7b4]] [formerly 6880a18f1a [formerly 554a9cddf3 [formerly f3143ba7b4] [formerly 6880a18f1a [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: b16d6177b8 [formerly dced4c4d11] [formerly 19043faeaa] [formerly 6637218e2f2a78a6f01a5e95414e63aee2a79753 [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c] [formerly 19043faeaa [formerly f2751f017e]]]
Former-commit-id: 67c4b418226a0ae79e19f4676d7b089aad01137c [formerly 15fd50423e5c76bf2d7d7f54653759492ef97c8d] [formerly f2184b9379 [formerly e8c199f108]]
Former-commit-id: f2184b9379
Former-commit-id: 89b3b81ab3
2013-10-29 14:33:53 -05:00
Steve Harris
cbcfa68727 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 7296bcf517 [formerly f25d638bc2] [formerly a103a0e8ac] [formerly a103a0e8ac [formerly 560b0075cd]] [formerly 7296bcf517 [formerly f25d638bc2] [formerly a103a0e8ac] [formerly a103a0e8ac [formerly 560b0075cd]] [formerly 6ea4ac62ed [formerly a103a0e8ac [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: 85a5c1535f [formerly 0be97d503a] [formerly 3b29cf6790] [formerly 704ff36457dc028529ab6670e5596074395f6e83 [formerly c51eafcb852c1a8282b6694b8e25e7101b5a76bb] [formerly 3b29cf6790 [formerly eced243e6a]]]
Former-commit-id: 579a0a18b96ed71542568a575b1b7e998f46f0ee [formerly 23f5786872767a023465fd464ca03603e3e984fb] [formerly 8982d892ba [formerly 75cdf331b6]]
Former-commit-id: 8982d892ba
Former-commit-id: ba80e5f206
2013-10-28 15:58:12 -05:00
Steve Harris
780ebc3871 14.1.1-4 baseline
Former-commit-id: c3693c792e [formerly cb3b53f205] [formerly 82dec19b6a] [formerly 82dec19b6a [formerly bd95bb6a4e]] [formerly c3693c792e [formerly cb3b53f205] [formerly 82dec19b6a] [formerly 82dec19b6a [formerly bd95bb6a4e]] [formerly 99e3707c5b [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 530f8f1198 [formerly 2039d101ef] [formerly b60635cd70] [formerly e8f742116ac7b5dcef62ae15a6ae48ef875ab994 [formerly 2d757fef6618aded3efb26a4e6771f03101fe824] [formerly b60635cd70 [formerly 7590a56e0e]]]
Former-commit-id: ebd3e0601d59cc8c94018247b3c6a228c41cc169 [formerly 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa] [formerly da4589ec2b [formerly 98ae84da42]]
Former-commit-id: da4589ec2b
Former-commit-id: cbf859daf6
2013-10-28 10:55:16 -04:00
Steve Harris
2ca9559de2 14.1.1-3 baseline
Former-commit-id: 0cc505a64a [formerly a0ba2e1252] [formerly 851f9df229] [formerly 851f9df229 [formerly 94f24e0d8a]] [formerly 0cc505a64a [formerly a0ba2e1252] [formerly 851f9df229] [formerly 851f9df229 [formerly 94f24e0d8a]] [formerly 5739b4f832 [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 6e4187af3c [formerly 2d30611c6d] [formerly aa59400b67] [formerly e5bec8304375023d2850a2bca444926f4925c949 [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19] [formerly aa59400b67 [formerly 4a6a209aea]]]
Former-commit-id: 04d097d14d16b1e927137c3ca7c25238be8c309d [formerly 9a1c18417dfee86a141522f27e066ec83d4258d5] [formerly 472c0a1a5e [formerly 8d67ffede4]]
Former-commit-id: 472c0a1a5e
Former-commit-id: c784003711
2013-10-28 10:46:02 -04:00
Nate Jensen
825f4e3398 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 279b51554b [formerly 2c88b7d9b3] [formerly 3a453d5442] [formerly 3a453d5442 [formerly 002005139f]] [formerly 279b51554b [formerly 2c88b7d9b3] [formerly 3a453d5442] [formerly 3a453d5442 [formerly 002005139f]] [formerly 5a99163569 [formerly 3a453d5442 [formerly 002005139f] [formerly 5a99163569 [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]]
Former-commit-id: 5a99163569
Former-commit-id: 4472a7cc0f [formerly 264555b5d7] [formerly b511177fa1] [formerly 490aa843709d752e26c33bdc4e4d50be01ed65b1 [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f] [formerly b511177fa1 [formerly cf63b37257]]]
Former-commit-id: 5a053b778bb89bffcb3ff6ba156fa97a3e2244c9 [formerly aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65] [formerly 213478f84b [formerly c4161d09ba]]
Former-commit-id: da5a709ca9e8b271838bd51cd70e9cc50971bad1 [formerly 213478f84b]
Former-commit-id: e95a9d9144
2013-10-24 20:02:18 -05:00
Ben Steffensmeier
477b1cea87 Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: d10af7eba0 [formerly f98448d19f] [formerly a935ffadf7] [formerly a935ffadf7 [formerly bfc3faf08f]] [formerly d10af7eba0 [formerly f98448d19f] [formerly a935ffadf7] [formerly a935ffadf7 [formerly bfc3faf08f]] [formerly fa0a0619bc [formerly a935ffadf7 [formerly bfc3faf08f] [formerly fa0a0619bc [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 3e061d717a [formerly 3b4ae67ded] [formerly 09a3276d51] [formerly b2e914f5bbffeb4c52b9e29d7dcf7d6747244619 [formerly 0c6ad2e7a6ad44d264169d56b0486e1f819a8499] [formerly 09a3276d51 [formerly d927e6b2d7]]]
Former-commit-id: f2aabefaed725abe1c2e6efa0fb6830da7bb870a [formerly af4e8832b224839d1a54437070e9f5572038a410] [formerly d1d057ae57 [formerly 5971562d1a]]
Former-commit-id: d1d057ae57
Former-commit-id: a14d315ae5
2013-10-24 11:28:06 -05:00
Bryan Kowal
c5e99724d2 Issue #2476 - re-compile 64-bit jep for RHEL6
Former-commit-id: 78b15fed89 [formerly d67bbce7f3] [formerly 069cb9645e] [formerly 069cb9645e [formerly 4c3cdbb28e]] [formerly 78b15fed89 [formerly d67bbce7f3] [formerly 069cb9645e] [formerly 069cb9645e [formerly 4c3cdbb28e]] [formerly 8036733372 [formerly 069cb9645e [formerly 4c3cdbb28e] [formerly 8036733372 [formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]]]]]
Former-commit-id: 8036733372
Former-commit-id: 8153c303c1 [formerly b17ec4bf91] [formerly 43f23dbc5f] [formerly 418c0b9d02de3e4c27d91b79b4cb21475fc6ace3 [formerly 6cd578ca9adeb4f26edf6048fb0bcfdd512f81a2] [formerly 43f23dbc5f [formerly 4bb993d6c3]]]
Former-commit-id: 6edec5ba349fcbc7d6eaa60da13ac5b0b55d0c39 [formerly 2ce7335dcd7a35775f7d91f9840dae3d021feaae] [formerly 25c863d914 [formerly b3a3b98654]]
Former-commit-id: 25c863d914
Former-commit-id: 61c9dae45c
2013-10-23 17:12:02 -05:00
Richard Peter
40a670bab5 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: fbc9ab7df1 [formerly 9b5d2fa69f] [formerly f69bbf7952] [formerly f69bbf7952 [formerly cb33f5ada7]] [formerly fbc9ab7df1 [formerly 9b5d2fa69f] [formerly f69bbf7952] [formerly f69bbf7952 [formerly cb33f5ada7]] [formerly 14d5b8656e [formerly f69bbf7952 [formerly cb33f5ada7] [formerly 14d5b8656e [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]]]
Former-commit-id: 14d5b8656e
Former-commit-id: d1dda0d18e [formerly b29e037e05] [formerly a49c67203e] [formerly 7f3ac8437c52f86ad4ef4bc45fc02522210f6148 [formerly e43a9bab4c68a481f2c9959d56447b4b556d21ba] [formerly a49c67203e [formerly 6ecb80e892]]]
Former-commit-id: e3da18e35445d090ecf1d42772ba24617818fe1d [formerly eeadb56d97d16e80b358cd1042a03be4d25aa4bb] [formerly 9b381e593d [formerly e27a298e62]]
Former-commit-id: b4b700b45093f85dc45f53c2c259253f898053f4 [formerly 9b381e593d]
Former-commit-id: 0a7c1f2fd7
2013-10-23 15:50:25 -05:00
Bryan Kowal
6fd45bb067 Issue #2476 - recompiled Jep for Windows
Former-commit-id: 8c9b09e74b [formerly 554b8ed515] [formerly 243ffb4b93] [formerly 243ffb4b93 [formerly 0e1c5b51ba]] [formerly 8c9b09e74b [formerly 554b8ed515] [formerly 243ffb4b93] [formerly 243ffb4b93 [formerly 0e1c5b51ba]] [formerly 79f2f2694f [formerly 243ffb4b93 [formerly 0e1c5b51ba] [formerly 79f2f2694f [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]]]]]
Former-commit-id: 79f2f2694f
Former-commit-id: be5b117376 [formerly 18a835700a] [formerly 752061e05f] [formerly ef3957f9607193248b8658235e3bfab82379129b [formerly 58afb6492c43f13934558f37ad7c83bc33ab527c] [formerly 752061e05f [formerly 1737a11d53]]]
Former-commit-id: 084d0af99a02a43d67096c27c9853a5637fc7a09 [formerly 833e74b1f5f48f42e650592487403ab30c677398] [formerly 55f25948a4 [formerly 214f089bfb]]
Former-commit-id: 55f25948a4
Former-commit-id: 97ffa8829a
2013-10-23 15:12:42 -05:00
Bryan Kowal
4c667ae94f Issue #2476 - recompiled jep for Linux
Former-commit-id: 02eeb1c2b2 [formerly 3cecffdc41] [formerly 701b9de382] [formerly 701b9de382 [formerly a3cfae3510]] [formerly 02eeb1c2b2 [formerly 3cecffdc41] [formerly 701b9de382] [formerly 701b9de382 [formerly a3cfae3510]] [formerly 9fe5429068 [formerly 701b9de382 [formerly a3cfae3510] [formerly 9fe5429068 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]]]]]
Former-commit-id: 9fe5429068
Former-commit-id: a698930031 [formerly 3bd099e334] [formerly 855abcd044] [formerly 594f56b599c0d2894d7f4394547a35140fa8d994 [formerly 9f7f22be22f7dce0a7d746d3dcc5083e9a47ffea] [formerly 855abcd044 [formerly 46f5db6284]]]
Former-commit-id: 8c54e89982bda79fe6f6736699aa871d5fc64d8f [formerly 9e486c49d43fefe956fbdfac89e423247921b42a] [formerly b1d11306ae [formerly 12e7425440]]
Former-commit-id: f391d105431c4687e0dc962a295c528fc25bb979 [formerly b1d11306ae]
Former-commit-id: 7edf3a45ff
2013-10-23 15:12:42 -05:00
Bryan Kowal
e1e3a71c79 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 217683e8d0 [formerly 49dd7daf05] [formerly 3f4263fa07] [formerly 3f4263fa07 [formerly a929dec887]] [formerly 217683e8d0 [formerly 49dd7daf05] [formerly 3f4263fa07] [formerly 3f4263fa07 [formerly a929dec887]] [formerly c13018301e [formerly 3f4263fa07 [formerly a929dec887] [formerly c13018301e [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]]]]
Former-commit-id: c13018301e
Former-commit-id: 75442a10f3 [formerly 07b0c95cb8] [formerly f731c424bb] [formerly ff5bca86caf4c811dbc9add8fa9fef41a29536b3 [formerly 01f5de1dacc767ea28030a4861c52d252dbd57ba] [formerly f731c424bb [formerly 0a06af1fdd]]]
Former-commit-id: 55d354d4ee6b61a8bce43d470d398804ce6c28ea [formerly b86c85fd3da49ecc68392ee5a3b1ab792326e1f0] [formerly 5a8bfe3756 [formerly c846630ac7]]
Former-commit-id: 5a8bfe3756
Former-commit-id: 08fcd810c5
2013-10-14 17:58:22 -05:00
Nate Jensen
0bf4cb58f3 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 7de7302a84 [formerly 2fb28dce46] [formerly d7e4576380] [formerly d7e4576380 [formerly b49a2ceb2f]] [formerly 7de7302a84 [formerly 2fb28dce46] [formerly d7e4576380] [formerly d7e4576380 [formerly b49a2ceb2f]] [formerly 40847d0edf [formerly d7e4576380 [formerly b49a2ceb2f] [formerly 40847d0edf [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]]]
Former-commit-id: 40847d0edf
Former-commit-id: 7b3b61480a [formerly 9d1df167be] [formerly d84f47b609] [formerly 39c05454a3d12b2f0a249a1ed5c29e48a4e74da1 [formerly 354b93b5a9315917fe3ed51f812147bc484eb332] [formerly d84f47b609 [formerly 9e4100b0e1]]]
Former-commit-id: 306abfbec892302afab08deb652c0d1292a9712f [formerly c8ae0a88008c418e7419cfb8e0c8c5886ca02adc] [formerly bae5313482 [formerly b506ef6a8d]]
Former-commit-id: bae5313482
Former-commit-id: 239711078f
2013-10-14 15:30:09 -05:00
Bryan Kowal
b5fb5b67c6 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: b99a401727 [formerly 3b7573154c] [formerly bb5acf7c11] [formerly bb5acf7c11 [formerly c125b5b053]] [formerly b99a401727 [formerly 3b7573154c] [formerly bb5acf7c11] [formerly bb5acf7c11 [formerly c125b5b053]] [formerly 9829477ced [formerly bb5acf7c11 [formerly c125b5b053] [formerly 9829477ced [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]]
Former-commit-id: 9829477ced
Former-commit-id: ddcedcc8b2 [formerly f7009e8d15] [formerly 0f825df590] [formerly 95de9d8a9cfbec1d7ebfcc89524eb4fb01618014 [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730] [formerly 0f825df590 [formerly ef789bf912]]]
Former-commit-id: fdd5e2f8f1cac089e2bef02f2c77078adb3b13dc [formerly 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531] [formerly 7bd9ea3d30 [formerly 0efd4c7c50]]
Former-commit-id: 7bd9ea3d30
Former-commit-id: 87750ddaef
2013-09-30 18:00:31 -05:00
Dave Hladky
6a6c4a5a78 Issue #2388 Multiple code jars in path, Nate's logger finds.
Former-commit-id: e064511726 [formerly e8234c2ef8] [formerly 3787da81a8] [formerly 3787da81a8 [formerly 8e5d3d9742]] [formerly e064511726 [formerly e8234c2ef8] [formerly 3787da81a8] [formerly 3787da81a8 [formerly 8e5d3d9742]] [formerly f184d2ba9c [formerly 3787da81a8 [formerly 8e5d3d9742] [formerly f184d2ba9c [formerly ad02f4640d747328257f9b7a3f2ca2300fcc7bba]]]]]
Former-commit-id: f184d2ba9c
Former-commit-id: 3be7ae4920 [formerly 4df5cea860] [formerly 4360a23a07] [formerly 0c81d4c52bd225e6d7bf69a087cec6a979c93090 [formerly e5b737dd2d117f50e8ddc1d9fef058bc6c2b1649] [formerly 4360a23a07 [formerly 41ba230de0]]]
Former-commit-id: e8a74c7295255e5025066b47f02e34176839bee6 [formerly 85d61f4cf30487354033294aee585d0c19887a96] [formerly 5001c8f42e [formerly b98d037cdd]]
Former-commit-id: 5001c8f42e
Former-commit-id: f80a730a58
2013-09-19 10:59:07 -05:00
Dave Hladky
805e05b2af Issue #2340 Update path for xmlschema jar
Former-commit-id: 8bd695b2b8 [formerly f54fc05964] [formerly 9db93af5a4] [formerly 9db93af5a4 [formerly f83ed6037c]] [formerly 8bd695b2b8 [formerly f54fc05964] [formerly 9db93af5a4] [formerly 9db93af5a4 [formerly f83ed6037c]] [formerly 687bd183ee [formerly 9db93af5a4 [formerly f83ed6037c] [formerly 687bd183ee [formerly 2336dbc99ba0effc1571672f5ab29fbde4f47863]]]]]
Former-commit-id: 687bd183ee
Former-commit-id: 44a71b6518 [formerly 67963a287a] [formerly c90333b16f] [formerly 9b277c33ea7950d6aa7fb9cb74fbe8b155284612 [formerly fed6a3e5edd854d22dfed390927c05ae87d484c3] [formerly c90333b16f [formerly 1694178dcd]]]
Former-commit-id: bac66810ea234003b3678c0cdeb12eb62b5228d9 [formerly 672cebca8808fc98d26731151ee2f13389b0b664] [formerly 10bf08a173 [formerly c64fc6fb5b]]
Former-commit-id: 10bf08a173
Former-commit-id: 8d482914c3
2013-09-06 09:03:19 -05:00
Dave Hladky
54d1b3ae5b Issue #2323 Update xmlschema packages to correct naming convention
Former-commit-id: 31bbbb6c92 [formerly f57218a173] [formerly b3486515c0] [formerly b3486515c0 [formerly 074f08c4cb]] [formerly 31bbbb6c92 [formerly f57218a173] [formerly b3486515c0] [formerly b3486515c0 [formerly 074f08c4cb]] [formerly ccff3e3a54 [formerly b3486515c0 [formerly 074f08c4cb] [formerly ccff3e3a54 [formerly 884684895e7f7f671e5efe4ea62222bfa3192900]]]]]
Former-commit-id: ccff3e3a54
Former-commit-id: ad7d0d6c5c [formerly 7c718668f8] [formerly e728270388] [formerly 12c41382b62f19daa3e1f8e499bf30e27126b95b [formerly be4cb956ddb1e2f374655ecbd886e8534f4e15fb] [formerly e728270388 [formerly 6a71524ce4]]]
Former-commit-id: 196b4100088fe3255c5e444eb1c67edb6e541c73 [formerly b80b5e234e607c3d64ef6631184c2a3a410223b9] [formerly aeb7d62901 [formerly 0a2c72f57c]]
Former-commit-id: aeb7d62901
Former-commit-id: 08c120e096
2013-09-04 12:56:10 -05:00
Benjamin Phillippe
a33b7613da Issue #1538 Federated registry fixes/modifications
Change-Id: Iedc048fe42687bec17385f0aacf0af0141df2146

Former-commit-id: 4cc3b75e17 [formerly 2b6aca163f] [formerly 178e073cf3] [formerly 178e073cf3 [formerly a96764e900]] [formerly 4cc3b75e17 [formerly 2b6aca163f] [formerly 178e073cf3] [formerly 178e073cf3 [formerly a96764e900]] [formerly b10ecfa19c [formerly 178e073cf3 [formerly a96764e900] [formerly b10ecfa19c [formerly 05e0a84c1ef3d04256884b81219f643e8f38187d]]]]]
Former-commit-id: b10ecfa19c
Former-commit-id: d77c74b87b [formerly 4e0dc57681] [formerly 117374dbef] [formerly cd6e436ce63078c86cabb53a57bd0706d93e8772 [formerly e00dac430e9e5ef681cf84ca23ae6d1f181901e0] [formerly 117374dbef [formerly 283326197a]]]
Former-commit-id: e4e334d2d7beafdaf5571c7cf0651af454ab2e25 [formerly aa9a2dc27e2a7dada329b6c19d2594489eb713f8] [formerly a9f7a0b874 [formerly 4634cadd3d]]
Former-commit-id: a9f7a0b874
Former-commit-id: 11011350c2
2013-08-28 11:41:06 -05:00
Richard Peter
da2a2aa3b0 Merge "Issue #2097 Initial update for OGC services Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99" into development
Former-commit-id: 339a17b21e [formerly b41733e62f] [formerly 9ce57ca237] [formerly 9ce57ca237 [formerly 7883b7642f]] [formerly 339a17b21e [formerly b41733e62f] [formerly 9ce57ca237] [formerly 9ce57ca237 [formerly 7883b7642f]] [formerly 34a6082255 [formerly 9ce57ca237 [formerly 7883b7642f] [formerly 34a6082255 [formerly 96d335d72286bba82f9054b525f47450854797d1]]]]]
Former-commit-id: 34a6082255
Former-commit-id: 2e8e326714 [formerly 8d6dd19565] [formerly b418109df7] [formerly a5edfcd6cab9f3b5c04293e0de7ef020eb82c37d [formerly e464ad97e5c451c923d9238fd91a98fb859d7428] [formerly b418109df7 [formerly f9a1a40bc2]]]
Former-commit-id: 0080bbf8802b552e215185f998d215ede6329b7f [formerly e72b3502f415cfb00a578a58639d3810cabf2a7a] [formerly 1e6aa9bdeb [formerly a8ee4a3e99]]
Former-commit-id: 0a5f6ddaa84ecd65687fac151247f230b83618f7 [formerly 1e6aa9bdeb]
Former-commit-id: 283db1405c
2013-08-28 08:26:51 -05:00