Index: src/main/java/org/exolab/castor/builder/TypeConversion.java
===================================================================
--- src/main/java/org/exolab/castor/builder/TypeConversion.java	(revision 7439)
+++ src/main/java/org/exolab/castor/builder/TypeConversion.java	(working copy)
@@ -97,6 +97,7 @@
 import org.exolab.castor.xml.schema.Structure;
 import org.exolab.castor.xml.schema.Union;
 import org.exolab.javasource.JClass;
+import org.exolab.javasource.JNaming;
 import org.exolab.javasource.JType;
 
 /**
@@ -147,7 +148,7 @@
      */
     public XSType convertType(final SimpleType simpleType, final String packageName,
                               final boolean useJava50) {
-         return convertType(simpleType, packageName, _config.usePrimitiveWrapper(), useJava50);
+         return convertType(simpleType, packageName, _config.usePrimitiveWrapper(), useJava50, null);
     }
 
     /**
@@ -159,10 +160,11 @@
      *        wrappers be used instead of the actual primitives (e.g.
      *        java.lang.Integer instead of int)
      * @param useJava50 true if source code is to be generated for Java 5
+     * @param javaClassBindingName valid java Class Name specified by corresponding binding component
      * @return the XSType which represets the given Simpletype
      */
     public XSType convertType(final SimpleType simpleType, final String packageName,
-            final boolean useWrapper, final boolean useJava50) {
+            final boolean useWrapper, final boolean useJava50, final String javaClassBindingName) {
         if (simpleType == null) {
             return null;
         }
@@ -184,7 +186,7 @@
             return new XSClass(new JClass(className));
         }
 
-        xsType = findXSTypeForEnumeration(simpleType, packageName);
+        xsType = findXSTypeForEnumeration(simpleType, packageName, javaClassBindingName);
         if (xsType != null) {
             return xsType;
         }
@@ -353,7 +355,7 @@
                 xsQName.setFacets(simpleType);
                 return xsQName;
             case SimpleTypesFactory.STRING_TYPE:               //-- string
-                xsType = findXSTypeForEnumeration(simpleType, packageName);
+                xsType = findXSTypeForEnumeration(simpleType, packageName, javaClassBindingName);
                 if (xsType == null) {
                     // Not an enumerated String type
                     XSString xsString = new XSString();
@@ -431,7 +433,7 @@
             return new XSClass(SGTypes.OBJECT);
         }
         
-        XSType convertedType = convertType(common, packageName, useWrapper, useJava50);
+        XSType convertedType = convertType(common, packageName, useWrapper, useJava50, null);
         Union unionType = (Union) simpleType;
         Enumeration memberTypes = unionType.getMemberTypes();
         while (memberTypes.hasMoreElements()) {
@@ -509,9 +511,10 @@
      * returns null.
      * @param simpleType the SimpleType being inspected
      * @param packageName current package name
+     * @param javaClassBindingName valid Java Class Name specified by corresponding binding component
      * @return an XSType for an enumerated type, null for a non-enumerated type.
      */
-    private XSType findXSTypeForEnumeration(final SimpleType simpleType, final String packageName) {
+    private XSType findXSTypeForEnumeration(final SimpleType simpleType, final String packageName, final String javaClassBindingName) {
         if (!simpleType.hasFacet(Facet.ENUMERATION)) {
             return null;
         }
@@ -521,17 +524,28 @@
 
         //-- anonymous type
         if (typeName == null) {
+            if (javaClassBindingName != null) {
+                // handled by binding file
+                if (!JNaming.isInJavaLang(javaClassBindingName) && !JNaming.isReservedByCastor(javaClassBindingName) && !JNaming.isReservedByWindows(javaClassBindingName)) {
+                    typeName = javaClassBindingName;
+                }
+            }
+        }
+               
+        if (typeName == null) {
+            // not handled by binding file
             Structure parent = simpleType.getParent();
             if (parent instanceof ElementDecl) {
                 typeName = ((ElementDecl) parent).getName();
             } else if (parent instanceof AttributeDecl) {
                 typeName = ((AttributeDecl) parent).getName();
             }
+                
             typeName = typeName + "Type";
         }
 
         String className = _config.getJavaNaming().toJavaClassName(typeName);
-
+        
         // Get the appropriate package name for this type
         String typePackageName = packageName;
         if (typePackageName == null) {
Index: src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java
===================================================================
--- src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java	(revision 7439)
+++ src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java	(working copy)
@@ -1270,7 +1270,7 @@
                 }
 
                 result = _typeConversion.convertType((SimpleType) type, 
-                        packageName, useWrapper,_config.useJava50());
+                        packageName, useWrapper,_config.useJava50(), getJavaClassName());
             }
         }
 
Index: pom.xml
===================================================================
--- pom.xml	(revision 7439)
+++ pom.xml	(working copy)
@@ -1,24 +1,21 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codehaus.castor</groupId>
 	<artifactId>castor-codegen</artifactId>
 	<version>1.2.1-SNAPSHOT</version>
 
