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

151 commits

Author SHA1 Message Date
Bryan Kowal
70db1c7dc7 Issue #3108 - update bignsharp for Windows 64-bit compatibility. Upgrade JNA. 
Amend: updated and/or added change revision history comments
Amend: fixed Java requirement in JNA classpath
Amend: fixed Java requirement in JNA MANIFEST

Change-Id: I5033f05c48a271fe08d3ec2ac01fe79481564371

Former-commit-id: 9c29e6739c [formerly 1e1f46e68b [formerly fb12234836a3562156a30531e6961c0a064588bd]]
Former-commit-id: 1e1f46e68b
Former-commit-id: 79244f5032
 2014-05-08 17:30:22 -05:00
Richard Peter
ee59a298eb Issue #2726: Add hooks to stop archiving processes during shutdown. 
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 9a7e1aa9b0 [formerly 37342cba87 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]
Former-commit-id: 37342cba87
Former-commit-id: 5b14b22ee1
 2014-04-24 19:11:50 -05:00
Brian Clements
8d0e4c9d46 Issue #2905 modified ucar BUFR library to fix bug 
Former-commit-id: 640391682f [formerly 184c2c3d77 [formerly d340cd72b224dedec1839bfdc75873faa8140ea9]]
Former-commit-id: 184c2c3d77
Former-commit-id: 00c0403ec5
 2014-04-10 16:43:10 -05:00
Bryan Kowal
aa83fbe567 Issue #2851 - 64-bit Windows Jep DLL 
cots/org.jep.win64/jep.dll: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: 1feefeb41b [formerly 5871d767db [formerly c03701dbe9e78dcd72a08a579329be9b4408295f]]
Former-commit-id: 5871d767db
Former-commit-id: a758bbdfaa
 2014-03-25 10:27:53 -05:00
Brad Gonzales
25050d57f6 Issue #2873 Removed 32 bit native libraries and references. 
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: 189234f162 [formerly 08dde4824f [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]
Former-commit-id: 08dde4824f
Former-commit-id: de508133ff
 2014-03-20 13:27:39 -05:00
Brian Clements
46513ea27c Issue #2905 added ucar bufr parser 
added netcdf 4.2 bufr library to ucar.nc2 foss
added backported 4.3 bufr splitter library
created a parser wrapper for ease of use


Former-commit-id: 5348f0a29d [formerly 199701def9 [formerly 5ddf9be7105dbd8d1fb76ce28a4e6e3f03240974]]
Former-commit-id: 199701def9
Former-commit-id: 5b69e9b21c
 2014-03-20 11:11:53 -05:00
Nate Jensen
10f1070f26 Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development 
Former-commit-id: 6148c00ed2 [formerly 6ddf9a2ee7 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]]
Former-commit-id: 6ddf9a2ee7
Former-commit-id: 3d7de2ad9a
 2014-03-18 09:20:16 -05:00
Ron Anderson
3ac978316a Issue #2908 Update org.apache.commons.pool to 1.5.4. Change GeoTools to use the separate org.apache.commons projects that are in the baseline. 
Change-Id: I05de2eaadc2766a8a0deee6ac816f29119800774

Former-commit-id: 107daf22ae [formerly 0a6630a84d [formerly 60ace911a0b1496d3bb74a85ff3c6b89ca70c267]]
Former-commit-id: 0a6630a84d
Former-commit-id: ef8a3b2581
 2014-03-13 18:01:22 -05:00
Bryan Kowal
0e4fbed3ef Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit 
Former-commit-id: 6ba13b2b44 [formerly 9b2af366c1 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]]
Former-commit-id: 9b2af366c1
Former-commit-id: 3e90c26b14
 2014-03-13 17:39:32 -05:00
Ron Anderson
d752e068c7 Issue #2718 Update to GeoTools 10.5 
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]
Former-commit-id: 1c727465ee
Former-commit-id: ab69d3e318
 2014-03-13 11:11:53 -05: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
bd410b2529 Issue #2698 added handles to venues 
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]
Former-commit-id: 3e585945d6
Former-commit-id: 4e2cb3f7ae
 2014-01-31 09:44:31 -06:00
