xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6543 commits 31 branches 40 tags 3.8 GiB
Commit graph

59 commits

Author SHA1 Message Date
Slav Korolev
d8f3f75c07 Issue #2757 - Fixed problem with adding and removing zones. 
Former-commit-id: a4914bd85d [formerly 443c7c7482 [formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]]
Former-commit-id: 443c7c7482
Former-commit-id: 4c209b4958
 2014-09-24 09:34:43 -04:00
Slav Korolev
ba5acfdda0 Issue #2757 - Updated handlers for dialog buttons. 
Former-commit-id: 23ec338be0 [formerly 71c4d8db07 [formerly 69a82633c287bf18c9f436014bb552829dcb62ea]]
Former-commit-id: 71c4d8db07
Former-commit-id: d2dd00d2ae
 2014-09-19 15:02:59 -04:00
Slav Korolev
f39c9c151d Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs. 
Former-commit-id: f458f75ecf [formerly 689930c484 [formerly 879a50a60209abf95752c178a0266cdd42bde012]]
Former-commit-id: 689930c484
Former-commit-id: 150a132320
 2014-04-24 15:40:52 -04:00
Nate Jensen
2561050293 Issue #2984 remove unnecessary dependencies on edex 
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746

Former-commit-id: df4171b29d [formerly 2253938ed5 [formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]
Former-commit-id: 2253938ed5
Former-commit-id: ef43b2d325
 2014-04-21 11:32:41 -05:00
Everett Kladstrup
eab1358602 Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]
Former-commit-id: 06d6961c0f
Former-commit-id: 8b19b3601a
 2014-04-09 09:31:12 -05:00
Max Schenkelberg
dbc6cc3fc6 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values. 
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]
Former-commit-id: a01a6d68d0
Former-commit-id: 59434c8a60
 2014-03-04 09:23:36 -06:00
Slav Korolev
91972c1b42 Issue #2757. Added filter for removed stations and cleaned code. 
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534

Former-commit-id: fa59172d87 [formerly c7c40a3467 [formerly b613a9d5b7e9b1c17fa354c9c6b617da040d1d71]]
Former-commit-id: c7c40a3467
Former-commit-id: cbd17ea025
 2014-02-04 15:21:22 -05:00
Slav Korolev
7b3702c186 Issue #2757. Fixed issues in Area Configuration Dialogs. 
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf

Former-commit-id: a768f540f0 [formerly ea573d2c30 [formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]
Former-commit-id: ea573d2c30
Former-commit-id: 6013121a99
 2014-02-03 09:50:01 -05:00
Slav Korolev
696728bafd Issue #2653. Corrected decoding of SNOW monitor data. 
Former-commit-id: ab7fc816b4 [formerly 714fd018ef [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]
Former-commit-id: 714fd018ef
Former-commit-id: 5bbb774073
 2014-01-07 11:48:13 -05:00
Richard Peter
ba577ff354 Merge branch 'omaha_14.1.1' (14.1.1-11) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: 0c4ae068ad
Former-commit-id: b3b23647b4
 2013-12-05 12:12:27 -06:00
Steve Harris
f53eb87892 14.1.1-12 baseline 
Former-commit-id: a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: b24d9c80b0
Former-commit-id: 371d1ca63c
 2013-12-04 16:47:59 -05:00
Richard Peter
6502f1f695 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 79bdd34f4f
Former-commit-id: 2c753c427c
 2013-11-14 14:40:23 -06:00
Steve Harris
8606fed724 14.1.1-8 baseline 
Former-commit-id: c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: aa6c977e7b
Former-commit-id: 90bc008a50
 2013-11-13 12:32:17 -05:00
Ben Steffensmeier
c91c0d3f1a Issue #2491 Clean a few more procedure only objects from ISerializableObject files. 
Former-commit-id: 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]
Former-commit-id: ff5f08d23a
Former-commit-id: d386c6bc76
 2013-11-04 13:01:49 -06:00
Nate Jensen
bd9578dd6d Issue #2361 remove dependencies on mesowest and delete dead grichardson code 
Former-commit-id: 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]
Former-commit-id: 477c64c8bd
Former-commit-id: 65d7d4dac9
 2013-10-23 14:52:29 -05:00
Lee Venable
7dae2b36cf Issue #2443 - fixed image memory leak. 
Former-commit-id: 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]
Former-commit-id: 0bacce33bc
Former-commit-id: 1021c25d9d
 2013-10-08 09:39:00 -05:00
Lee Venable
f27781b74e Issue #2436 - disposed of the sort color 
Former-commit-id: c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]
Former-commit-id: 9c97908f36
Former-commit-id: 8c8adf8be6
 2013-10-07 09:11:25 -05:00
Max Schenkelberg
84377d3e8c Issue #2277 Remove more ScriptCreator references 
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747

Former-commit-id: 63e90f6955 [formerly 17b38d9f72 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]
Former-commit-id: 17b38d9f72
Former-commit-id: 487775918d
 2013-09-11 16:32:00 -05:00
David Gillingham
bd9b224ff5 Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into 
Java. Convert to use of these new methods where possible. Create unit tests.

Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d

Former-commit-id: 40b5d54bf3 [formerly 0b6b0e06cc [formerly 5992197809236553e9c021526e42d28ed327b413]]
Former-commit-id: 0b6b0e06cc
Former-commit-id: c17f8b4409
 2013-08-15 11:30:45 -05:00
Nate Jensen
178107c128 Issue #2142 removing some viz dependencies on edex.common 
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 4c9cc211ec [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]
Former-commit-id: 22438766b4
Former-commit-id: bcdaae1922
 2013-07-22 12:20:43 -05:00
