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

156 commits

Author SHA1 Message Date
Steve Harris
77b2da7a4f Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
	edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java

Former-commit-id: b3bc71c8a4 [formerly 652fb19bc4] [formerly 6964df0664 [formerly a20833879f1a0434c562a22a874b1e1722278954]]
Former-commit-id: 6964df0664
Former-commit-id: 661eceea83
 2014-05-12 15:05:43 -05:00
Brian Clements
83d56c4eca Omaha #3107 cleaned up openfire foss project exports 
openfire foss project was exporting too many transient dependencies
changed to only export needed packages


Former-commit-id: 97d6e82c14 [formerly 634295ceb7] [formerly 1109404260 [formerly 748382d20485400f85b9bf790774ec5482be1624]]
Former-commit-id: 1109404260
Former-commit-id: 7aa6cfaa33
 2014-05-12 12:45:02 -05:00
Bryan Kowal
2098b015f1 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: 79244f5032 [formerly 1e1f46e68b] [formerly 9c29e6739c [formerly fb12234836a3562156a30531e6961c0a064588bd]]
Former-commit-id: 9c29e6739c
Former-commit-id: c1e9154e89
 2014-05-08 17:30:22 -05:00
Steve Harris
6ad5b5a9d7 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts (these moved to ufcore):
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
	edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
	edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.auth/build.properties
	edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
	edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
	edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
	edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java


Former-commit-id: 7f3a19cd1f [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]
Former-commit-id: 3380a1dba0
Former-commit-id: f168d3dddb
 2014-04-30 11:22:22 -05:00
Steve Harris
9ef44d2a4c Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss 
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2

