Commit graph

105 commits

Author SHA1 Message Date
Mark Peters
e37e8f93b4 Omaha #4316 Include seconds in logs of collaboration messages.
Change-Id: Iace196e567f36b0be700f707c9352a680a9b3d32

Former-commit-id: 66778ffd5d3bb702a783f6450b58a5be63187e96
2015-07-08 16:19:15 -05:00
Steve Harris
9b3d8a8443 Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12

 Conflicts:
	build/deploy.edex.awips2/esb/bin/setup.env
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py


Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Mark Peters
3a252033ff Omaha #4469 Some files are missing from plugins' build.properties
Change-Id: Ib36f309d1cce20ad908b32a8a1d1218fde6863d7

Former-commit-id: 4e596c0cde3e6e04a92a3766224b153989feb676
2015-05-19 11:47:40 -05:00
Shawn.Hooper
48e06c41ad ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
Merge 14.4.1-33 into 15.1.1-8

Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c

Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
2015-05-01 16:12:48 -04:00
Greg Armendariz
1a3ca4f8df Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: a25d39959ccdc41ab99e0eaf4ad87559adfcb362
2015-02-25 09:51:49 -06:00
Greg Armendariz
af72fd3775 Omaha #3299 - Fix collaboration RPM build issue
Former-commit-id: 9132eff524289c5df48c682cd3ff226fe14cdf1b
2015-02-06 11:37:47 -06:00
Bryan Kowal
48ec32e595 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: f6a3317e329728080f8efe8db545e3324161986e
2014-12-05 09:20:23 -06:00
Greg Armendariz
b229adbf38 Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: 2a4e26c1be0118f71e18a2c5bfa8777163a97d30
2014-09-02 10:40:13 -05:00
Brian Clements
23f1f7b2b6 Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a

Former-commit-id: d2bfe367c9753fc4a2db181c7966179a20713a02
2014-09-02 10:04:39 -05:00
Steve Harris
5d58625abc 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: 8793dca41f756ba812206b48391caea6e593a657
2014-08-29 10:17:52 -05:00
Brian Clements
66da9e63b7 Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663

Former-commit-id: bb90464f68d562105809ef36f88869ff4570095c
2014-08-27 13:18:13 -05:00
Brian.Dyke
aa83bf804f 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: 7334d3991903dfe8a62728de33c21e81534fdbb6
2014-08-27 11:19:19 -04:00
Steve Harris
28e88dfe7e Omaha #3368 - Move ohd plugin to new repository
Former-commit-id: 56dfed379b0e41c435a3226c3f02b9bc5232b4fd
2014-08-21 11:04:08 -05:00
Bryan Kowal
fec755cc93 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: e4623ff1a31816aefd717d2ae494e81441710b79
2014-08-14 10:39:09 -05:00
Bryan Kowal
b568c25e10 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: d11649deb78aa356f27a22f33b38f7238513576c
2014-08-07 16:27:46 -05:00
Richard Peter
96a1821753 Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: e537db61848adeea0cef18e6a769597d746d6620
2014-08-07 14:01:54 -05:00
Bryan Kowal
3b080e7c36 Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514
2014-08-06 16:34:35 -05:00
Steve Harris
436ce72db9 Omaha #3275 - moving developer tools to separate repository
Former-commit-id: da96ff215e03ffdad7e7d157f6f5539663ad47ce
2014-06-25 16:16:03 -05:00
Brian Clements
84e3f967d9 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: baab2ea12e1117446295ae60bc06228eb6139895
2014-06-17 09:26:24 -05:00
Nate Jensen
f681b52b46 Omaha #2840 log tool can now save html reports to directory
Change-Id: Ifa2d9653d2ee689512f33169028705de98f65682

Former-commit-id: 4aec10e9b7155baa7e4243a4db78ad16440dbba7
2014-06-11 17:13:38 -05:00
Nate Jensen
a9d6a75a62 Omaha #3027 fix logservice's build script and reconnect logic if error
occurs

Change-Id: Ic389fe690c832505ab044996a2d9d7d16e535616

