Commit graph

31 commits

Author SHA1 Message Date
Nathan Bowler
770d12fb5a Omaha #3328 Merged it.geosolutions into org.geotools.
Change-Id: I7e2d449864b46c3b1d73d84c6387cddbfcf5ff58

Former-commit-id: 10913a4876 [formerly 632229ec07 [formerly 16e95239c901b82a402963268c2d3fb900e415d7]]
Former-commit-id: 632229ec07
Former-commit-id: 26ed86fbed
2014-08-01 14:01:16 -04:00
Nate Jensen
223f082f95 Omaha #3255 fix cave install of data delivery
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e

Former-commit-id: f01e19946c [formerly eff82573df [formerly bc22cda0a2bcdb550ad4d57a9be522336d4bc633]]
Former-commit-id: eff82573df
Former-commit-id: 76658aa485
2014-06-19 13:15:40 -05:00
Benjamin Phillippe
f3d556e3c2 Omaha #3255 Remove cxf from cave feature to fix build
Former-commit-id: fc024e6d4c [formerly 8d2605199e [formerly b6f01bfe3f45ab4c3299879db44763994f7f8222]]
Former-commit-id: 8d2605199e
Former-commit-id: 8428c676d7
2014-06-19 10:58:11 -05:00
Brian Clements
ab3fbc6f09 Omaha #3206 added version to servlet api in cave feature
without this, the build prefers the javax.servlet in the target platform

Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80

Former-commit-id: 2fd2b5aa16 [formerly 6f76a9a328 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]
Former-commit-id: 6f76a9a328
Former-commit-id: f0e8bf76a9
2014-05-23 17:04:49 -05:00
Brian Clements
8471e4d8a4 Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: c875f17719 [formerly f9de79465a [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]
Former-commit-id: f9de79465a
Former-commit-id: 0a2ddfbc79
2014-05-22 14:09:07 -05:00
Nate Jensen
5f8e5a3331 Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: 9cf43e7de6 [formerly 78afc6040c [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]]
Former-commit-id: 78afc6040c
Former-commit-id: b5f3aee368
2014-03-14 14:14:37 -05:00
Ben Steffensmeier
f98448d19f Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]
Former-commit-id: bfc3faf08f
Former-commit-id: a935ffadf7
2013-10-24 11:28:06 -05:00
Nate Jensen
2fb28dce46 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]
Former-commit-id: b49a2ceb2f
Former-commit-id: d7e4576380
2013-10-14 15:30:09 -05:00
Nate Jensen
0aab8a628a Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: be9315642b [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]
Former-commit-id: ec01e6e872
Former-commit-id: 8968389383
2013-08-07 16:44:30 -05:00
Ben Steffensmeier
8744b432e2 Issue #2068 Unpack viz cots plugins.
Former-commit-id: 073ad47a7d [formerly a1a44cdc7a [formerly 5a76cddc79705708969b37de530ad0bce2c26505]]
Former-commit-id: a1a44cdc7a
Former-commit-id: 62c3bc9bbe
2013-06-06 13:17:50 -05:00
Nate Jensen
b1ed04a275 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 4e63b88031 [formerly 5280b54277 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]
Former-commit-id: 5280b54277
Former-commit-id: 0c718e1cd1
2013-05-15 09:22:16 -05:00
Nate Jensen
c5e226e268 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 08b9ce4c62
Former-commit-id: 1fcbeb41c9
2013-05-14 16:16:13 -05:00
Max Schenkelberg
16cce70f9d 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: 7513e5982b [formerly bd52681be3 [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]
Former-commit-id: bd52681be3
Former-commit-id: 6ccef4d3c7
2013-04-17 11:42:46 -05:00
Max Schenkelberg
9f4b102dc7 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: 26cfcd2af5 [formerly c6db3ce43b [formerly d9cc808839d4a3210381329eec4f73e061be9968]]
Former-commit-id: c6db3ce43b
Former-commit-id: 43341e7ad3
2013-03-20 14:10:52 -05:00
Steve Harris
8db22baf07 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: cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]
Former-commit-id: 36df63be5c
Former-commit-id: 310474ae9b
2013-03-20 13:45:11 -05:00
Ben Steffensmeier
0d765a2fcf Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: 2b6aa86371
Former-commit-id: 0d9119a1c7
2013-03-20 13:05:54 -05:00
Bryan Kowal
875c17399a 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: 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: d081a2afcd
Former-commit-id: f806c880d3
2013-02-28 18:09:25 -06:00
Max Schenkelberg
0fb8bb14d2 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 547c593dec [formerly ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]
Former-commit-id: ec40d261e5
Former-commit-id: 1769edc026
2013-02-27 16:19:58 -06:00
Ron Anderson
9156b9ffe8 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: a2a89fb4e7
Former-commit-id: dc7c9edb87
2013-02-15 09:03:41 -06:00
Matt Nash
ce8795b271 Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3

Former-commit-id: ab07a92d48 [formerly 1d56d879fb [formerly 01033bfd4b1b298095697267be60d978aa5c14a5]]
Former-commit-id: 1d56d879fb
Former-commit-id: 6949c1f105
2012-12-13 09:40:49 -06:00
Dustin Johnson
acd4cf94d8 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: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
2012-11-08 09:57:16 -06:00
Max Schenkelberg
94e64c9b0d 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: ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: 2f90120248
Former-commit-id: f069f34a96
2012-11-07 10:44:42 -06:00
Dustin Johnson
7d0e4a6e75 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: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
2012-11-01 13:36:06 -05:00
Brad Gonzales
1ba2a25bce 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: 24fc32ee14 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: b2656df2f8
Former-commit-id: d26119c383
2012-10-26 14:00:55 -05:00
Nate Jensen
7e34a3e6ab Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: 7046ba996a [formerly bcedcc51fa [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]
Former-commit-id: bcedcc51fa
Former-commit-id: e58404bcb5
2012-06-29 13:19:47 -05:00
Nate Jensen
314910c88f Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702

Former-commit-id: 24b40c3392 [formerly 315594cab4 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]
Former-commit-id: 315594cab4
Former-commit-id: eb2c21c15d
2012-06-28 17:57:17 -05:00
Bryan Kowal
a6814ec7fb 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: 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]
Former-commit-id: 207bbd3087
Former-commit-id: fa84e5df3e
2012-06-19 15:03:57 -05:00
Steve Harris
bcc12e03ed 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: 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 27bc369818
Former-commit-id: 572e1bb476
2012-05-09 13:14:00 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Bryan Kowal
db3f60b23a 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: ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]
Former-commit-id: 6ddeef48fa
Former-commit-id: b1a5abc6b3
2012-04-10 16:42:36 -05:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00