Richard Peter
27442499e6
Merge "Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to." into development
...
Former-commit-id: 5eb49ca9bf6a263af5059531b09cdb8a735ba9ac
2013-06-05 11:48:09 -05:00
Ben Steffensmeier
772ecd6e46
Issue #1869 Ensure RecordFactory throws NoPluginException when there is no plugin.
...
Former-commit-id: 50da6ea32b6d876d70d8c4d7a4914f5bb17b4c62
2013-06-05 10:17:20 -05:00
Lee Venable
778baf331f
Merge "Issue #1984 - Save images for table columns so they don't throw errors in Windows." into development
...
Former-commit-id: a2fc3646e554018740153c78f2ecd3bc88abb691
2013-06-05 08:45:39 -05:00
Nate Jensen
725adab244
Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
...
Former-commit-id: 3d70e1866b618991ed0f8decb4925c794222c7ad
2013-06-05 08:42:23 -05:00
Bryan Kowal
4b5c653363
Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
...
Former-commit-id: 289cd9fbe02da77b3c56729ec1ee4d3e89256a08
2013-06-04 18:25:58 -05:00
Ben Steffensmeier
2dc2e990cb
Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
...
Former-commit-id: 327fe058b08967d18fa83ac9e6fc9c3356d68ff2
2013-06-04 18:23:06 -05:00
Ben Steffensmeier
5951b85ac6
Issue #2041 Improve exception handing in grid resources.
...
Change-Id: I9edcb10da3ec9bfce16650cbf8c480af94dc6d39
Former-commit-id: 17334720cd9f5705687b2030b1532b342e9a6fb8
2013-06-04 17:38:56 -05:00
Ben Steffensmeier
8ce74c44df
Issue #2041 Improve exception handling for concurrent python.
...
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47
Former-commit-id: c605b0ce9b7437bfaa803b31c6f4b2f7dc17a6ea
2013-06-04 17:03:05 -05:00
Bryan Kowal
a77c77e7bc
Issue #2021 - do not track changes in directories generated by the build for tmcp; equivalent to ignoring the java bin directories and class files.
...
Change-Id: I72461155481aec1661ebb80a6230aeed1cb00dfb
Former-commit-id: 291ae689ebe66d24a9b0154180f9114a6486aa20
2013-06-04 15:49:58 -05:00
Lee Venable
187a4e9b17
Issue #1984 - Save images for table columns so they don't throw errors in Windows.
...
Change-Id: I42bb4549664296abde66d5904b0ce1739ba6232c
Former-commit-id: 3f26818dfeb006393598af41faf33cac6957d3e0
2013-06-04 15:48:40 -05:00
Greg Armendariz
2bb9f1ceec
Merge "Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files" into development
...
Former-commit-id: b88ac881c4963543a21566ae1361638ec40f8ac0
2013-06-04 15:29:10 -05:00
Richard Peter
e513fdbc3e
Merge "Issue #1965 Initial archive retention dialog work. updated archive creation, purge, and test cases after Roger's last checkin. added edex plugin for feature. added an abstract base archive dialog." into development
...
Former-commit-id: 1b5ab5d85b4f634357d0f52551b800378349b363
2013-06-04 15:08:09 -05:00
Richard Peter
82341a9fc1
Merge "Issue #2043 switch capeFunc to java. Change-Id: I35db8657838d1e11180248ebfb5011181ea09659" into development
...
Former-commit-id: aa178f96c90b1c13ade6eb7db297583e5241601c
2013-06-04 14:57:10 -05:00
Greg Armendariz
f1fbb33f31
Merge "Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file." into development
...
Former-commit-id: 70379062d2943f045459a03c0de88ec09c1f0853
2013-06-04 14:35:39 -05:00
Greg Armendariz
eeff0a13e1
Merge "Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro filesystem in rary.ohd.filesystem - it used to be merged into the tar file." into development
...
Former-commit-id: 92f888181ea2d4e4dbfb44623c58a2a547b7e1d8
2013-06-04 14:35:27 -05:00
Dustin Johnson
3198277096
Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
...
Former-commit-id: 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78
2013-06-04 14:22:59 -05:00
Bryan Kowal
6e49c0d761
Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files
...
Change-Id: I1ae5a3c9a5d93822c6b5ce8190d1bed28e2b6198
Former-commit-id: 34bad0464e49f17004ce6b467559bbcdc9bacf59
2013-06-04 14:21:15 -05:00
Benjamin Phillippe
f00d8ae721
Issue #2022 Modifications to subscription last run time
...
and notificationservers
Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea
Former-commit-id: 4118d4e3888a5feb9bbc39036a8ceeb70d66e375
2013-06-04 14:19:09 -05:00
Richard Peter
192e5b9be8
Merge branch 'omaha_13.4.1' (13.4.1-13) into development
...
Conflicts:
cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java
Former-commit-id: ed63eaede59b2b8d388d6fa03394f5e8d91c51dd
2013-06-04 14:06:53 -05:00
Steve Harris
a97ea3942d
Issue #1872 - Licensing for java jdk, jbzip2, postgresql, qpid
...
Change-Id: I09f958247c6342ff45da5f85a197ccb4c652c6db
Former-commit-id: c9334ae14df169463a03d7c46fa3bbe8c5ac27c9
2013-06-04 13:56:51 -05:00
Roger Ferrel
b952eee030
Issue #1965 Initial archive retention dialog work.
...
updated archive creation, purge, and test cases after Roger's last checkin.
added edex plugin for feature.
added an abstract base archive dialog.
Change-Id: I7c9ca3df40a7591815a1aae4fabf660217d44574
Former-commit-id: 64b75031afaecd74649392a19cc0b10dcdb79a2b
2013-06-04 13:08:05 -05:00
Bryan Kowal
71b04e3147
Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file.
...
Change-Id: Ie625a515e8dc30cacc002bb6d8e77365c1347a13
Former-commit-id: 02af194872173d89f77e15a6a8caca1e5812dbe4
2013-06-04 12:52:27 -05:00
Nate Jensen
329d9d1c6a
Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
...
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53
Conflicts:
cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
Former-commit-id: 6742f7dbcac39261d8bee4e055bb9e4eda66520d
2013-06-04 11:43:22 -05:00
Ben Steffensmeier
098d209d5c
Issue #2043 switch capeFunc to java.
...
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659
Former-commit-id: 5eaac7266a0f8d3b083703076a255c41d8bd1039
2013-06-04 10:16:53 -05:00
Bryan Kowal
abd8ae931c
Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro
...
filesystem in rary.ohd.filesystem - it used to be merged into the tar file.
Change-Id: Id3bdfd69d7bb51581dca8e8c0c64c833ec32f5cc
Former-commit-id: 5080f2839a6f94c6152aeff231241935b570a3c3
2013-06-04 10:05:23 -05:00
Bryan Kowal
46c9ba7c7b
Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
...
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56
Former-commit-id: 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b
2013-06-04 09:36:09 -05:00
Bryan Kowal
cea990cbe3
Issue #2021 - native hydro code will now compile successfully
...
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07
Former-commit-id: 152392137ad1a77c7bf0d8ec5a165ba5a20f0d9f
2013-06-04 09:22:00 -05:00
Nate Jensen
3151ba277c
Merge "Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable." into development
...
Former-commit-id: b442e15efa533e64a2707878e15c52531cd79d5b
2013-06-04 09:13:56 -05:00
Max Schenkelberg
3379b100cb
Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
...
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75
Former-commit-id: 483247738be16ae76bc2f9891f557960e7ade60e
2013-06-03 17:19:18 -05:00
Dustin Johnson
d47da65262
Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
...
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63
Former-commit-id: 121d9a02acfe528c524788a062c2d2034f80afe5
2013-06-03 14:54:53 -05:00
Nate Jensen
5d3b2b98bb
Merge "Issue #1996 remove tear offs from GFE by adding a field to enable by perspective" into development
...
Former-commit-id: c97ca6775122d26f308558eb4e449fb56949b6ba
2013-06-03 13:32:21 -05:00
Bryan Kowal
c407dd8623
Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
...
Former-commit-id: 360e0f61f8580cfca1e8dd307e920e9e0150016d
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
1e413c68f6
Issue #1931 Fixed Repository Items REST Service
...
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97
Former-commit-id: b2764126282aab128cc1465905c11686894ab1f7
2013-06-03 10:26:36 -05:00
Matt Nash
7895dfa2e4
Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
...
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1
Former-commit-id: 7666c93bd833f935c6b1635adeb385c2fa4e04cc
2013-06-03 09:58:43 -05:00
Ron Anderson
fb5d432669
Merge "Issue #1759 : Add a more detailed comment in code for previous change." into omaha_13.4.1
...
Former-commit-id: b1c936f0dfb28dc543d7a83b6d0a0233866b98de
2013-06-03 07:45:02 -05:00
Dustin Johnson
3700d27fbf
Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
...
Former-commit-id: 18a9b41a8be832ab1e8da28c32f3b8457704915b
2013-05-31 15:29:04 -05:00
Dave Hladky
2f67b74318
Issue #2062 Fixed up AWIPS2_baseline portion of merge
...
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 982daef280be6f3efe87a066fa5919be9cfeb9ec
2013-05-31 15:27:45 -05:00
Richard Peter
c11f08b9ec
Merge "Issue #1869 speed up upgrade script for dropping dataURI." into development
...
Former-commit-id: 90b17526aa5b34d159315d9ea98e3022e015e025
2013-05-31 14:57:16 -05:00
Richard Peter
948d1aabfe
Issue #2058 : Update obsPurgeRules.xml and sfcobsPurgeRules.xml
...
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c
Former-commit-id: ea807c13a7cf0ff8a561feb46c99e649eb5254a0
2013-05-31 14:43:43 -05:00
Ben Steffensmeier
0d34bff004
Issue #1869 speed up upgrade script for dropping dataURI.
...
Former-commit-id: 075e1cda11aeeef027a106c50d535fd7cb8adf2e
2013-05-31 14:43:38 -05:00
Dustin Johnson
88c8ad3a81
Issue #2038 Set attribute xml on mock opendap adapter
...
Change-Id: I2e2e68907b475848c7b5b556c9d33a7f07877083
Former-commit-id: 5bdb3c359d80edfcc0029fb7264809c49f682579
2013-05-31 13:54:41 -05:00
Greg Armendariz
d80ee4dede
Merge "Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7" into development
...
Former-commit-id: e20d4f7898f931deb45db5437625addbb37055c8
2013-05-31 13:29:31 -05:00
Greg Armendariz
1eeafcaaf8
Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
...
Former-commit-id: 47c28707fef620afd9b38d934c6310f7380c44e8
2013-05-31 13:27:59 -05:00
Richard Peter
c2e1b72f9b
Issue #2053 : Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
...
Former-commit-id: 26c7862ba586d3b109bf0c6799b1ec8b12d360fe
2013-05-31 13:01:52 -05:00
Dustin Johnson
2687ebafd6
Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
...
Former-commit-id: 606b358ba6bfebf410151217f1a7ad92839025b0
2013-05-31 12:43:49 -05:00
Dustin Johnson
3d8de9e9f3
Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
...
Former-commit-id: 493d8a02f516023a5c0c3620da75e5466c44ede2
2013-05-31 12:32:23 -05:00
David Gillingham
5b9094275d
Issue #1759 : Add a more detailed comment in code for previous change.
...
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e
Former-commit-id: 76fd66783565677c99006dd7c2b7628acd61c2a3
2013-05-31 12:25:19 -05:00
Dustin Johnson
4a8adeb80a
Issue #2038 Change datadelivery retrieval to be plugin contributable
...
Amend: Fix class name resolution, no arguments to metadata adapter constructors
Change-Id: I2c08563499a34996502d22f0f9685602b8897139
Former-commit-id: fc6effe4993694944d5331038d24310dec44a5d8
2013-05-31 12:19:07 -05:00
Ron Anderson
7e1d2d273f
Merge "Issue #1759 : Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
...
Former-commit-id: 08de853f51cf46cb8b8a7b9f26b355ec59c164ab
2013-05-31 12:09:49 -05:00
Bryan Kowal
a78c84dcd7
Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7
...
- Amend: update 32-bit rpm build script
Change-Id: I23fae3f39e7fedb00b46fffb3aa1540dd87ed6b6
Former-commit-id: b68957a08d64f697b373bb017e28ee5fa186ed82
2013-05-31 11:47:09 -05:00
