[jboss-osgi-commits] JBoss-OSGI SVN: r100943 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-14 05:08:10 -0500 (Sun, 14 Feb 2010)
New Revision: 100943

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
Log:
Fix equinox AS integration

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml	2010-02-14 09:16:56 UTC (rev 100942)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml	2010-02-14 10:08:10 UTC (rev 100943)
@@ -34,15 +34,15 @@
             
             <!-- logging -->  
             org.apache.log4j;version=1.2,
-        	org.jboss.logging;version=2.1,
+            org.jboss.logging;version=2.1,
 
             <!-- jboss -->          
-        	org.jboss.net.protocol,
-        	org.jboss.virtual;version=2.1,
-        	org.jboss.virtual.plugins.registry;version=2.1,
-        	org.jboss.virtual.plugins.context.jar;version=2.1,
-        	org.jboss.virtual.plugins.vfs.helpers;version=2.1,
-        	org.jboss.virtual.protocol;version=2.1,
+            org.jboss.net.protocol,
+            org.jboss.virtual;version=2.1,
+            org.jboss.virtual.plugins.registry;version=2.1,
+            org.jboss.virtual.plugins.context.jar;version=2.1,
+            org.jboss.virtual.plugins.vfs.helpers;version=2.1,
+            org.jboss.virtual.protocol;version=2.1,
           
             <!-- jboss-osgi  -->          
             org.jboss.osgi.deployment.common;version=1.0,
@@ -53,9 +53,10 @@
             org.jboss.osgi.spi.framework;version=1.0,
             org.jboss.osgi.spi.management;version=1.0,
             org.jboss.osgi.spi.service;version=1.0,
-            org.jboss.osgi.spi.util;version=1.0
+            org.jboss.osgi.spi.util;version=1.0,
             
-        	org.osgi.framework;version=1.5
+            <!-- org.osgi -->
+            org.osgi.framework;version=1.5
           </value>
         </entry>
         <!-- 

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	2010-02-14 09:16:56 UTC (rev 100942)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2010-02-14 10:08:10 UTC (rev 100943)
@@ -31,18 +31,18 @@
             javax.xml.bind.annotation;version=2.1,
             org.apache.xerces.dom;version=2.9,
             org.jnp.interfaces;version=5.0,
-          
+            
             <!-- logging -->  
             org.apache.log4j;version=1.2,
-        	org.jboss.logging;version=2.1,
+            org.jboss.logging;version=2.1,
 
             <!-- jboss -->          
-        	org.jboss.net.protocol,
-        	org.jboss.virtual;version=2.1,
-        	org.jboss.virtual.plugins.registry;version=2.1,
-        	org.jboss.virtual.plugins.context.jar;version=2.1,
-        	org.jboss.virtual.plugins.vfs.helpers;version=2.1,
-        	org.jboss.virtual.protocol;version=2.1,
+            org.jboss.net.protocol,
+            org.jboss.virtual;version=2.1,
+            org.jboss.virtual.plugins.registry;version=2.1,
+            org.jboss.virtual.plugins.context.jar;version=2.1,
+            org.jboss.virtual.plugins.vfs.helpers;version=2.1,
+            org.jboss.virtual.protocol;version=2.1,
           
             <!-- jboss-osgi  -->          
             org.jboss.osgi.deployment.common;version=1.0,
@@ -53,9 +53,10 @@
             org.jboss.osgi.spi.framework;version=1.0,
             org.jboss.osgi.spi.management;version=1.0,
             org.jboss.osgi.spi.service;version=1.0,
-            org.jboss.osgi.spi.util;version=1.0
+            org.jboss.osgi.spi.util;version=1.0,
             
-        	org.osgi.framework;version=1.5
+            <!-- org.osgi -->
+            org.osgi.framework;version=1.5
           </value>
         </entry>
         <!--