LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TRUNK][UPDATE] 

- excludes xml annotation from export
- uncomments xml annotation in LocalizedString

git-svn-id: https://svn.libreccm.org/ccm/trunk@5134 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2017-11-23 15:48:29 +00:00
parent 736b58230b
commit 52a5609621
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
View File

@ -62,10 +62,10 @@ public abstract class AbstractMarshaller<P extends Portable> {
JacksonXmlModule module = new JacksonXmlModule(); JacksonXmlModule module = new JacksonXmlModule();
module.setDefaultUseWrapper(false); module.setDefaultUseWrapper(false);
xmlMapper = new XmlMapper(module); xmlMapper = new XmlMapper(module);
xmlMapper.registerModule(new JaxbAnnotationModule());
if (indentation) { if (indentation) {
xmlMapper.enable(SerializationFeature.INDENT_OUTPUT); xmlMapper.enable(SerializationFeature.INDENT_OUTPUT);
} }
//xmlMapper.registerModule(new JaxbAnnotationModule());
xmlMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); xmlMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
break; break;

19
ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedString.java
View File

@ -18,16 +18,13 @@
*/ */
package com.arsdigita.portation.modules.core.l10n; package com.arsdigita.portation.modules.core.l10n;
import com.arsdigita.portation.modules.core.l10n.jaxb.LocalizedStringValuesAdapter;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.xml.bind.annotation.XmlAccessType; import java.util.Collections;
import javax.xml.bind.annotation.XmlAccessorType; import java.util.HashMap;
import javax.xml.bind.annotation.XmlElement; import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Map;
import java.util.*; import java.util.Set;
import static com.arsdigita.portation.modules.core.l10n.L10NConstants.L10N_XML_NS;
/** /**
* A helper class for localisable string properties. This class is declared as * A helper class for localisable string properties. This class is declared as
@ -38,11 +35,11 @@ import static com.arsdigita.portation.modules.core.l10n.L10NConstants.L10N_XML_N
* @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a> * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
* @version created on 6/15/16 * @version created on 6/15/16
*/ */
@XmlAccessorType(XmlAccessType.FIELD) //@XmlAccessorType(XmlAccessType.FIELD)
public class LocalizedString { public class LocalizedString {
@XmlElement(name = "values", namespace = L10N_XML_NS) //@XmlElement(name = "values", namespace = L10N_XML_NS)
@XmlJavaTypeAdapter(LocalizedStringValuesAdapter.class) //@XmlJavaTypeAdapter(LocalizedStringValuesAdapter.class)
private Map<Locale, String> values; private Map<Locale, String> values;
/** /**