[jboss-osgi-commits] JBoss-OSGI SVN: r100143 - in projects/jboss-osgi: trunk/distribution/installer/src/main/resources/jbossas and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-01-29 13:35:27 -0500 (Fri, 29 Jan 2010) New Revision: 100143 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployer.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml Log: AS6 integration - WIP Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployer.java 2010-01-29 18:33:01 UTC (rev 100142) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployer.java 2010-01-29 18:35:27 UTC (rev 100143) @@ -23,7 +23,6 @@ import org.jboss.classloading.spi.dependency.policy.ClassLoaderPolicyModule; import org.jboss.classloading.spi.metadata.ClassLoadingMetaData; -import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer; import org.jboss.osgi.framework.classloading.OSGiModule; @@ -36,8 +35,31 @@ */ public class OSGiModuleDeployer extends VFSClassLoaderDescribeDeployer { + /* [TODO] We don't need to overwrite deploy if the base class can handle an already attached Module + public void deploy(DeploymentUnit unit, ClassLoadingMetaData metaData) throws DeploymentException + { + // If there is no module attached proceed as normal + Module module = unit.getAttachment(Module.class); + if (module == null) + { + super.deploy(unit, metaData); + return; + } + + // If there is already a module attached and this is an OSGi deployment + // remove the old module and create a new OSGiModule + if (metaData instanceof OSGiClassLoadingMetaData) + { + ClassLoading classLoading = getClassLoading(); + classLoading.removeModule(module); + unit.removeAttachment(Module.class); + super.deploy(unit, metaData); + } + } + */ + @Override - protected ClassLoaderPolicyModule createModule(DeploymentUnit unit, ClassLoadingMetaData metaData) throws DeploymentException + protected ClassLoaderPolicyModule createModule(DeploymentUnit unit, ClassLoadingMetaData metaData) { return new OSGiModule(unit, metaData); } Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-01-29 18:33:01 UTC (rev 100142) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-01-29 18:35:27 UTC (rev 100143) @@ -207,6 +207,10 @@ <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property> </bean> <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/> + + <!-- bean name="OSGiModuleDeployer" class="org.jboss.osgi.framework.deployers.OSGiModuleDeployer"> + <property name="classLoading"><inject bean="ClassLoading" /></property> + </bean --> <!-- ******************************** Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml 2010-01-29 18:33:01 UTC (rev 100142) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml 2010-01-29 18:35:27 UTC (rev 100143) @@ -40,7 +40,7 @@ JBOSS_VERSION=jboss-6.0.0-SNAPSHOT SERVER_NAME=default -JBOSS_HOME=$WORKSPACE/jbossas/build/output/$JBOSS_VERSION +JBOSS_HOME=$WORKSPACE/jbossas/build/target/$JBOSS_VERSION JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_VERSION.zip JBOSS_BINDADDR=(a)jboss.bind.address@