Commit graph

723 commits

Author SHA1 Message Date
Nate Jensen
1e761b6716 Issue #716 only print mergetool message if it's not set
Change-Id: I7a2e56e58dff3b6b2dcc65a734767d2c707882b8

Former-commit-id: d3e7ea521c17f091b37d07f877c728fdb616c4a9
2012-06-28 16:16:26 -05:00
Max Schenkelberg
a3014f6ec3 Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: 24423c6b03bffd01313a93b6c641b3d8fef35902
2012-06-28 15:29:05 -05:00
Nate Jensen
24a4ef99a7 Merge "Issue #821 Fixed editor menu so plugin.xml action contribution items are created every time the menu is shown to make sure any submenus are recreated in the action." into development
Former-commit-id: 41f21e357b6aacc42ff01a93a85f50c68c2c890b
2012-06-28 14:16:28 -05:00
Ben Steffensmeier
6f2e2b2cea Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: 067bfaab551c3c061ecfa8defba7d90c3e34b81a
2012-06-28 14:07:48 -05:00
Ben Steffensmeier
881896c21b Issue #704 introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def

Former-commit-id: bb83a95f5f00cce75b47e7fab084cf3258f65aba
2012-06-28 13:58:29 -05:00
Max Schenkelberg
668838364d Issue #821 Fixed editor menu so plugin.xml action contribution items
are created every time the menu is shown to make sure any submenus are
recreated in the action.

Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382

Former-commit-id: 537240ee2e9dfb7c110f8d3a63566932b599dfdf
2012-06-28 11:53:21 -05:00
Bryan Kowal
5fe8bd69f8 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 403599d216e643dba2fcae0883f32987c7bade3f
2012-06-27 18:38:19 -05:00
Bryan Kowal
b87b66abc5 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: af5a90e383c1c115b363a33d9e72f957ada697a4
2012-06-27 17:21:48 -05:00
Bryan Kowal
98fdfa6f37 Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: b6990b5dc58e07fe7d5c85f8fa322723391193a4
2012-06-27 16:22:53 -05:00
Bryan Kowal
53e5b7c491 12.6.1-10 baseline
Conflicts:
	cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/IImagingExtension.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.npp.feature/com.raytheon.uf.viz.npp.feature.ecl
	cave/com.raytheon.uf.viz.npp.viirs/.classpath
	cave/com.raytheon.uf.viz.npp.viirs/.project
	cave/com.raytheon.uf.viz.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.npp.viirs/com.raytheon.uf.viz.npp.viirs.ecl
	cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/widgets/ScaleWidget.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/AbstractRadarResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	cots/org.jboss.cache/.project
	deltaScripts/12.5.1/drop_gfe_tables.sh
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendQueue.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/SendIscTransactions.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/ClimoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/HLSTopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/TopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/com.raytheon.uf.common.dataplugin.npp.viirs.ecl
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.common.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSSpatialMessageData.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/gov.noaa.nws.ost.edex.plugin.regionalsat.ecl
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/cave_static/site/AFC/menus/satellite/regionalsat/baseRegionalComposite.xml
	ncep/gov.noaa.nws.ncep.common.staticdata/.classpath
	ncep/gov.noaa.nws.ncep.common.staticdata/.project
	ncep/gov.noaa.nws.ncep.common.staticdata/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.common.staticdata/build.properties
	ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.project
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/build.properties
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/gov.noaa.nws.ncep.gempak.parameters.core.ecl
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metParameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/ClimDayTemp.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/DayTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/HeightAboveSeaLevel.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/NightTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/POP12HrsAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms12hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms24hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms6hr.java
	ncep/gov.noaa.nws.ncep.staticdataprovider/.classpath
	ncep/gov.noaa.nws.ncep.staticdataprovider/.project
	ncep/gov.noaa.nws.ncep.staticdataprovider/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.staticdataprovider/gov.noaa.nws.ncep.staticdataprovider.ecl
	ncep/gov.noaa.nws.ncep.viz.customProjection/.classpath
	ncep/gov.noaa.nws.ncep.viz.customProjection/.project
	ncep/gov.noaa.nws.ncep.viz.customProjection/gov.noaa.nws.ncep.viz.customProjection.ecl
	rpms/awips2.core/Installer.ldm/component.spec

Change-Id: Ib8015bb11aef0561ff3b3bc426b51b5c8ee8ef4a

