Author: thomas.diesler(a)jboss.com Date: 2009-06-30 15:19:06 -0400 (Tue, 30 Jun 2009) New Revision: 90703 Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml Log: [JBDEPLOY-202] BeansDeployer cannot be recycled Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-06-30 19:15:50 UTC (rev 90702) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-06-30 19:19:06 UTC (rev 90703) @@ -19,7 +19,7 @@ <!-- Properties --> <properties> - <version.jboss.deployers>2.0.5.GA</version.jboss.deployers> + <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer> <version.jboss.osgi.apache.xerces>2.9.1</version.jboss.osgi.apache.xerces> <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java 2009-06-30 19:19:06 UTC (rev 90703) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2006, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.microcontainer.internal; + +// $Id: $ + +import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer; +import org.jboss.deployers.vfs.spi.deployer.JBossXBDeployerHelper; +import org.jboss.kernel.spi.deployment.KernelDeployment; +import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverFactory; + +/** + * A {@link BeanDeployer} that provides a non-static {@link SchemaBindingResolver}. + * + * @author thomas.diesler(a)jboss.com + * @since 30-Jun-2009 + */ +public class EmbeddedBeanDeployer extends BeanDeployer +{ + private JBossXBDeployerHelper<KernelDeployment> helper; + + @Override + protected JBossXBDeployerHelper<KernelDeployment> getHelper() + { + if (helper == null) + helper = new EmbeddedDeployerHelper<KernelDeployment>(getOutput()); + + return helper; + } + + class EmbeddedDeployerHelper<T> extends JBossXBDeployerHelper<T> + { + private DefaultSchemaResolver resolver; + + protected EmbeddedDeployerHelper(Class<T> output) + { + super(output); + } + + @Override + public DefaultSchemaResolver getResolver() + { + if (resolver == null) + { + SchemaResolverFactory factory = EmbeddedSchemaResolverFactory.getInstance(); + resolver = (DefaultSchemaResolver)factory.getSchemaBindingResolver(); + } + return resolver; + } + } +} Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml 2009-06-30 19:15:50 UTC (rev 90702) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml 2009-06-30 19:19:06 UTC (rev 90703) @@ -66,7 +66,7 @@ <!-- POJO Deployment --> - <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"> + <bean name="BeanDeployer" class="org.jboss.osgi.microcontainer.internal.EmbeddedBeanDeployer"> <property name="suffix">jboss-beans.xml</property> </bean> <bean name="KernelDeploymentDeployer" class="org.jboss.osgi.deployer.BundleContainedBeansDeployer">