Steve Harris
56f5ae9f48 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]
Former-commit-id: 24ab7cff49
Former-commit-id: a465718a0d
 2014-01-21 12:36:54 -06:00
Max Schenkelberg
7073ea5e90 Issue #2620 Fixed manifest issues for baseline p2 export 
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 87a6db7853 [formerly 68aa666045 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]
Former-commit-id: 68aa666045
Former-commit-id: 1256748c42
 2014-01-20 13:54:27 -06:00
Max Schenkelberg
bcc3b9f3df Issue #2620 Removed unused commons.logging project, removed dependency in apache.http build path 
Change-Id: I4c6156080784c5fe9d2f9e9b8f8ea1594b919fb1

Former-commit-id: 65bbc5d6d5 [formerly b2e5968d97 [formerly 02ae43dcc86c7154af5629c20813bb542eb6cd6b]]
Former-commit-id: b2e5968d97
Former-commit-id: aad907e0b3
 2014-01-16 14:50:34 -06:00
Nate Jensen
16d01f1ca7 Issue #2581 fix local storm report delta script and unique constraint 
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809

Former-commit-id: 059e057cdb [formerly e6feb413f7 [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]
Former-commit-id: e6feb413f7
Former-commit-id: 562e85e45b
 2014-01-15 09:50:35 -06:00
Max Schenkelberg
30059d255c Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins. 
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]
Former-commit-id: 16046a4dde
Former-commit-id: b3aed99142
 2014-01-06 17:03:45 -06:00
Brian Clements
c2b759b38e Issue #2562 moved session data from chat to packet extension 
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]
Former-commit-id: 80650337ce
Former-commit-id: 2c20a87634
 2013-12-19 12:08:21 -06:00
Brian Clements
7779bb7da2 Issue #2562 fixed smack buid properties 
removed src folder


Former-commit-id: f4c657de4d [formerly fdb5504f33 [formerly e844d36335795a022a6d2180c0a38bfea6f3eac4]]
Former-commit-id: fdb5504f33
Former-commit-id: b175049eb0
 2013-12-17 10:55:28 -06:00
Brian Clements
d0d14ec091 Issue #2561 removed ECF from collaboration 
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]
Former-commit-id: 8ece30944a
Former-commit-id: 5d1d44b60d
 2013-12-06 17:07:16 -06:00
Steve Harris
ad200adacd Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge 
Former-commit-id: 39ab54c912 [formerly c37908caa8 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]
Former-commit-id: c37908caa8
Former-commit-id: 920e06b8ff
 2013-11-19 10:08:45 -06:00
Steve Harris
f7878c44cb Merge branch 'omaha_14.1.1' (14.1.1-9) into development 
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 0a36987a01
Former-commit-id: 542a0946f2
 2013-11-15 13:15:25 -06:00
Steve Harris
ba884f2a27 14.1.1-9 baseline 
Former-commit-id: 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: f8f995b697
Former-commit-id: a32eadf384
 2013-11-15 12:47:49 -05:00
Bryan Kowal
1d519f9778 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]
Former-commit-id: 86dd200844
Former-commit-id: 178d95e59d
 2013-11-13 13:16:55 -06:00
Dave Hladky
80ce7ec3e7 Issue #2542 Jetty upgraded 
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: e3a259182c [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]
Former-commit-id: 643a150777
Former-commit-id: 5313c8b68d
 2013-11-12 14:55:41 -06:00
Richard Peter
061fa07147 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 306bd6fae1
Former-commit-id: 7ba466f5a6
 2013-11-12 11:11:36 -06:00
Brian Clements
b21233ec65 Issue #2515 upgraded camel from 2.11.0 to 2.11.2 
removed log showBody workaround


Former-commit-id: ea6b162369 [formerly 4f374688c8 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]
Former-commit-id: 4f374688c8
Former-commit-id: 6f0630aa55
 2013-11-07 16:56:25 -06:00
Steve Harris
21ff310620 14.1.1-7 baseline 
Former-commit-id: 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 3328e2dd1d
Former-commit-id: 80614c0e52
 2013-11-06 14:16:14 -05:00
