GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.35 -r1.36
--- CompactReader.java	14 Dec 2007 21:47:42 -0000	1.35
+++ CompactReader.java	14 Dec 2007 22:04:13 -0000	1.36
@@ -15,10 +15,10 @@

 import org.lcsim.geometry.util.BaseIDDecoder;
 import org.lcsim.material.XMLMaterialManager;
 import org.lcsim.units.clhep.Constants;

-import org.lcsim.util.cache.CachingEntityResolver;

 import org.lcsim.util.xml.ElementFactory;
 import org.lcsim.util.xml.JDOMExpressionFactory;
 import org.lcsim.util.xml.ElementFactory.ElementCreationException;

+import org.lcsim.util.xml.ClasspathEntityResolver;

 
 /**
  * A tool for reading xml files containing compact detector descriptions.

@@ -28,7 +28,7 @@

  * org.lcsim.geometry.GeometryReader class, which extends this.
  *
  * @author tonyj

- * @version $Id: CompactReader.java,v 1.35 2007/12/14 21:47:42 jeremy Exp $

+ * @version $Id: CompactReader.java,v 1.36 2007/12/14 22:04:13 jeremy Exp $

  *
  */
 public class CompactReader

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.15 -r1.16
--- Main.java	14 Dec 2007 21:48:14 -0000	1.15
+++ Main.java	14 Dec 2007 22:04:13 -0000	1.16
@@ -15,11 +15,11 @@

 import org.jdom.input.SAXBuilder;
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;

-import org.lcsim.geometry.compact.ClasspathEntityResolver;

 import org.lcsim.geometry.compact.CompactReader;
 import org.lcsim.geometry.compact.Detector;
 import org.lcsim.geometry.compact.converter.Converter;
 import org.lcsim.util.xml.ElementFactory;

+import org.lcsim.util.xml.ClasspathEntityResolver;

 
 /**
  *