Nate Jensen
|
e7a5741574
|
Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4
Former-commit-id: c79b83981a [formerly 0aab8a628a] [formerly 8968389383] [formerly 8968389383 [formerly ec01e6e872]] [formerly c79b83981a [formerly 0aab8a628a] [formerly 8968389383] [formerly 8968389383 [formerly ec01e6e872]] [formerly be9315642b [formerly 8968389383 [formerly ec01e6e872] [formerly be9315642b [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]]]
Former-commit-id: be9315642b
Former-commit-id: 6c45c0a7a5 [formerly de5ac0756a] [formerly 8cca3c32ac] [formerly 30fac95d5362d9c6dd8386980da76f18dba907b8 [formerly 71058eb3f64680175103324660052217c65f2678] [formerly 8cca3c32ac [formerly b0f3d536e4]]]
Former-commit-id: 7bbe9bef4bd4def5747e668a290b5544b7163d34 [formerly b4837d2813879922805a2c09fd2460bdd91130d5] [formerly d6cbe9b4f5 [formerly 9d4e00d5d1]]
Former-commit-id: d6cbe9b4f5
Former-commit-id: 5d607d3cbf
|
2013-08-07 16:44:30 -05:00 |
|
Ben Steffensmeier
|
01165a964d
|
Issue #2068 Unpack viz cots plugins.
Former-commit-id: 81c415a741 [formerly 8744b432e2] [formerly 62c3bc9bbe] [formerly 62c3bc9bbe [formerly a1a44cdc7a]] [formerly 81c415a741 [formerly 8744b432e2] [formerly 62c3bc9bbe] [formerly 62c3bc9bbe [formerly a1a44cdc7a]] [formerly 073ad47a7d [formerly 62c3bc9bbe [formerly a1a44cdc7a] [formerly 073ad47a7d [formerly 5a76cddc79705708969b37de530ad0bce2c26505]]]]]
Former-commit-id: 073ad47a7d
Former-commit-id: 3cf45e9dbf [formerly 68e003197c] [formerly b117268b67] [formerly 5c9a259f1eebb0565d3b30a5368a5f7c3f53a727 [formerly 587c0e8ab39d1a12b84ad0feb9eb72f3be035a36] [formerly b117268b67 [formerly 7f9cf6d46d]]]
Former-commit-id: b5f175ad4a450935f48acededa3fcc1ae40e1671 [formerly 0260136aa7844f6570725d776e85e69c91584609] [formerly c30e3bd615 [formerly 486ea54d69]]
Former-commit-id: 64325fe8f4af058794eedaf63e0ceb1db408f96a [formerly c30e3bd615]
Former-commit-id: 6aee2bb3db
|
2013-06-06 13:17:50 -05:00 |
|
Nate Jensen
|
26e4a0bcc3
|
Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89
Former-commit-id: 1ed162a194 [formerly b1ed04a275] [formerly 0c718e1cd1] [formerly 0c718e1cd1 [formerly 5280b54277]] [formerly 1ed162a194 [formerly b1ed04a275] [formerly 0c718e1cd1] [formerly 0c718e1cd1 [formerly 5280b54277]] [formerly 4e63b88031 [formerly 0c718e1cd1 [formerly 5280b54277] [formerly 4e63b88031 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]]]
Former-commit-id: 4e63b88031
Former-commit-id: 806b845bd1 [formerly 47be3995a9] [formerly 65fdf84101] [formerly 7beac75449eec72768a012642a08b9e28e7e1e19 [formerly 5cf8e53ac89e47650c22747cbc9c44014230f489] [formerly 65fdf84101 [formerly 1e059ee8d9]]]
Former-commit-id: c7e9197719b578696b2e1aac44df57f808e52679 [formerly 94a45bae766a98d27590ffd7fb1d2a8f5125013f] [formerly 338bbc4216 [formerly 4973acb807]]
Former-commit-id: 338bbc4216
Former-commit-id: e25bc42522
|
2013-05-15 09:22:16 -05:00 |
|
Nate Jensen
|
60837117e4
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: 895fe171a1 [formerly c5e226e268] [formerly 1fcbeb41c9] [formerly 1fcbeb41c9 [formerly 08b9ce4c62]] [formerly 895fe171a1 [formerly c5e226e268] [formerly 1fcbeb41c9] [formerly 1fcbeb41c9 [formerly 08b9ce4c62]] [formerly 6f1684b85c [formerly 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: fad1ef1bdf [formerly 575b6335c3] [formerly dac803ca07] [formerly 475600f64961fb3fb420a8943d72d4a972e5b4e9 [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555] [formerly dac803ca07 [formerly 22c23492c4]]]
Former-commit-id: 57244b5b455b212ed520cee4831de3878e39d243 [formerly ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d] [formerly 0080d492e2 [formerly 925339b84c]]
Former-commit-id: 0080d492e2
Former-commit-id: 6b9fa8445b
|
2013-05-14 16:16:13 -05:00 |
|
Max Schenkelberg
|
469f41d357
|
Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project
Amend: Removed eclipse feature all together, added os and arch to fragments. Ensured unpack flag stayed same when changing features.
Change-Id: I78a2c5262ebdbe3ace3c180254b5f036011c0a65
Former-commit-id: 665192e766 [formerly 16cce70f9d] [formerly 6ccef4d3c7] [formerly 6ccef4d3c7 [formerly bd52681be3]] [formerly 665192e766 [formerly 16cce70f9d] [formerly 6ccef4d3c7] [formerly 6ccef4d3c7 [formerly bd52681be3]] [formerly 7513e5982b [formerly 6ccef4d3c7 [formerly bd52681be3] [formerly 7513e5982b [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]]]]
Former-commit-id: 7513e5982b
Former-commit-id: 2aa881db67 [formerly d0edd6a882] [formerly 1950aff01a] [formerly 22b9b60c01df6ad9c0115590423de8d624e5f904 [formerly 0dd1d5c1eb848344c287d03fc5cb6b4556d376ab] [formerly 1950aff01a [formerly 57f34e9080]]]
Former-commit-id: bc5eea40deabf407d67e325fb6b5b69d235f86d2 [formerly d0f63d287352e6fa8f52b87780f423ef41d87efa] [formerly eb6a0d25d0 [formerly 2e5c1a7c32]]
Former-commit-id: fbc8d336c541d68e1875cf299262c5e59332d5ed [formerly eb6a0d25d0]
Former-commit-id: 10ee43ad97
|
2013-04-17 11:42:46 -05:00 |
|
Max Schenkelberg
|
15101efedf
|
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: c3042a87a6 [formerly 9f4b102dc7] [formerly 43341e7ad3] [formerly 43341e7ad3 [formerly c6db3ce43b]] [formerly c3042a87a6 [formerly 9f4b102dc7] [formerly 43341e7ad3] [formerly 43341e7ad3 [formerly c6db3ce43b]] [formerly 26cfcd2af5 [formerly 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 92bc8c1230 [formerly 8732e302f7] [formerly ec27a16858] [formerly 6c039859fc636409c28a8081beef0a1720524744 [formerly 1d0bcac64713d401322363f780281a663de8cdab] [formerly ec27a16858 [formerly 2e10fd83f6]]]
Former-commit-id: 04c983a88030a23e8d4b488d41d42db87066e3eb [formerly 0ea78b9e51d9a9b783beb7ba00499485ffe88ecd] [formerly a25ccc8c5c [formerly 924e27f51f]]
Former-commit-id: a25ccc8c5c
Former-commit-id: 4a8a63253a
|
2013-03-20 14:10:52 -05:00 |
|
Steve Harris
|
5a073388aa
|
Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 34fda0562b [formerly 8db22baf07] [formerly 310474ae9b] [formerly 310474ae9b [formerly 36df63be5c]] [formerly 34fda0562b [formerly 8db22baf07] [formerly 310474ae9b] [formerly 310474ae9b [formerly 36df63be5c]] [formerly cb5ea76f98 [formerly 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 49e63b0132 [formerly 96ba08115a] [formerly d00dc0d174] [formerly 358d5a06d33172151856ef0de421ec4363e39500 [formerly 676c62cd28cf7ed4ed697282c1db1cda2b6aebde] [formerly d00dc0d174 [formerly 104e6e79e8]]]
Former-commit-id: 3e8d9896d604651706dfe93ba40f1b97c61f1707 [formerly b81ab6022fde7cae7ff4586a3467e9e741b445f7] [formerly 352c267fc9 [formerly 6d4512fa3a]]
Former-commit-id: 8f0cf85763e56aa5e311212f71b1a064bb2fc721 [formerly 352c267fc9]
Former-commit-id: 0929de5965
|
2013-03-20 13:45:11 -05:00 |
|
Ben Steffensmeier
|
11476d7855
|
Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: c1b18431cf [formerly 0d765a2fcf] [formerly 0d9119a1c7] [formerly 0d9119a1c7 [formerly 2b6aa86371]] [formerly c1b18431cf [formerly 0d765a2fcf] [formerly 0d9119a1c7] [formerly 0d9119a1c7 [formerly 2b6aa86371]] [formerly ed544fc17c [formerly 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]]]
Former-commit-id: ed544fc17c
Former-commit-id: 90f0231f79 [formerly 4b0e7e77d3] [formerly b201d9dee2] [formerly 138eb364950ce1016001212990a8dfab9f67c1c0 [formerly b850b70906a6763277fa77ce5a2f3e638139e35a] [formerly b201d9dee2 [formerly 646b61f653]]]
Former-commit-id: 1b311c0985427233098a2a49273485f4d6e4f12a [formerly 054b143635c076ebd5e79c9bbfe409552cff76ec] [formerly 4cde2bd826 [formerly 498d153e40]]
Former-commit-id: 4cde2bd826
Former-commit-id: a503ef0938
|
2013-03-20 13:05:54 -05:00 |
|
Bryan Kowal
|
58647c87ae
|
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: 69b98cc17c [formerly 875c17399a] [formerly f806c880d3] [formerly f806c880d3 [formerly d081a2afcd]] [formerly 69b98cc17c [formerly 875c17399a] [formerly f806c880d3] [formerly f806c880d3 [formerly d081a2afcd]] [formerly 4faf8aefbe [formerly f806c880d3 [formerly d081a2afcd] [formerly 4faf8aefbe [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: 35aa700385 [formerly e005f18132] [formerly c4709b1bfb] [formerly 03758d66cfbee8a58f6c4f66ac3022795fd756f9 [formerly 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6] [formerly c4709b1bfb [formerly 497bf33892]]]
Former-commit-id: ae437a69c71de7bdd560a77b113da3415fa40771 [formerly a05976388b8f7d2005143e0d29a6962ef9b7b34e] [formerly 4d50fec21f [formerly cb5a2677b9]]
Former-commit-id: 4d50fec21f
Former-commit-id: cfaaafbd5a
|
2013-02-28 18:09:25 -06:00 |
|
Max Schenkelberg
|
bcee002b37
|
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: f71c49b37b [formerly 0fb8bb14d2] [formerly 1769edc026] [formerly 1769edc026 [formerly ec40d261e5]] [formerly f71c49b37b [formerly 0fb8bb14d2] [formerly 1769edc026] [formerly 1769edc026 [formerly ec40d261e5]] [formerly 547c593dec [formerly 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]]]
Former-commit-id: 547c593dec
Former-commit-id: 11af7adae3 [formerly b6a0a31731] [formerly fc58e7431a] [formerly a4ddde18ac76054fba1efad79ea017f97f8039a8 [formerly 5b67b8fa2777f5d1c1e3d2378514221879eea2b9] [formerly fc58e7431a [formerly 13a4056335]]]
Former-commit-id: 5c03857dff4891b06793ec56ae4ebbef5e959910 [formerly 984eb0a6ab87ef54eab69d0af6ddebb0e5af12f0] [formerly 3dcfc90510 [formerly 0c8f3d2449]]
Former-commit-id: 7ccc9d0adf55beec033bad41976a267a83542482 [formerly 3dcfc90510]
Former-commit-id: 805eacaa9a
|
2013-02-27 16:19:58 -06:00 |
|
Ron Anderson
|
a63610593f
|
Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: 248bf1269a [formerly 9156b9ffe8] [formerly dc7c9edb87] [formerly dc7c9edb87 [formerly a2a89fb4e7]] [formerly 248bf1269a [formerly 9156b9ffe8] [formerly dc7c9edb87] [formerly dc7c9edb87 [formerly a2a89fb4e7]] [formerly 7c0a5d74bf [formerly dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 2ed0989eee [formerly 12f2ac0171] [formerly d69d628450] [formerly 09203d9a70e32daeb05197143cbf38a108871cde [formerly 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf] [formerly d69d628450 [formerly e952a4f179]]]
Former-commit-id: 95e9c1dc1a8f2e0bbcbb2e724172578932ac608b [formerly af2b3c67dc766d6b95ad299a4853ebd80437f7e4] [formerly 80df624bb3 [formerly 45627edcc7]]
Former-commit-id: 80df624bb3
Former-commit-id: 46248d1c10
|
2013-02-15 09:03:41 -06:00 |
|
Matt Nash
|
f4a02979c7
|
Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3
Former-commit-id: e0a924f255 [formerly ce8795b271] [formerly 6949c1f105] [formerly 6949c1f105 [formerly 1d56d879fb]] [formerly e0a924f255 [formerly ce8795b271] [formerly 6949c1f105] [formerly 6949c1f105 [formerly 1d56d879fb]] [formerly ab07a92d48 [formerly 6949c1f105 [formerly 1d56d879fb] [formerly ab07a92d48 [formerly 01033bfd4b1b298095697267be60d978aa5c14a5]]]]]
Former-commit-id: ab07a92d48
Former-commit-id: 9809cecb58 [formerly df28ed4abf] [formerly 210da024a4] [formerly 8930c9226adcfa1af45608e5be8273c64026908b [formerly 5a514d93d7982a7df8191a39807e94e778ed2652] [formerly 210da024a4 [formerly d24fab93dd]]]
Former-commit-id: 567a2bac8d56050ae96aedac2049293949a38754 [formerly fd7e753d34910cbe83aaf4127c8059bb3ec72513] [formerly bf2dcdb733 [formerly 349ba67388]]
Former-commit-id: bf2dcdb733
Former-commit-id: 93b662e32f
|
2012-12-13 09:40:49 -06:00 |
|
Dustin Johnson
|
8863642277
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly 1dbeb22893 [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: e9b7956d0f [formerly cd5faf58bf] [formerly 2d1e886cf3] [formerly e239f886daa359a6280760b8fa6b78b5c8380ec8 [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc] [formerly 2d1e886cf3 [formerly 4222b24d09]]]
Former-commit-id: 807d5554bc7b021defe634c74b7c5d059408a145 [formerly 58274565203c021076e001f24f089a98cd2216f6] [formerly b4a13190ad [formerly 6613c51d3b]]
Former-commit-id: b4a13190ad
Former-commit-id: eb82c7672b
|
2012-11-08 09:57:16 -06:00 |
|
Max Schenkelberg
|
6c4bb4e5a0
|
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: b509b0b6f8 [formerly 94e64c9b0d] [formerly f069f34a96] [formerly f069f34a96 [formerly 2f90120248]] [formerly b509b0b6f8 [formerly 94e64c9b0d] [formerly f069f34a96] [formerly f069f34a96 [formerly 2f90120248]] [formerly ca4177dd08 [formerly f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]]
Former-commit-id: ca4177dd08
Former-commit-id: 7c98f74df1 [formerly f9e6347863] [formerly 5a5bd522a1] [formerly 082a977ca10e61c029a5c8992d7e42d06b9c7952 [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b] [formerly 5a5bd522a1 [formerly 747ab974e9]]]
Former-commit-id: 2951cbd77dc372be3c17a88e1f16e6924b339e01 [formerly 0f95dc114844e36c224300902fd5c26ef83108c0] [formerly 2345861756 [formerly 50625b0453]]
Former-commit-id: 2345861756
Former-commit-id: 3a1cefc612
|
2012-11-07 10:44:42 -06:00 |
|
Dustin Johnson
|
9d4be7348f
|
Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: d51d594e7e [formerly 7d0e4a6e75] [formerly 8e69107b5a] [formerly 8e69107b5a [formerly 98d7beae50]] [formerly d51d594e7e [formerly 7d0e4a6e75] [formerly 8e69107b5a] [formerly 8e69107b5a [formerly 98d7beae50]] [formerly 31d7d09c10 [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: ae183fca66 [formerly fe8a2a3b09] [formerly e7a0f96a9a] [formerly 55a41099e1396bc77b91bb9c62fad3b1d22efc4b [formerly 465044dd2793505eba62cb46e6b3a8ac48623765] [formerly e7a0f96a9a [formerly bcf575966b]]]
Former-commit-id: b7a0d046a48a764818e233bf0f08a36bc23a5f3a [formerly df421cc2225941d22d1932b1c7a86fb3bdad68ce] [formerly 931d94d1de [formerly 4d9c945388]]
Former-commit-id: c1eaba9befa2ec7cf2eeda222b35df8a9dffd0fb [formerly 931d94d1de]
Former-commit-id: 4bc4d95b21
|
2012-11-01 13:36:06 -05:00 |
|
Brad Gonzales
|
1a07fbf382
|
Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats
update the edex feature and edex build.xml to include the edex stat projects.
Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4
Former-commit-id: 1b34c32a96 [formerly 1ba2a25bce] [formerly d26119c383] [formerly d26119c383 [formerly b2656df2f8]] [formerly 1b34c32a96 [formerly 1ba2a25bce] [formerly d26119c383] [formerly d26119c383 [formerly b2656df2f8]] [formerly 24fc32ee14 [formerly d26119c383 [formerly b2656df2f8] [formerly 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]]]
Former-commit-id: 24fc32ee14
Former-commit-id: 3aff93a86f [formerly ff6f910a9d] [formerly 781265a6a8] [formerly 25f63fea4f5c01344a827aba3064ebb3942d39cf [formerly ddba220564f0c36e18583d0653bc164afe5c183b] [formerly 781265a6a8 [formerly 5949c8b09c]]]
Former-commit-id: 2c73a3e57cd1f89bfd9ba3a450d76ed154c37bc9 [formerly a76485ccacebffc316c6acd73b16f63a1cb16d68] [formerly 673749c4b9 [formerly e1a106fdbb]]
Former-commit-id: 673749c4b9
Former-commit-id: e6bb9385b9
|
2012-10-26 14:00:55 -05:00 |
|
Nate Jensen
|
07b668fa66
|
Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f
Former-commit-id: 276b04621a [formerly 7e34a3e6ab] [formerly e58404bcb5] [formerly e58404bcb5 [formerly bcedcc51fa]] [formerly 276b04621a [formerly 7e34a3e6ab] [formerly e58404bcb5] [formerly e58404bcb5 [formerly bcedcc51fa]] [formerly 7046ba996a [formerly e58404bcb5 [formerly bcedcc51fa] [formerly 7046ba996a [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]]]]
Former-commit-id: 7046ba996a
Former-commit-id: aab6968752 [formerly d91a0470ad] [formerly 95bbc6a2d4] [formerly 53fc83b67fc89a7f92c5abe57a6aa72e904c8d12 [formerly 0568bcdd3aeb09c62970a0d7fde73f55fd4d84b8] [formerly 95bbc6a2d4 [formerly 63c5c4dc33]]]
Former-commit-id: 6b373a17d82e93742d0f4452dae114185d2db1d5 [formerly 39cc252f2828b2aca1e65da68a70de8fe6c5317b] [formerly 065bd9facf [formerly c558b07925]]
Former-commit-id: 065bd9facf
Former-commit-id: d261959c58
|
2012-06-29 13:19:47 -05:00 |
|
Nate Jensen
|
01eb3122f2
|
Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702
Former-commit-id: f2d4e6e306 [formerly 314910c88f] [formerly eb2c21c15d] [formerly eb2c21c15d [formerly 315594cab4]] [formerly f2d4e6e306 [formerly 314910c88f] [formerly eb2c21c15d] [formerly eb2c21c15d [formerly 315594cab4]] [formerly 24b40c3392 [formerly eb2c21c15d [formerly 315594cab4] [formerly 24b40c3392 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]]]]
Former-commit-id: 24b40c3392
Former-commit-id: fa48818048 [formerly b98cc05c01] [formerly 11f01325e5] [formerly e92d8e860405514c2fcf2e10ea018de74fa1ed0a [formerly d2911501fc67a32eb2a016f4d84e1503e130e670] [formerly 11f01325e5 [formerly d125185d28]]]
Former-commit-id: 49bf76b22c3ecebe55074991d6a91acea7d43a2e [formerly eed240cb87b23fd0b2ceb0fb620c5c47647b08b7] [formerly c39f1c2a1d [formerly bd58025a99]]
Former-commit-id: c39f1c2a1d
Former-commit-id: 9d4acfd024
|
2012-06-28 17:57:17 -05:00 |
|
Bryan Kowal
|
f6c9d905b3
|
Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: 66fe9fad69 [formerly a6814ec7fb] [formerly fa84e5df3e] [formerly fa84e5df3e [formerly 207bbd3087]] [formerly 66fe9fad69 [formerly a6814ec7fb] [formerly fa84e5df3e] [formerly fa84e5df3e [formerly 207bbd3087]] [formerly 25addabe64 [formerly fa84e5df3e [formerly 207bbd3087] [formerly 25addabe64 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]]]
Former-commit-id: 25addabe64
Former-commit-id: d019030b46 [formerly f064abd37a] [formerly 21a02e1510] [formerly cdb02d197915d645dffc85ea535f9a7a3a5587df [formerly 17ed68aef27593eee306fe2fb3bb631e5e2624fc] [formerly 21a02e1510 [formerly 94e4af6d47]]]
Former-commit-id: 43125bc3492bab41f4d0a4cba88be4658c06aaa5 [formerly 26b9b80270ee9967c245bdeb19a771d7cfaad8d6] [formerly b69b1e9509 [formerly 85507d67dd]]
Former-commit-id: b69b1e9509
Former-commit-id: 6706056477
|
2012-06-19 15:03:57 -05:00 |
|
Steve Harris
|
a789fd0d77
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bd61076019 [formerly bcc12e03ed] [formerly 572e1bb476] [formerly 572e1bb476 [formerly 27bc369818]] [formerly bd61076019 [formerly bcc12e03ed] [formerly 572e1bb476] [formerly 572e1bb476 [formerly 27bc369818]] [formerly 58037cb5d1 [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 2330419e62 [formerly 43f936900c] [formerly 9c9e01dbda] [formerly 4e26e76e8116f7535adc882a8a1b21dd2ec4072c [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144] [formerly 9c9e01dbda [formerly 63ea8599d7]]]
Former-commit-id: 35bac2b756ec6599768a02b4a0a01e807e005567 [formerly c26989a65231e5bf4f604b7a06a750251f0cd612] [formerly 1d2ad9224a [formerly 7978d3b640]]
Former-commit-id: 1d2ad9224a
Former-commit-id: c76fddc7e4
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
26b250dbd1
|
12.4.1-4 baseline
Former-commit-id: 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 2a216f333c [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f [formerly 98d8b3f188] [formerly a2a6a18fae] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae [formerly a4e519f3cd]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683 [formerly 8cd5974f4c]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
|
2012-04-18 15:18:16 -05:00 |
|
Bryan Kowal
|
6f12ac24ed
|
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: 408db5f942 [formerly db3f60b23a] [formerly b1a5abc6b3] [formerly b1a5abc6b3 [formerly 6ddeef48fa]] [formerly 408db5f942 [formerly db3f60b23a] [formerly b1a5abc6b3] [formerly b1a5abc6b3 [formerly 6ddeef48fa]] [formerly ce99417a2a [formerly b1a5abc6b3 [formerly 6ddeef48fa] [formerly ce99417a2a [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]]]
Former-commit-id: ce99417a2a
Former-commit-id: b3f52b6871 [formerly 8b08c8308e] [formerly 541fe8fbbb] [formerly e1d91914620229dd59e54a6ac40aed73f1c618cc [formerly 2de12493f2b8810fd8a4d81ec071b4416735a9af] [formerly 541fe8fbbb [formerly 10a291afa1]]]
Former-commit-id: 876dc00eb11468d3518c36bac3ea0f64c445a98d [formerly ffb83e28c6229d71093fafcfa99acc4e62dc25af] [formerly 07e4ddc1b9 [formerly 47c7cba3f5]]
Former-commit-id: 07e4ddc1b9
Former-commit-id: 22218f31bd
|
2012-04-10 16:42:36 -05:00 |
|
root
|
57877615f5
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 2c3569dd39 [formerly 9bb8decbcf] [formerly 8e80217e59] [formerly e2ecdcfe33 [formerly 377dcd10b9] [formerly 8e80217e59 [formerly 3360eb6c5f]]]
Former-commit-id: e2ecdcfe33 [formerly 377dcd10b9]
Former-commit-id: e2ecdcfe33
Former-commit-id: 7dbd17a5aa
|
2012-01-06 08:55:05 -06:00 |
|