8:40 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-08-17 09:40:37 -0400 (Mon, 17 Aug 2009)
New Revision: 92423
Removed:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/pom.xml
projects/jboss-osgi/trunk/reactor/runtime/
Log:
Fix AS integration
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-08-17 13:21:57 UTC
(rev 92422)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-08-17 13:40:37 UTC
(rev 92423)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-runtime-jbossas</artifactId>
<packaging>jar</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml 2009-08-17
13:21:57 UTC (rev 92422)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml 2009-08-17
13:40:37 UTC (rev 92423)
@@ -15,7 +15,7 @@
-->
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework"
class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
+ <bean name="jboss.osgi:service=Framework"
class="org.jboss.osgi.equinox.EquinoxIntegration">
<property name="properties">
<map keyClass="java.lang.String"
valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-08-17
13:21:57 UTC (rev 92422)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-08-17
13:40:37 UTC (rev 92423)
@@ -15,7 +15,7 @@
-->
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework"
class="org.jboss.osgi.felix.framework.FelixIntegration">
+ <bean name="jboss.osgi:service=Framework"
class="org.jboss.osgi.felix.FelixIntegration">
<property name="properties">
<map keyClass="java.lang.String"
valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
Deleted:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml 2009-08-17
13:21:57 UTC (rev 92422)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml 2009-08-17
13:40:37 UTC (rev 92423)
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- $Id$
--->
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!--
- ********************************
- * *
- * Framework *
- * *
- ********************************
- -->
-
- <!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework"
class="org.jboss.osgi.knopflerfish.framework.KnopflerfishIntegration">
- <property name="properties">
- <map keyClass="java.lang.String"
valueClass="java.lang.String">
-
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
-
<entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
-
<entry><key>org.osgi.framework.dir</key><value>${jboss.server.data.dir}/knopflerfish</value></entry>
-
<entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
- <entry>
- <key>org.osgi.framework.system.packages</key>
- <value>
- <!-- system -->
- javax.management,
- javax.xml.parsers,
- org.xml.sax,
-
- <!-- jboss-osgi -->
- org.jboss.osgi.spi;version=1.0,
- 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.service;version=1.0,
- org.jboss.osgi.spi.testing;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
-
- <!-- jboss -->
- org.jboss.logging,
- org.jboss.xb.binding;version=2.0,
- org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
-
- <!-- core -->
- org.osgi.framework;version=1.4,
- org.osgi.service.packageadmin;version=1.2,
- org.osgi.service.startlevel;version=1.1
- </value>
- </entry>
- <!--
- If set to 'true' bundles can be deployed in any order. Deployed bundle
will get started when their dependencies can be resolved.
- If set to 'false' bundles must be deployed in the order that is
required to start them.
- -->
-
<entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry>
- </map>
- </property>
- <property name="autoInstall">
- <list elementClass="java.net.URL">
-
<value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
- </list>
- </property>
- <property name="autoStart">
- <list elementClass="java.net.URL">
-
<value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value>
-
<value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value>
- </list>
- </property>
- </bean>
-
- <!-- The Framework Management -->
- <bean name="jboss.osgi:service=ManagedFramework"
class="org.jboss.osgi.spi.management.ManagedFramework">
- <property name="systemContext"><inject
bean="jboss.osgi:service=Framework"
property="bundleContext"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel"
property="mbeanServer"/></property>
- </bean>
-
- <!--
- ********************************
- * *
- * Services *
- * *
- ********************************
- -->
-
- <!-- Microcontainer Service -->
- <bean name="jboss.osgi:service=Microcontainer"
class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
- <property name="systemContext"><inject
bean="jboss.osgi:service=Framework"
property="bundleContext"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel"
property="mbeanServer"/></property>
- <property name="kernel"><inject
bean="jboss.kernel:service=Kernel" /></property>
- </bean>
-
- <!--
- ********************************
- * *
- * Deployers *
- * *
- ********************************
- -->
-
- <!-- The OSGi MetaData Deployer -->
- <bean name="jboss.osgi:service=BundleMetaDataDeployer"
class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
-
- <!-- The OSGi Bundle Structure Deployer -->
- <bean name="jboss.osgi:service=BundleStructureDeployer"
class="org.jboss.osgi.deployer.BundleStructureDeployer" />
-
- <!-- The OSGi Bundle Deployer -->
- <bean name="jboss.osgi:service=BundleRealDeployer"
class="org.jboss.osgi.deployer.BundleRealDeployer">
- <property name="systemContext"><inject
bean="jboss.osgi:service=Framework" property="bundleContext"
/></property>
- <property name="skipBundles"><inject
bean="jboss.osgi:service=Framework" property="autoInstall"
/></property>
- </bean>
-
- <!-- The Bundle ClassLoader Deployer -->
- <bean name="jboss.osgi:service=BundleClassLoaderDeployer"
class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
- <property name="systemContext"><inject
bean="jboss.osgi:service=Framework" property="bundleContext"
/></property>
- </bean>
-
- <!-- The Bundle Start/Stop Deployer -->
- <bean name="jboss.osgi:service=BundleStartStopDeployer"
class="org.jboss.osgi.deployer.BundleStartStopDeployer">
- <property name="systemContext"><inject
bean="jboss.osgi:service=Framework" property="bundleContext"
/></property>
- </bean>
-
- <!-- The Bundle Management Deployer -->
- <bean name="jboss.osgi:service=BundleManagementDeployer"
class="org.jboss.osgi.deployer.BundleManagementDeployer">
- <property name="mbeanServer"><inject bean="JMXKernel"
property="mbeanServer"/></property>
- </bean>
-
-</deployment>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-08-17 13:21:57 UTC (rev 92422)
+++ projects/jboss-osgi/trunk/pom.xml 2009-08-17 13:40:37 UTC (rev 92423)
@@ -55,7 +55,7 @@
<version.jboss.osgi.runtime.deployers>1.0.0</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>1.9.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
-
<version.jboss.osgi.runtime.jbossas>1.0.0</version.jboss.osgi.runtime.jbossas>
+
<version.jboss.osgi.runtime.jbossas>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.runtime.jbossmc>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
<version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webconsole>1.0.0</version.jboss.osgi.webconsole>
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-08-17 13:21:57 UTC (rev 92422)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-08-17 13:40:37 UTC (rev 92423)
@@ -76,6 +76,7 @@
<module>spi</module>
<module>runtime/equinox</module>
<module>runtime/felix</module>
+ <module>runtime/jbossas</module>
<module>runtime/jbossmc</module>
<module>bundles/common</module>
<module>blueprint</module>
Property changes on: projects/jboss-osgi/trunk/reactor/runtime
___________________________________________________________________
Name: svn:externals
- equinox
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
felix
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+ equinox
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
felix
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
jbossas
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...