Former-commit-id: bba5e64230d90d5c36bb9a4498db8c9eff945157
2014-06-09 16:32:48 -05:00
Steve Harris
455eb8b39d 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: 45250149681f057cf168f4d3cb27276279f62c05
2014-06-02 11:21:46 -05:00
Brian.Dyke
3f1e12effc 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: 9d7a819489480e119b65cb5643520818adeb1ebf
2014-05-30 10:46:25 -04:00
Nate Jensen
6672ada43c Merge "Omaha #3093 add usage to hprof tool and standardize outputting size of things." into omaha_14.4.1
Former-commit-id: 6d6831bf3f4c3190d933521887c9953202618ace
2014-05-22 18:11:19 -05:00
Ben Steffensmeier
edd27c14cd Omaha #3093 add usage to hprof tool and standardize outputting size of things.
Former-commit-id: 7fd433be3f94ac37e644d12623af36bf4092ab3c
2014-05-22 15:56:34 -05:00
Brian Clements
c875f17719 Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: c042671ecf12a6fa46e35d4954d23492f35b7c76
2014-05-22 14:09:07 -05:00
Ben Steffensmeier
405eabac07 Omaha #3093 add hprof output for grid cached data.
Former-commit-id: d509822129823efcdf67dd9c028bc72af99b1039
2014-05-21 14:48:45 -05:00
Ben Steffensmeier
df62609973 Omaha #3093 Add option to hprof tool to zero primitive arrays for compression.
Former-commit-id: 6a80964572cf331b433ae8dc222ac209dd35bf63
2014-05-21 12:30:57 -05:00
Brian Clements
da7d5888b0 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c
2014-05-20 16:07:20 -05:00
Nate Jensen
5353d06ab6 Omaha #3160 remove OBE ncep util plugins
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808

Former-commit-id: d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0
2014-05-13 13:28:20 -05:00
Ben Steffensmeier
973c6fdb55 Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
Former-commit-id: 3bd0a076add20c38fad41461295fb430e8ceb5cb
2014-05-06 18:06:44 -05:00
Chip Gobs
e42bef2a33 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: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
2014-05-06 10:48:35 -04:00
Ben Steffensmeier
2c82f5ea7a Issue #2648 Update hprof info to match grid changes in 14.3
Former-commit-id: c391a6fbb543e467030f45a494e00bc4246c6a36
2014-04-23 15:42:33 -05:00
Brad Gonzales
6c7e2ac2a7 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: 9374912aeb3e3a642d34a0aec75bcda7c707bcf9
2014-04-18 15:16:41 -05:00
Nate Jensen
7e19d70363 Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 948b1c1eb060963c943eccc31033af27b70804b0
2014-04-15 10:54:39 -05:00
Brad Gonzales
535611f556 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: e975a825046c8d0505223093e5765d5283425b2f
2014-04-14 14:30:18 -05:00
Brad Gonzales
f76e4e8fea Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: 67ccbb2e7eb96028137b9f82bca550bfb9e89345
2014-04-14 14:30:18 -05:00
Brad Gonzales
d50f39e98d 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: 38594a026e343bcf9db7d55816ae29fa77716f05
2014-04-09 18:47:09 -05:00
Brad Gonzales
f0189d61ca 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: d7466d36140c94b5ef4e57fea25526231912e018
2014-04-03 17:47:58 -05:00
Brad Gonzales
15e1b7a7f6 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: 480c86e5bbe6866b8c4c285006d3d7f7fed2b056
2014-03-31 11:45:22 -05:00
Brian Clements
d44c55e976 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: 31c42d161146b0367435c66535d4da700a572f24
2014-03-12 08:27:22 -05:00
Brad Gonzales
dea17a19da Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: 6d2a542774db6c37cfc2a65f490ebf618f2e7954
2014-03-06 16:29:37 -06:00
Brian Clements
cde0d05820 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: 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e
2014-03-06 11:49:57 -06:00
Brian Clements
e1819cd4e2 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: d8f30a7af43faa2fd4ac18769d2313ae6008cfd1
2014-03-05 15:29:27 -06:00
Brian Clements
f44f1212dd 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: 1e52606fe709f2cf27f835363ca5ab2bf6ada912
2014-03-04 16:02:25 -06:00
Brian Clements
934ce73e4b 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: 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a
2014-03-03 14:07:01 -06:00
Brian Clements
d8e283e1b4 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: e0e4dfdedff283c809060257fbf04e777faf318d
2014-02-28 16:15:17 -06:00
Nate Jensen
39e167fc76 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46
2014-02-27 17:14:32 -06:00
Richard Peter
1c150e6e8b 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: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
Brian Clements
5b4f1e8288 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: ff23569984eee43927c10ca041ca7e0ca4d40a3b
2014-02-18 10:03:12 -06:00