Former-commit-id: 2be0e7730f [formerly 7b56fb23a8] [formerly c4597ec58b [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]
Former-commit-id: c4597ec58b
Former-commit-id: 7c44a9506c
 2014-04-28 16:25:21 -05:00
Steve Harris
558686f2fd Omaha #3085 - Removed ufcore and ufcore-foss plugins 
Former-commit-id: 03e7d5d06f [formerly a89621797d] [formerly 491b768204 [formerly 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca]]
Former-commit-id: 491b768204
Former-commit-id: 23e542e36b
 2014-04-28 09:59:23 -05:00
Richard Peter
2d1262e41f Issue #2726: Add hooks to stop archiving processes during shutdown. 
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 5b14b22ee1 [formerly 37342cba87] [formerly 9a7e1aa9b0 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: caccf6ca52
 2014-04-24 19:11:50 -05:00
Brian Clements
81f93a1929 Issue #2905 modified ucar BUFR library to fix bug 
Former-commit-id: 00c0403ec5 [formerly 184c2c3d77] [formerly 640391682f [formerly d340cd72b224dedec1839bfdc75873faa8140ea9]]
Former-commit-id: 640391682f
Former-commit-id: 0d8909db10
 2014-04-10 16:43:10 -05:00
Bryan Kowal
278ff3c00a 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: a758bbdfaa [formerly 5871d767db] [formerly 1feefeb41b [formerly c03701dbe9e78dcd72a08a579329be9b4408295f]]
Former-commit-id: 1feefeb41b
Former-commit-id: a02cf1f5df
 2014-03-25 10:27:53 -05:00
Brad Gonzales
0022633626 Issue #2873 Removed 32 bit native libraries and references. 
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: de508133ff [formerly 08dde4824f] [formerly 189234f162 [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]
Former-commit-id: 189234f162
Former-commit-id: d303662a51
 2014-03-20 13:27:39 -05:00
Brian Clements
420b48c8ea 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: 5b69e9b21c [formerly 199701def9] [formerly 5348f0a29d [formerly 5ddf9be7105dbd8d1fb76ce28a4e6e3f03240974]]
Former-commit-id: 5348f0a29d
Former-commit-id: 0e11ca3cfe
 2014-03-20 11:11:53 -05:00
Nate Jensen
d2fbbdc147 Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development 
Former-commit-id: 3d7de2ad9a [formerly 6ddf9a2ee7] [formerly 6148c00ed2 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]]
Former-commit-id: 6148c00ed2
Former-commit-id: e77738ef65
 2014-03-18 09:20:16 -05:00
Ron Anderson
c1cfe962c5 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: ef8a3b2581 [formerly 0a6630a84d] [formerly 107daf22ae [formerly 60ace911a0b1496d3bb74a85ff3c6b89ca70c267]]
Former-commit-id: 107daf22ae
Former-commit-id: 211e0427e4
 2014-03-13 18:01:22 -05:00
Bryan Kowal
f0ff052afc Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit 
Former-commit-id: 3e90c26b14 [formerly 9b2af366c1] [formerly 6ba13b2b44 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]]
Former-commit-id: 6ba13b2b44
Former-commit-id: 2b053a3bc8
 2014-03-13 17:39:32 -05:00
Ron Anderson
06b0b5b684 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: ab69d3e318 [formerly 1c727465ee] [formerly bcfaf40ebf [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]
Former-commit-id: bcfaf40ebf
Former-commit-id: 4b2a388628
 2014-03-13 11:11:53 -05:00
Brian Clements
410ebf65f5 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: bc8ac5e051 [formerly ad3d10074a] [formerly e1819cd4e2 [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]
Former-commit-id: e1819cd4e2
Former-commit-id: 3f0115d329
 2014-03-05 15:29:27 -06:00
Brian Clements
4190b13ae2 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: 4e2cb3f7ae [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]
Former-commit-id: 3250eb34f5
Former-commit-id: 4f4d5c5d69
 2014-01-31 09:44:31 -06:00
Steve Harris
b62efa9387 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: a465718a0d [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]
Former-commit-id: 69dc3d835b
Former-commit-id: 252c7ee40a
 2014-01-21 12:36:54 -06:00
Max Schenkelberg
424f2282f0 Issue #2620 Fixed manifest issues for baseline p2 export 
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

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

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

Former-commit-id: 562e85e45b [formerly e6feb413f7] [formerly 059e057cdb [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]
Former-commit-id: 059e057cdb
Former-commit-id: bc2f099cc6
 2014-01-15 09:50:35 -06:00
Max Schenkelberg
0ceaa43902 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: b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]
Former-commit-id: cc2080449c
Former-commit-id: f58795f460
 2014-01-06 17:03:45 -06:00
Brian Clements
d58f8d7134 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: 2c20a87634 [formerly 80650337ce] [formerly ce0a34b53c [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]
Former-commit-id: ce0a34b53c
Former-commit-id: 4015dc23ee
 2013-12-19 12:08:21 -06:00
Brian Clements
5826f6a006 Issue #2562 fixed smack buid properties 
removed src folder


Former-commit-id: b175049eb0 [formerly fdb5504f33] [formerly f4c657de4d [formerly e844d36335795a022a6d2180c0a38bfea6f3eac4]]
Former-commit-id: f4c657de4d
Former-commit-id: 92f1087bcf
 2013-12-17 10:55:28 -06:00
Brian Clements
5a7fca6352 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: 5d1d44b60d [formerly 8ece30944a] [formerly e6c4b39aca [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]
Former-commit-id: e6c4b39aca
Former-commit-id: b8df043202
 2013-12-06 17:07:16 -06:00
Steve Harris
7b9bc1ae90 Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge 
Former-commit-id: 920e06b8ff [formerly c37908caa8] [formerly 39ab54c912 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]
Former-commit-id: 39ab54c912
Former-commit-id: 94a60728ca
 2013-11-19 10:08:45 -06:00
Steve Harris
3f9df61017 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: 542a0946f2 [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 869b505f80
 2013-11-15 13:15:25 -06:00
Steve Harris
eab5bb1147 14.1.1-9 baseline 
Former-commit-id: a32eadf384 [formerly f8f995b697] [formerly 5a0a40e67c [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
 2013-11-15 12:47:49 -05:00
Bryan Kowal
a2b1211c52 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

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

Former-commit-id: 5313c8b68d [formerly 643a150777] [formerly e3a259182c [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]
Former-commit-id: e3a259182c
Former-commit-id: 53866e481a
 2013-11-12 14:55:41 -06:00
Richard Peter
3f68fc6eed 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: 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 59671c1e7d
 2013-11-12 11:11:36 -06:00
Brian Clements
83edfb5349 Issue #2515 upgraded camel from 2.11.0 to 2.11.2 
removed log showBody workaround


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

Former-commit-id: 04bcd7e6dc [formerly 49422aea62] [formerly d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]
Former-commit-id: d08a652e23
Former-commit-id: adb62df96a
 2013-10-31 15:43:29 -05:00
Bryan Kowal
f02d4b7a0b 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: 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d366e70934
 2013-10-31 15:34:46 -05:00
Bryan Kowal
02cdbe0173 Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit 
Former-commit-id: ecda7100be [formerly c74123f5a8] [formerly e9b76cf185 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]
Former-commit-id: e9b76cf185
Former-commit-id: d08a1af457
 2013-10-31 14:53:27 -05:00
Greg Armendariz
5cf091c499 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 0daf07742e [formerly f6d98d6317] [formerly 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]
Former-commit-id: 64dd62005b
Former-commit-id: 4fb0e0bd2f
 2013-10-30 14:52:16 -05:00
Nate Jensen
19043faeaa 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: 554a9cddf3 [formerly f3143ba7b4] [formerly 6880a18f1a [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]
Former-commit-id: 6880a18f1a
Former-commit-id: f2751f017e
 2013-10-29 14:33:53 -05:00
Steve Harris
3b29cf6790 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: a103a0e8ac [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: eced243e6a
 2013-10-28 15:58:12 -05:00
Steve Harris
b60635cd70 14.1.1-4 baseline 
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
 2013-10-28 10:55:16 -04:00
Steve Harris
aa59400b67 14.1.1-3 baseline 
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 5739b4f832
Former-commit-id: 4a6a209aea
 2013-10-28 10:46:02 -04:00
Nate Jensen
b511177fa1 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development 
Former-commit-id: 3a453d5442 [formerly 002005139f] [formerly 5a99163569 [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]
Former-commit-id: 5a99163569
Former-commit-id: cf63b37257
 2013-10-24 20:02:18 -05:00
Ben Steffensmeier
09a3276d51 Issue #2491 Use reflections to build Procedure JAXB context. 
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: a935ffadf7 [formerly bfc3faf08f] [formerly fa0a0619bc [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]
Former-commit-id: fa0a0619bc
Former-commit-id: d927e6b2d7
 2013-10-24 11:28:06 -05:00
Bryan Kowal
43f23dbc5f Issue #2476 - re-compile 64-bit jep for RHEL6 
Former-commit-id: 069cb9645e [formerly 4c3cdbb28e] [formerly 8036733372 [formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]]
Former-commit-id: 8036733372
Former-commit-id: 4bb993d6c3
 2013-10-23 17:12:02 -05:00
Richard Peter
a49c67203e Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: f69bbf7952 [formerly cb33f5ada7] [formerly 14d5b8656e [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]
Former-commit-id: 14d5b8656e
Former-commit-id: 6ecb80e892
 2013-10-23 15:50:25 -05:00
Bryan Kowal
752061e05f Issue #2476 - recompiled Jep for Windows 
Former-commit-id: 243ffb4b93 [formerly 0e1c5b51ba] [formerly 79f2f2694f [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]]
Former-commit-id: 79f2f2694f
Former-commit-id: 1737a11d53
 2013-10-23 15:12:42 -05:00
Bryan Kowal
855abcd044 Issue #2476 - recompiled jep for Linux 
Former-commit-id: 701b9de382 [formerly a3cfae3510] [formerly 9fe5429068 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]]
Former-commit-id: 9fe5429068
Former-commit-id: 46f5db6284
 2013-10-23 15:12:42 -05:00