-	<!-- 
-		<parent>
-		<groupId>org.codehaus.castor</groupId>
-		<artifactId>castor</artifactId>
-		<version>1.1-M3</version>
-		</parent>
+	<!-- 
+		<parent>
+		<groupId>org.codehaus.castor</groupId>
+		<artifactId>castor</artifactId>
+		<version>1.1-M3</version>
+		</parent>
 	-->
 	<packaging>jar</packaging>
 
 	<name>Castor XML - Code generator</name>
-	<description></description>
 
 	<build>
 		<plugins>
@@ -28,15 +25,9 @@
 				<artifactId>castor-maven-plugin</artifactId>
 				<version>1.0</version>
 				<configuration>
-					<schema>
-						src/main/resources/org/exolab/castor/builder/binding/binding.xsd
-					</schema>
-					<packaging>
-						org.exolab.castor.builder.binding
-					</packaging>
-					<properties>
-						src/main/resources/org/exolab/castor/builder/binding.generation.properties
-					</properties>
+					<schema>src/main/resources/org/exolab/castor/builder/binding/binding.xsd</schema>
+					<packaging>org.exolab.castor.builder.binding</packaging>
+					<properties>src/main/resources/org/exolab/castor/builder/binding.generation.properties</properties>
 				</configuration>
 				<dependencies>
 					<dependency>
@@ -45,14 +36,14 @@
 						<version>1.1-M3-SNAPSHOT</version>
 					</dependency>
 				</dependencies>
-				<!-- enable when old sources have been dropped from the repo; until then, manually execute castor:generate
-					<executions>
-					<execution>
-					<goals>
-					<goal>generate</goal>
-					</goals>
-					</execution>
-					</executions>	        
+				<!-- enable when old sources have been dropped from the repo; until then, manually execute castor:generate
+					<executions>
+					<execution>
+					<goals>
+					<goal>generate</goal>
+					</goals>
+					</execution>
+					</executions>	        
 				-->
 			</plugin>
 
@@ -63,12 +54,8 @@
 					<source>1.4</source>
 					<target>1.4</target>
 					<includes>
-						<include implementation="java.lang.String">
-							org/exolab/castor/builder/**
-						</include>
-						<include implementation="java.lang.String">
-							org/exolab/javasource/**
-						</include>
+						<include implementation="java.lang.String">org/exolab/castor/builder/**</include>
+						<include implementation="java.lang.String">org/exolab/javasource/**</include>
 					</includes>
 				</configuration>
 			</plugin>
@@ -78,9 +65,7 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
-						<manifestFile>
-							src/main/resources/META-INF/MANIFEST.MF
-						</manifestFile>
+						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
 			</plugin>
@@ -134,15 +119,9 @@
 	</build>
 
 	<scm>
-		<connection>
-			scm:svn:http://svn.codehaus.org/castor/castor/trunk/codegen
-		</connection>
-		<developerConnection>
-			scm:svn:https://svn.codehaus.org/castor/castor/trunk/codegen
-		</developerConnection>
-		<url>
-			http://svn.castor.codehaus.org/browse/castor/castor/trunk/codegen
-		</url>
+		<connection>scm:svn:http://svn.codehaus.org/castor/castor/trunk/codegen</connection>
+		<developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/trunk/codegen</developerConnection>
+		<url>http://svn.castor.codehaus.org/browse/castor/castor/trunk/codegen</url>
 	</scm>
 
 	<dependencies>
@@ -186,6 +165,15 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.6.2</version>
+            <scope>test</scope>
+        </dependency>
+
+		
+
 	</dependencies>
 
 	<!--  redundant; will be removed once we switch to parent structure -->
@@ -198,9 +186,7 @@
 		<snapshotRepository>
 			<id>codehaus.org</id>
 			<name>Castor Central Development Repository</name>
-			<url>
-				dav:https://dav.codehaus.org/snapshots.repository/castor/
-			</url>
+			<url>dav:https://dav.codehaus.org/snapshots.repository/castor/</url>
 		</snapshotRepository>
 		<site>
 			<id>codehaus.org</id>
@@ -212,36 +198,27 @@
 		<repository>
 			<id>java.net</id>
 			<name>java.net Maven Repository</name>
-			<url>
-				https://maven-repository.dev.java.net/nonav/repository
-			</url>
+			<url>https://maven-repository.dev.java.net/nonav/repository</url>
 			<layout>legacy</layout>
 		</repository>
 		<repository>
 			<id>maven2-repository.dev.java.net</id>
 			<name>Java.net Repository for Maven 2</name>
-			<url>
-				https://maven2-repository.dev.java.net/nonav/repository
-			</url>
+			<url>https://maven2-repository.dev.java.net/nonav/repository</url>
 			<layout>default</layout>
 		</repository>
 		<repository>
 			<id>codehaus-snapshots</id>
 			<name>Maven Codehaus Snapshots</name>
-			<url>
-				http://snapshots.repository.codehaus.org
-			</url>
+			<url>http://snapshots.repository.codehaus.org</url>
 		</repository>
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
 			<id>Maven Codehaus Snapshots</id>
-			<url>
-				http://snapshots.maven.codehaus.org/maven2
-			</url>
+			<url>http://snapshots.maven.codehaus.org/maven2</url>
 			<snapshots>
-				<enabled>true</enabled>
 			</snapshots>
 			<releases>
 				<enabled>false</enabled>
@@ -250,5 +227,3 @@
 	</pluginRepositories>
 
 </project>
-
-