[jboss-osgi-commits] JBoss-OSGI SVN: r93109 - in projects/jboss-osgi/trunk: distribution/installer/runtime/conf and 8 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-09-01 20:01:15 -0400 (Tue, 01 Sep 2009) New Revision: 93109 Added: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-all.xml projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-default.xml projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-web.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/FrameworkLaunchTestCase.java Removed: projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleFrameworkLaunchTestCase.java Modified: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: More MC runtime installer Deleted: projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-bootstrap.xml 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-bootstrap.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -1,160 +0,0 @@ -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - ******************************** - * * - * OSGi Framework * - * * - ******************************** - --> - - <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager"> - <constructor> - <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> - <parameter><inject bean="MainDeployer" /></parameter> - </constructor> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/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, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging;version=2.0, - - org.jboss.osgi.spi;version=1.0, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.framework;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 - </value></entry> - <!-- Hot Deployment --> - <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</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"> - </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> - <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - - <!-- - ******************************** - * * - * OSGi Deployment * - * * - ******************************** - --> - - <!-- 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"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/> - <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> - - <!-- - ******************************** - * * - * OSGi Classloading * - * * - ******************************** - --> - - <!-- ClassLoading --> - <bean name="ClassLoaderSystem" 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 Added: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-all.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-all.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-all.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -0,0 +1,175 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * OSGi Framework * + * * + ******************************** + --> + + <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager"> + <constructor> + <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> + <parameter><inject bean="MainDeployer" /></parameter> + </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.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, + org.jboss.beans.metadata.spi;version=2.0, + org.jboss.beans.metadata.spi.builder;version=2.0, + org.jboss.dependency.spi;version=2.0, + org.jboss.kernel.spi.dependency;version=2.0, + org.jboss.logging;version=2.0, + + org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.framework;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 + </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> + </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> + <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + + <!-- + ******************************** + * * + * OSGi Deployment * + * * + ******************************** + --> + + <!-- 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"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/> + <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> + + <!-- + ******************************** + * * + * OSGi Classloading * + * * + ******************************** + --> + + <!-- ClassLoading --> + <bean name="ClassLoaderSystem" 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 Property changes on: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-all.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-default.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-default.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-default.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -0,0 +1,164 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * OSGi Framework * + * * + ******************************** + --> + + <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager"> + <constructor> + <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> + <parameter><inject bean="MainDeployer" /></parameter> + </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.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, + org.jboss.beans.metadata.spi;version=2.0, + org.jboss.beans.metadata.spi.builder;version=2.0, + org.jboss.dependency.spi;version=2.0, + org.jboss.kernel.spi.dependency;version=2.0, + org.jboss.logging;version=2.0, + + org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.framework;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 + </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> + </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> + <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + + <!-- + ******************************** + * * + * OSGi Deployment * + * * + ******************************** + --> + + <!-- 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"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/> + <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> + + <!-- + ******************************** + * * + * OSGi Classloading * + * * + ******************************** + --> + + <!-- ClassLoading --> + <bean name="ClassLoaderSystem" 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 Property changes on: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-default.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml (from rev 93088, projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-bootstrap.xml) =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -0,0 +1,161 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * OSGi Framework * + * * + ******************************** + --> + + <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager"> + <constructor> + <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> + <parameter><inject bean="MainDeployer" /></parameter> + </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.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, + org.jboss.beans.metadata.spi;version=2.0, + org.jboss.beans.metadata.spi.builder;version=2.0, + org.jboss.dependency.spi;version=2.0, + org.jboss.kernel.spi.dependency;version=2.0, + org.jboss.logging;version=2.0, + + org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.framework;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 + </value></entry> + <!-- Hot Deployment --> + <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</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> + <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + + <!-- + ******************************** + * * + * OSGi Deployment * + * * + ******************************** + --> + + <!-- 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"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/> + <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> + + <!-- + ******************************** + * * + * OSGi Classloading * + * * + ******************************** + --> + + <!-- ClassLoading --> + <bean name="ClassLoaderSystem" 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 Added: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-web.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-web.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-web.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -0,0 +1,175 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * OSGi Framework * + * * + ******************************** + --> + + <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager"> + <constructor> + <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> + <parameter><inject bean="MainDeployer" /></parameter> + </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.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, + org.jboss.beans.metadata.spi;version=2.0, + org.jboss.beans.metadata.spi.builder;version=2.0, + org.jboss.dependency.spi;version=2.0, + org.jboss.kernel.spi.dependency;version=2.0, + org.jboss.logging;version=2.0, + + org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.framework;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 + </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> + </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> + <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + + <!-- + ******************************** + * * + * OSGi Deployment * + * * + ******************************** + --> + + <!-- 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"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/> + <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> + + <!-- + ******************************** + * * + * OSGi Classloading * + * * + ******************************** + --> + + <!-- ClassLoading --> + <bean name="ClassLoaderSystem" 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 Property changes on: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-bootstrap-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties 2009-09-02 00:01:15 UTC (rev 93109) @@ -21,11 +21,6 @@ org.jboss.osgi.jndi.rmi.port=1098 org.jboss.osgi.jndi.port=1099 -# Remote Logging -org.jboss.osgi.service.remote.log.sender=true -org.jboss.osgi.service.remote.log.host=${jboss.bind.address} -org.jboss.osgi.service.remote.log.port=5400 - # Husky socket connector properties org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address} org.jboss.osgi.husky.runtime.connector.port=5401 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-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -221,7 +221,6 @@ <include name="jboss-osgi-apache-xerces.jar" /> <include name="jboss-osgi-blueprint.jar" /> <include name="jboss-osgi-jaxb.jar" /> - <include name="jboss-osgi-microcontainer.jar" /> <include name="jboss-osgi-xml-binding.jar" /> </fileset> @@ -239,6 +238,9 @@ <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib/apache-felix&quot; targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> + <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true"> + <include name="jboss-osgi-microcontainer.jar" /> + </fileset> <!-- Equinox Integration --> @@ -250,10 +252,16 @@ <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.eclipse.osgi.services.jar" /> </fileset> + <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true"> + <include name="jboss-osgi-microcontainer.jar" /> + </fileset> <!-- JBossMC Integration --> - <singlefile condition="isJBossMC" src=&quot;(a){runtime.dir}/conf/jboss-osgi-bootstrap.xml&quot; target="$INSTALL_PATH/runtime/conf/META-INF/jboss-osgi-bootstrap.xml" override="true"/> + <singlefile condition="isJBossMC" src=&quot;(a){runtime.dir}/server/conf/jboss-osgi-bootstrap-minimal.xml&quot; target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml" override="true"/> + <singlefile condition="isJBossMC" src=&quot;(a){runtime.dir}/server/conf/jboss-osgi-bootstrap-default.xml&quot; target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-bootstrap.xml" override="true"/> + <singlefile condition="isJBossMC" src=&quot;(a){runtime.dir}/server/conf/jboss-osgi-bootstrap-web.xml&quot; target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml" override="true"/> + <singlefile condition="isJBossMC" src=&quot;(a){runtime.dir}/server/conf/jboss-osgi-bootstrap-all.xml&quot; target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml" override="true"/> <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/lib" override="true"> <include name="jboss-classloader.jar" /> <include name="jboss-classloading.jar" /> @@ -278,8 +286,10 @@ <include name="jboss-reflect.jar" /> <include name="jbossxb.jar" /> </fileset> - <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib/org.osgi&quot; targetdir="$INSTALL_PATH/runtime/lib" override="true"> + <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib/apache-felix&quot; targetdir="$INSTALL_PATH/runtime/lib" override="true"> <include name="org.osgi.core.jar" /> + </fileset> + <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib/apache-felix&quot; targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/pom.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -241,6 +241,16 @@ <modules> <module>distribution</module> </modules> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> </profile> </profiles> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -35,6 +35,11 @@ <version>1.0.0.Beta1</version> </parent> + <!-- Properties --> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> + </properties> + <!-- Dependencies --> <dependencies> <dependency> Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/FrameworkLaunchTestCase.java (from rev 93088, projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleFrameworkLaunchTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/FrameworkLaunchTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/FrameworkLaunchTestCase.java 2009-09-02 00:01:15 UTC (rev 93109) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.example.simple; + +//$Id: $ + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.jboss.osgi.spi.framework.OSGiBootstrap; +import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.test.osgi.example.simple.bundle.SimpleService; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.launch.Framework; + +/** + * A test that deployes a bundle and verifies its state + * + * @author thomas.diesler(a)jboss.com + * @since 28-Aug-2009 + */ +public class FrameworkLaunchTestCase extends OSGiTest +{ + @Test + public void testSimpleBundle() throws Exception + { + OSGiBootstrapProvider bootstrapProvider = OSGiBootstrap.getBootstrapProvider(); + Framework framework = bootstrapProvider.getFramework(); + framework.start(); + + BundleContext sysContext = framework.getBundleContext(); + + Bundle bundle = sysContext.installBundle(getBundleLocation("example-simple.jar")); + assertEquals("example-simple", bundle.getSymbolicName()); + + bundle.start(); + assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState()); + + BundleContext bndContext = bundle.getBundleContext(); + assertNotNull("BundleContext not null", bndContext); + + // getServiceReference from bundle context + ServiceReference sref = bndContext.getServiceReference(SimpleService.class.getName()); + assertNotNull("ServiceReference not null", sref); + + // getServiceReference from system context + sref = sysContext.getServiceReference(SimpleService.class.getName()); + assertNotNull("ServiceReference not null", sref); + + bundle.uninstall(); + assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState()); + + framework.stop(); + framework.waitForStop(5000); + } + + private String getBundleLocation(String jarname) + { + return getTestArchiveURL(jarname).toExternalForm(); + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleFrameworkLaunchTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleFrameworkLaunchTestCase.java 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleFrameworkLaunchTestCase.java 2009-09-02 00:01:15 UTC (rev 93109) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.example.simple; - -//$Id: SimpleTestCase.java 91196 2009-07-14 09:41:15Z thomas.diesler(a)jboss.com $ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.jboss.osgi.spi.framework.OSGiBootstrap; -import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.OSGiTest; -import org.jboss.test.osgi.example.simple.bundle.SimpleService; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.launch.Framework; - -/** - * A test that deployes a bundle and verifies its state - * - * @author thomas.diesler(a)jboss.com - * @since 28-Aug-2009 - */ -public class SimpleFrameworkLaunchTestCase extends OSGiTest -{ - @Test - public void testSimpleBundle() throws Exception - { - OSGiBootstrapProvider bootstrapProvider = OSGiBootstrap.getBootstrapProvider(); - Framework framework = bootstrapProvider.getFramework(); - framework.start(); - - BundleContext sysContext = framework.getBundleContext(); - - Bundle bundle = sysContext.installBundle(getBundleLocation("example-simple.jar")); - assertEquals("example-simple", bundle.getSymbolicName()); - - bundle.start(); - assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState()); - - BundleContext bndContext = bundle.getBundleContext(); - assertNotNull("BundleContext not null", bndContext); - - // getServiceReference from bundle context - ServiceReference sref = bndContext.getServiceReference(SimpleService.class.getName()); - assertNotNull("ServiceReference not null", sref); - - // getServiceReference from system context - sref = sysContext.getServiceReference(SimpleService.class.getName()); - assertNotNull("ServiceReference not null", sref); - - bundle.uninstall(); - assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState()); - - framework.stop(); - framework.waitForStop(5000); - } - private String getBundleLocation(String jarname) - { - return getTestArchiveURL(jarname).toExternalForm(); - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -48,13 +48,11 @@ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> <property name="autoInstall"> <list elementClass="java.net.URL"> - <!-- [JBOSGI-136] Cannot resolve dependency against unstarted bundle - <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value --> + <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> </list> </property> <property name="autoStart"> <list elementClass="java.net.URL"> - <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value> <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value> </list> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -32,10 +32,11 @@ <!-- Limit categories --> <!-- ================ --> - <!-- Show jboss deployer traces --> - <category name="org.jboss"> + <!-- Show jboss deployer traces + <category name="org.jboss.deployer"> <priority value="TRACE" /> </category> + --> <!-- ======================= --> <!-- Setup the Root category --> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -37,13 +37,11 @@ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> <property name="autoInstall"> <list elementClass="java.net.URL"> - <!-- [JBOSGI-136] Cannot resolve dependency against unstarted bundle - <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value --> + <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> </list> </property> <property name="autoStart"> <list elementClass="java.net.URL"> - <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value> <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value> </list> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-01 23:59:46 UTC (rev 93108) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-02 00:01:15 UTC (rev 93109) @@ -192,6 +192,9 @@ --> <!-- default to felix --> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> + </properties> <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId> @@ -215,6 +218,9 @@ <value>equinox</value> </property> </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties> + </properties> <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId> @@ -244,6 +250,9 @@ <value>felix</value> </property> </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> + </properties> <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId>