Steve Harris
|
70a928d039
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: af6c0529ad [formerly 2f20a86a30] [formerly af6c0529ad [formerly 2f20a86a30] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: d7a4853091 [formerly 27b50c57bd]
Former-commit-id: 2838ca117f
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
3b468d9f50
|
12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d]
Former-commit-id: 91e65230ad
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
518fa79f7f
|
12.6.1-3 baseline
Former-commit-id: 7c5306b795 [formerly 42f3513175] [formerly 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 32c0464d79 [formerly 1fdc0aa237]
Former-commit-id: ca8baf18a3
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
ca0f3f5814
|
12.5.1-15 baseline
Former-commit-id: 0ca936807e [formerly d5c238de07] [formerly 0ca936807e [formerly d5c238de07] [formerly cee20d8656 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]
Former-commit-id: cee20d8656
Former-commit-id: 31d7649939 [formerly 7da9afe36a]
Former-commit-id: ad91dc8a2e
|
2012-06-11 16:02:30 -05:00 |
|
Steve Harris
|
c01b096242
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: c7024992a3 [formerly 37793c86b1] [formerly c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 23c34c469a [formerly cf3c768213]
Former-commit-id: 3dd5b84aa2
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Bryan Kowal
|
89a427c142
|
Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.
Former-commit-id: 3478f30891 [formerly b8622629e3] [formerly 3478f30891 [formerly b8622629e3] [formerly c0db02e377 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]
Former-commit-id: c0db02e377
Former-commit-id: 733b34202f [formerly d92eb0c227]
Former-commit-id: 2b48d12f7c
|
2012-06-05 16:55:52 -05:00 |
|
Bryan Kowal
|
e5fd40d59e
|
Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1
Former-commit-id: 8ee68911fb [formerly a808bc245f] [formerly 8ee68911fb [formerly a808bc245f] [formerly 0f0bab6e54 [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: b817484c67 [formerly 0211167d87]
Former-commit-id: e7f2ec38b5
|
2012-05-24 16:51:35 -05:00 |
|
Steve Harris
|
26ed02c3dc
|
12.5.1-6 baseline
Former-commit-id: df80148db6 [formerly 24474489f9] [formerly df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 4792884ab2 [formerly c452cce633]
Former-commit-id: 2738af2019
|
2012-05-16 16:41:22 -05:00 |
|
Bryan Kowal
|
4f7aa56ad1
|
Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.
Former-commit-id: 38f61f4a73 [formerly ea8bf623cf] [formerly 38f61f4a73 [formerly ea8bf623cf] [formerly fbb694b48e [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]]
Former-commit-id: fbb694b48e
Former-commit-id: cbe0691efd [formerly f7cba22ee2]
Former-commit-id: 7f6a6ff856
|
2012-05-10 09:24:56 -05:00 |
|
Steve Harris
|
d040b14742
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: d7f7c26582 [formerly 092efd6072] [formerly d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329 [formerly 98447412f8]
Former-commit-id: 7ee04eb560
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
1d2ad9224a
|
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: 572e1bb476 [formerly 27bc369818] [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7]
Former-commit-id: 7978d3b640
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
ef49f63d8d
|
12.5.1-2 baseline
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: f6300cd995 [formerly a821111fbf]
Former-commit-id: 377ae76413
|
2012-05-03 19:17:13 -05:00 |
|
Steve Harris
|
0c25458510
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
f1eb6efb23
|
12.4.1-10 baseline
Former-commit-id: 418489e726 [formerly 704b75e1a1] [formerly 418489e726 [formerly 704b75e1a1] [formerly 01457fbbde [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: 97caaa0327 [formerly aabc3842ac]
Former-commit-id: 3ed3a665cb
|
2012-04-24 15:38:29 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Bryan Kowal
|
f6e4e22f23
|
Issue #453 - defined a new generic xmpp rpm specification that will currently be used to create the awips2-openfire rpm. Updated the soon-to-be deprecated nightly and release builds to build the new rpm.
Former-commit-id: 51688bb591 [formerly fadb50446d] [formerly 51688bb591 [formerly fadb50446d] [formerly 298ab2e057 [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]]
Former-commit-id: 298ab2e057
Former-commit-id: fb02245232 [formerly 62e4e0bbea]
Former-commit-id: b00be4fdeb
|
2012-04-16 17:00:30 -05:00 |
|
Bryan Kowal
|
7abc0980b4
|
Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: b561cc5c85 [formerly 58b10dd9ae] [formerly b561cc5c85 [formerly 58b10dd9ae] [formerly 25c3f269bf [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]]
Former-commit-id: 25c3f269bf
Former-commit-id: 30c2ed6fed [formerly 4dec6ced9f]
Former-commit-id: f0524db48b
|
2012-04-11 10:28:30 -05:00 |
|
Steve Harris
|
f51d290333
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: c90ce9d54e [formerly ed26e06df2] [formerly c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 51bb9ebb46 [formerly dcdd7f0648]
Former-commit-id: 58cb18d860
|
2012-04-10 12:50:03 -05:00 |
|
Bryan Kowal
|
6f9a0e45cb
|
Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
Former-commit-id: f49aadd9c8 [formerly 1afa927c33] [formerly f49aadd9c8 [formerly 1afa927c33] [formerly 839d7c886f [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]
Former-commit-id: 839d7c886f
Former-commit-id: ab70749ea4 [formerly 24148c19a9]
Former-commit-id: adaa011b1f
|
2012-04-09 09:32:45 -05:00 |
|
Bryan Kowal
|
faefa46212
|
Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
Former-commit-id: 3e039dc79f [formerly e792b2a16f] [formerly 3e039dc79f [formerly e792b2a16f] [formerly 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]
Former-commit-id: 2ed20e107d
Former-commit-id: edb7431d0a [formerly 5f4d6f600a]
Former-commit-id: 3db4653b1e
|
2012-04-04 18:29:13 -05:00 |
|
Steve Harris
|
293563cfe7
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
0a7cb5fd7a
|
Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: 0665862abe [formerly 70357d90bc] [formerly 0665862abe [formerly 70357d90bc] [formerly a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]
Former-commit-id: a0abcf8120
Former-commit-id: 65aa72fee7 [formerly 6884520750]
Former-commit-id: 5a310acb18
|
2012-03-29 10:03:05 -05:00 |
|
Bryan Kowal
|
c52c131e5c
|
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 5ba68624c5 [formerly 8a4c883e0b] [formerly 5ba68624c5 [formerly 8a4c883e0b] [formerly 31f989ecb4 [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]]
Former-commit-id: 31f989ecb4
Former-commit-id: e27502effd [formerly 81a360d139]
Former-commit-id: 339d963f90
|
2012-03-21 16:49:38 -05:00 |
|
Bryan Kowal
|
d7f5da6110
|
Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
Former-commit-id: 97cb8ab51c [formerly 55a759fb8a] [formerly 97cb8ab51c [formerly 55a759fb8a] [formerly 64cdd27f62 [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]]
Former-commit-id: 64cdd27f62
Former-commit-id: 3914878a65 [formerly 117306c734]
Former-commit-id: a01d2a17f9
|
2012-03-16 12:16:48 -05:00 |
|
David Gillingham
|
69adfe2e40
|
Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: 7e5ec12276 [formerly e13850a2b6] [formerly 7e5ec12276 [formerly e13850a2b6] [formerly d433b7d4d6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 3c4e90e0bf [formerly 2b5588bd1e]
Former-commit-id: 2d82185a1d
|
2012-03-13 12:31:38 -05:00 |
|
Bryan Kowal
|
0c547b30ce
|
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: 5838ff71f1 [formerly fc1ca4efcc] [formerly 5838ff71f1 [formerly fc1ca4efcc] [formerly b871752e3a [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]
Former-commit-id: b871752e3a
Former-commit-id: d04bc82c9a [formerly 638d2c964b]
Former-commit-id: 4c87af89f9
|
2012-03-08 09:00:55 -06:00 |
|
David Gillingham
|
f91abb8deb
|
Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.
Former-commit-id: 15a9e7cdae [formerly 90a745a037] [formerly 15a9e7cdae [formerly 90a745a037] [formerly 78c7f29096 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]
Former-commit-id: 78c7f29096
Former-commit-id: 5e2b3c3955 [formerly 8a86e910aa]
Former-commit-id: b70345182d
|
2012-03-07 16:05:54 -06:00 |
|
Bryan Kowal
|
c8c031d8d7
|
Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
Former-commit-id: d4142689c9 [formerly 4d8d3d4d00] [formerly d4142689c9 [formerly 4d8d3d4d00] [formerly c803afd454 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]
Former-commit-id: c803afd454
Former-commit-id: f046b941ba [formerly 033a4e237b]
Former-commit-id: 2cc79e1acb
|
2012-03-07 10:22:40 -06:00 |
|
Bryan Kowal
|
2f7b3400c5
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 6e8b4a188f [formerly 5228de77e2] [formerly 6e8b4a188f [formerly 5228de77e2] [formerly 793dad5711 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]]
Former-commit-id: 793dad5711
Former-commit-id: 1585b4b827 [formerly 81f778e43a]
Former-commit-id: faa13ee9f7
|
2012-03-05 13:46:10 -06:00 |
|
Bryan Kowal
|
e3f992a525
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 861ca25a4e [formerly 47230422ce] [formerly 861ca25a4e [formerly 47230422ce] [formerly 94d6af30f0 [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]]
Former-commit-id: 94d6af30f0
Former-commit-id: 421c425047 [formerly ca62eb90f3]
Former-commit-id: e23844d671
|
2012-02-29 12:43:46 -06:00 |
|
Steve Harris
|
f8ae79c35c
|
Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 24059a5b4e [formerly 9b67525e95] [formerly 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 73a337bc31 [formerly 40d7357165]
Former-commit-id: 21f12bae82
|
2012-02-27 15:58:49 -06:00 |
|
Bryan Kowal
|
48f3f1e2d7
|
Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 475849bd91 [formerly 1e3e31a657] [formerly 475849bd91 [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]
Former-commit-id: c2cd292c32
Former-commit-id: d4367098a7 [formerly 49a30a5b1a]
Former-commit-id: 8350501de4
|
2012-02-23 16:46:48 -06:00 |
|
Bryan Kowal
|
511f0efe24
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 4881def0e9 [formerly bae0cb555e] [formerly 4881def0e9 [formerly bae0cb555e] [formerly e135f4508d [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]
Former-commit-id: e135f4508d
Former-commit-id: fa23b673c4 [formerly 5c86773a77]
Former-commit-id: 4a78479648
|
2012-02-23 14:20:50 -06:00 |
|
Steve Harris
|
93d99ca49c
|
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 4981170462 [formerly dcadf7baa4] [formerly 4981170462 [formerly dcadf7baa4] [formerly 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 4eb1ef5b0f [formerly 938dc5b21c]
Former-commit-id: 2c958713b6
|
2012-02-23 12:38:55 -06:00 |
|
Steve Harris
|
3aef320ffd
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 92084b3f20 [formerly d0bbbfefcc] [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82 [formerly 3d511fe719]
Former-commit-id: ae9c52b012
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
978d22db50
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: b55a488ed8 [formerly 4450cf8963]
Former-commit-id: 15c56d11bc
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
01d72ca3c9
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: 610fdf3f4e [formerly aaead73ec5]
Former-commit-id: 156ad8471d
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
7ca623525e
|
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: ec0f1aebfc [formerly b89ebc5e01] [formerly ec0f1aebfc [formerly b89ebc5e01] [formerly 496cc6a06b [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]
Former-commit-id: 496cc6a06b
Former-commit-id: dd3a5a8d88 [formerly 4a93298877]
Former-commit-id: 37e57b6588
|
2012-02-20 16:38:06 -06:00 |
|
Steve Harris
|
bcccffbaa4
|
Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: d971880b98 [formerly cabf9fd956] [formerly d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: b12f5e5d75 [formerly 33483f3960]
Former-commit-id: acd7845ebd
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
60bf5aeced
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]
Former-commit-id: cc66c8be24
Former-commit-id: dd911bed4d [formerly 54b5b6baef]
Former-commit-id: 09b81c6e00
|
2012-02-20 12:43:38 -06:00 |
|
Bryan Kowal
|
ce9165ce58
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 682c10767d
Former-commit-id: cc8c6597a2 [formerly 2ba23624b4]
Former-commit-id: 8403801a2b
|
2012-02-17 12:17:14 -06:00 |
|
Steve Harris
|
8e09b816da
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 68a5ebc0ad [formerly 272ba87883] [formerly 68a5ebc0ad [formerly 272ba87883] [formerly c1129dbd00 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]]]
Former-commit-id: c1129dbd00
Former-commit-id: 4e6af98f5b [formerly ad402655f4]
Former-commit-id: c74ded15b9
|
2012-02-15 15:08:58 -06:00 |
|
Steve Harris
|
3598fb2fcd
|
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 221a02882a [formerly b9f4780fcb] [formerly 221a02882a [formerly b9f4780fcb] [formerly 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]
Former-commit-id: 23cc9689de
Former-commit-id: a85a777232 [formerly a2e3aabc60]
Former-commit-id: b2999a6d59
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
604b6c1f10
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 6aed9311a8 [formerly 7356d655da] [formerly 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]]
Former-commit-id: 1707b98721
Former-commit-id: de85613a99 [formerly db1e3b1215]
Former-commit-id: a1462275f7
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
79698247d7
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 74c156e508 [formerly 5e47f8c33a] [formerly 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]]
Former-commit-id: a91b01bfbe
Former-commit-id: 98b223d08e [formerly 39b13d7102]
Former-commit-id: ad1f608967
|
2012-02-15 12:54:54 -06:00 |
|
Steve Harris
|
0d9992da14
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 46dda7b8bd [formerly 2119a1513e] [formerly 46dda7b8bd [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: d23d12d596 [formerly cb3371ee28]
Former-commit-id: dc9df63a11
|
2012-02-14 15:54:46 -06:00 |
|
Ben Steffensmeier
|
16b7863b52
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 808846e237 [formerly 944e59e989] [formerly 808846e237 [formerly 944e59e989] [formerly f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]
Former-commit-id: f65d86a06a
Former-commit-id: 993f2aafa4 [formerly d00572c122]
Former-commit-id: 800e674078
|
2012-02-14 15:46:11 -06:00 |
|
Bryan Kowal
|
3e8caa6467
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: a19dd6ff33 [formerly 7ca62dc7d6] [formerly a19dd6ff33 [formerly 7ca62dc7d6] [formerly 1855bbcbee [formerly 26243249e27ee347933748aa53e9436e32751d9c]]]
Former-commit-id: 1855bbcbee
Former-commit-id: 88b67b4977 [formerly 27c4557e0a]
Former-commit-id: 8cef173e1d
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
985111384a
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 00c0ab406b [formerly 40c0e93995] [formerly 00c0ab406b [formerly 40c0e93995] [formerly 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]]]
Former-commit-id: 7d21e3149e
Former-commit-id: e17a1e06a7 [formerly e9d85fc09c]
Former-commit-id: 4c691bcbfb
|
2012-01-30 16:05:17 -06:00 |
|