[jboss-cvs] JBossAS SVN: r100940 - in projects/jboss-osgi/trunk/distribution: installer/src/main/resources/installer and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-13 11:25:37 -0500 (Sat, 13 Feb 2010)
New Revision: 100940

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
   projects/jboss-osgi/trunk/distribution/pom.xml
Log:
Dont install aries blueprint. It's now embedded in jboss blueprint

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	2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2010-02-13 16:25:37 UTC (rev 100940)
@@ -150,7 +150,6 @@
         <include name="jboss-osgi-runtime-equinox-sources.jar" />
         <include name="jboss-osgi-runtime-felix-sources.jar" />
         <include name="jboss-osgi-runtime-jbossas-sources.jar" />
-        <include name="jboss-osgi-serviceloader-sources.jar" />
         <include name="jboss-osgi-spi-sources.jar" />
         <include name="jboss-osgi-webapp-sources.jar" />
         <include name="jboss-osgi-webconsole-sources.jar" />
@@ -247,9 +246,7 @@
         <include name="jboss-osgi-jaxb.jar" />
         <include name="jboss-osgi-jta.jar" />
         <include name="jboss-osgi-reflect.jar" />
-        <include name="jboss-osgi-serviceloader.jar" />
         <include name="jboss-osgi-xml-binding.jar" />
-        <include name="org.apache.aries.blueprint.jar" />
         <include name="org.apache.aries.util.jar" />
       </fileset>
 
@@ -412,9 +409,7 @@
         <include name="jboss-osgi-jndi.jar" />
         <include name="jboss-osgi-webconsole.jar" />
         <include name="jboss-osgi-reflect.jar" />
-        <!-- include name="jboss-osgi-serviceloader.jar" / -->
         <include name="jboss-osgi-xml-binding.jar" />
-        <include name="org.apache.aries.blueprint.jar" />
         <include name="org.apache.aries.util.jar" />
         <include name="org.apache.felix.log.jar" />
         <include name="pax-web-jetty-bundle.jar" />

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties	2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties	2010-02-13 16:25:37 UTC (rev 100940)
@@ -22,6 +22,7 @@
   	org.jboss.osgi.deployment.common;version=1.0, \
   	org.jboss.osgi.deployment.deployer;version=1.0, \
   	org.jboss.osgi.deployment.interceptor;version=1.0, \
+    org.jboss.osgi.deployment.internal;version=1.0, \
   	org.jboss.osgi.spi;version=1.0, \
   	org.jboss.osgi.spi.capability;version=1.0, \
   	org.jboss.osgi.spi.framework;version=1.0, \

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties	2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties	2010-02-13 16:25:37 UTC (rev 100940)
@@ -22,6 +22,7 @@
   	org.jboss.osgi.deployment.common;version=1.0, \
   	org.jboss.osgi.deployment.deployer;version=1.0, \
   	org.jboss.osgi.deployment.interceptor;version=1.0, \
+    org.jboss.osgi.deployment.internal;version=1.0, \
   	org.jboss.osgi.spi;version=1.0, \
   	org.jboss.osgi.spi.capability;version=1.0, \
   	org.jboss.osgi.spi.framework;version=1.0, \

Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml	2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/pom.xml	2010-02-13 16:25:37 UTC (rev 100940)
@@ -346,10 +346,6 @@
     
     <!-- Aries Dependencies -->
     <dependency>
-      <groupId>org.apache.aries.blueprint</groupId>
-      <artifactId>org.apache.aries.blueprint</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.aries</groupId>
       <artifactId>org.apache.aries.util</artifactId>
     </dependency>