From: Adrian B. <adr...@jb...> - 2005-05-19 16:39:41
|
User: adrian Date: 05/05/19 12:39:19 Modified: src/main/org/jboss/kernel/plugins/deployment/xml BeanXMLDeployer.java Log: Reinstate the stream method Revision Changes Path 1.3 +2 -5 microkernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: BeanXMLDeployer.java =================================================================== RCS file: /cvsroot/jboss/microkernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- BeanXMLDeployer.java 12 May 2005 21:11:47 -0000 1.2 +++ BeanXMLDeployer.java 19 May 2005 16:39:18 -0000 1.3 @@ -23,7 +23,7 @@ * @author <a href="ad...@jb...">Adrian Brock</a> * @author <a href="mailto:les...@jb...">Les A. Hazlewood</a> * @author <a href="mailto:mar...@jb...">Marc Fleury</a> - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class BeanXMLDeployer extends AbstractKernelDeployer { @@ -80,13 +80,12 @@ */ public KernelDeployment deploy(String deploymentName, InputStream stream) throws Throwable { - /* boolean trace = log.isTraceEnabled(); if (trace) log.trace("Parsing " + deploymentName); Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - KernelDeployment deployment = null; TODO: (KernelDeployment) unmarshaller.unmarshal(stream, schemaBinding); + KernelDeployment deployment = (KernelDeployment) unmarshaller.unmarshal(stream, schemaBinding); if (deployment == null) throw new RuntimeException("The deployment " + deploymentName + " is not well formed!"); deployment.setName(deploymentName); @@ -98,7 +97,5 @@ log.trace("Deployed " + deployment.getInstalledContexts()); return deployment; - */ - return null; } } |