Index: org/exolab/castor/builder/SourceGenerator.java
===================================================================
--- org/exolab/castor/builder/SourceGenerator.java	(Revision 6999)
+++ org/exolab/castor/builder/SourceGenerator.java	(Arbeitskopie)
@@ -797,7 +797,14 @@
             _schemasProcessed.add(schema);
             if (!_schemasProcessed.contains(importedSchema)) {
                 SGStateInfo importedSInfo  = new SGStateInfo(importedSchema, this);
-                importedSInfo.setPackageName(sInfo.getPackageName());
+                String packageName = sInfo.getPackageName();
+                importedSInfo.setPackageName(packageName);
+                
+                //--map the schemaLocation of the imported schema with the packageName defined
+                if (packageName != null) {
+                    setLocationPackageMapping(importedSchema.getSchemaLocation(), packageName);
+                }
+                
                 generateAllClassFiles(importedSchema, importedSInfo);
 
                 //--'store' the imported JClass instances