[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model ...

[Robert Stryker]

  User: rawb    
  Date: 06/09/06 15:28:12

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model 
                        DescriptorModel.java
  Log:
  Change to allow for different jres. (Bug used xerces-only property, and different jre could default to some other parser)
  
  Revision  Changes    Path
  1.7       +11 -1     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/DescriptorModel.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DescriptorModel.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/DescriptorModel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- DescriptorModel.java	8 Aug 2006 14:22:16 -0000	1.6
  +++ DescriptorModel.java	6 Sep 2006 19:28:12 -0000	1.7
  @@ -31,6 +31,9 @@
   import java.util.List;
   import java.util.Set;
   
  +import javax.xml.parsers.SAXParser;
  +import javax.xml.parsers.SAXParserFactory;
  +
   import org.dom4j.Attribute;
   import org.dom4j.Document;
   import org.dom4j.Node;
  @@ -47,6 +50,7 @@
   import org.jboss.ide.eclipse.as.core.server.JBossServer;
   import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper;
   import org.jboss.ide.eclipse.as.core.util.ASDebug;
  +import org.xml.sax.XMLReader;
   
   /**
    * This class is intended to represent the actual mbeans, 
  @@ -197,8 +201,13 @@
   				File file = new File(path);
   				long lastModified = file.lastModified();
   				URL url = new File(path).toURL();
  +
  +				SAXParserFactory spf = SAXParserFactory.newInstance();
  +				SAXParser sp = spf.newSAXParser();
  +				sp.getXMLReader().setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
  +				
   				SAXReader reader = new SAXReader(false);
  -				reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
  +				reader.setXMLReader(sp.getXMLReader());
   				Document document = reader.read(url);
   				
   				// add to maps
  @@ -206,6 +215,7 @@
   				pathToLastRead.put(path, new Long(lastModified));
   			} catch( Exception e ) {
   				ASDebug.p("file " + path + ", Exception: " + e.getMessage(), this);
  +				e.printStackTrace();
   			}
   		}