Issue #9.

Author: highsource

pom.xml

@@ -167,6 +167,12 @@
 				<artifactId>junit</artifactId>
 				<version>4.11</version>
 			</dependency>
+			<!-- Joda-Time -->
+			<dependency>
+				<groupId>joda-time</groupId>
+				<artifactId>joda-time</artifactId>
+				<version>2.5</version>
+			</dependency>
 			<!-- Commons -->
 			<dependency>
 				<groupId>org.apache.commons</groupId>

tests/simplify-01/pom.xml

@@ -21,6 +21,10 @@
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<defaultGoal>test</defaultGoal>

tests/simplify-01/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/DateAdapter.java

@@ -2,6 +2,8 @@
 
 import java.util.Date;
 
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
@@ -11,26 +13,21 @@
  * 
  * @author
  */
-public class DateAdapter {
-
-  private static final DateTimeFormatter s_parser = ISODateTimeFormat.dateTimeParser().withZoneUTC();
-  private static final DateTimeFormatter s_formatter = ISODateTimeFormat.dateTime().withZoneUTC();
-
-  public static Date parseDateTime(String v) {
-
-    try {
-      return s_parser.parseDateTime(v).toDate();
-    }
-    catch (Exception e) {
-      return null;
-    }
-
-  }
-
-  /** {@inheritDoc} */
-
-  public static String printDateTime(Date v) {
-    return new DateTime(v).toString(s_formatter);
-  }
+public class DateAdapter extends XmlAdapter<String, Date> {
+
+	private static final DateTimeFormatter PARSER = ISODateTimeFormat
+			.dateTimeParser().withZoneUTC();
+	private static final DateTimeFormatter FORMATTER = ISODateTimeFormat
+			.dateTime().withZoneUTC();
+
+	@Override
+	public String marshal(Date value) throws Exception {
+		return new DateTime(value).toString(FORMATTER);
+	}
+
+	@Override
+	public Date unmarshal(String text) throws Exception {
+		return PARSER.parseDateTime(text).toDate();
+	}
 
 }

tests/simplify-01/src/main/resources/binding.xjb

@@ -1,16 +1,24 @@
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:simplify="http://jaxb2-commons.dev.java.net/basic/simplify" jaxb:extensionBindingPrefixes="simplify" jaxb:version="2.1">
-    <jaxb:globalBindings choiceContentProperty="true">
-        <jaxb:javaType name="java.util.Date" xmlType="xs:dateTime" parseMethod="com.amadeus.apt.fom.presentation.model.flights.Adapter.DateAdapter.parseDateTime" printMethod="com.amadeus.apt.fom.presentation.model.flights.Adapter.DateAdapter.printDateTime"/>
-    </jaxb:globalBindings>
-    <jaxb:bindings schemaLocation="schema.xsd" node="/xs:schema">
-        <jaxb:schemaBindings>
-            <jaxb:package name="org.jvnet.jaxb2_commons.plugin.simplify.tests01"/>
-        </jaxb:schemaBindings>
-        <jaxb:bindings node="xs:complexType[@name='gh2']">
-            <simplify:property name="bOrC">
-                <simplify:as-element-property/>
-            </simplify:property>
-        </jaxb:bindings>
-    </jaxb:bindings>
+<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:simplify="http://jaxb2-commons.dev.java.net/basic/simplify"
+	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+	jaxb:extensionBindingPrefixes="xjc simplify" jaxb:version="2.1">
+
+	<jaxb:globalBindings choiceContentProperty="true">
+		<!--jaxb:javaType name="java.util.Date" xmlType="xs:dateTime" parseMethod="com.amadeus.apt.fom.presentation.model.flights.Adapter.DateAdapter.parseDateTime" 
+			printMethod="com.amadeus.apt.fom.presentation.model.flights.Adapter.DateAdapter.printDateTime"/ -->
+		<xjc:javaType name="java.util.Date" xmlType="xs:dateTime"
+			adapter="org.jvnet.jaxb2_commons.plugin.simplify.tests01.DateAdapter" />
+	</jaxb:globalBindings>
+
+	<jaxb:bindings schemaLocation="schema.xsd" node="/xs:schema">
+		<jaxb:schemaBindings>
+			<jaxb:package name="org.jvnet.jaxb2_commons.plugin.simplify.tests01" />
+		</jaxb:schemaBindings>
+		<jaxb:bindings node="xs:complexType[@name='gh2']">
+			<simplify:property name="bOrC">
+				<simplify:as-element-property />
+			</simplify:property>
+		</jaxb:bindings>
+	</jaxb:bindings>
 </jaxb:bindings>