Index: src/main/java/org/exolab/castor/xml/UnmarshalHandler.java
===================================================================
--- src/main/java/org/exolab/castor/xml/UnmarshalHandler.java	(Revision 6884)
+++ src/main/java/org/exolab/castor/xml/UnmarshalHandler.java	(Arbeitskopie)
@@ -3105,8 +3105,14 @@
                 Object value = atts.getValue(index);
                 //-- check for proper type and do type
                 //-- conversion
-                if (isPrimitive(args.types[argIndex]))
+                if (isPrimitive(args.types[argIndex])) {
                     value = toPrimitiveObject(args.types[argIndex], (String)value, descriptor);
+                } else {
+                    // check whether we are looking at an enum-style object, and if so,
+                    // convert the (string) value
+                    value = convertToEnumObject(descriptor, value);
+                }
+                
                 //check if the value is a QName that needs to
                 //be resolved (ns:value -> {URI}value)
                 String valueType = descriptor.getSchemaType();
@@ -3123,6 +3129,40 @@
     } //-- processConstructorArgs
 
     /**
+     * Checks whether the actual value passed in should be converted to an enum-style class
+     * instance
+     * @param descriptor The {@link XMLFieldDescriptor} instance in question.
+     * @param value The actual value (which might need conversion).
+     * @return The value, potentially converted to an enum-style class.
+     */
+    private Object convertToEnumObject(XMLFieldDescriptor descriptor, Object value) {
+        Class fieldType = descriptor.getFieldType();
+        Method valueOfMethod;
+        try {
+            valueOfMethod = fieldType.getMethod("valueOf", new Class[] { String.class });
+            if (valueOfMethod != null 
+                    && Modifier.isStatic(valueOfMethod.getModifiers())) {
+                Class returnType = valueOfMethod.getReturnType();
+                if (returnType.isAssignableFrom(fieldType)) {
+                    Object enumObject = valueOfMethod.invoke(null, new Object[] { value });
+                    value = enumObject;
+                }
+            }
+        } catch (SecurityException e) {
+            // TODO: well, cannot do anything about it 
+        } catch (NoSuchMethodException e) {
+            // TODO: nothing to do, as it simply isn't an enum-style class
+        } catch (IllegalArgumentException e) {
+            // TODO: cannot really happen
+        } catch (IllegalAccessException e) {
+            // TODO: indicates that the valueOf() method isn't public
+        } catch (InvocationTargetException e) {
+            // TODO: hmm .. what else
+        }
+        return value;
+    }
+
+    /**
      * Processes the given IDREF
      *
      * @param idRef the ID of the object in which to reference
Index: src/build.xml
===================================================================
--- src/build.xml	(Revision 6885)
+++ src/build.xml	(Arbeitskopie)
@@ -382,7 +382,7 @@
         </copy>
     </target>
 
-    <target name="tests" depends="compile.bugs,compile.tests" description="Build the tests packages"/>
+    <target name="tests" depends="compile.tests" description="Build the tests packages"/>
 
     <target name="-test.category.test"
             description="An internal target to test if the test.category property is set">
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/mapping.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/mapping.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/mapping.xml	(Revision 0)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<mapping>
+    <class name="SimpleMessage" verify-constructable="false">
+           <map-to xml="SimpleMessage" />
+        <field name="severity" type="Severity" get-method="severity" set-method="%2">
+            <bind-xml name="severity" node="attribute"/>
+        </field>
+        <field name="formattedText" type="java.lang.String" get-method="formattedText" set-method="%1" >
+            <bind-xml name="text" node="attribute"/>
+        </field>
+    </class>
+    
+</mapping>
\ Kein Zeilenvorschub am Ende der Datei
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/Severity.java
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/Severity.java	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/Severity.java	(Revision 0)
@@ -0,0 +1,27 @@
+public final class Severity {
+
+    public static final Severity ERROR = new Severity("Error");
+
+    public static final Severity WARNING = new Severity("Warning");
+
+    public static final Severity OK = new Severity("OK");
+
+    private final transient String name;
+
+    private Severity(String name) {
+        this.name = name;
+    }
+
+    public String toString() {
+        return name;
+    }
+
+    public static Severity valueOf(String value) {
+        if (value.equals("Error")) {
+            return ERROR;
+        } else if (value.equals("Warning")) {
+            return WARNING;
+        }
+        return OK;
+    }
+}
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/TestDescriptor.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/TestDescriptor.xml	(Revision 0)
@@ -0,0 +1,26 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+    <Name>Mapping-Constructors-With-Enum</Name>
+    <Author>Werner Guttmann</Author>
+
+    <Comment>
+        Tests the special handling of constructor arguments in the case where one or more
+        arguments are of type 'enum'.
+    </Comment>
+
+    <Category>basic capability</Category>
+
+    <MarshallingTest>
+        <Root_Object>SimpleMessage</Root_Object>
+
+        <UnitTestCase>
+            <Name>Test01</Name>
+            <Mapping_File>mapping.xml</Mapping_File>
+            <Input>input.xml</Input>
+            <GoldFile>input.xml</GoldFile>
+        </UnitTestCase>
+
+    </MarshallingTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/input.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/input.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/input.xml	(Revision 0)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SimpleMessage severity="Warning" text="cannot delete temporary file" />
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/SimpleMessage.java
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/SimpleMessage.java	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/withEnum/SimpleMessage.java	(Revision 0)
@@ -0,0 +1,20 @@
+public final class SimpleMessage {
+
+    private Severity severity;
+
+    private String text;
+
+    public SimpleMessage(String text, Severity severity) {
+        this.text = text;
+        this.severity = severity;
+    }
+
+    public Severity severity() {
+        return severity;
+    }
+
+    public String formattedText() {
+        return text;
+    }
+
+}
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/Foo.java
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/Foo.java	(Revision 6884)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/Foo.java	(Arbeitskopie)
@@ -1,22 +0,0 @@
-
-public class Foo {
-
-    private int size = 20;
-
-    public Foo() {
-        // Nothing to do
-    }
-
-    public Foo(int size) {
-        this.size = size;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(int size) {
-        this.size = size;
-    }
-
-}
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/mapping.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/mapping.xml	(Revision 6884)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/mapping.xml	(Arbeitskopie)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-  <class name="Foo">
-     <field name="size" get-method="getSize" set-method="%1" type="int">
-        <bind-xml node="attribute"/>
-     </field>
-  </class>
-</mapping>
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/TestDescriptor.xml	(Revision 6884)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/TestDescriptor.xml	(Arbeitskopie)
@@ -1,25 +0,0 @@
-<?xml version='1.0'?>
-<TestDescriptor>
-
-    <Name>Mapping-Constructors</Name>
-    <Author>Keith Visco</Author>
-
-    <Comment>
-        Tests the special handling of constructor arguments.
-    </Comment>
-
-    <Category>basic capability</Category>
-
-    <MarshallingTest>
-        <Root_Object>Foo</Root_Object>
-
-        <UnitTestCase>
-            <Name>Test01</Name>
-            <Mapping_File>mapping.xml</Mapping_File>
-            <Input>input.xml</Input>
-            <GoldFile>input.xml</GoldFile>
-        </UnitTestCase>
-
-    </MarshallingTest>
-
-</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/mapping/constructor/input.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/constructor/input.xml	(Revision 6884)
+++ xmlctf/tests/MasterTestSuite/mapping/constructor/input.xml	(Arbeitskopie)
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<foo size="178"/>