Steve Harris
354a736ed5 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: a956fd7f4d [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]
Former-commit-id: 2e0db025f3
Former-commit-id: 1a9ff8df10
 2013-11-04 20:29:07 -06:00
Dave Hladky
a6182c2af0 Issue #2472 Replacing lost commit 
Former-commit-id: 9c6a430d40 [formerly 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]
Former-commit-id: 1f1469fe82
Former-commit-id: 62d08dbe93
 2013-11-04 16:24:14 -06:00
Bryan Kowal
4a22b3ce5f Issue #2476 - re-compile jep for RHEL6 64-bit 
Former-commit-id: d034d82744 [formerly 5b99b99d3c [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]]
Former-commit-id: 5b99b99d3c
Former-commit-id: fc05fd7140
 2013-10-31 15:56:34 -05:00
Bryan Kowal
fd5a5096de Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]
Former-commit-id: 49422aea62
Former-commit-id: 04bcd7e6dc
 2013-10-31 15:43:29 -05: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
Bryan Kowal
60904307b5 Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit 
Former-commit-id: e9b76cf185 [formerly c74123f5a8 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]
Former-commit-id: c74123f5a8
Former-commit-id: ecda7100be
 2013-10-31 14:53:27 -05:00
Greg Armendariz
795d6cf541 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]
Former-commit-id: f6d98d6317
Former-commit-id: 0daf07742e
 2013-10-30 14:52:16 -05:00
Nate Jensen
a18df07586 Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code 
Former-commit-id: 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]
Former-commit-id: f3143ba7b4
Former-commit-id: 554a9cddf3
 2013-10-29 14:33:53 -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
2c88b7d9b3 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development 
Former-commit-id: 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]
Former-commit-id: 002005139f
Former-commit-id: 3a453d5442
 2013-10-24 20:02:18 -05:00
Ben Steffensmeier
f98448d19f Issue #2491 Use reflections to build Procedure JAXB context. 
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]
Former-commit-id: bfc3faf08f
Former-commit-id: a935ffadf7
 2013-10-24 11:28:06 -05:00
Bryan Kowal
d67bbce7f3 Issue #2476 - re-compile 64-bit jep for RHEL6 
Former-commit-id: 8036733372 [formerly 4c3cdbb28e [formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]]
Former-commit-id: 4c3cdbb28e
Former-commit-id: 069cb9645e
 2013-10-23 17:12:02 -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
Bryan Kowal
554b8ed515 Issue #2476 - recompiled Jep for Windows 
Former-commit-id: 79f2f2694f [formerly 0e1c5b51ba [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]]
Former-commit-id: 0e1c5b51ba
Former-commit-id: 243ffb4b93
 2013-10-23 15:12:42 -05:00
Bryan Kowal
3cecffdc41 Issue #2476 - recompiled jep for Linux 
Former-commit-id: 9fe5429068 [formerly a3cfae3510 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]]
Former-commit-id: a3cfae3510
Former-commit-id: 701b9de382
 2013-10-23 15:12:42 -05:00
Bryan Kowal
49dd7daf05 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: c13018301e [formerly a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]
Former-commit-id: a929dec887
Former-commit-id: 3f4263fa07
 2013-10-14 17:58:22 -05:00
Nate Jensen
2fb28dce46 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections 
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]
Former-commit-id: b49a2ceb2f
Former-commit-id: d7e4576380
 2013-10-14 15:30:09 -05: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
Dave Hladky
e8234c2ef8 Issue #2388 Multiple code jars in path, Nate's logger finds. 
Former-commit-id: f184d2ba9c [formerly 8e5d3d9742 [formerly ad02f4640d747328257f9b7a3f2ca2300fcc7bba]]
Former-commit-id: 8e5d3d9742
Former-commit-id: 3787da81a8
 2013-09-19 10:59:07 -05:00
Dave Hladky
f54fc05964 Issue #2340 Update path for xmlschema jar 
Former-commit-id: 687bd183ee [formerly f83ed6037c [formerly 2336dbc99ba0effc1571672f5ab29fbde4f47863]]
Former-commit-id: f83ed6037c
Former-commit-id: 9db93af5a4
 2013-09-06 09:03:19 -05:00