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

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

Author: thomas.diesler at jboss.com
Date: 2009-10-21 14:25:10 -0400 (Wed, 21 Oct 2009)
New Revision: 95329

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties
   projects/jboss-osgi/trunk/reactor/deployment/pom.xml
Log:
Fix felix runtime/jboss startup

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-10-21 18:15:16 UTC (rev 95328)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-10-21 18:25:10 UTC (rev 95329)
@@ -258,9 +258,11 @@
         <include name="org.apache.felix.framework.jar" />
       </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
-        <include name="jboss-osgi-deployment.jar" />
         <include name="org.osgi.compendium.jar" />
       </fileset>
+      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
+        <include name="jboss-osgi-deployment.jar" />
+      </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
         <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.metatype.jar" />

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties	2009-10-21 18:15:16 UTC (rev 95328)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties	2009-10-21 18:25:10 UTC (rev 95329)
@@ -30,8 +30,6 @@
    org.apache.log4j;version=1.2, \
    org.jboss.logging, \
    org.jboss.net.protocol, \
-   org.jboss.osgi.deployment.common;version=1.0, \
-   org.jboss.osgi.deployment.deployer;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/server/conf/jboss-osgi-felix-default.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties	2009-10-21 18:15:16 UTC (rev 95328)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties	2009-10-21 18:25:10 UTC (rev 95329)
@@ -24,8 +24,6 @@
    org.apache.log4j;version=1.2, \
    org.jboss.logging, \
    org.jboss.net.protocol, \
-   org.jboss.osgi.deployment.common;version=1.0, \
-   org.jboss.osgi.deployment.deployer;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/server/conf/jboss-osgi-felix-minimal.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties	2009-10-21 18:15:16 UTC (rev 95328)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties	2009-10-21 18:25:10 UTC (rev 95329)
@@ -10,8 +10,6 @@
 org.osgi.framework.system.packages.extra=\
    org.apache.log4j;version=1.2, \
    org.jboss.logging, \
-   org.jboss.osgi.deployment.common;version=1.0, \
-   org.jboss.osgi.deployment.deployer;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/server/conf/jboss-osgi-felix-web.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties	2009-10-21 18:15:16 UTC (rev 95328)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties	2009-10-21 18:25:10 UTC (rev 95329)
@@ -30,8 +30,6 @@
    org.apache.log4j;version=1.2, \
    org.jboss.logging, \
    org.jboss.net.protocol, \
-   org.jboss.osgi.deployment.common;version=1.0, \
-   org.jboss.osgi.deployment.deployer;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/reactor/deployment/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/pom.xml	2009-10-21 18:15:16 UTC (rev 95328)
+++ projects/jboss-osgi/trunk/reactor/deployment/pom.xml	2009-10-21 18:25:10 UTC (rev 95329)
@@ -76,11 +76,24 @@
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.jboss.osgi.deployment.internal.DeploymentServicesActivator</Bundle-Activator>
             <Export-Package>
-              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.scanner;version=1.0,
+              org.jboss.osgi.deployment.common;version=${version},
+              org.jboss.osgi.deployment.deployer;version=${version},
+              org.jboss.osgi.deployment.interceptor;version=${version},
+              org.jboss.osgi.deployment.scanner;version=${version},
             </Export-Package>
+            <Import-Package>
+              javax.management, 
+              org.jboss.osgi.spi.capability;version=1.0, 
+              org.jboss.osgi.spi.logging;version=1.0, 
+              org.jboss.osgi.spi.management;version=1.0, 
+              org.jboss.osgi.spi.util;version=1.0, 
+              org.jboss.virtual, 
+              org.osgi.framework, 
+              org.osgi.service.packageadmin, 
+              org.osgi.service.startlevel, 
+              org.osgi.util.tracker, 
+              org.slf4j
+            </Import-Package>
             <Private-Package>
               org.jboss.osgi.deployment.internal
             </Private-Package>