Max Schenkelberg
cd88054e2b Issue #2142 Got log4j out of edex. 
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 63421a4819
Former-commit-id: 94fa6f0e30
 2013-07-15 14:26:15 -05:00
Steve Harris
6f374b35d0 13.3.1-12 baseline 
Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
 2013-03-25 13:27:13 -05:00
Steve Harris
3ec20c1689 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 
Former-commit-id: 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 305dd72969
Former-commit-id: 61a19a460b
 2013-03-05 12:27:49 -06:00
Steve Harris
e4a1c61ad5 13.3.1-5 baseline 
Former-commit-id: e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
 2013-03-05 10:47:06 -06:00
Steve Harris
abdc733151 Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: a0573644c4
Former-commit-id: 64744fdb19
 2013-02-21 15:41:39 -06:00
Steve Harris
e0406d3183 13.3.1-1 baseline 
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
 2013-02-20 16:19:40 -06:00
Roger Ferrel
3275e6adfe Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg. 
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42

Former-commit-id: 873f932f8e [formerly 130fa3f73d [formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]]
Former-commit-id: 130fa3f73d
Former-commit-id: 24c88a1673
 2013-02-07 12:46:01 -06:00
Steve Harris
a4fa438a41 13.2.1-2 baseline 
Former-commit-id: 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 83e9157df7
Former-commit-id: 33bc5fd816
 2013-01-23 11:18:44 -05:00
Steve Harris
e8f4a2f031 13.1.2-2 baseline 
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
 2013-01-06 14:32:24 -06:00
Slav Korolev
466abfbc1c Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file. 
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 1a510a9f61 [formerly 48f074eb72 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]
Former-commit-id: 48f074eb72
Former-commit-id: 829899374d
 2012-12-07 15:18:03 -05:00
Slav Korolev
81d98a46f1 Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments. 
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: b650fa6675 [formerly a284f0f50f [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]
Former-commit-id: a284f0f50f
Former-commit-id: 349ea52e2b
 2012-12-07 12:23:39 -05:00
Slav Korolev
32f192134d Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables. 
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2

Former-commit-id: af101861e4 [formerly 5e4bbc03a4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]
Former-commit-id: 5e4bbc03a4
Former-commit-id: 153af1673a
 2012-12-06 12:42:06 -05:00
Slav Korolev
a519f985ec Issue #1297. Changed non-blocking ZoneTableDlg. Next patch. 
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: 4560efe149 [formerly d220f74018 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]
Former-commit-id: d220f74018
Former-commit-id: 487a9eabb8
 2012-11-16 11:08:42 -05:00
Dustin Johnson
acd4cf94d8 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
 2012-11-08 09:57:16 -06:00
Steve Harris
8278cac143 12.12.1-1 baseline 
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
 2012-11-07 12:41:20 -06:00
Slav Korolev
eefd20833a Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format. 
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d

Former-commit-id: 8c1719f248 [formerly 52601577db [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]]
Former-commit-id: 52601577db
Former-commit-id: 2beb1dbc67
 2012-10-24 09:24:02 -04:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline 
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
 2012-08-21 15:27:03 -05:00
root
bb7b5341dd Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: cb46f57879
Former-commit-id: 0987fc6b3d
 2012-08-15 22:15:20 +00:00
Steve Harris
b9fb1c89d4 12.9.1-1 baseline 
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
 2012-08-15 13:59:00 -05:00
Nate Jensen
baff86f951 Issue #882 improved use of SimulatedTime 
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: a65e9608fd
Former-commit-id: 6f90bfa61c
 2012-07-31 08:57:54 -05:00
Steve Harris
32fdf6ed3b 12.6.1-9 baseline 
Former-commit-id: 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
 2012-07-10 07:53:49 -05:00
Bryan Kowal
455d7b90a9 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: b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: a33740e915
Former-commit-id: b1b294c401
 2012-06-27 17:21:48 -05:00
Steve Harris
a9742f306e 12.6.1-10 baseline 
Former-commit-id: 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]
Former-commit-id: 8dc4a774e2
Former-commit-id: edac4d827c
 2012-06-21 08:58:00 -05:00
Steve Harris
584f7eddf8 Revert "12.6.1-10 baseline" 
This reverts commit 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].


Former-commit-id: 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: b4b1f6975f
Former-commit-id: 62cf6a9f92
 2012-06-21 08:51:08 -05:00
Steve Harris
16fd236f2d 12.6.1-10 baseline 
Former-commit-id: a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: ddde63eee0
Former-commit-id: 06f1c7b73c
 2012-06-21 08:38:48 -05:00
Steve Harris
1ad64ffa98 12.6.1-5 baseline 
Former-commit-id: 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: c99afab05f
Former-commit-id: 09f73b0601
 2012-06-11 16:23:47 -05:00
Steve Harris
bc96eba820 12.6.1-3 baseline 
Former-commit-id: d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: 42f3513175
Former-commit-id: 7c5306b795
 2012-06-11 16:23:47 -05:00
Steve Harris
975053c3dc 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: d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: 37793c86b1
Former-commit-id: c7024992a3
 2012-06-11 15:24:03 -05:00
Steve Harris
2f10c7a1e4 12.5.1-15 baseline 
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
 2012-06-08 13:39:48 -05:00
Steve Harris
45773fbee0 12.5.1-9 baseline 
Former-commit-id: 1f542697cb [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]
Former-commit-id: 8f3c9ebfb7
Former-commit-id: b8de76b45e
 2012-05-21 17:48:55 -05:00