Commit graph

78 commits

Author SHA1 Message Date
Ben Steffensmeier
5ad9828170 Omaha #3093 add hprof output for grid cached data.
Former-commit-id: 405eabac07 [formerly 202321d897 [formerly d509822129823efcdf67dd9c028bc72af99b1039]]
Former-commit-id: 202321d897
Former-commit-id: 68c8895ee3
2014-05-21 14:48:45 -05:00
Ben Steffensmeier
15c7e3bb2d Omaha #3093 Add option to hprof tool to zero primitive arrays for compression.
Former-commit-id: df62609973 [formerly 5554946186 [formerly 6a80964572cf331b433ae8dc222ac209dd35bf63]]
Former-commit-id: 5554946186
Former-commit-id: ede28797fd
2014-05-21 12:30:57 -05:00
Brian Clements
c885bf9426 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: da7d5888b0 [formerly 5b5295e5ad [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]
Former-commit-id: 5b5295e5ad
Former-commit-id: c55124bcc7
2014-05-20 16:07:20 -05:00
Nate Jensen
ba596d4848 Omaha #3160 remove OBE ncep util plugins
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808

Former-commit-id: 5353d06ab6 [formerly bb1414677e [formerly d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0]]
Former-commit-id: bb1414677e
Former-commit-id: 548d5ec519
2014-05-13 13:28:20 -05:00
Ben Steffensmeier
5a52d61636 Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
Former-commit-id: 973c6fdb55 [formerly 18ec643a30 [formerly 3bd0a076add20c38fad41461295fb430e8ceb5cb]]
Former-commit-id: 18ec643a30
Former-commit-id: 462ec63608
2014-05-06 18:06:44 -05:00
Ben Steffensmeier
582af8d74f Issue #2648 Update hprof info to match grid changes in 14.3
Former-commit-id: 2c82f5ea7a [formerly a608d3a7e9 [formerly c391a6fbb543e467030f45a494e00bc4246c6a36]]
Former-commit-id: a608d3a7e9
Former-commit-id: 2dcc596c83
2014-04-23 15:42:33 -05:00
Brad Gonzales
8a6655cb35 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 1a43f04b16 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]
Former-commit-id: 1a43f04b16
Former-commit-id: c267d077c3
2014-04-18 15:16:41 -05:00
Nate Jensen
cd6754fe7f Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 7e19d70363 [formerly 0845eef927 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]]
Former-commit-id: 0845eef927
Former-commit-id: 8a4e3b8088
2014-04-15 10:54:39 -05:00
Brad Gonzales
10a8b59e4e 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 189282166d [formerly e975a825046c8d0505223093e5765d5283425b2f]]
Former-commit-id: 189282166d
Former-commit-id: 45264a2cde
2014-04-14 14:30:18 -05:00
Brad Gonzales
496a56dccb Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: f76e4e8fea [formerly 023622a2c5 [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]]
Former-commit-id: 023622a2c5
Former-commit-id: 98476d4813
2014-04-14 14:30:18 -05:00
Brad Gonzales
19f4b1b64a 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 056dbdbdff [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]
Former-commit-id: 056dbdbdff
Former-commit-id: fe95275a34
2014-04-09 18:47:09 -05:00
Brad Gonzales
9ff7dd12aa 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 4fa60427b4 [formerly d7466d36140c94b5ef4e57fea25526231912e018]]
Former-commit-id: 4fa60427b4
Former-commit-id: fe8e6a1fa1
2014-04-03 17:47:58 -05:00
Brad Gonzales
85911a9d01 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 404faeeca0 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]
Former-commit-id: 404faeeca0
Former-commit-id: d4659c48a6
2014-03-31 11:45:22 -05:00
Brian Clements
2aa9dcb248 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 bfde9c37ce [formerly 31c42d161146b0367435c66535d4da700a572f24]]
Former-commit-id: bfde9c37ce
Former-commit-id: ce1038723d
2014-03-12 08:27:22 -05:00
Brad Gonzales
885a9567bc Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: dea17a19da [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]
Former-commit-id: 0e3dc17872
Former-commit-id: a24cbcfa77
2014-03-06 16:29:37 -06:00
Brian Clements
a97d1a1fb5 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 fac33a8915 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]]
Former-commit-id: fac33a8915
Former-commit-id: acbd4910fe
2014-03-06 11:49:57 -06:00
Brian Clements
e4d22971bd 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 ad3d10074a [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]
Former-commit-id: ad3d10074a
Former-commit-id: bc8ac5e051
2014-03-05 15:29:27 -06:00
Brian Clements
2482a58273 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 7b085f62de [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]
Former-commit-id: 7b085f62de
Former-commit-id: cd0e1e271a
2014-03-04 16:02:25 -06:00
Brian Clements
769ee18145 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 3b6121b9fa [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]
Former-commit-id: 3b6121b9fa
Former-commit-id: a738448825
2014-03-03 14:07:01 -06:00
Brian Clements
fd18963221 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 ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]
Former-commit-id: ce24bd1018
Former-commit-id: 9d0b02e0a4
2014-02-28 16:15:17 -06:00
Nate Jensen
b64a89eff1 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: 39e167fc76 [formerly 7fb97ffad0 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]
Former-commit-id: 7fb97ffad0
Former-commit-id: 5b2f17826e
2014-02-27 17:14:32 -06:00
Richard Peter
79d3aa4e1a 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 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
2014-02-27 15:18:26 -06:00
Brian Clements
68fac79fe7 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 f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]
Former-commit-id: f6b2827434
Former-commit-id: f0c89ef6c6
2014-02-18 10:03:12 -06:00
Ron Anderson
69ee4792ad Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

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

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

