Commit graph

113 commits

Author SHA1 Message Date
Steve Harris
aecc6a8474 12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Bryan Kowal
657290655b Issue #708 - update the binlightning edex specs.
Former-commit-id: bd20a47c90 [formerly bd20a47c90 [formerly 0c37ab92aefae0b00a8c8767421c9b28773ca8fe]]
Former-commit-id: f2a3f33e07
Former-commit-id: 59d98d5c11
2012-06-20 16:00:40 -05:00
Bryan Kowal
424121af9d Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: d20417a793 [formerly d20417a793 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]
Former-commit-id: a828d869a0
Former-commit-id: 916ce42ff8
2012-06-20 14:47:19 -05:00
Bryan Kowal
720c2063f0 Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 973ceff9a7 [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]
Former-commit-id: f79134499e
Former-commit-id: 1acbc16759
2012-06-20 11:22:58 -05:00
Bryan Kowal
cb8969eb0f Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
Former-commit-id: 5aabc3bba1 [formerly 5aabc3bba1 [formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]]
Former-commit-id: dff89c83e4
Former-commit-id: 5435963041
2012-06-19 13:33:01 -05:00
Bryan Kowal
cbc8964e5b 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: f528e10391 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
2012-06-18 11:16:28 -05:00
Steve Harris
2838ca117f 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: 2f20a86a30 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 48860df690
Former-commit-id: 27b50c57bd
2012-06-12 14:37:12 -05:00
Steve Harris
91e65230ad 12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
2012-06-11 16:23:47 -05:00
Steve Harris
ca8baf18a3 12.6.1-3 baseline
Former-commit-id: 42f3513175 [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: d57eb02b9e
Former-commit-id: 1fdc0aa237
2012-06-11 16:23:47 -05:00
Steve Harris
ad91dc8a2e 12.5.1-15 baseline
Former-commit-id: d5c238de07 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]
Former-commit-id: cee20d8656
Former-commit-id: 7da9afe36a
2012-06-11 16:02:30 -05:00
Steve Harris
3dd5b84aa2 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: 37793c86b1 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: d325d496f5
Former-commit-id: cf3c768213
2012-06-11 15:24:03 -05:00
Steve Harris
9054c5ab6c 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Bryan Kowal
2b48d12f7c 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: b8622629e3 [formerly b8622629e3 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]
Former-commit-id: c0db02e377
Former-commit-id: d92eb0c227
2012-06-05 16:55:52 -05:00
Bryan Kowal
e7f2ec38b5 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: a808bc245f [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 0211167d87
2012-05-24 16:51:35 -05:00
Steve Harris
2738af2019 12.5.1-6 baseline
Former-commit-id: 24474489f9 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
2012-05-16 16:41:22 -05:00
Bryan Kowal
7f6a6ff856 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: ea8bf623cf [formerly ea8bf623cf [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]
Former-commit-id: fbb694b48e
Former-commit-id: f7cba22ee2
2012-05-10 09:24:56 -05:00
Steve Harris
7ee04eb560 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: 092efd6072 [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
7978d3b640 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: 27bc369818 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
2012-05-09 13:14:00 -05:00
Steve Harris
377ae76413 12.5.1-2 baseline
Former-commit-id: 84d191e7b6 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
e5543a0e86 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
3ed3a665cb 12.4.1-10 baseline
Former-commit-id: 704b75e1a1 [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 01457fbbde
Former-commit-id: aabc3842ac
2012-04-24 15:38:29 -05:00
Steve Harris
8cd5974f4c 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Bryan Kowal
b00be4fdeb 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: fadb50446d [formerly fadb50446d [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]
Former-commit-id: 298ab2e057
Former-commit-id: 62e4e0bbea
2012-04-16 17:00:30 -05:00
Bryan Kowal
f0524db48b Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 58b10dd9ae [formerly 58b10dd9ae [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]
Former-commit-id: 25c3f269bf
Former-commit-id: 4dec6ced9f
2012-04-11 10:28:30 -05:00
Steve Harris
58cb18d860 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: ed26e06df2 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: fee53dea94
Former-commit-id: dcdd7f0648
2012-04-10 12:50:03 -05:00
Bryan Kowal
adaa011b1f 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: 1afa927c33 [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]
Former-commit-id: 839d7c886f
Former-commit-id: 24148c19a9
2012-04-09 09:32:45 -05:00
Bryan Kowal
3db4653b1e 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: e792b2a16f [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]
Former-commit-id: 2ed20e107d
Former-commit-id: 5f4d6f600a
2012-04-04 18:29:13 -05:00
Steve Harris
2e0f4b241b 12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
5a310acb18 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: 70357d90bc [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: a0abcf8120
Former-commit-id: 6884520750
2012-03-29 10:03:05 -05:00
Bryan Kowal
339d963f90 Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 8a4c883e0b [formerly 8a4c883e0b [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]
Former-commit-id: 31f989ecb4
Former-commit-id: 81a360d139
2012-03-21 16:49:38 -05:00
Bryan Kowal
a01d2a17f9 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: 55a759fb8a [formerly 55a759fb8a [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]
Former-commit-id: 64cdd27f62
Former-commit-id: 117306c734
2012-03-16 12:16:48 -05:00
David Gillingham
2d82185a1d Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: e13850a2b6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]
Former-commit-id: d433b7d4d6
Former-commit-id: 2b5588bd1e
2012-03-13 12:31:38 -05:00
Bryan Kowal
4c87af89f9 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: fc1ca4efcc [formerly fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]
Former-commit-id: b871752e3a
Former-commit-id: 638d2c964b
2012-03-08 09:00:55 -06:00
David Gillingham
b70345182d Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: 90a745a037 [formerly 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]
Former-commit-id: 78c7f29096
Former-commit-id: 8a86e910aa
2012-03-07 16:05:54 -06:00
Bryan Kowal
2cc79e1acb 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: 4d8d3d4d00 [formerly 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]
Former-commit-id: c803afd454
Former-commit-id: 033a4e237b
2012-03-07 10:22:40 -06:00
Bryan Kowal
faa13ee9f7 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 5228de77e2 [formerly 5228de77e2 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]
Former-commit-id: 793dad5711
Former-commit-id: 81f778e43a
2012-03-05 13:46:10 -06:00
Bryan Kowal
e23844d671 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 47230422ce [formerly 47230422ce [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]
Former-commit-id: 94d6af30f0
Former-commit-id: ca62eb90f3
2012-02-29 12:43:46 -06:00
Steve Harris
21f12bae82 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: 9b67525e95 [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: e5b56c99ab
Former-commit-id: 40d7357165
2012-02-27 15:58:49 -06:00
Bryan Kowal
8350501de4 Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 1e3e31a657 [formerly 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]
Former-commit-id: c2cd292c32
Former-commit-id: 49a30a5b1a
2012-02-23 16:46:48 -06:00
Bryan Kowal
4a78479648 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: bae0cb555e [formerly bae0cb555e [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]
Former-commit-id: e135f4508d
Former-commit-id: 5c86773a77
2012-02-23 14:20:50 -06:00
Steve Harris
2c958713b6 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: dcadf7baa4 [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: 86e586befe
Former-commit-id: 938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
ae9c52b012 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: d0bbbfefcc [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: 7a10ca9766
Former-commit-id: 3d511fe719
2012-02-23 10:06:18 -06:00
Steve Harris
15c56d11bc Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
156ad8471d Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
37e57b6588 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: b89ebc5e01 [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: 496cc6a06b
Former-commit-id: 4a93298877
2012-02-20 16:38:06 -06:00
Steve Harris
acd7845ebd 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: cabf9fd956 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
09b81c6e00 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: 4b76d22f77 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: cc66c8be24
Former-commit-id: 54b5b6baef
2012-02-20 12:43:38 -06:00
Bryan Kowal
8403801a2b Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 10a0ca252d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
2012-02-17 12:17:14 -06:00
Steve Harris
c74ded15b9 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 272ba87883 [formerly 272ba87883 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]]
Former-commit-id: c1129dbd00
Former-commit-id: ad402655f4
2012-02-15 15:08:58 -06:00
Steve Harris
b2999a6d59 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: b9f4780fcb [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]
Former-commit-id: 23cc9689de
Former-commit-id: a2e3aabc60
2012-02-15 14:39:43 -06:00