Commit graph

98 commits

Author SHA1 Message Date
Greg Armendariz
a9f6d3528c Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: b229adbf38 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]
Former-commit-id: 33b0ac3811
2014-09-02 10:40:13 -05:00
Brian Clements
eb84b255b0 Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a

Former-commit-id: 23f1f7b2b6 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]
Former-commit-id: 9fe49043e7
2014-09-02 10:04:39 -05:00
Steve Harris
bddf9c0f27 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 793064063b
2014-08-29 10:17:52 -05:00
Brian Clements
ab4eaee171 Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663

Former-commit-id: 66da9e63b7 [formerly bb90464f68d562105809ef36f88869ff4570095c]
Former-commit-id: 3595bd2728
2014-08-27 13:18:13 -05:00
Brian.Dyke
a08db8d73d Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
2014-08-27 11:19:19 -04:00
Steve Harris
aec275dc31 Omaha #3368 - Move ohd plugin to new repository
Former-commit-id: 28e88dfe7e [formerly 56dfed379b0e41c435a3226c3f02b9bc5232b4fd]
Former-commit-id: 8c467a9fa5
2014-08-21 11:04:08 -05:00
Bryan Kowal
ce78f461a3 Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters
that are no longer required by EDEX.

Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f

Former-commit-id: fec755cc93 [formerly e4623ff1a31816aefd717d2ae494e81441710b79]
Former-commit-id: a61c35fcb5
2014-08-14 10:39:09 -05:00
Bryan Kowal
09442217cd Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]
Former-commit-id: a9b4b4124a
2014-08-07 16:27:46 -05:00
Richard Peter
fc6aae3c3c Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]
Former-commit-id: 477119b739
2014-08-07 14:01:54 -05:00
Bryan Kowal
dd7ae1f7d3 Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]
Former-commit-id: dd00d2fe38
2014-08-06 16:34:35 -05:00
Steve Harris
6c0a7da2a0 Omaha #3275 - moving developer tools to separate repository
Former-commit-id: 436ce72db9 [formerly da96ff215e03ffdad7e7d157f6f5539663ad47ce]
Former-commit-id: 5fd1555ff9
2014-06-25 16:16:03 -05:00
Brian Clements
8205f7cd56 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]
Former-commit-id: b6a2bf0ae4
2014-06-17 09:26:24 -05:00
Nate Jensen
4b1c9f17ca Omaha #2840 log tool can now save html reports to directory
Change-Id: Ifa2d9653d2ee689512f33169028705de98f65682

Former-commit-id: f681b52b46 [formerly 4aec10e9b7155baa7e4243a4db78ad16440dbba7]
Former-commit-id: 3f586a2690
2014-06-11 17:13:38 -05:00
Nate Jensen
3583bda1f0 Omaha #3027 fix logservice's build script and reconnect logic if error
occurs

Change-Id: Ic389fe690c832505ab044996a2d9d7d16e535616

Former-commit-id: a9d6a75a62 [formerly bba5e64230d90d5c36bb9a4498db8c9eff945157]
Former-commit-id: 5edfea4582
2014-06-09 16:32:48 -05:00
Steve Harris
647cd97e29 Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]
Former-commit-id: 7fec0d039c
2014-06-02 11:21:46 -05:00
Brian.Dyke
a0a879be7d Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]
Former-commit-id: a8737e18f0
2014-05-30 10:46:25 -04:00
Nate Jensen
dd3fd33cd6 Merge "Omaha #3093 add usage to hprof tool and standardize outputting size of things." into omaha_14.4.1
Former-commit-id: 6672ada43c [formerly 6d6831bf3f4c3190d933521887c9953202618ace]
Former-commit-id: e800d85924
2014-05-22 18:11:19 -05:00
Ben Steffensmeier
eac412d380 Omaha #3093 add usage to hprof tool and standardize outputting size of things.
Former-commit-id: edd27c14cd [formerly 7fd433be3f94ac37e644d12623af36bf4092ab3c]
Former-commit-id: c5abcecc61
2014-05-22 15:56:34 -05:00
Brian Clements
0a2ddfbc79 Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: c875f17719 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]
Former-commit-id: f9de79465a
2014-05-22 14:09:07 -05:00
Ben Steffensmeier
68c8895ee3 Omaha #3093 add hprof output for grid cached data.
Former-commit-id: 405eabac07 [formerly d509822129823efcdf67dd9c028bc72af99b1039]
Former-commit-id: 202321d897
2014-05-21 14:48:45 -05:00
Ben Steffensmeier
ede28797fd Omaha #3093 Add option to hprof tool to zero primitive arrays for compression.
Former-commit-id: df62609973 [formerly 6a80964572cf331b433ae8dc222ac209dd35bf63]
Former-commit-id: 5554946186
2014-05-21 12:30:57 -05:00
Brian Clements
c55124bcc7 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: da7d5888b0 [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]
Former-commit-id: 5b5295e5ad
2014-05-20 16:07:20 -05:00
Nate Jensen
548d5ec519 Omaha #3160 remove OBE ncep util plugins
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808