Former-commit-id: 2ec1248fcc [formerly e0394c649c [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]]
Former-commit-id: e0394c649c
Former-commit-id: 47347f42ca
2014-02-03 09:29:47 -06:00
Steve Harris
f562540e7c 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 1738185503 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]
Former-commit-id: 1738185503
Former-commit-id: 14ba3b29f4
2014-01-29 09:41:57 -06:00
Nate Jensen
1d5b9cd648 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 d5239174f6 [formerly 99f45c9a2ae2e82ba88dd8df7e2c008bda863a9e]]
Former-commit-id: d5239174f6
Former-commit-id: 5e2636809d
2014-01-23 18:09:50 -06:00
Nate Jensen
0353f43d54 Issue #2359 updated readme with bscalio suggestions
Change-Id: I25356e9c6e89473a5442ca1bfdab29b41a996694

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

Change-Id: I22a0b7d37694e523356c6f5ea0ad567bd6d32c15

Former-commit-id: be30d6c94e [formerly c015cb1653 [formerly 9bde0e7f917cde0bb4aeec6c92427729c007dabf]]
Former-commit-id: c015cb1653
Former-commit-id: 5aa4811368
2014-01-20 17:46:47 -06:00
Ben Steffensmeier
aae0dd9677 Issue #2648 Enhance hprof output for grids and UI activity.
Former-commit-id: a401c4bed0 [formerly 91270be4f7 [formerly 80e4b1bdff46f8e1c77ba50b696e8bef5e53d51e]]
Former-commit-id: 91270be4f7
Former-commit-id: 31bbdb3d4d
2014-01-20 13:00:54 -06:00
Ben Steffensmeier
b64ac87d9c Issue #2648 Hprof analysis utility.
Change-Id: Ib450c48a88e8a485a2461e1f4a5c81e1be4fee68

Former-commit-id: 30ac7d37a5 [formerly de58f318cb [formerly 1bfc1a31ed9052795e1ab0e83cd4bede3eb8e17c]]
Former-commit-id: de58f318cb
Former-commit-id: 51a7dfb438
2014-01-08 16:47:03 -06:00
Brian Clements
023e384ae4 Issue #2563 added packet extension to openfire plugin
openfire plugin now sends configuration in packet extension
legacy method of putting config in chat message still supported by default
added configuration to web gui to toggle legacy message method


Former-commit-id: a2c709fb34 [formerly 2e53fcbccb [formerly a26eeaae28de6e41fdc49a2b75ad6814ece478cd]]
Former-commit-id: 2e53fcbccb
Former-commit-id: 04e7c2f749
2014-01-07 10:33:37 -06:00
Bryan Kowal
b2550c873b Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]
Former-commit-id: 43008f4698
Former-commit-id: 0c3b22c8f2
2013-12-16 16:39:10 -06:00
Nate Jensen
00a1b179a5 Issue #2359 add ability to ignore messages based on threads, ie ignore
shef

Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48

