mjames-upc
4bb6ba4eef
rollback h5py and nose, remove cycler
2016-03-20 12:03:07 -06:00
mjames-upc
5b6bc2ace8
RequiredExecutionEnvironment: JavaSE-1.7
2016-02-03 21:45:47 -06:00
mjames-upc
0eb1228273
remnant leftovers from merge corrected for local build
2016-01-26 15:17:19 -07:00
mjames-upc
c921ec69d6
another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n
...
Former-commit-id: f25e918e50
2015-09-03 15:48:53 -06:00
David Lovely
00a34f5d56
Omaha #4392 Fixed broker address substitution
...
Change-Id: Ib7ea0577e8d020ad2d94aa7ddbaa08459c9fa433
Former-commit-id: f2a6c66c503b2a545d773b2a545d77b60b0e763e
2015-04-22 12:04:54 -05:00
David Lovely
e5019a23c9
Omaha #4392 Removed un-used JMX port configuration
...
Former-commit-id: 41a03c3a1d42ce2e652142ce2e6521701f6c96cb
2015-04-20 13:46:01 -05:00
David Lovely
118bca680a
Omaha #4392 Updates to configure new QPID json file.
...
Former-commit-id: 9f488920a1531944303c531944303cf2e5ab25dc
2015-04-16 09:03:21 -05:00
Greg Armendariz
fe5cf3f8e6
Omaha #3299 - Updated deploy-install to find features
...
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2
Former-commit-id: 1a3ca4f8df6a5463ab876a5463ab872fd4ace0a2
2015-02-25 09:51:49 -06:00
Greg Armendariz
d237c346e8
Omaha #3299 - Fix collaboration RPM build issue
...
Former-commit-id: af72fd3775b88c8da164b88c8da1646fed5e21e7
2015-02-06 11:37:47 -06:00
Greg Armendariz
49575f9b1a
Omaha #3299 - Fix collaboration RPM build issue
...
Former-commit-id: d237c346e86fed5e21e7b88c8da164d237c346e86fed5e21e7b88c8da164af72fd3775b88c8da164af72fd37752569f921efd27e4b416e483ed63a573463c009282f8b5d32eb
2015-02-06 11:37:47 -06:00
Bryan Kowal
4aaf636e18
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: 48ec32e59519f6551c8819f6551c88289689e774
2014-12-05 09:20:23 -06:00
Bryan Kowal
4b83570666
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: 4aaf636e18289689e77419f6551c884aaf636e18289689e77419f6551c8848ec32e59519f6551c8848ec32e5950e79d9e7a8aba4679eb69f5297504dec8371db52258f7a93ca
2014-12-05 09:20:23 -06:00
Greg Armendariz
964ad44a4d
Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
...
Former-commit-id: b229adbf3833b0ac381133b0ac3811a9f6d3528c
2014-09-02 10:40:13 -05:00
Greg Armendariz
a38bb1fdd3
Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
...
Former-commit-id: 964ad44a4da9f6d3528c33b0ac3811964ad44a4da9f6d3528c33b0ac3811b229adbf3833b0ac3811b229adbf38937866d9fcd63a9da4d6edb50956c8a2aa3fa6ff8566996f06
2014-09-02 10:40:13 -05:00
Brian Clements
051344f98f
Omaha #3573 fixed clean in collaboration dataserver ant script
...
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a
Former-commit-id: 23f1f7b2b69fe49043e79fe49043e7eb84b255b0
2014-09-02 10:04:39 -05:00
Brian Clements
26bbbcafc6
Omaha #3573 fixed clean in collaboration dataserver ant script
...
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a
Former-commit-id: 051344f98feb84b255b09fe49043e7051344f98feb84b255b09fe49043e723f1f7b2b69fe49043e723f1f7b2b6efa02bf1b08da4a4ccf47a29eef035e56c909c2654a627e05a
2014-09-02 10:04:39 -05:00
Steve Harris
3619a11a8a
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 5d58625abc793064063b793064063bbddf9c0f27
2014-08-29 10:17:52 -05:00
Steve Harris
3c8bfc8160
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 3619a11a8abddf9c0f27793064063b3619a11a8abddf9c0f27793064063b5d58625abc793064063b5d58625abc10070d276266b485c000d984dd538fe681e0a457ecf26b3ac5
2014-08-29 10:17:52 -05:00
Brian Clements
78e961b8f5
Omaha #3562 jetty upgrade change for dataserver
...
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: 66da9e63b73595bd27283595bd2728ab4eaee171
2014-08-27 13:18:13 -05:00
Brian Clements
8df5ce6b51
Omaha #3562 jetty upgrade change for dataserver
...
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: 78e961b8f5ab4eaee1713595bd272878e961b8f5ab4eaee1713595bd272866da9e63b73595bd272866da9e63b7c6644cbe46aa4dc98be03efcaa6a8e7a990efc0c0efea299ab
2014-08-27 13:18:13 -05:00
Brian.Dyke
0a5ddf7457
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: aa83bf804fe654318431e654318431a08db8d73d
2014-08-27 11:19:19 -04:00
Brian.Dyke
2da6c7b93b
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457a08db8d73de6543184310a5ddf7457a08db8d73de654318431aa83bf804fe654318431aa83bf804f4a56b6f6e1f90649d7e7f7f16ff9ebc0dc594eda7e4ab705cc
2014-08-27 11:19:19 -04:00
Steve Harris
849aac396b
Omaha #3368 - Move ohd plugin to new repository
...
Former-commit-id: 28e88dfe7e8c467a9fa58c467a9fa5aec275dc31
2014-08-21 11:04:08 -05:00
Steve Harris
96e8c6acb9
Omaha #3368 - Move ohd plugin to new repository
...
Former-commit-id: 849aac396baec275dc318c467a9fa5849aac396baec275dc318c467a9fa528e88dfe7e8c467a9fa528e88dfe7e3817d55f4a7542fda9a7675dbe0c21b5f3fe44ed1d59bbc93f
2014-08-21 11:04:08 -05:00
Bryan Kowal
53f036b5a5
Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters
...
that are no longer required by EDEX.
Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f
Former-commit-id: fec755cc93a61c35fcb5a61c35fcb5ce78f461a3
2014-08-14 10:39:09 -05:00
Bryan Kowal
90df3831bf
Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters
...
that are no longer required by EDEX.
Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f
Former-commit-id: 53f036b5a5ce78f461a3a61c35fcb553f036b5a5ce78f461a3a61c35fcb5fec755cc93a61c35fcb5fec755cc93395122dc26601726b27c4f82e0ba7de78304e1a7e5b68c6ae3
2014-08-14 10:39:09 -05:00
Bryan Kowal
632e493332
Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
...
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.
Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903
Former-commit-id: b568c25e10a9b4b4124aa9b4b4124a09442217cd
2014-08-07 16:27:46 -05:00
Bryan Kowal
8ba34e138a
Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
...
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.
Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903
Former-commit-id: 632e49333209442217cda9b4b4124a632e49333209442217cda9b4b4124ab568c25e10a9b4b4124ab568c25e10fbc1786ab1b0c94a2d611d6eb95f9f25fd6f379f0a3fcc0c91
2014-08-07 16:27:46 -05:00
Richard Peter
d3ba2f19bf
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
...
Former-commit-id: 96a1821753477119b739477119b739fc6aae3c3c
2014-08-07 14:01:54 -05:00
Richard Peter
9f90398239
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
...
Former-commit-id: d3ba2f19bffc6aae3c3c477119b739d3ba2f19bffc6aae3c3c477119b73996a1821753477119b73996a18217536bb571bc37bc7d8bfe6df7e0a6cf11fd18b7a13483c71feeff
2014-08-07 14:01:54 -05:00
Bryan Kowal
51cf294761
Issue #3470 - finished TODO in yajsw ShellScript.java
...
Former-commit-id: 3b080e7c36dd00d2fe38dd00d2fe38dd7ae1f7d3
2014-08-06 16:34:35 -05:00
Bryan Kowal
5e18599cf4
Issue #3470 - finished TODO in yajsw ShellScript.java
...
Former-commit-id: 51cf294761dd7ae1f7d3dd00d2fe3851cf294761dd7ae1f7d3dd00d2fe383b080e7c36dd00d2fe383b080e7c366a9bfbd79be1e6244b578576c5544312be1442f1ab26a99200
2014-08-06 16:34:35 -05:00
Steve Harris
875e655efd
Omaha #3275 - moving developer tools to separate repository
...
Former-commit-id: 436ce72db95fd1555ff95fd1555ff96c0a7da2a0
2014-06-25 16:16:03 -05:00
Steve Harris
cd12b341e6
Omaha #3275 - moving developer tools to separate repository
...
Former-commit-id: 875e655efd6c0a7da2a05fd1555ff9875e655efd6c0a7da2a05fd1555ff9436ce72db95fd1555ff9436ce72db9439a09df83548f6ff8e66e2d34ae965e80a12a32e0abad27a0
2014-06-25 16:16:03 -05:00
Brian Clements
f38f9fae51
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: 84e3f967d9b6a2bf0ae4b6a2bf0ae48205f7cd56
2014-06-17 09:26:24 -05:00
Brian Clements
ca995b0147
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: f38f9fae518205f7cd56b6a2bf0ae4f38f9fae518205f7cd56b6a2bf0ae484e3f967d9b6a2bf0ae484e3f967d92ffe3033244dc81aabfa5436efb886616315d8300dcfac1a44
2014-06-17 09:26:24 -05:00
Nate Jensen
aaceca95ea
Omaha #2840 log tool can now save html reports to directory
...
Change-Id: Ifa2d9653d2ee689512f33169028705de98f65682
Former-commit-id: f681b52b463f586a26903f586a26904b1c9f17ca
2014-06-11 17:13:38 -05:00
Nate Jensen
b328eea72f
Omaha #2840 log tool can now save html reports to directory
...
Change-Id: Ifa2d9653d2ee689512f33169028705de98f65682
Former-commit-id: aaceca95ea4b1c9f17ca3f586a2690aaceca95ea4b1c9f17ca3f586a2690f681b52b463f586a2690f681b52b46a312a5cee2aa30d5d5ce9e476810dd3897523dfb4e3f445707
2014-06-11 17:13:38 -05:00
Nate Jensen
217d088e67
Omaha #3027 fix logservice's build script and reconnect logic if error
...
occurs
Change-Id: Ic389fe690c832505ab044996a2d9d7d16e535616
Former-commit-id: a9d6a75a625edfea45825edfea45823583bda1f0
2014-06-09 16:32:48 -05:00
Nate Jensen
b76b8e5c95
Omaha #3027 fix logservice's build script and reconnect logic if error
...
occurs
Change-Id: Ic389fe690c832505ab044996a2d9d7d16e535616
Former-commit-id: 217d088e673583bda1f05edfea4582217d088e673583bda1f05edfea4582a9d6a75a625edfea4582a9d6a75a627130cd5864aa86a7537b4011b49c8fe7827132b6e110d853d1
2014-06-09 16:32:48 -05:00
Steve Harris
2b95865dec
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 455eb8b39d7fec0d039c7fec0d039c647cd97e29
2014-06-02 11:21:46 -05:00
Steve Harris
cbd6f7c310
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 2b95865dec647cd97e297fec0d039c2b95865dec647cd97e297fec0d039c455eb8b39d7fec0d039c455eb8b39db1f34a5dd0373c816e6aec743199f1cbceb4ea627eabeb7ad6
2014-06-02 11:21:46 -05:00
Brian.Dyke
5524d6b38d
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 3f1e12effca8737e18f0a8737e18f0a0a879be7d
2014-05-30 10:46:25 -04:00
Brian.Dyke
408ecfa5c0
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 5524d6b38da0a879be7da8737e18f05524d6b38da0a879be7da8737e18f03f1e12effca8737e18f03f1e12effcc76d6df69d3961c75ecd66aacd6578a23d3715229351315fd6
2014-05-30 10:46:25 -04:00
Nate Jensen
056a32b760
Merge "Omaha #3093 add usage to hprof tool and standardize outputting size of things." into omaha_14.4.1
...
Former-commit-id: 6672ada43ce800d85924e800d85924dd3fd33cd6
2014-05-22 18:11:19 -05:00
Nate Jensen
34d4a300dd
Merge "Omaha #3093 add usage to hprof tool and standardize outputting size of things." into omaha_14.4.1
...
Former-commit-id: 056a32b760dd3fd33cd6e800d85924056a32b760dd3fd33cd6e800d859246672ada43ce800d859246672ada43c0cb80adb2e9b6a1fad036c790425cac76fc90b57d4b3211023
2014-05-22 18:11:19 -05:00
Ben Steffensmeier
d26fc4e108
Omaha #3093 add usage to hprof tool and standardize outputting size of things.
...
Former-commit-id: edd27c14cdc5abcecc61c5abcecc61eac412d380
2014-05-22 15:56:34 -05:00
Ben Steffensmeier
f29f0309fd
Omaha #3093 add usage to hprof tool and standardize outputting size of things.
...
Former-commit-id: d26fc4e108eac412d380c5abcecc61d26fc4e108eac412d380c5abcecc61edd27c14cdc5abcecc61edd27c14cde27200ab537bfce9646fd0946b97db9cc363e7b6602fa86b8d
2014-05-22 15:56:34 -05:00
Brian Clements
8471e4d8a4
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: c875f17719f9de79465af9de79465a0a2ddfbc79
2014-05-22 14:09:07 -05:00
Brian Clements
fed3c48de4
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: 8471e4d8a40a2ddfbc79f9de79465a8471e4d8a40a2ddfbc79f9de79465ac875f17719f9de79465ac875f17719fb373ce2ae53de96dd53fd9f98b2bae7730e221967376b444a
2014-05-22 14:09:07 -05:00
