Repository: syncope Updated Branches: refs/heads/2_0_NO_JAXB [created] bbe8fe089
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/core/rest-cxf/src/main/resources/restCXFContext.xml ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml index c8ea537..b469dcf 100644 --- a/core/rest-cxf/src/main/resources/restCXFContext.xml +++ b/core/rest-cxf/src/main/resources/restCXFContext.xml @@ -38,9 +38,12 @@ under the License. <bean id="dateParamConverterProvider" class="org.apache.syncope.common.rest.api.DateParamConverterProvider"/> - <bean id="xmlProvider" class="com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider"/> + <bean id="jacksonXmlMapper" class="org.apache.syncope.common.lib.jackson.UnwrappedXmlMapper"/> + <bean id="xmlProvider" class="org.apache.syncope.core.rest.cxf.JacksonXMLProvider"> + <property name="mapper" ref="jacksonXmlMapper"/> + </bean> - <bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.cxf.UnwrappedObjectMapper"/> + <bean id="jacksonObjectMapper" class="org.apache.syncope.common.lib.jackson.UnwrappedObjectMapper"/> <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"> <property name="mapper" ref="jacksonObjectMapper"/> </bean> @@ -70,7 +73,7 @@ under the License. <property name="applicationTitle" value="Apache Syncope ${syncope.version}"/> <property name="namespacePrefix" value="syncope"/> <property name="linkAnyMediaTypeToXmlSchema" value="true"/> - <property name="useJaxbContextForQnames" value="true"/> + <property name="useJaxbContextForQnames" value="false"/> <property name="addResourceAndMethodIds" value="true"/> <property name="ignoreMessageWriters" value="true"/> <property name="usePathParamsToCompareOperations" value="false"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelMetrics.java ---------------------------------------------------------------------- diff --git a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelMetrics.java b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelMetrics.java index 050c63c..2d4df04 100644 --- a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelMetrics.java +++ b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelMetrics.java @@ -18,23 +18,14 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.apache.syncope.common.lib.AbstractBaseBean; -@XmlRootElement(name = "camelMetrics") -@XmlType public class CamelMetrics extends AbstractBaseBean { private static final long serialVersionUID = -391404198406614231L; - @XmlRootElement(name = "meanRate") - @XmlType public static class MeanRate extends AbstractBaseBean { private static final long serialVersionUID = -233921226510124154L; @@ -63,9 +54,6 @@ public class CamelMetrics extends AbstractBaseBean { private final List<MeanRate> responseMeanRates = new ArrayList<>(); - @XmlElementWrapper(name = "responseMeanRates") - @XmlElement(name = "meanRate") - @JsonProperty("responseMeanRates") public List<MeanRate> getResponseMeanRates() { return responseMeanRates; } http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java ---------------------------------------------------------------------- diff --git a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java index cb64fb6..8c18403 100644 --- a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java +++ b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java @@ -19,13 +19,9 @@ package org.apache.syncope.common.lib.to; * under the License. */ import javax.ws.rs.PathParam; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.apache.syncope.common.lib.AbstractBaseBean; import org.apache.syncope.common.lib.types.AnyTypeKind; -@XmlRootElement(name = "camelRoute") -@XmlType public class CamelRouteTO extends AbstractBaseBean { private static final long serialVersionUID = 6431992877435181674L;
