Author: thomas.diesler(a)jboss.com Date: 2009-11-27 12:48:55 -0500 (Fri, 27 Nov 2009) New Revision: 97115 Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/pom.xml Log: Fix runtime for MC framework Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-27 16:53:45 UTC (rev 97114) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-27 17:48:55 UTC (rev 97115) @@ -186,8 +186,9 @@ </Embed-Dependency> <_exportcontents> org.jboss.xb.annotations;version=${version.jboss.xb}, + org.jboss.xb.binding.resolver;version=${version.jboss.xb}, org.jboss.xb.binding.sunday.unmarshalling;version=${version.jboss.xb}, - org.jboss.xb.binding;version=${version.jboss.xb}, + org.jboss.xb.util;version=${version.jboss.xb}, </_exportcontents> </instructions> </configuration> Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java 2009-11-27 16:53:45 UTC (rev 97114) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java 2009-11-27 17:48:55 UTC (rev 97115) @@ -38,7 +38,7 @@ */ public interface UnmarshallerService { - void setFeature(String featureName, Boolean flag); + void setFeature(String featureName, boolean flag); void setValidation(boolean validation); Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java 2009-11-27 16:53:45 UTC (rev 97114) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java 2009-11-27 17:48:55 UTC (rev 97115) @@ -66,7 +66,7 @@ log.debug("UnmarshallerService using: " + bundleLoader); } - public void setFeature(String featureName, Boolean flag) + public void setFeature(String featureName, boolean flag) { factory.setFeature(featureName, flag); } Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-27 16:53:45 UTC (rev 97114) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-27 17:48:55 UTC (rev 97115) @@ -40,7 +40,7 @@ <!-- Properties --> <properties> <version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix> - <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> + <version.jboss.deployers>2.0.9.GA</version.jboss.deployers> <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer> <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> Modified: 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 2009-11-27 16:53:45 UTC (rev 97114) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java 2009-11-27 17:48:55 UTC (rev 97115) @@ -24,15 +24,16 @@ // $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.osgi.jbossxb.UnmarshallerService; import org.jboss.osgi.spi.NotImplementedException; import org.jboss.virtual.VirtualFile; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; +import org.jboss.xb.util.JBossXBHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; +import org.xml.sax.InputSource; /** * A {@link BeanDeployer} that that delegates to the {@link UnmarshallerService}. @@ -70,12 +71,12 @@ } @Override - protected JBossXBDeployerHelper<KernelDeployment> getHelper() + protected JBossXBHelper<KernelDeployment> getHelper() { return new EmbeddedDeployerHelper<KernelDeployment>(getOutput()); } - class EmbeddedDeployerHelper<T> extends JBossXBDeployerHelper<T> + class EmbeddedDeployerHelper<T> extends JBossXBHelper<T> { protected EmbeddedDeployerHelper(Class<T> output) { @@ -83,35 +84,34 @@ } @Override - public void setFeature(String featureName, Boolean flag) throws Exception + public void setFeature(String featureName, boolean flag) throws Exception { UnmarshallerService unmarshaller = getUnmarshallerService(systemContext); unmarshaller.setFeature(featureName, flag); } - + @Override @SuppressWarnings("unchecked") - public T parse(VirtualFile file) throws Exception + public T parse(InputSource source) throws Exception { UnmarshallerService unmarshaller = getUnmarshallerService(systemContext); - return (T)unmarshaller.unmarshal(file.openStream()); + return (T)unmarshaller.unmarshal(source); } - // Below are the methods that are not (yet) implemented @Override - public <U> U parse(Class<U> expectedType, VirtualFile file, U root, ObjectModelFactory omf) throws Exception + public <U> U parse(Class<U> expectedType, InputSource source, U root, ObjectModelFactory omf) throws Exception { throw new NotImplementedException(); } @Override - public <U> U parse(Class<U> expectedType, VirtualFile file) throws Exception + public <U> U parse(Class<U> expectedType, InputSource source) throws Exception { throw new NotImplementedException(); } @Override - public T parse(VirtualFile file, T root, ObjectModelFactory omf) throws Exception + public T parse(InputSource source, T root, ObjectModelFactory omf) throws Exception { throw new NotImplementedException(); } Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-11-27 16:53:45 UTC (rev 97114) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-11-27 17:48:55 UTC (rev 97115) @@ -147,6 +147,7 @@ <include name="jboss-osgi-jndi-sources.jar" /> <include name="jboss-osgi-jta-sources.jar" /> <include name="jboss-osgi-microcontainer-sources.jar" /> + <include name="jboss-osgi-reflect-sources.jar" /> <include name="jboss-osgi-runtime-equinox-sources.jar" /> <include name="jboss-osgi-runtime-felix-sources.jar" /> <include name="jboss-osgi-runtime-jbossas-sources.jar" /> @@ -239,6 +240,7 @@ <include name="jboss-osgi-husky.jar" /> <include name="jboss-osgi-jaxb.jar" /> <include name="jboss-osgi-jta.jar" /> + <include name="jboss-osgi-reflect.jar" /> <include name="jboss-osgi-xml-binding.jar" /> </fileset> @@ -382,6 +384,7 @@ <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> <include name="jboss-osgi-webconsole.jar" /> + <include name="jboss-osgi-reflect.jar" /> <include name="jboss-osgi-xml-binding.jar" /> <include name="pax-web-jetty-bundle.jar" /> <include name="org.apache.felix.log.jar" /> Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2009-11-27 16:53:45 UTC (rev 97114) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-11-27 17:48:55 UTC (rev 97115) @@ -251,6 +251,17 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-reflect</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-reflect</artifactId> + <version>${version.jboss.osgi.reflect}</version> + <classifier>sources</classifier> + </dependency> + <!-- jboss-osgi-reflect: no javadoc --> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-webapp</artifactId> <version>${version.jboss.osgi.webapp}</version> <classifier>sources</classifier>