Author: desruisseaux Date: Tue Jun 25 09:47:16 2013 New Revision: 1496395 URL: http://svn.apache.org/r1496395 Log: Enable XML (un)marshalling of TM_Primitive (temporal schema). Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java?rev=1496395&r1=1496394&r2=1496395&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] Tue Jun 25 09:47:16 2013 @@ -126,7 +126,7 @@ public class DefaultTemporalExtent exten * @return The content date. */ @Override - // TODO @XmlElement(name = "extent", required = true) + @XmlElement(name = "extent", required = true) public TemporalPrimitive getExtent() { return extent; } Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java?rev=1496395&r1=1496394&r2=1496395&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] Tue Jun 25 09:47:16 2013 @@ -144,7 +144,7 @@ @XmlJavaTypeAdapter(GM_Object.class), @XmlJavaTypeAdapter(MD_Identifier.class), // @XmlJavaTypeAdapter(SC_VerticalCRS.class), // TODO -// @XmlJavaTypeAdapter(TM_Primitive.class), // TODO + @XmlJavaTypeAdapter(TM_Primitive.class), // Java types, primitive types and basic OGC types handling @XmlJavaTypeAdapter(InternationalStringAdapter.class), @@ -163,6 +163,6 @@ import javax.xml.bind.annotation.adapter import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.jaxb.gco.*; +import org.apache.sis.internal.jaxb.gml.*; import org.apache.sis.internal.jaxb.metadata.*; -// TODO import org.apache.sis.internal.jaxb.referencing.*; import org.apache.sis.internal.jaxb.geometry.GM_Object;