Former-commit-id: ed1b94ea07 [formerly 4a4f50155c [formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]
Former-commit-id: 4a4f50155c
Former-commit-id: db842ce2e6
2013-11-22 15:54:22 -06:00
Bryan Kowal
5164a7c0b1 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: feaacd9356
Former-commit-id: 38464427d3
2013-10-31 15:34:46 -05:00
Steve Harris
f25d638bc2 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]
Former-commit-id: 560b0075cd
Former-commit-id: a103a0e8ac
2013-10-28 15:58:12 -05:00
Steve Harris
cb3b53f205 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
2013-10-28 10:55:16 -04:00
Steve Harris
a0ba2e1252 14.1.1-3 baseline
Former-commit-id: 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 94f24e0d8a
Former-commit-id: 851f9df229
2013-10-28 10:46:02 -04:00
Nate Jensen
ea89d218a8 Issue #2359 fix for extra long messages
Former-commit-id: 3abe5b9f18 [formerly 665e224c75 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]
Former-commit-id: 665e224c75
Former-commit-id: e7763c0864
2013-10-28 09:15:20 -05:00
Richard Peter
9b5d2fa69f Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]
Former-commit-id: cb33f5ada7
Former-commit-id: f69bbf7952
2013-10-23 15:50:25 -05:00
Nate Jensen
55fd890223 Issue #2359 better email addresses
Former-commit-id: b56c67a8fb [formerly a609706b5e [formerly 03be0960bfbbd8072166bc0a06e4100538dbc7ca]]
Former-commit-id: a609706b5e
Former-commit-id: fd55a9792d
2013-10-23 14:02:31 -05:00
Steve Harris
553238dca4 13.5.2-8 baseline
Former-commit-id: 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 94aa71fcd1
Former-commit-id: 8ba7d392d6
2013-10-04 11:30:03 -04:00
Bryan Kowal
3b7573154c Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]
Former-commit-id: c125b5b053
Former-commit-id: bb5acf7c11
2013-09-30 18:00:31 -05:00
Nate Jensen
1c344d7f6d Issue #2359 initial checkin of remote log service
Change-Id: Idd48062f204002956f63c6d449868a7bd9695263

Former-commit-id: f148663bd1 [formerly 3162ae260b [formerly 12988c63aeccc678f25f4210ad484a080ddd8aa7]]
Former-commit-id: 3162ae260b
Former-commit-id: 74c1e60ad2
2013-09-12 11:50:16 -05:00
Bryan Kowal
fb1feea107 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]
Former-commit-id: c1dab22fdb
Former-commit-id: 683d7e5b19
2013-08-15 15:30:05 -05:00
Steve Harris
52da6c54db 13.5.1-8 baseline
Former-commit-id: dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: 3bece5e5d0
Former-commit-id: 392faf86e7
2013-07-26 09:02:34 -04:00
Everett Kladstrup
2c518b816d Issue #2231 Make edex startup more configurable
* Allow for skipping the RPM check
* Allow for using system java in wrapper instead of hard-coded /awips2/java
* Allow for configuring wrapper process actions with system variables
  e.g. RESTART vs. SHUTDOWN on crash

Change-Id: Icaa3b3e388013a8106db6e29fd999aa5824c72bc

Former-commit-id: 9515d45e9d [formerly e056592ba9 [formerly 7834360e8c56ac74b29a585eeda8c0387067250b]]
Former-commit-id: e056592ba9
Former-commit-id: 3bb1b03cb7
2013-07-25 12:22:32 -05:00
Richard Peter
19dacc32c1 Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]
Former-commit-id: 15d1a6eab0
Former-commit-id: 401ed88e44
2013-07-22 09:40:18 -05:00
Richard Peter
8e3a28636c Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.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/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]
Former-commit-id: 7e08c04383
Former-commit-id: 85fb4c3940
2013-07-18 21:46:25 -05:00