Index: main/java/org/exolab/castor/builder/SourceFactory.java
===================================================================
--- main/java/org/exolab/castor/builder/SourceFactory.java	(Revision 5965)
+++ main/java/org/exolab/castor/builder/SourceFactory.java	(Arbeitskopie)
@@ -1733,7 +1733,7 @@
         boolean useValuesAsName = true;
         while (enumeration.hasMoreElements()) {
             Facet facet = (Facet)enumeration.nextElement();
-            String possibleId = translateEnumValueToIdentifier(facet.getValue());
+            String possibleId = translateEnumValueToIdentifier(facet);
             if (!JavaNaming.isValidJavaIdentifier(possibleId)) {
                 useValuesAsName = false;
                 break;
@@ -1841,7 +1841,7 @@
             String typeName = null;
             String objName = null;
 
-            if (useValuesAsName) objName = translateEnumValueToIdentifier(value);
+            if (useValuesAsName) objName = translateEnumValueToIdentifier(facet);
             else objName = "VALUE_" + count;
 
             //-- create typeName
@@ -2073,28 +2073,43 @@
      *   - the characters <code>|\/?~!@#$%^&*-+=:;.,</code> and any whitespace are replaced with <code>_</code>
      * @author rhett-sutphin@uiowa.edu 
      */
-    private String translateEnumValueToIdentifier(String enumValue) 
+    private String translateEnumValueToIdentifier(Facet facet) 
     {
+        String enumValue = facet.getValue();
         
         try {
-            int intVal = Integer.parseInt(enumValue);
+            int intVal = Integer.parseInt(facet.getValue());
             if (intVal >= 0) return "VALUE_" + intVal;
             
             return "VALUE_NEG_" + Math.abs(intVal);
         } catch (NumberFormatException e) {
             // just keep going
         }
-        StringBuffer sb = new StringBuffer(enumValue.toUpperCase());
-        char c;
-        for (int i = 0 ; i < sb.length() ; i++) {
-            c = sb.charAt(i);
-            if ("[](){}<>'`\"".indexOf(c) >= 0) {
-                sb.deleteCharAt(i);
-                i--;
+        
+        XMLBindingComponent component = new XMLBindingComponent(_config);
+        if (_binding != null) component.setBinding(_binding);        
+        // set binding view
+        component.setView(facet);
+        
+        StringBuffer sb = new StringBuffer();
+        
+        String memberName = component.getJavaMemberName();
+        if (memberName != null) {
+            sb.append(memberName);
+        } else {
+            
+            sb.append(enumValue.toUpperCase());
+            char c;
+            for (int i = 0 ; i < sb.length() ; i++) {
+                c = sb.charAt(i);
+                if ("[](){}<>'`\"".indexOf(c) >= 0) {
+                    sb.deleteCharAt(i);
+                    i--;
+                }
+                else if (Character.isWhitespace(c) || "\\/?~!@#$%^&*-+=:;.,".indexOf(c) >= 0) {
+                    sb.setCharAt(i, '_');
+                }
             }
-            else if (Character.isWhitespace(c) || "\\/?~!@#$%^&*-+=:;.,".indexOf(c) >= 0) {
-                sb.setCharAt(i, '_');
-            }
         }
         return sb.toString();   
     } //-- translateEnumValueToIdentifier    
Index: main/resources/org/exolab/castor/builder/binding/binding.xsd
===================================================================
--- main/resources/org/exolab/castor/builder/binding/binding.xsd	(Revision 5965)
+++ main/resources/org/exolab/castor/builder/binding/binding.xsd	(Arbeitskopie)
@@ -37,8 +37,7 @@
                 <xsd:element ref="attributeBinding" minOccurs="0" maxOccurs="unbounded"/>
                 <xsd:element ref="complexTypeBinding" minOccurs="0" maxOccurs="unbounded"/>
                 <xsd:element ref="groupBinding" minOccurs="0" maxOccurs="unbounded"/>
-                <!-- Not yet implemented -->
-                <!--<xsd:element name="enumBinding" type="enumBindingType" minOccurs="0" maxOccurs="unbounded"/>-->
+                <xsd:element name="enumBinding" type="enumBindingType" minOccurs="0" maxOccurs="unbounded"/>
             </xsd:sequence>
             <!-- the binding type: 'element' approach or 'type' approach -->
             <xsd:attribute name="defaultBindingType" type="bindingType"/>
@@ -50,6 +49,7 @@
     <xsd:element name="attributeBinding" type="componentBindingType"/>
     <xsd:element name="complexTypeBinding" type="componentBindingType"/>
     <xsd:element name="groupBinding" type="componentBindingType"/>
+    <xsd:element name="enumBinding" type="enumBindingType"/>
                 
     <!--ComplexTypes definitions-->
     <xsd:complexType name="includeType">
@@ -127,6 +127,7 @@
              <xsd:element ref="attributeBinding" minOccurs="0" maxOccurs="unbounded"/>
              <xsd:element ref="complexTypeBinding" minOccurs="0" maxOccurs="unbounded"/>
              <xsd:element ref="groupBinding" minOccurs="0" maxOccurs="unbounded"/>   
+             <xsd:element name="enumBinding" type="enumBindingType" minOccurs="0" maxOccurs="unbounded"/>
          </xsd:sequence>
          <!--the name of the schema component or an XPath expression that identify the component-->
          <xsd:attribute name="name" type="pathType" use="required"/>
@@ -191,15 +192,17 @@
 	     <xsd:attribute name="validator" type="xsd:string"/>
      </xsd:complexType>
      
-    <!-- <xsd:complexType name="enumBindingType">
+    <xsd:complexType name="enumBindingType">
          <xsd:annotation>
             <xsd:documentation>
                 This type allows the mapping between an XML schema enumeration
                 and a java class that follows the type-safe enumeration paradigm.
+                Additionally, it allows the specify the name of the Java constant
+                definition for a given enumeraton value.
             </xsd:documentation>
          </xsd:annotation>
          <xsd:sequence>
-             <xsd:element name="enumClassName">
+             <xsd:element name="enumClassName" minOccurs="0" maxOccurs="1">
                  <xsd:complexType>
                      <xsd:simpleContent>
                          <xsd:extension base="xsd:string">
@@ -208,7 +211,7 @@
                      </xsd:simpleContent>
                  </xsd:complexType>
              </xsd:element>
-             <xsd:element name="enumMember">
+             <xsd:element name="enumMember" minOccurs="0" maxOccurs="unbounded">
                  <xsd:complexType>
                      <xsd:sequence>
                          <xsd:element name="value" type="xsd:string"/>
@@ -217,7 +220,7 @@
                  </xsd:complexType>
              </xsd:element>
          </xsd:sequence>
-     </xsd:complexType>-->
+     </xsd:complexType>
 
      <!--simpleType definitions-->
      <xsd:simpleType name="pathType">
Index: build.xml
===================================================================
--- build.xml	(Revision 5965)
+++ build.xml	(Arbeitskopie)
@@ -798,4 +798,24 @@
         </javac>
     </target>
 
+    <target name="gen.binding" depends="jar,srcgen.anttask.jar"
+            description="Use the Source Generator to create the Java classes for binding.xsd">
+        <delete dir="${gen.src}/binding"/>
+        <mkdir dir="${gen.src}/binding"/>
+        <taskdef name="castor-srcgen" classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask" 
+                 classpathref="build.classpath"/>          
+        <castor-srcgen file="${main.resources}/org/exolab/castor/builder/binding/binding.xsd" 
+                todir="../${gen.src}/binding" 
+                package="org.exolab.castor.builder.binding" 
+                lineseparator="unix"
+                types="j2" 
+                warnings="true"/>
+        <javac destdir="${classes}" excludes="${excludes}" 
+               debug="${main.opt.debug}" deprecation="off" 
+               optimize="on">
+            <src path="${gen.src}/binding" />
+            <classpath refid="build.classpath"/>
+        </javac>
+    </target>
+
 </project>