Former-commit-id: 9597fdac96022c94dad425367de23eafedad06bc
2012-06-27 15:04:34 -05:00
David Gillingham
12b2403627 Issue #810: turn off Wes2Bridge archiver by default
Change-Id: I1974b81e73b2daab48947d2a44dc9072aba459af

Former-commit-id: ff97ae48126d906463a4a1063782fa3f154fdeeb
2012-06-26 17:58:21 -05:00
David Gillingham
672d7a2c31 Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline.
Former-commit-id: 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d
2012-06-26 17:49:06 -05:00
Brad Gonzales
c99fa8db33 Issue #628 second attempt. add jaxen 1.1.4 jar to org.dom4j package. restore PgenPaletteWindow settings in plugin.xml
Former-commit-id: 063414b3e997718b74d59cb0155dc081fe91504c
2012-06-26 15:41:14 -05:00
Nate Jensen
ab86141e2f Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
Former-commit-id: 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3
2012-06-26 13:21:49 -05:00
Bryan Kowal
b1a1448256 Issue #704 - update build.properties files for python.
Former-commit-id: 88840dea400d8df50e273365d81b5180ab06fb11
2012-06-26 10:26:29 -05:00
Nate Jensen
61b0394381 Merge "Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic." into development
Former-commit-id: 2eab85ae7e6ad05e549b173fd026f22b61e8e8a7
2012-06-26 10:24:17 -05:00
Bryan Kowal
670c7cabb4 Issue #800 - fix build.properties.
Former-commit-id: 914838d805b01754cf5947eaa7196b148d2738b5
2012-06-26 09:42:20 -05:00
Bryan Kowal
1e5c9ef92d Issue #704 - fix build.properties files.
Former-commit-id: 7130431b6e279db1c5ed550e0ce42c5fdf4238f1
2012-06-25 16:50:11 -05:00
Lee Venable
175651d6c5 Merge "Issue #666 fixed ncep ovelay resources so recylce works properly" into development
Former-commit-id: 536549ae3f5ad1d8b73289f3838d20fc654439aa
2012-06-25 15:49:00 -05:00
Ben Steffensmeier
603d48a017 Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
Former-commit-id: 308f0e8c03ab4237830a91c96c500b6860c6fd36
2012-06-25 15:22:35 -05:00
Lee Venable
97b5d9ccea Merge "Issue #704 fixes to plots/MPE to work better in KML" into development
Former-commit-id: 5ac36fa40f250c4ee856190ac51eea82e68623bb
2012-06-25 15:04:00 -05:00
Max Schenkelberg
7e114e008b Issue #666 fixed ncep ovelay resources so recylce works properly
Change-Id: Iedde396d06a86760c1871362b36c08bc3185e27e

Former-commit-id: 1eea078927b999eea1891b56bd2a85ae6044d99f
2012-06-25 13:17:02 -05:00
Ben Steffensmeier
b01be5085f Issue #704 fixes to plots/MPE to work better in KML
Former-commit-id: f1d440729b4e436e879219abaaaf7fa0e04d4ef6
2012-06-22 17:54:31 -05:00
Brad Gonzales
bef2bfa7cc Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 237309aab32cdb36703dbe62d2cfe102b3197863
2012-06-22 15:08:40 -05:00
Steve Harris
a2c88aee12 Issue #708 - execute permissions didn't survive the git push
Former-commit-id: 44388508c45f2c560301558c4fb297b806ba55a7
2012-06-22 12:08:20 -05:00
Steve Harris
209299d1cb Issue #708 - new script for setting up Gerrit hook and aliases
Change-Id: Iabdc5005ed9376e31414429a76898c0798d8e7ff

Former-commit-id: ec3999181ac1f2d2d0ca7f469b69a5bf83633570
2012-06-22 11:39:00 -05:00
Max Schenkelberg
d7b326cfa6 Issue #665 fixed TransformFactory when getting worldToGrid to return crsToGrid
Amend: Updated comment for new return

Change-Id: I95151c5233898d156398760d3360de8c80b28001

Former-commit-id: 42fc0cbd10401a6099e571467ff112f544e525e7
2012-06-21 17:54:32 -05:00
Max Schenkelberg
fce005b109 Issue #778 changed SPIResource to not dispose font when magnification changes but instead call setMagnification()
Change-Id: Ibc8aa9b69643d67a1203a560f3adbc3d870db2bf

Former-commit-id: 6ce5d188d0b27bf4cf07a8cd9b15fa9ad0bb16c2
2012-06-21 16:07:23 -05:00
Max Schenkelberg
130692aefd Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5

