[jboss-cvs] JBossAS SVN: r80817 - trunk/connector/src/main/org/jboss/resource/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2008-11-11 12:42:16 -0500 (Tue, 11 Nov 2008)
New Revision: 80817

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
Log:
[JBAS-6115] - Make sure we use the JBossEntityResolver when parsing -ds.xml

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2008-11-11 17:19:31 UTC (rev 80816)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2008-11-11 17:42:16 UTC (rev 80817)
@@ -28,7 +28,7 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.sax.SAXSource;
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
@@ -45,7 +45,11 @@
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
 import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
+import org.jboss.util.xml.JBossEntityResolver;
 import org.jboss.virtual.VirtualFile;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
  * A ManagedConnectionFactoryParserDeployer.
@@ -111,11 +115,15 @@
 
       try
       {
-         JAXBElement<ManagedConnectionFactoryDeploymentGroup> elem = um.unmarshal(new StreamSource(is), ManagedConnectionFactoryDeploymentGroup.class);
+         InputSource input = new InputSource(is);
+         input.setSystemId(file.toURI().toString());
+         XMLReader reader = XMLReaderFactory.createXMLReader();
+         reader.setEntityResolver(new JBossEntityResolver());
+         SAXSource source = new SAXSource(reader, input);
+         JAXBElement<ManagedConnectionFactoryDeploymentGroup> elem = um.unmarshal(source, ManagedConnectionFactoryDeploymentGroup.class);
          ManagedConnectionFactoryDeploymentGroup deployment = elem.getValue();
          repository.addManagedConnectionFactoryDeploymentGroup(deployment);
          return deployment;
-         
       }      
       finally
       {