[jboss-osgi-commits] JBoss-OSGI SVN: r93687 - in projects/jboss-osgi: projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration and 2 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-18 07:51:46 -0400 (Fri, 18 Sep 2009)
New Revision: 93687

Modified:
   projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
Log:
Remove XB support from runtime-jbossas

Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-09-18 11:51:46 UTC (rev 93687)
@@ -76,13 +76,10 @@
             http://jira.codehaus.org/browse/MDEP-175 
           -->
           <includeArtifactIds>
-            jboss-osgi-apache-xerces,jboss-osgi-jaxb,jboss-osgi-microcontainer,jboss-osgi-xml-binding
+            jboss-osgi-microcontainer
           </includeArtifactIds>
           <includes>
-            org/jboss/osgi/jaxb/*.class, 
-            org/jboss/osgi/jbossxb/*.class, 
-            org/jboss/osgi/microcontainer/integration/*.class,
-            org/jboss/osgi/xml/*.class
+            org/jboss/osgi/microcontainer/integration/*.class
           </includes>
         </configuration>
       </plugin>

Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java	2009-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java	2009-09-18 11:51:46 UTC (rev 93687)
@@ -90,9 +90,9 @@
       KernelController controller = kernel.getController();
 
       // Register the XMLBindingService 
-      XMLBindingService xbService = new XMLBindingService(){};
-      bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
-      log.debug("XMLBindingService registered");
+      //XMLBindingService xbService = new XMLBindingService(){};
+      //bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
+      //log.debug("XMLBindingService registered");
       
       // Preregister some MC beans
       installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, bundleContext);

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-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-18 11:51:46 UTC (rev 93687)
@@ -359,7 +359,9 @@
         <include name="jboss-osgi-common-core.jar" />
         <include name="jboss-osgi-jaxb.jar" />
         <include name="jboss-osgi-jmx.jar" />
+        <include name="jboss-osgi-jndi.jar" />
         <include name="jboss-osgi-webconsole.jar" />
+        <include name="jboss-osgi-xml-binding.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
         <include name="org.apache.felix.log.jar" />
       </fileset>
@@ -430,11 +432,6 @@
         override="true">
         <include name="org.osgi.compendium.jar" />
       </fileset>
-      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
-        override="true">
-        <include name="jboss-osgi-jndi.jar" />
-        <include name="jboss-osgi-xml-binding.jar" />
-      </fileset>
 
     </pack>
 

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2009-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2009-09-18 11:51:46 UTC (rev 93687)
@@ -40,7 +40,6 @@
             org.jboss.osgi.spi.service;version=1.0,
             org.jboss.osgi.spi.testing;version=1.0,
             org.jboss.osgi.spi.util;version=1.0, 
-            org.jboss.osgi.xml;version=1.0,
             
             <!-- jboss -->
             org.jboss.beans.metadata.plugins;version=2.0,