Former-commit-id: 75fb17528d393b767df8d8a34abd5e41f007b771
2012-06-21 16:07:20 -05:00
Steve Harris
577ebf6558 Issue #708 - removed extraneous files from 12.6.1-10
Former-commit-id: fdeb636cf84f50fb9c99502f4a7c2991bc48de55
2012-06-21 10:23:40 -05:00
Nate Jensen
22d4de96fd Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
Former-commit-id: 995d7e08ade1a3e10ac8ab51aa24f900091054de
2012-06-21 10:04:51 -05:00
Bryan Kowal
022777b7ec Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
Former-commit-id: f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded
2012-06-21 09:54:25 -05:00
Steve Harris
3cd0902b49 12.6.1-10 baseline
Former-commit-id: dd65e6d99709e0117519a1f2a2f02a41c8938d0e
2012-06-21 08:58:00 -05:00
Steve Harris
25198a5cd6 Revert "12.6.1-10 baseline"
This reverts commit a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1].


Former-commit-id: 8cdb21fda317373a0dc95e5048716d0e31412ab4
2012-06-21 08:51:08 -05:00
Steve Harris
a2c0893d1a 12.6.1-10 baseline
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
2012-06-21 08:38:48 -05:00
Steve Harris
6c4e72a430 Issue #708 - Removed extraneous files from 12.5.1-15
Former-commit-id: bab92b963dca76671250f5e2e2bb462ad5a12a29
2012-06-21 08:25:31 -05:00
Ben Steffensmeier
16e4fe8ce2 Issue #704 fixes to random resources and optimization of radar projection transforms
Former-commit-id: 7619165ce45efe9dbad045adfaaf978acee782be
2012-06-20 18:07:17 -05:00
Nate Jensen
133cd9994e Merge "Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later" into development
Former-commit-id: 5e8d1cbc132dbd69b86342234631f3d11e3bdb3d
2012-06-20 17:56:50 -05:00
Bryan Kowal
f2a3f33e07 Issue #708 - update the binlightning edex specs.
Former-commit-id: 0c37ab92aefae0b00a8c8767421c9b28773ca8fe
2012-06-20 16:00:40 -05:00
Max Schenkelberg
61e0ea0516 Issue #590 Fixed GFE colorbar when changing parms after setting up collaboration session. Needed to move adding of listeners to initInternal and not the constructor so recycling readds them after dispose removes them
Change-Id: Ieb5fc7786682b5b442deccf4a5292374a4a7de47

Former-commit-id: c0d7f68bed2b141240d2e2a695c8439f7a4ffa67
2012-06-20 15:32:27 -05:00
Bryan Kowal
a828d869a0 Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: 982e97b44967376b7e08138c4997a87ec1c98b44
2012-06-20 14:47:19 -05:00
Ben Steffensmeier
0c69731e18 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: 65e7e8b2c891d1938f0b98c3c8737f18517fe27f
2012-06-20 14:13:37 -05:00
Bryan Kowal
f79134499e Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 0932e1173258d916a6a1caae5c943903d830c2af
2012-06-20 11:22:58 -05:00
Steve Harris
c0b5f3f892 Issue #708 - removed extraneous files
Former-commit-id: 134264091ddd0567f4789c852f8ee7b41b3dc9bf
2012-06-20 08:24:45 -05:00
Steve Harris
fbe7e50417 Issue #708 - removed extraneous files
Former-commit-id: 389c544088260bd6d6d107f51dc36426e9af3229
2012-06-20 08:15:55 -05:00
Nate Jensen
a8af268ca1 Merge "Issue #440 made PathManager not request data if there are no contexts to request for" into development
Former-commit-id: dd1f52c8e5d36cccab98821018cb77f544529933
2012-06-19 16:47:34 -05:00
Bryan Kowal
25addabe64 Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: 048ea55e064e0581cf32ca286c67f611ee4e0c3b
2012-06-19 15:03:57 -05:00
Bryan Kowal
dff89c83e4 Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
Former-commit-id: 03e09af0cae74d0510a86ff07a31bbffbe3c4aac
2012-06-19 13:33:01 -05:00
Bryan Kowal
a4c6095b76 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d
2012-06-19 13:17:17 -05:00
Bryan Kowal
25e20ad89c Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: 1afabfa6e3621f0cfda1084e95c0e5a91a313812
2012-06-19 13:15:53 -05:00