From 46e10fb1a0099e5bd5188e347be9cbec6e681431 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 11 Oct 2019 15:10:56 +0200
Subject: [PATCH] Added MessageState enumeration and XJB file for message
 schema

---
 .classpath                                   | 15 ++++++++-----
 .settings/org.eclipse.core.resources.prefs   |  1 +
 .settings/org.eclipse.wst.common.component   |  8 ++++++-
 pom.xml                                      |  8 +++++++
 src/main/java/envoy/schema/MessageState.java | 22 ++++++++++++++++++++
 src/main/resources/message_schema.xsd        | 11 +++++++++-
 src/main/xjb/bindings.xml                    | 15 +++++++++++++
 7 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/envoy/schema/MessageState.java
 create mode 100644 src/main/xjb/bindings.xml

diff --git a/.classpath b/.classpath
index cd5c385..a9a94b3 100644
--- a/.classpath
+++ b/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -41,5 +36,15 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xjb">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 93fb95b..8660235 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,7 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/main/xjb=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding//target/generated-sources/jaxb=UTF-8
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9de5f51..08f1a01 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+        
     <wb-module deploy-name="envoy-common">
+                
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+                
         <wb-resource deploy-path="/" source-path="/target/generated-sources/jaxb"/>
+        <wb-resource deploy-path="/" source-path="/src/main/xjb"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+            
     </wb-module>
+    
 </project-modules>
diff --git a/pom.xml b/pom.xml
index 50c664e..cf6ff6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,14 @@
 
 	<build>
 		<finalName>envoy-common</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>src/main/xjb</directory>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
diff --git a/src/main/java/envoy/schema/MessageState.java b/src/main/java/envoy/schema/MessageState.java
new file mode 100644
index 0000000..0f174c6
--- /dev/null
+++ b/src/main/java/envoy/schema/MessageState.java
@@ -0,0 +1,22 @@
+package envoy.schema;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Project: <strong>envoy-common</strong><br>
+ * File: <strong>MessageState.java</strong><br>
+ * Created: <strong>11 Oct 2019</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ */
+@XmlType(name = "")
+@XmlEnum
+public enum MessageState {
+
+	Waiting, Sent, Received, Read;
+
+	public String value() { return name(); }
+
+	public static MessageState fromValue(String v) { return valueOf(v); }
+}
diff --git a/src/main/resources/message_schema.xsd b/src/main/resources/message_schema.xsd
index 4151e4b..c3d09f9 100644
--- a/src/main/resources/message_schema.xsd
+++ b/src/main/resources/message_schema.xsd
@@ -21,7 +21,16 @@
 						<xs:element name="Sender" type="xs:long" />
 						<xs:element name="Recipient" type="xs:long" />
 						<xs:element name="Date" type="xs:date" />
-						<xs:element name="State" type="xs:boolean" />
+						<xs:element name="State">
+							<xs:simpleType>
+								<xs:restriction base="xs:string">
+									<xs:enumeration value="Waiting"/>
+									<xs:enumeration value="Sent"/>
+									<xs:enumeration value="Received"/>
+									<xs:enumeration value="Read"/>
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:element>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
diff --git a/src/main/xjb/bindings.xml b/src/main/xjb/bindings.xml
new file mode 100644
index 0000000..66ef12c
--- /dev/null
+++ b/src/main/xjb/bindings.xml
@@ -0,0 +1,15 @@
+<jaxb:bindings xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+	jaxb:extensionBindingPrefixes="xjc" version="2.1">
+	<jaxb:globalBindings generateIsSetMethod="true"
+		fixedAttributeAsConstantProperty="true">
+		<xjc:serializable />
+	</jaxb:globalBindings>
+	<jaxb:bindings schemaLocation="../resources/message_schema.xsd">
+		<jaxb:bindings
+			node="//xs:element[@name='State']/xs:simpleType">
+			<jaxb:typesafeEnumClass name="MessageState" />
+		</jaxb:bindings>
+	</jaxb:bindings>
+</jaxb:bindings>
\ No newline at end of file