Former-commit-id: 5353d06ab6 [formerly d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0]
Former-commit-id: bb1414677e
2014-05-13 13:28:20 -05:00
Ben Steffensmeier
462ec63608 Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
Former-commit-id: 973c6fdb55 [formerly 3bd0a076add20c38fad41461295fb430e8ceb5cb]
Former-commit-id: 18ec643a30
2014-05-06 18:06:44 -05:00
Chip Gobs
4e4d00792d VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]
Former-commit-id: 65d2135ac2
2014-05-06 10:48:35 -04:00
Ben Steffensmeier
2dcc596c83 Issue #2648 Update hprof info to match grid changes in 14.3
Former-commit-id: 2c82f5ea7a [formerly c391a6fbb543e467030f45a494e00bc4246c6a36]
Former-commit-id: a608d3a7e9
2014-04-23 15:42:33 -05:00
Brad Gonzales
c267d077c3 Issue #3001 Renamed com.raytheon.edex.plugin.ccfp to com.raytheon.uf.edex.plugin.ccfp.
Amend: Updates from peer review.

Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b

Former-commit-id: 6c7e2ac2a7 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]
Former-commit-id: 1a43f04b16
2014-04-18 15:16:41 -05:00
Nate Jensen
8a4e3b8088 Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 7e19d70363 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]
Former-commit-id: 0845eef927
2014-04-15 10:54:39 -05:00
Brad Gonzales
45264a2cde Issue #2937 Moved presence/site determination from feed log to feed listener.
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: 535611f556 [formerly e975a825046c8d0505223093e5765d5283425b2f]
Former-commit-id: 189282166d
2014-04-14 14:30:18 -05:00
Brad Gonzales
98476d4813 Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: f76e4e8fea [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]
Former-commit-id: 023622a2c5
2014-04-14 14:30:18 -05:00
Brad Gonzales
fe95275a34 Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: d50f39e98d [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]
Former-commit-id: 056dbdbdff
2014-04-09 18:47:09 -05:00
Brad Gonzales
fe8e6a1fa1 Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
rpm to replace it.  Changed dependency references to httpd-collaboration to refer to collab-dataserver.

Amend:  Updated call to status in init script.
        Redirect start.sh error output to an error file.
        Use macro to define ant opts in component.spec.

Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4

Former-commit-id: f0189d61ca [formerly d7466d36140c94b5ef4e57fea25526231912e018]
Former-commit-id: 4fa60427b4
2014-04-03 17:47:58 -05:00
Brad Gonzales
d4659c48a6 Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]
Former-commit-id: 404faeeca0
2014-03-31 11:45:22 -05:00
Brian Clements
ce1038723d Issue #2827 fixed collab dataserver returning empty body with 200
we check if a file exists in and out of the lock when reading
if the file is deleted between checks, the inner check attempts to return an error
we had already access the output stream from the response object so it is committed to 200
fixed by waiting to get the output stream until after the second check


