6:05 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-09-02 07:05:48 -0400 (Wed, 02 Sep 2009)
New Revision: 93124
Modified:
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-jbossmc.xml
Log:
#2 jbossas integration (wip)
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-02
10:15:43 UTC (rev 93123)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-02
11:05:48 UTC (rev 93124)
@@ -375,6 +375,13 @@
</fileset>
<singlefile condition="isJBossMC"
src="(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
override="true"/>
+ <fileset condition="isJBossMC"
dir="(a){deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/lib"
override="true">
+ <include name="jboss-classloading.jar" />
+ <include name="jboss-dependency.jar" />
+ </fileset>
+ <fileset condition="isJBossMC"
dir="(a){deploy.artifacts.dir}/lib/org.osgi"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
+ <include name="org.osgi.core.jar" />
+ </fileset>
<fileset condition="isJBossMC"
dir="(a){deploy.artifacts.dir}/lib/org.osgi"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
---
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-09-02
10:15:43 UTC (rev 93123)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-09-02
11:05:48 UTC (rev 93124)
@@ -15,11 +15,9 @@
</constructor>
<property name="properties">
<map keyClass="java.lang.String"
valueClass="java.lang.String">
-
<entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/osgi-store</value></entry>
+
<entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/data/osgi-store</value></entry>
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
- com.sun.xml.internal.bind.v2,
org.jboss.beans.metadata.plugins;version=2.0,
org.jboss.beans.metadata.plugins.builder;version=2.0,
@@ -38,43 +36,19 @@
org.jboss.osgi.spi.testing;version=1.0,
org.jboss.osgi.spi.util;version=1.0
</value></entry>
- <!-- Hot Deployment -->
-
<entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
<!-- Husky socket connector properties -->
<entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
<entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
<!-- HTTP Service Port -->
<entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
<!-- Config Admin Service -->
-
<entry><key>felix.cm.dir</key><value>${osgi.server.home}/data/osgi-configadmin</value></entry>
- <!-- JMX bundle properties -->
-
<entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
-
<entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
- <!-- JNDI bundle properties -->
-
<entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
-
<entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
-
<entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
+
<entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/data/osgi-configadmin</value></entry>
</map>
</property>
<incallback method="addPlugin" />
<uncallback method="removePlugin" />
</bean>
- <bean name="OSGiAutoInstallPlugin"
class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
- <property name="autoInstall">
- <list elementClass="java.net.URL">
-
<value>${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar</value>
- </list>
- </property>
- <property name="autoStart">
- <list elementClass="java.net.URL">
-
<value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value>
-
<value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value>
-
<value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value>
- </list>
- </property>
- </bean>
<bean name="OSGiFrameworkEventsPlugin"
class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
</bean>
@@ -93,47 +67,9 @@
********************************
-->
- <!-- The MainDeployer -->
- <bean name="MainDeployer"
class="org.jboss.deployers.plugins.main.MainDeployerImpl">
- <property name="structuralDeployers"><inject
bean="StructuralDeployers" /></property>
- <property name="deployers"><inject bean="Deployers"
/></property>
- </bean>
-
- <!-- The holder for deployers that determine structure -->
- <bean name="StructuralDeployers"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
- <property name="structureBuilder">
- <!-- The consolidator of the structure information -->
- <bean name="StructureBuilder"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder" />
- </property>
- <!-- Accept any implementor of structure deployer -->
- <incallback method="addDeployer" />
- <uncallback method="removeDeployer" />
- </bean>
-
- <!-- The holder for deployers that do real deployment -->
- <bean name="Deployers"
class="org.jboss.deployers.plugins.deployers.DeployersImpl">
- <constructor><parameter><inject
bean="jboss.kernel:service=KernelController"
/></parameter></constructor>
- <!-- Accept any implementor of deployer -->
- <incallback method="addDeployer" />
- <uncallback method="removeDeployer" />
- </bean>
-
<!-- Bundle Structure -->
<bean name="BundleStructure"
class="org.jboss.osgi.deployer.BundleStructureDeployer" />
- <!-- JAR & File Structure (needed for negative testing) -->
- <bean name="JARStructure"
class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure" />
- <bean name="FileStructure"
class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure" />
-
- <!-- POJO Deployment -->
- <bean name="BeanDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" />
- <bean name="KernelDeploymentDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer" />
- <bean name="BeanMetaDataDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
- <constructor>
- <parameter class="org.jboss.dependency.spi.Controller"><inject
bean="jboss.kernel:service=KernelController" /></parameter>
- </constructor>
- </bean>
-
<!-- OSGI Deployment -->
<bean name="OSGiManifestParsingDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer"
/>
<bean name="OSGiBundleStateDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
@@ -151,25 +87,8 @@
-->
<!-- ClassLoading -->
- <bean name="ClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
+ <bean name="OSGiClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
<constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
</bean>
- <bean name="ClassLoading"
class="org.jboss.classloading.spi.dependency.ClassLoading">
- <incallback method="addModule" state="Configured" />
- <uncallback method="removeModule" state="Configured" />
- </bean>
- <bean name="ClassLoadingDefaultDeployer"
class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
- <property name="defaultMetaData">
- <classloading xmlns="urn:jboss:classloading:1.0"
export-all="NON_EMPTY" import-all="true" />
- </property>
- </bean>
- <bean name="ClassLoaderClassPathDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"
/>
- <bean name="ClassLoaderDescribeDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
- <property name="classLoading"><inject
bean="ClassLoading" /></property>
- </bean>
- <bean name="ClassLoaderDeployer"
class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
- <property name="classLoading"><inject
bean="ClassLoading" /></property>
- <property name="system"><inject bean="ClassLoaderSystem"
/></property>
- </bean>
</deployment>
\ No newline at end of file