awips2/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization
Richard Peter 67683dd891 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 44b1782461
2014-04-28 16:27:40 -05:00
..
adapters Issue #2968 fix buffer thread safety issues 2014-04-07 17:30:27 -05:00
annotations 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
jaxb Issue #2491 Fix collaboration Xml. 2013-10-31 14:06:37 -05:00
reflect Issue #2361 remove StyleManager's use of SerializationUtil and 2013-11-14 13:29:30 -06:00
thrift Issue #2537 point data code cleanup. 2013-11-26 15:16:54 -06:00
util Merge 12.9.1-4 into development_on_ss_builds 2012-08-15 22:15:20 +00:00
BaseSerializationContext.java 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
BuiltInTypeSupport.java 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
DynamicSerializationManager.java Issue #2228 use TMemoryInputTransport for slight efficiency improvement 2013-08-06 09:52:02 -05:00
ExceptionWrapper.java 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
IDeserializationContext.java Issue #2215 upgrade thrift to version 0.9.0 2013-07-23 12:28:07 -05:00
IJaxbableClassesLocator.java 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
ISerializableObject.java Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections 2013-10-14 15:30:09 -05:00
ISerializationContext.java Issue #2215 upgrade thrift to version 0.9.0 2013-07-23 12:28:07 -05:00
ISerializationContextBuilder.java Issue #2228 use TMemoryInputTransport for slight efficiency improvement 2013-08-06 09:52:02 -05:00
ISerializationTypeAdapter.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
JAXBManager.java Issue #2060 remove FFG post processor dependency on dataURI, other minor 2014-04-25 12:19:23 -05:00
MapEntryType.java 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
MapType.java 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
SerializableExceptionWrapper.java 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
SerializableManager.java Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections 2013-10-14 15:30:09 -05:00
SerializationCache.java Issue #1744 - Revert "Issue #1744 fix deadlock" 2013-03-04 13:03:19 -06:00
SerializationException.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
SerializationUtil.java Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 2014-04-28 16:27:40 -05:00
SingleTypeJAXBManager.java Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject 2013-10-03 15:18:55 -05:00
WrappedException.java 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
XmlGenericMapAdapter.java 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00