From 7ded49894bbc4e538e35c85acd0d50c62c2911f8 Mon Sep 17 00:00:00 2001 From: "Richard A. Porter" Date: Sun, 28 Jun 2015 01:33:59 -0700 Subject: [PATCH] DDF-1298 Classloader/XML Parser issue in the container environment. --- .../wfs/v2_0_0/catalog/source/WfsSource.java | 13 +- ...atureCollectionMessageBodyReaderWfs20.java | 112 ++++++++++-------- 2 files changed, 68 insertions(+), 57 deletions(-) diff --git a/wfs/2.0.0/spatial-wfs-v2_0_0-source/src/main/java/org/codice/ddf/spatial/ogc/wfs/v2_0_0/catalog/source/WfsSource.java b/wfs/2.0.0/spatial-wfs-v2_0_0-source/src/main/java/org/codice/ddf/spatial/ogc/wfs/v2_0_0/catalog/source/WfsSource.java index 365839a3..6019cfb8 100644 --- a/wfs/2.0.0/spatial-wfs-v2_0_0-source/src/main/java/org/codice/ddf/spatial/ogc/wfs/v2_0_0/catalog/source/WfsSource.java +++ b/wfs/2.0.0/spatial-wfs-v2_0_0-source/src/main/java/org/codice/ddf/spatial/ogc/wfs/v2_0_0/catalog/source/WfsSource.java @@ -1,16 +1,15 @@ /** * Copyright (c) Codice Foundation - * + *

* This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser * General Public License as published by the Free Software Foundation, either version 3 of the * License, or any later version. - * + *

* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. A copy of the GNU Lesser General Public License * is distributed along with this program and can be found at * . - * **/ package org.codice.ddf.spatial.ogc.wfs.v2_0_0.catalog.source; @@ -805,8 +804,8 @@ protected GetFeatureType buildGetFeatureRequest(Query query) throws UnsupportedQ } } - private JAXBElement buildSortBy(QName featureType, SortBy incomingSortBy) throws - UnsupportedQueryException { + private JAXBElement buildSortBy(QName featureType, SortBy incomingSortBy) + throws UnsupportedQueryException { net.opengis.filter.v_2_0_0.ObjectFactory filterObjectFactory = new net.opengis.filter.v_2_0_0.ObjectFactory(); String propertyName = mapSortByPropertyName(featureType, @@ -1000,8 +999,8 @@ public String getVersion() { } @Override - public ResourceResponse retrieveResource(URI uri, Map arguments) throws - IOException, ResourceNotFoundException, ResourceNotSupportedException { + public ResourceResponse retrieveResource(URI uri, Map arguments) + throws IOException, ResourceNotFoundException, ResourceNotSupportedException { StringBuilder strBuilder = new StringBuilder(); strBuilder.append("