Here's a patch that gets rid off the sun specific stuff in jboss and
jbossmq modules.  I have a vague feeling that someone's added sun-specific
stuff in the tomcat module, you'll have to check.


Index: DependencyManager.java
===================================================================
RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/dependencies/DependencyManager.java,v
retrieving revision 1.4
diff -r1.4 DependencyManager.java
25c25,29
< import com.sun.xml.parser.Parser;
---
> import javax.xml.parsers.DocumentBuilderFactory;
> import javax.xml.parsers.DocumentBuilderFactoryImpl;
> import javax.xml.parsers.SAXParserFactory;
> import javax.xml.parsers.SAxParser;
> import org.xml.sax.Parser;
74c78,81
<         Parser parser = new Parser();
---
> 
>       SAXParserFactory factory = SAXParserFactory.newInstance();
>       SAXParser saxParser = factory.newSAXParser();
>       Parser parser = saxParser.getParser();

Index: ConfigurationService.java
===================================================================
RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/configuration/ConfigurationService.java,v
retrieving revision 1.18
diff -r1.18 ConfigurationService.java
18a19
> import javax.xml.parsers.*;
22d22
< import com.sun.xml.tree.*;
252,254c252,253
<        XmlDocumentBuilder xdb = new XmlDocumentBuilder();
<        Parser parser = new com.sun.xml.parser.Parser();
<        xdb.setParser(parser);
---
>        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
>        DocumentBuilder builder = factory.newDocumentBuilder();
258,259c257
<            parser.parse(new InputSource(new StringReader(cfg)));
<            userConf = xdb.getDocument();
---
>          userConf = builder.parse( new InputSource( new StringReader( cfg ) ) );
279,281d276
<           xdb = new XmlDocumentBuilder();
<           parser = new com.sun.xml.parser.Parser();
<           xdb.setParser(parser);
285,286c280
<               parser.parse(new InputSource(new StringReader(cfg)));
<               autoConf = xdb.getDocument();
---
>             autoConf = builder.parse( new InputSource( new StringReader( cfg ) ) );

Index: XmlFileLoader.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/XmlFileLoader.java,v
retrieving revision 1.11
diff -r1.11 XmlFileLoader.java
144,158d143
< /*         
< 
<                       com.sun.xml.tree.XmlDocumentBuilder xdb = new 
com.sun.xml.tree.XmlDocumentBuilder();
< 
<                       Parser parser = new com.sun.xml.parser.ValidatingParser();
< 
<                       // Use a local entity resolver to get rid of the DTD loading 
via internet
<                       EntityResolver er = new LocalResolver();
<                       parser.setEntityResolver(er);
<                       xdb.setParser(parser);
< 
<                       parser.parse(new InputSource(in));
<          com.sun.xml.tree.XmlDocument doc = xdb.getDocument();
<          doc.write(System.out);
< */

Index: XElementProducer.java
===================================================================
RCS file: /products/cvs/ejboss/jbossmq/src/main/org/jbossmq/xml/XElementProducer.java,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 XElementProducer.java
10a11
> import javax.xml.parsers.*;
168c169,171
<                       Parser parser = new com.sun.xml.parser.Parser();
---
>                       SAXParserFactory factory = SAXParserFactory.newInstance();
>                       SAXParser saxParser = factory.newSAXParser();
>                       Parser parser = saxParser.getParser();
201c204,206
<                       Parser parser = new com.sun.xml.parser.Parser();
---
>                       SAXParserFactory factory = SAXParserFactory.newInstance();
>                       SAXParser saxParser = factory.newSAXParser();
>                       Parser parser = saxParser.getParser();
218c223
< }
\ No newline at end of file
---
> }

Tom
-- 
"If you mess with something for long enough it will break." - Schmidt


Reply via email to