--- xjc/src/com/sun/tools/xjc/Options.java	2011-05-25 16:16:41.000000000 +0200
+++ xjc/src/com/sun/tools/xjc/Options.java-gil	2011-07-24 18:15:40.711151264 +0200
@@ -67,8 +67,8 @@ import com.sun.codemodel.CodeWriter;
 import com.sun.codemodel.JPackage;
 import com.sun.codemodel.writer.FileCodeWriter;
 import com.sun.codemodel.writer.PrologCodeWriter;
-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver;
 import com.sun.tools.xjc.api.ClassNameAllocator;
 import com.sun.tools.xjc.api.SpecVersion;
 import com.sun.tools.xjc.generator.bean.field.FieldRendererFactory;