Author: thomas.diesler(a)jboss.com Date: 2009-07-10 06:24:31 -0400 (Fri, 10 Jul 2009) New Revision: 91061 Added: projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/ projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml Log: Migrate AS integration to here Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 10:17:08 UTC (rev 91060) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061) @@ -33,6 +33,24 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> @@ -63,6 +81,14 @@ </includes> </configuration> </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>jboss-beans-*.xml</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> Added: projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml 2009-07-10 10:24:31 UTC (rev 91061) @@ -0,0 +1,18 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jboss-beans-*.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Copied: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml (from rev 91048, projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/resources/osgi-deployers-jboss-beans.xml) =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml 2009-07-10 10:24:31 UTC (rev 91061) @@ -0,0 +1,123 @@ +<?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.equinox.framework.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> + <entry><key>org.osgi.service.http.port</key><value>8090</value></entry> + <entry><key>osgi.framework</key><value>${jboss.server.home.url}/deployers/osgi.deployer/org.eclipse.osgi.jar</value></entry> + <entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</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 + </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.eclipse.osgi.services.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 Copied: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml (from rev 91048, projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml) =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-07-10 10:24:31 UTC (rev 91061) @@ -0,0 +1,147 @@ +<?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.felix.framework.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> + <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>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> + <entry> + <key>org.osgi.framework.system.packages.extra</key> + <value> + <!-- system --> + org.apache.xerces.dom, + + <!-- jboss-osgi --> + org.jboss.osgi.jmx;version=1.0, + org.jboss.osgi.jndi;version=1.0, + org.jboss.osgi.microcontainer;version=1.0, + 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.beans.metadata.plugins;version=2.0, + org.jboss.beans.metadata.plugins.builder;version=2.0, + org.jboss.beans.metadata.spi.builder;version=2.0, + org.jboss.beans.metadata.spi;version=2.0, + org.jboss.dependency.spi;version=2.0, + org.jboss.kernel.spi.dependency;version=2.0, + org.jboss.logging, + org.jboss.virtual, + org.jboss.virtual.plugins.registry, + org.jboss.virtual.plugins.context.jar, + org.jboss.virtual.plugins.vfs.helpers, + org.jboss.virtual.protocol, + org.jboss.xb.binding;version=2.0, + org.jboss.xb.binding.sunday.unmarshalling;version=2.0, + </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> + <!-- + Setup remote logging + --> + <entry><key>org.jboss.osgi.service.remote.log.sender</key><value>true</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.host</key><value>${jboss.bind.address}</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</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> + </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 Copied: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml (from rev 91048, projects/jboss-osgi/projects/runtime/knopflerfish/trunk/src/main/resources/osgi-deployers-jboss-beans.xml) =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml 2009-07-10 10:24:31 UTC (rev 91061) @@ -0,0 +1,129 @@ +<?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