Commit graph

524 commits

Author SHA1 Message Date
Bryan Kowal
1bf8b23695 Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208

Former-commit-id: 642bd6d582 [formerly 2670a3d7b3] [formerly 0ecf2f92c1] [formerly 642bd6d582 [formerly 2670a3d7b3] [formerly 0ecf2f92c1] [formerly 7524f8ad8d [formerly 0ecf2f92c1 [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]]]]
Former-commit-id: 7524f8ad8d
Former-commit-id: 7ea050461f [formerly 250a553c35] [formerly b3228eeb2c91e6611c30b71f1855b6bc7d7f3b41 [formerly d908d0add3]]
Former-commit-id: fa04d8a895ea5303fcd460ab7b1e8250d9aaea51 [formerly 7ad3a9f249]
Former-commit-id: 990f5558da
2012-07-18 11:12:09 -05:00
Bryan Kowal
65c619ab09 Issue #889 - specified the full path to awips2-ant.
Former-commit-id: 0b49b7db45 [formerly a56cc7060b] [formerly c32bb9556e] [formerly 0b49b7db45 [formerly a56cc7060b] [formerly c32bb9556e] [formerly 41bb75fa61 [formerly c32bb9556e [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]]]]
Former-commit-id: 41bb75fa61
Former-commit-id: 545668d74c [formerly d84d08c641] [formerly e11bcd965969002fda6342c5478bbd8834a3cd86 [formerly 90e005eec4]]
Former-commit-id: e6acabe72d33a1d6a6d4182cddc780affab378b6 [formerly 22555d73c1]
Former-commit-id: df3ee1a8f3
2012-07-14 08:51:00 -05:00
Bryan Kowal
80875985e1 Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: 81dd57d347 [formerly b446253674] [formerly db6b535eb6] [formerly 81dd57d347 [formerly b446253674] [formerly db6b535eb6] [formerly 1e5b71ee7b [formerly db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 302e87f975 [formerly 34a4f58074] [formerly b71427b1b065dcf68000893375f8b019e4a32137 [formerly 46198b0c92]]
Former-commit-id: 6d4f722b2ceb4bc80697f4f3dc2b3ebe3a204d0a [formerly de1d59a174]
Former-commit-id: fee2a4e419
2012-07-12 12:58:40 -05:00
Bryan Kowal
0e31c23ec4 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]]
Former-commit-id: 3b7c761f99
Former-commit-id: e07c3c20b5 [formerly 470511d9a3] [formerly 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc [formerly 424bbaf0f7]]
Former-commit-id: 281f96fab761d65add6971c8397918fee705ea1a [formerly f64ce786e2]
Former-commit-id: 7077599e8d
2012-07-11 12:44:32 -05:00
Bryan Kowal
aa6196fcc5 Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.


Former-commit-id: 85dab34a39 [formerly 0e279845ba] [formerly b79f5a3c2b] [formerly 85dab34a39 [formerly 0e279845ba] [formerly b79f5a3c2b] [formerly c7a172f97a [formerly b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]]]]
Former-commit-id: c7a172f97a
Former-commit-id: 38f5b0d3b8 [formerly 8aea713004] [formerly 14635ee7a33af24a843b10200822f7105e7b3f28 [formerly 7ace6b7acb]]
Former-commit-id: 9802908fb51bdb1d2062e947557d67175edcdaaf [formerly 8d6415ee35]
Former-commit-id: e500a413ba
2012-07-11 09:42:46 -05:00
Bryan Kowal
c152d7678f Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]]
Former-commit-id: f92eb59a73
Former-commit-id: 76ee9afb3f [formerly 8d64fdba2c] [formerly 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c]]
Former-commit-id: 3ef9b4970b7c7eec89ff3c64f7174952b28b4ded [formerly 212afcceea]
Former-commit-id: 5b4c392e7f
2012-07-10 16:57:16 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Bryan Kowal
e05b247e3b Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
2012-06-27 17:21:48 -05:00
Bryan Kowal
b28d23c4b0 Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
Former-commit-id: b382ae8a1e [formerly dd0936cfd9] [formerly 003c669ae5] [formerly b382ae8a1e [formerly dd0936cfd9] [formerly 003c669ae5] [formerly 022777b7ec [formerly 003c669ae5 [formerly f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded]]]]
Former-commit-id: 022777b7ec
Former-commit-id: 4afd1372b9 [formerly 4ac49d172d] [formerly 5ce62d298f8853c96c50a381a4dedf1071c7aede [formerly 251b5fd79e]]
Former-commit-id: d016f2143a5ec65c788fc9832afa781553aac5be [formerly 3a21d467e2]
Former-commit-id: e12877f829
2012-06-21 09:54:25 -05:00
Steve Harris
8080ea523b 12.6.1-10 baseline
Former-commit-id: a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 7550311ef6 [formerly efe25edfad] [formerly 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f]]
Former-commit-id: 032c121c88e37cbeafabb63e30162517b2659626 [formerly df59dc7c44]
Former-commit-id: 56f8cf00a8
2012-06-21 08:58:00 -05:00
Steve Harris
c7356570ae Revert "12.6.1-10 baseline"
This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].


Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418]
Former-commit-id: e77a15c047
2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88 12.6.1-10 baseline
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]
Former-commit-id: 95e7f4fc0c
2012-06-21 08:38:48 -05:00
Bryan Kowal
c2e4f38618 Issue #708 - update the binlightning edex specs.
Former-commit-id: 62b2293a2a [formerly 1cf8c09f4d] [formerly bd20a47c90] [formerly 62b2293a2a [formerly 1cf8c09f4d] [formerly bd20a47c90] [formerly f2a3f33e07 [formerly bd20a47c90 [formerly 0c37ab92aefae0b00a8c8767421c9b28773ca8fe]]]]
Former-commit-id: f2a3f33e07
Former-commit-id: 692c4cae72 [formerly 071e7a51d9] [formerly fada994d194ae9673698caa02b646cdbbee39665 [formerly 59d98d5c11]]
Former-commit-id: 7cba69609be5739a90e2ad9992bdbcf445b23a39 [formerly 657290655b]
Former-commit-id: 9ebfd6ef9c
2012-06-20 16:00:40 -05:00
Bryan Kowal
41916b3e01 Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly a828d869a0 [formerly d20417a793 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]]]
Former-commit-id: a828d869a0
Former-commit-id: fe2c592edc [formerly 7ac868e3c7] [formerly 0237c8d764ada3f7a1e6a9ba396990a9fd82cb43 [formerly 916ce42ff8]]
Former-commit-id: fe01b191ff5a0383a52b9187bf968513677b9762 [formerly 424121af9d]
Former-commit-id: 48d821f5f8
2012-06-20 14:47:19 -05:00
Bryan Kowal
eecb7d3b2f Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly f79134499e [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]]]
Former-commit-id: f79134499e
Former-commit-id: 4e53eadca4 [formerly 872a3a5f60] [formerly f01648537abdc924d90c96168fabc6a20dc2d827 [formerly 1acbc16759]]
Former-commit-id: ae07adff22f508ce1afff3acfa7f125a0046379e [formerly 720c2063f0]
Former-commit-id: 66028f4fe2
2012-06-20 11:22:58 -05:00
Bryan Kowal
241826ed34 Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
Former-commit-id: 0d0ba75a14 [formerly 944a1ce201] [formerly 5aabc3bba1] [formerly 0d0ba75a14 [formerly 944a1ce201] [formerly 5aabc3bba1] [formerly dff89c83e4 [formerly 5aabc3bba1 [formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]]]]
Former-commit-id: dff89c83e4
Former-commit-id: 1cb8279ac7 [formerly 11ea72acf0] [formerly 6bc21555bbadb2d4481dfe124a5ad7b3415643e6 [formerly 5435963041]]
Former-commit-id: 2c6f5ee749bb3932e15d58b2f0f37f3de85c557d [formerly cb8969eb0f]
Former-commit-id: e9ab580a49
2012-06-19 13:33:01 -05:00
Bryan Kowal
14f81556c3 Merge branch '11-Collaboration' into development
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b]
Former-commit-id: a6d1f97dec
2012-06-18 11:16:28 -05:00
Steve Harris
ec9204fa94 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: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
2012-06-12 14:37:12 -05:00
Steve Harris
883d66bc46 12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
2012-06-11 16:23:47 -05:00
Steve Harris
581546a5eb 12.6.1-3 baseline
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04 [formerly 32c0464d79] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3]
Former-commit-id: 518fa79f7f
2012-06-11 16:23:47 -05:00
Steve Harris
61e2068af7 12.5.1-15 baseline
Former-commit-id: 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]]
Former-commit-id: cee20d8656
Former-commit-id: cd017cbb21 [formerly 31d7649939] [formerly 71d57ecda7503a310fc8294587521ac3d45da531 [formerly 7da9afe36a]]
Former-commit-id: 6cb525b2e1f0b266e8a8aef21ae0d0c57440c151 [formerly ad91dc8a2e]
Former-commit-id: ca0f3f5814
2012-06-11 16:02:30 -05:00
Steve Harris
b54ad5af66 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: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2]
Former-commit-id: c01b096242
2012-06-11 15:24:03 -05:00
Steve Harris
46068c6716 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Bryan Kowal
a2edb47d13 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: 8366f5bffa [formerly 3478f30891] [formerly b8622629e3] [formerly 8366f5bffa [formerly 3478f30891] [formerly b8622629e3] [formerly c0db02e377 [formerly b8622629e3 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]]
Former-commit-id: c0db02e377
Former-commit-id: 1397ac4ae6 [formerly 733b34202f] [formerly b02340a5b6e6f0e27447ad5a1f532ed0a3b37d18 [formerly d92eb0c227]]
Former-commit-id: a5cf683e790b615a5bad87dc4f842fa91d4710a1 [formerly 2b48d12f7c]
Former-commit-id: 89a427c142
2012-06-05 16:55:52 -05:00
Bryan Kowal
344e7567ae 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: 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 0f0bab6e54 [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 304ce341b8 [formerly b817484c67] [formerly 1d8ed9e871f8274a9db57fa6db67ccd77f68abfa [formerly 0211167d87]]
Former-commit-id: e6a8df53928cd8442f4e71b1f738aa3bf1de31b5 [formerly e7f2ec38b5]
Former-commit-id: e5fd40d59e
2012-05-24 16:51:35 -05:00
Steve Harris
e460104ec9 12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025 [formerly 4792884ab2] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019]
Former-commit-id: 26ed02c3dc
2012-05-16 16:41:22 -05:00
Bryan Kowal
0b0d0fe3ab 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: 35c8df1b0a [formerly 38f61f4a73] [formerly ea8bf623cf] [formerly 35c8df1b0a [formerly 38f61f4a73] [formerly ea8bf623cf] [formerly fbb694b48e [formerly ea8bf623cf [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]]]
Former-commit-id: fbb694b48e
Former-commit-id: c557f812ae [formerly cbe0691efd] [formerly 220b395157e5157821d8ab81715fe4b80ec576e2 [formerly f7cba22ee2]]
Former-commit-id: 4357a37d3bdaa0f9bdd1ae191f613d97876311b3 [formerly 7f6a6ff856]
Former-commit-id: 4f7aa56ad1
2012-05-10 09:24:56 -05:00
Steve Harris
2f6ae50479 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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560]
Former-commit-id: d040b14742
2012-05-09 13:19:47 -05:00
Steve Harris
c76fddc7e4 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: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640]
Former-commit-id: 1d2ad9224a
2012-05-09 13:14:00 -05:00
Steve Harris
6715112613 12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e [formerly f6300cd995] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413]
Former-commit-id: ef49f63d8d
2012-05-03 19:17:13 -05:00
Steve Harris
7f90924706 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
ad3bb08978 12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]]
Former-commit-id: 01457fbbde
Former-commit-id: caab7c1fbb [formerly 97caaa0327] [formerly bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]]
Former-commit-id: 8277df75752720d65ab600e9a692b7a94f2111c5 [formerly 3ed3a665cb]
Former-commit-id: f1eb6efb23
2012-04-24 15:38:29 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Bryan Kowal
af724d221a 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: e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly 298ab2e057 [formerly fadb50446d [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]]]
Former-commit-id: 298ab2e057
Former-commit-id: 706deb7c81 [formerly fb02245232] [formerly c9ae7cff3acaca8aa2da593554b31f3a03757a19 [formerly 62e4e0bbea]]
Former-commit-id: 0a517de94bd683b763a00f53701f6f88f16d1af0 [formerly b00be4fdeb]
Former-commit-id: f6e4e22f23
2012-04-16 17:00:30 -05:00
Bryan Kowal
450c2ed249 Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 77dcca12a8 [formerly b561cc5c85] [formerly 58b10dd9ae] [formerly 77dcca12a8 [formerly b561cc5c85] [formerly 58b10dd9ae] [formerly 25c3f269bf [formerly 58b10dd9ae [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]]]
Former-commit-id: 25c3f269bf
Former-commit-id: fec3d21677 [formerly 30c2ed6fed] [formerly cd67d08ad844aecd4dce4ee5b42ed767d75185ed [formerly 4dec6ced9f]]
Former-commit-id: cae076d0e6ec70ad21f67d40de60a9a6d163298b [formerly f0524db48b]
Former-commit-id: 7abc0980b4
2012-04-11 10:28:30 -05:00
Steve Harris
80108c0af9 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: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34 [formerly 51bb9ebb46] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860]
Former-commit-id: f51d290333
2012-04-10 12:50:03 -05:00
Bryan Kowal
d484d46519 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: 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]]
Former-commit-id: 839d7c886f
Former-commit-id: 438e88cc58 [formerly ab70749ea4] [formerly 52c4e4a8f476851151cdf69f82896ccf0b965430 [formerly 24148c19a9]]
Former-commit-id: 8311d4eb699b277f616ec522a0769d665dba89b5 [formerly adaa011b1f]
Former-commit-id: 6f9a0e45cb
2012-04-09 09:32:45 -05:00
Bryan Kowal
ad3d889f82 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: 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f24e7a4d31 [formerly edb7431d0a] [formerly f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a]]
Former-commit-id: 1f75c4defef522fcbd2e5b5755b3202c6dd96d6d [formerly 3db4653b1e]
Former-commit-id: faefa46212
2012-04-04 18:29:13 -05:00
Steve Harris
9340618732 12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
2012-03-30 08:38:33 -05:00
Steve Harris
8850e44772 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 239813406d [formerly 65aa72fee7] [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]]
Former-commit-id: 5a694628c15cf0ff0b617182e7f4ca869e47cb8d [formerly 5a310acb18]
Former-commit-id: 0a7cb5fd7a
2012-03-29 10:03:05 -05:00
Bryan Kowal
db90c1809d Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 69e6f68295 [formerly 5ba68624c5] [formerly 8a4c883e0b] [formerly 69e6f68295 [formerly 5ba68624c5] [formerly 8a4c883e0b] [formerly 31f989ecb4 [formerly 8a4c883e0b [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]]]
Former-commit-id: 31f989ecb4
Former-commit-id: 5009de761a [formerly e27502effd] [formerly a23c215ea5b5c94cb670f657e0aafe5ca63f7dde [formerly 81a360d139]]
Former-commit-id: 8fe130f1144ae3cbedbd14148c987770a657bb45 [formerly 339d963f90]
Former-commit-id: c52c131e5c
2012-03-21 16:49:38 -05:00
Bryan Kowal
1fe1eeccc6 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: dd9c964943 [formerly 97cb8ab51c] [formerly 55a759fb8a] [formerly dd9c964943 [formerly 97cb8ab51c] [formerly 55a759fb8a] [formerly 64cdd27f62 [formerly 55a759fb8a [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]]]
Former-commit-id: 64cdd27f62
Former-commit-id: 5eaec7c5eb [formerly 3914878a65] [formerly 4d0abefebcd64ca578719d844b51d428715ea13d [formerly 117306c734]]
Former-commit-id: 3bc0454eafc8d8cfa60eb285412d45b69a7c2067 [formerly a01d2a17f9]
Former-commit-id: d7f5da6110
2012-03-16 12:16:48 -05:00
David Gillingham
13b2df8c41 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 9cc2c09ae5 [formerly 3c4e90e0bf] [formerly 0328fbf92c7293da9871a341342665168164a9a2 [formerly 2b5588bd1e]]
Former-commit-id: 5d55cc005839dda8cfa6803d81909c0ffb8ccde0 [formerly 2d82185a1d]
Former-commit-id: 69adfe2e40
2012-03-13 12:31:38 -05:00
Bryan Kowal
b29cbc5be3 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly b871752e3a [formerly fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]]
Former-commit-id: b871752e3a
Former-commit-id: 3e1e672233 [formerly d04bc82c9a] [formerly 3df9a673b587901bb723b61fae9fe68a607983cf [formerly 638d2c964b]]
Former-commit-id: 638e6f193c8e5f3613e0d0472cbb2ae78b006b0c [formerly 4c87af89f9]
Former-commit-id: 0c547b30ce
2012-03-08 09:00:55 -06:00
David Gillingham
9a3c195379 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly 78c7f29096 [formerly 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]]
Former-commit-id: 78c7f29096
Former-commit-id: 038b850981 [formerly 5e2b3c3955] [formerly f703d811132f818c9f224c92beac74aea6d8f0ec [formerly 8a86e910aa]]
Former-commit-id: 6dc5df0140d31d3d91480386f33128d2b67b7fe9 [formerly b70345182d]
Former-commit-id: f91abb8deb
2012-03-07 16:05:54 -06:00
Bryan Kowal
004143b566 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: bdb4777017 [formerly d4142689c9] [formerly 4d8d3d4d00] [formerly bdb4777017 [formerly d4142689c9] [formerly 4d8d3d4d00] [formerly c803afd454 [formerly 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]]
Former-commit-id: c803afd454
Former-commit-id: 6a3ecc4a79 [formerly f046b941ba] [formerly c9f4c7e859d1fac6dc6d9e694a3d0b274cf87b59 [formerly 033a4e237b]]
Former-commit-id: f3e5ddd3f65cf224c8de269536f0285debc4a002 [formerly 2cc79e1acb]
Former-commit-id: c8c031d8d7
2012-03-07 10:22:40 -06:00
Bryan Kowal
bcff919943 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 3341371f4b [formerly 6e8b4a188f] [formerly 5228de77e2] [formerly 3341371f4b [formerly 6e8b4a188f] [formerly 5228de77e2] [formerly 793dad5711 [formerly 5228de77e2 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]]]
Former-commit-id: 793dad5711
Former-commit-id: 5385cfa2bf [formerly 1585b4b827] [formerly f6188b475a4ee0356d290aacf6a0bbdd5148fa7d [formerly 81f778e43a]]
Former-commit-id: 28c1dc9c1902cf83e95e61b72e0ad922c6b36d44 [formerly faa13ee9f7]
Former-commit-id: 2f7b3400c5
2012-03-05 13:46:10 -06:00
Bryan Kowal
57fae78242 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 4ba738041e [formerly 861ca25a4e] [formerly 47230422ce] [formerly 4ba738041e [formerly 861ca25a4e] [formerly 47230422ce] [formerly 94d6af30f0 [formerly 47230422ce [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]]]
Former-commit-id: 94d6af30f0
Former-commit-id: dc2253dc9b [formerly 421c425047] [formerly 7b911aa542fe20d21eca67fd282d200dd07394b8 [formerly ca62eb90f3]]
Former-commit-id: 5807436789894a1befc6bbae966b4c36f4b85c8c [formerly e23844d671]
Former-commit-id: e3f992a525
2012-02-29 12:43:46 -06:00
Steve Harris
85d3d96d4c 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: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 2dbdc945bf [formerly 73a337bc31] [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]]
Former-commit-id: 9ad2c540c010a2b27f18bb9c98356065c7663bd2 [formerly 21f12bae82]
Former-commit-id: f8ae79c35c
2012-02-27 15:58:49 -06:00
Bryan Kowal
4f320a2de2 Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 48d5fd8ee6 [formerly 475849bd91] [formerly 1e3e31a657] [formerly 48d5fd8ee6 [formerly 475849bd91] [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]]
Former-commit-id: c2cd292c32
Former-commit-id: 2fa51704a0 [formerly d4367098a7] [formerly e59528ebf20a3f9e9fafe944e7bf90cae2f7d19f [formerly 49a30a5b1a]]
Former-commit-id: 8426e1c56a4cc6dfca4864365d9663eb933e5c32 [formerly 8350501de4]
Former-commit-id: 48f3f1e2d7
2012-02-23 16:46:48 -06:00