Former-commit-id: d44c55e976 [formerly 31c42d161146b0367435c66535d4da700a572f24]
Former-commit-id: bfde9c37ce
2014-03-12 08:27:22 -05:00
Brad Gonzales
a24cbcfa77 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]
Former-commit-id: 0e3dc17872
2014-03-06 16:29:37 -06:00
Brian Clements
acbd4910fe Issue #2756 reworked collaboration dataserver build
replaced install ant script with build script that also deploys
new build uses feature explorer, but handles its own compile stage
updated deployment and start script to match new build
added logging level control argument


Former-commit-id: cde0d05820 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]
Former-commit-id: fac33a8915
2014-03-06 11:49:57 -06:00
Brian Clements
bc8ac5e051 Issue #2702 replaced openfire source tarball with 3.9.1
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: e1819cd4e2 [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]
Former-commit-id: ad3d10074a
2014-03-05 15:29:27 -06:00
Brian Clements
cd0e1e271a Issue #2756 added security toggle to collaboration
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: f44f1212dd [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]
Former-commit-id: 7b085f62de
2014-03-04 16:02:25 -06:00
Brian Clements
a738448825 Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 934ce73e4b [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]
Former-commit-id: 3b6121b9fa
2014-03-03 14:07:01 -06:00
Brian Clements
9d0b02e0a4 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]
Former-commit-id: ce24bd1018
2014-02-28 16:15:17 -06:00
Nate Jensen
5b2f17826e Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: 39e167fc76 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]
Former-commit-id: 7fb97ffad0
2014-02-27 17:14:32 -06:00
Richard Peter
7bd6a07913 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 0e25ae35c1
2014-02-27 15:18:26 -06:00
Brian Clements
f0c89ef6c6 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]
Former-commit-id: f6b2827434
2014-02-18 10:03:12 -06:00
Ron Anderson
3e78908bb5 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]
Former-commit-id: fcf45916f4
2014-02-13 10:10:34 -06:00
Ben Steffensmeier
ca109598ec Issue #2648 Add AlertMessage output.
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e

Former-commit-id: c96be7613c [formerly 47826e8d3e4570c9f970fc30f5dac462611b91bf]
Former-commit-id: f45ec64979
2014-02-12 17:08:23 -06:00
Greg Armendariz
47347f42ca Issue #2754 - Remove logging calls
Change-Id: Ic95b84691dc5cf6cea454f2a70acc9da301eaf05

Former-commit-id: 2ec1248fcc [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]
Former-commit-id: e0394c649c
2014-02-03 09:29:47 -06:00
Steve Harris
14ba3b29f4 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: 1aea63a1f6 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]
Former-commit-id: 1738185503
2014-01-29 09:41:57 -06:00
Nate Jensen
5e2636809d Issue #2359 remove ignore threads capability since it was a hack to stop
shef and there's a better way to stop shef

Change-Id: I8c2fc8279937aca4e15ea52197081c8271d0c55c

Former-commit-id: 52eaaa17d0 [formerly 99f45c9a2ae2e82ba88dd8df7e2c008bda863a9e]
Former-commit-id: d5239174f6
2014-01-23 18:09:50 -06:00
Nate Jensen
e2c9407815 Issue #2359 updated readme with bscalio suggestions
Change-Id: I25356e9c6e89473a5442ca1bfdab29b41a996694

Former-commit-id: b08d9d4932 [formerly 2c9c6f8aee77f96911d698bc2031af5e01f03ee0]
Former-commit-id: 90a7339f6d
2014-01-23 09:25:37 -06:00
Nate Jensen
5aa4811368 Issue #2359 clean up log service for distribution, build everything
necessary into tar.gz file

Change-Id: I22a0b7d37694e523356c6f5ea0ad567bd6d32c15

Former-commit-id: be30d6c94e [formerly 9bde0e7f917cde0bb4aeec6c92427729c007dabf]
Former-commit-id: c015cb1653
2014-01-20 17:46:47 -06:00