Steve Harris
346b22b196
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 36261cb095
[formerly 753a5213ab
] [formerly 36261cb095
[formerly 753a5213ab
] [formerly 0cd7e56e65
[formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: bca46a1354
[formerly d5bcdb0015
]
Former-commit-id: 5232592cfa
2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
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/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: 5c65862b8f
[formerly a1006667e0
] [formerly 5c65862b8f
[formerly a1006667e0
] [formerly 4b08491880
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135
[formerly 6ea95002de
]
Former-commit-id: 29ed641a13
2013-03-12 15:48:34 -05:00
Steve Harris
c28f3aeb02
13.3.1-6 baseline
...
Former-commit-id: 2e110bd151
[formerly 3a4c7931e1
] [formerly 2e110bd151
[formerly 3a4c7931e1
] [formerly 566b677d09
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924
[formerly 4ed21b702b
]
Former-commit-id: c6f379f59a
2013-03-12 08:35:45 -05:00
Nate Jensen
d0bed867b0
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 5d9778a8d6
[formerly 5e3d6df7e0
] [formerly 5d9778a8d6
[formerly 5e3d6df7e0
] [formerly 5c59a61cef
[formerly 392feade3f36680edcdb135f7c061be172210c26]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 21863c5db5
[formerly d7902aba68
]
Former-commit-id: a2f804350a
2013-03-07 16:49:40 -06:00
Steve Harris
2b489e4e40
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 6b13492420
[formerly d5b80f9225
] [formerly 6b13492420
[formerly d5b80f9225
] [formerly aa0e9acefd
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec
[formerly b9563da8a8
]
Former-commit-id: 46d0c9fcee
2013-03-05 12:29:44 -06:00
Steve Harris
d842ed88a7
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b
[formerly 305dd72969
] [formerly 61a19a460b
[formerly 305dd72969
] [formerly 57f42761d7
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: b423579e4a
[formerly a8e1557c62
]
Former-commit-id: b630339eb7
2013-03-05 12:27:49 -06:00
Steve Harris
153aadc1d7
13.3.1-4 baseline
...
Former-commit-id: d79303de13
[formerly 8c0b90f292
] [formerly d79303de13
[formerly 8c0b90f292
] [formerly 2edca90902
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: 3e0614b43a
[formerly 5e55ded3a9
]
Former-commit-id: 0df35cc5ec
2013-03-05 10:39:59 -06:00
Bryan Kowal
0a60b0f122
Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
...
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a
Former-commit-id: eb4d75de7f
[formerly 862f97a19b
] [formerly eb4d75de7f
[formerly 862f97a19b
] [formerly cd08f88c43
[formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]]
Former-commit-id: cd08f88c43
Former-commit-id: 8512836953
[formerly d9c1a92b8e
]
Former-commit-id: 5dae6fd039
2013-03-04 15:52:07 -06:00
David Gillingham
861a3d0c44
Issue #1447 : Initial commit of VTEC table sharing functionality: port A1 changes to
...
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: ca81ae4a71
[formerly 50744c1f92
] [formerly ca81ae4a71
[formerly 50744c1f92
] [formerly 9351f33c1c
[formerly 1e72fe30d97504f70352a181de35805a197e50f4]]]
Former-commit-id: 9351f33c1c
Former-commit-id: 622700dee9
[formerly 77a3f33fd5
]
Former-commit-id: 4f6b2ffcff
2013-03-01 11:05:02 -06:00
Max Schenkelberg
3dcfc90510
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
...
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: 1769edc026
[formerly ec40d261e5
] [formerly 1769edc026
[formerly ec40d261e5
] [formerly 547c593dec
[formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]
Former-commit-id: 547c593dec
Former-commit-id: fc58e7431a
[formerly 13a4056335
]
Former-commit-id: 0c8f3d2449
2013-02-27 16:19:58 -06:00
Bryan Kowal
8210c0d984
Issue #1662 - wrapper parameters can now be used to specify the order
...
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters
Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c
Former-commit-id: 5b3478d6c7
[formerly 8bf5e3ffad
] [formerly 5b3478d6c7
[formerly 8bf5e3ffad
] [formerly 44349717fb
[formerly aae64b29491d8da0001cf1182a357683546d4593]]]
Former-commit-id: 44349717fb
Former-commit-id: 65fb00c3c3
[formerly 4f7fed259c
]
Former-commit-id: dc46b8eeb1
2013-02-27 12:46:48 -06:00
Max Schenkelberg
1073393fbb
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: 2611980ca4
[formerly 4ed4ef8d71
] [formerly 2611980ca4
[formerly 4ed4ef8d71
] [formerly e0ba97d547
[formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: 5617dfaa67
[formerly 6b1426dd34
]
Former-commit-id: 453ac44050
2013-02-27 11:50:38 -06:00
Ron Anderson
59c7ee5120
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: d43afc8c67
[formerly bfe3c684df
] [formerly d43afc8c67
[formerly bfe3c684df
] [formerly f37999b1eb
[formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0
[formerly 77fbbb6a61
]
Former-commit-id: 92abcad349
2013-02-26 18:44:51 -06:00
Nate Jensen
360b33b854
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: 15c4c4dfa0
[formerly b062299796
] [formerly 15c4c4dfa0
[formerly b062299796
] [formerly 36d4eff2c6
[formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: b173d34ba9
[formerly 5c33098315
]
Former-commit-id: c06d4abcee
2013-02-26 13:53:40 -06:00
Matt Nash
2841c495af
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: 41bbd4cf2d
[formerly a2fb0db684
] [formerly 41bbd4cf2d
[formerly a2fb0db684
] [formerly 051b36ad73
[formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]
Former-commit-id: 051b36ad73
Former-commit-id: 32096feba8
[formerly b1fe380c44
]
Former-commit-id: 1c51407ffd
2013-02-26 13:29:04 -06:00
Dustin Johnson
fa87f70100
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: ebf02481f0
[formerly d58d28c636
] [formerly ebf02481f0
[formerly d58d28c636
] [formerly 722e41b8b0
[formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]
Former-commit-id: 722e41b8b0
Former-commit-id: 219e882fc5
[formerly cf86c92fad
]
Former-commit-id: b62631b9d1
2013-02-26 11:32:03 -06:00
Steve Harris
108abd5e69
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: cd99e680bb
[formerly b50e384a0f
] [formerly cd99e680bb
[formerly b50e384a0f
] [formerly e8135b9c14
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]
Former-commit-id: e8135b9c14
Former-commit-id: 901cbbf56d
[formerly 2398ef1e85
]
Former-commit-id: 1d8b6e0256
2013-02-25 16:05:22 -06:00
Steve Harris
9db68d0585
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 0a4564eb97
[formerly 67f090638f
] [formerly 0a4564eb97
[formerly 67f090638f
] [formerly 6ec9e73035
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: e46625f8f2
[formerly 0051276ad1
]
Former-commit-id: 140ae3191c
2013-02-25 15:58:48 -06:00
Bryan Kowal
e38658e939
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: 4d160993fb
[formerly b05073fbe3
] [formerly 4d160993fb
[formerly b05073fbe3
] [formerly 0d2262c0bf
[formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: f8c920c6cd
[formerly 36a887416f
]
Former-commit-id: ebe04d4919
2013-02-25 11:30:13 -06:00
Steve Harris
a43233f8c2
13.3.1-2 baseline
...
Former-commit-id: 3e60b23072
[formerly df6d6f598e
] [formerly 3e60b23072
[formerly df6d6f598e
] [formerly 3d115ed3be
[formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 370ed98038
[formerly e8a51dc780
]
Former-commit-id: 2a2a9e03b7
2013-02-25 10:18:36 -05:00
Bryan Kowal
dd7eda15aa
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 4cd5453e0a
[formerly 7c62991edf
] [formerly 4cd5453e0a
[formerly 7c62991edf
] [formerly d5c8b82941
[formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]
Former-commit-id: d5c8b82941
Former-commit-id: 53b9e69868
[formerly 5a5914c010
]
Former-commit-id: fd17273cb2
2013-02-22 09:28:37 -06:00
Steve Harris
b5d9e75b95
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: 64744fdb19
[formerly a0573644c4
] [formerly 64744fdb19
[formerly a0573644c4
] [formerly 2641d578e2
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a
[formerly 33dd2589f1
]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Bryan Kowal
b88a24574b
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 519ce2c0fb
[formerly a8fb04f41c
] [formerly 519ce2c0fb
[formerly a8fb04f41c
] [formerly 803397c7c7
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: b2a0a7c148
[formerly 450e8e7a4c
]
Former-commit-id: 2a21f2624b
2013-02-21 13:55:28 -06:00
Steve Harris
07e4e4c8fb
13.3.1-1 baseline
...
Former-commit-id: 96768407a5
[formerly 0563d7ac18
] [formerly 96768407a5
[formerly 0563d7ac18
] [formerly cabc8cf8b4
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 0569ff413d
[formerly 92e4c7ba19
]
Former-commit-id: 654f15be5c
2013-02-21 09:36:59 -05:00
Steve Harris
8c828dbd75
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e
[formerly 71e8990021
] [formerly 8ae397085e
[formerly 71e8990021
] [formerly d2a654625f
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9
[formerly 46d28be4a4
]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Dustin Johnson
2565df8435
Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO
...
- Change new registry modes to explicitly list includes/excludes.
- Add separate bandwidth manager creation capabilities for NCF and WFO.
- Add deltaScript to add a "route" slot to subscriptions.
- Remove unnecessary schemas from Spring files.
Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa
Former-commit-id: d4afef2cab
[formerly d8659e742e
] [formerly d4afef2cab
[formerly d8659e742e
] [formerly c8760e5699
[formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]]
Former-commit-id: c8760e5699
Former-commit-id: 5a8b6459d4
[formerly ca721863be
]
Former-commit-id: 5ffa5f410e
2013-02-20 10:42:51 -06:00
Dustin Johnson
0f1fcc9b5b
Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
...
Amend:
Use ref syntax with uri.
Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062
Former-commit-id: 2a588688b1
[formerly cc598094fa
] [formerly 2a588688b1
[formerly cc598094fa
] [formerly 116809346b
[formerly 66fe560026848357ae165a675be9818da719675d]]]
Former-commit-id: 116809346b
Former-commit-id: 5ff6387368
[formerly 3585482cad
]
Former-commit-id: 992a02d000
2013-02-18 15:47:17 -06:00
Richard Peter
107393f436
Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
...
Former-commit-id: b3e2ca7b30
[formerly a40ae4d8b2
] [formerly b3e2ca7b30
[formerly a40ae4d8b2
] [formerly a6fa92923f
[formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]
Former-commit-id: a6fa92923f
Former-commit-id: 774ea0ede6
[formerly 5936f671ce
]
Former-commit-id: b5706ca6cf
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
e6fc131343
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: e771076275
[formerly 1393f3e3cf
] [formerly e771076275
[formerly 1393f3e3cf
] [formerly 0933a5f596
[formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 91bbdc3337
[formerly f0f3c71d50
]
Former-commit-id: f868f66f76
2013-02-15 11:39:56 -06:00
Ron Anderson
80df624bb3
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87
[formerly a2a89fb4e7
] [formerly dc7c9edb87
[formerly a2a89fb4e7
] [formerly 7c0a5d74bf
[formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: d69d628450
[formerly e952a4f179
]
Former-commit-id: 45627edcc7
2013-02-15 09:03:41 -06:00
Ben Steffensmeier
2bcf3749ce
Issue #1614 allow locationNames for grid data access
...
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2
Former-commit-id: ef7addb005
[formerly ab319bd3a8
] [formerly ef7addb005
[formerly ab319bd3a8
] [formerly 9b4de367e3
[formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: efaddb710c
[formerly 0995024482
]
Former-commit-id: aecc5a69e9
2013-02-14 10:07:01 -06:00
Matt Nash
6f1596ab82
Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused.
...
Change-Id: I36d72ed9642752eb92ae0902892bd79810111c07
Former-commit-id: 2bed543d32
[formerly 1c504de33e
] [formerly 2bed543d32
[formerly 1c504de33e
] [formerly da21cf82e9
[formerly 4b56329756881b3291ad2856a5c166cdfc635bf9]]]
Former-commit-id: da21cf82e9
Former-commit-id: 39f3f70e1b
[formerly d39f0938e8
]
Former-commit-id: a64fd03896
2013-02-12 12:02:48 -06:00
Dustin Johnson
35b13ba973
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: 0d548bd66f
[formerly 8307af022c
] [formerly 0d548bd66f
[formerly 8307af022c
] [formerly ef32853dc1
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]
Former-commit-id: ef32853dc1
Former-commit-id: 73a5667256
[formerly e504a474f9
]
Former-commit-id: e48bf48821
2013-02-11 14:21:57 -06:00
Steve Harris
dc55ef579a
13.2.1-6 baseline
...
Former-commit-id: d66ad2f77b
[formerly d0752de66c
] [formerly d66ad2f77b
[formerly d0752de66c
] [formerly a46e33f06e
[formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: bbe92e6824
[formerly 30d38334cc
]
Former-commit-id: 0c128dd8f0
2013-02-07 16:00:39 -06:00
Steve Harris
46eee24352
13.2.1-6 baseline
...
Former-commit-id: cc48fa4fc6
[formerly b80782b081
] [formerly cc48fa4fc6
[formerly b80782b081
] [formerly 53adfb7345
[formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]]
Former-commit-id: 53adfb7345
Former-commit-id: 1f44caaedb
[formerly dee1480773
]
Former-commit-id: 16b7b742be
2013-02-07 16:38:44 -05:00
Steve Harris
a11c8dff6d
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: da43a7a8ca
[formerly 4bc8e9ab5c
] [formerly da43a7a8ca
[formerly 4bc8e9ab5c
] [formerly 5ee47e098d
[formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: b119d66cda
[formerly 3ad515e28f
]
Former-commit-id: d73efe8e86
2013-02-06 11:12:01 -06:00
Steve Harris
f997ecea38
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 14f23d4227
[formerly a16ac7819c
] [formerly 14f23d4227
[formerly a16ac7819c
] [formerly 6c6b53679b
[formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 48a0ffda4d
[formerly 28ddc9bad8
]
Former-commit-id: f028c16f79
2013-02-06 11:08:53 -06:00
Steve Harris
f36867a520
13.2.1-5 baseline
...
Former-commit-id: a6b3cde1ff
[formerly 232734091d
] [formerly a6b3cde1ff
[formerly 232734091d
] [formerly 146fcc6da8
[formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 7497a15e22
[formerly 1c602ec3a7
]
Former-commit-id: bb0759d5ad
2013-02-06 11:02:32 -06:00
Bryan Kowal
2afa604676
Issue #1577 - deploy-install and AWIPS II ant task updates
...
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring
Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f
Former-commit-id: 81da18f851
[formerly 7815b651bb
] [formerly 81da18f851
[formerly 7815b651bb
] [formerly 5fea87f1dd
[formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: efe288c82c
[formerly 99994d3151
]
Former-commit-id: 2fafc6a34b
2013-02-05 13:25:15 -06:00
Brad Gonzales
7253bbf20e
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 35cc853c74
[formerly f459554e33
] [formerly 35cc853c74
[formerly f459554e33
] [formerly 5bc6dd5498
[formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 8fc5c18ebd
[formerly f3ef309293
]
Former-commit-id: adbfa7ced1
2013-02-04 08:52:33 -06:00
Steve Harris
5ae95b956b
13.2.1-4 baseline
...
Former-commit-id: ae2859d5a2
[formerly 8f2e7d4437
] [formerly ae2859d5a2
[formerly 8f2e7d4437
] [formerly 0d7f53b6f4
[formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 3f25b862c8
[formerly 2998f750f4
]
Former-commit-id: 0a4ef8c084
2013-01-31 11:40:31 -06:00
Steve Harris
d52f193d7f
13.2.1-4 baseline
...
Former-commit-id: f2b28cfa56
[formerly 1beb655fa0
] [formerly f2b28cfa56
[formerly 1beb655fa0
] [formerly 1e77a6f0bd
[formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: 06f4b4ad5a
[formerly e6e4de6247
]
Former-commit-id: 0c67e2153f
2013-01-31 12:05:59 -05:00
Steve Harris
2107a54161
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: c218786986
[formerly 658bea377b
] [formerly c218786986
[formerly 658bea377b
] [formerly ec56acde81
[formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 73d9455c65
[formerly 6383bf8ed2
]
Former-commit-id: a74d58ce6f
2013-01-31 10:19:14 -06:00
Steve Harris
99bc358644
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e655d297f7
[formerly 0505ed0a72
] [formerly e655d297f7
[formerly 0505ed0a72
] [formerly 6040272573
[formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 75f6e61e6f
[formerly 513d49939f
]
Former-commit-id: ba97151132
2013-01-29 15:57:21 -06:00
Steve Harris
9ab34b7aeb
13.2.1-3 baseline
...
Former-commit-id: 283147571f
[formerly f45120a1f4
] [formerly 283147571f
[formerly f45120a1f4
] [formerly 7a739c6a5b
[formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73
[formerly 3edfa1e0be
]
Former-commit-id: dbaf4a3e39
2013-01-29 15:52:43 -06:00
Steve Harris
eafa141b90
13.2.1-2 baseline
...
Former-commit-id: 0006a2b6cb
[formerly 7a7f7c45ca
] [formerly 0006a2b6cb
[formerly 7a7f7c45ca
] [formerly c3e4551dfa
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 251a9c0195
[formerly 1153d80c5b
]
Former-commit-id: 27706b8dcb
2013-01-25 09:07:12 -06:00
Steve Harris
ab562e22a4
13.2.1-3 baseline
...
Former-commit-id: a5a0da5c02
[formerly 7435527b25
] [formerly a5a0da5c02
[formerly 7435527b25
] [formerly 2b6ac028bd
[formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 9d248cff7a
[formerly cc0fdef15c
]
Former-commit-id: 082e66584a
2013-01-23 11:24:17 -05:00
Steve Harris
2779f5c6d9
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21
[formerly 47cc08ac79
]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
08bf724a6c
13.2.1-1 baseline
...
Former-commit-id: 48d1aa7732
[formerly 9771dfae6b
] [formerly 48d1aa7732
[formerly 9771dfae6b
] [formerly c63f9bcae0
[formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113
[formerly f6670806bf
]
Former-commit-id: 9146e727f9
2013-01-23 11:13:03 -05:00
Steve Harris
c60051d5df
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: cf384edfbb
[formerly 11b9bfc187
] [formerly cf384edfbb
[formerly 11b9bfc187
] [formerly 1af055a04b
[formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: 8b578c10dc
[formerly 29b9077291
]
Former-commit-id: b03d5ce450
2013-01-22 16:45:48 -06:00