Author: thomas.diesler(a)jboss.com Date: 2010-03-31 04:16:05 -0400 (Wed, 31 Mar 2010) New Revision: 103296 Removed: projects/jboss-osgi/legacy/microcontainer/trunk/.classpath projects/jboss-osgi/legacy/microcontainer/trunk/.project projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/legacy/microcontainer/trunk/pom.xml projects/jboss-osgi/legacy/microcontainer/trunk/scripts/antrun-test-jars.xml projects/jboss-osgi/legacy/microcontainer/trunk/scripts/assembly-bundles.xml projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedXMLDeployer.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocator.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocatorMBean.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerDeployerServiceImpl.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java projects/jboss-osgi/legacy/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/DeployerServiceTestCase.java projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/MicrocontainerServiceRefreshTestCase.java projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBeanMBean.java projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/log4j.xml projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-bundle.bnd projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-jboss-beans.xml Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java projects/jboss-osgi/projects/bundles/common/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/.classpath projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/.classpath projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.classpath projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jta/trunk/.classpath projects/jboss-osgi/projects/bundles/jta/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/webconsole/trunk/.classpath projects/jboss-osgi/projects/bundles/webconsole/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath projects/jboss-osgi/projects/runtime/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/pom.xml projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath projects/jboss-osgi/projects/runtime/equinox/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/felix/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/vfs/trunk/api/.classpath projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.classpath projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.classpath projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/trunk/pom.xml Log: [JBOSGI-299] WebConsole does not display on jbossas/trunk Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/.classpath =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/.project =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/.project 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/.project 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-microcontainer</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,12 +0,0 @@ -#Tue Feb 17 14:10:42 CET 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.maven.ide.eclipse.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/.settings/org.maven.ide.eclipse.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,9 +0,0 @@ -#Tue Feb 17 14:09:34 CET 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/pom.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/pom.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,366 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> - - <!-- $Id$ --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>JBossOSGi Bundles - Microcontainer</name> - <description>The JBossOSGi Microcontainer Service</description> - - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <packaging>bundle</packaging> - - <version>2.2.0-SNAPSHOT</version> - - <!-- Parent --> - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.4</version> - </parent> - - <!-- Subversion --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> - - <!-- Properties --> - <properties> - <version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix> - <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers> - <version.jboss.kernel>2.2.0-SNAPSHOT</version.jboss.kernel> - <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> - <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> - <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment> - <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> - <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx> - <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect> - <version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers> - <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding> - <version.osgi>4.2.0</version.osgi> - </properties> - - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss.deployers}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - <version>${version.jboss.kernel}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-deployers</artifactId> - <version>${version.jboss.osgi.runtime.deployers}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - </dependency> - - <!-- Provided Dependencies --> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common-core</artifactId> - <version>${version.jboss.osgi.common.core}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>${version.jboss.osgi.husky}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jaxb</artifactId> - <version>${version.jboss.osgi.jaxb}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-reflect</artifactId> - <version>${version.jboss.osgi.reflect}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-xml-binding</artifactId> - <version>${version.jboss.osgi.xml.binding}</version> - <scope>provided</scope> - </dependency> - - <!-- OSGi Dependencies --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> - - <!-- Test Dependencies --> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.microcontainer.internal.MicrocontainerServiceActivator</Bundle-Activator> - <Export-Package> - org.jboss.osgi.microcontainer;version=${version} - </Export-Package> - <Private-Package> - org.jboss.osgi.microcontainer.internal - </Private-Package> - <Import-Package> - javassist*;version="[3.9,4.0)", - - javax.management, - javax.management.openmbean, - javax.naming, - javax.xml.bind*, - javax.xml.parsers, - javax.xml.transform*, - javax.xml.validation, - - org.jboss.beans*;version="[2.2,2.3)", - org.jboss.classadapter.spi;version="[2.2,2.3)", - org.jboss.config*;version="[2.2,2.3)", - org.jboss.joinpoint*;version="[2.2,2.3)", - org.jboss.reflect*;version="[2.2,2.3)", - - org.jboss.logging, - - org.jboss.osgi.deployment.deployer;version="[1.0,1.1)", - org.jboss.osgi.jbossxb;version="[2.0,2.1)", - org.jboss.osgi.jmx;version="[1.0,1.1)", - org.jboss.osgi.spi*;version="[1.0,1.1)", - - org.jboss.util*, - - org.jboss.virtual*, - org.jboss.xb.annotations;version="[2.0,2.1)", - org.jboss.xb.binding*;version="[2.0,2.1)", - org.jboss.xb.util;version="[2.0,2.1)", - - org.osgi.framework, - org.osgi.service.packageadmin, - org.osgi.service.startlevel, - org.osgi.util.tracker, - - org.slf4j, - org.w3c.dom, - org.xml.sax, - - !junit*, - !org.jboss.test*, - </Import-Package> - <Embed-Transitive>true</Embed-Transitive> - <Embed-Dependency> - jboss-classloader;inline=false, - jboss-classloading;inline=false, - jboss-classloading-spi;inline=false, - jboss-classloading-vfs;inline=false, - jboss-dependency;inline=false, - jboss-deployers-client-spi;inline=false, - jboss-deployers-client;inline=false, - jboss-deployers-core-spi;inline=false, - jboss-deployers-core;inline=false, - jboss-deployers-impl;inline=false, - jboss-deployers-spi;inline=false, - jboss-deployers-structure-spi;inline=false, - jboss-deployers-vfs-spi;inline=false, - jboss-deployers-vfs;inline=false, - jboss-managed;inline=false, - jboss-metatype;inline=false, - jboss-mdr;inline=false, - jboss-osgi-deployers;inline=false, - jboss-kernel;inline=false, - mcann-core;inline=false, - </Embed-Dependency> - <_exportcontents> - org.jboss.beans.metadata*;version=${version.jboss.kernel}, - org.jboss.dependency.spi*;version=${version.jboss.kernel}, - org.jboss.kernel.spi*;version=${version.jboss.kernel}, - </_exportcontents> - </instructions> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>bundles</id> - <phase>test-compile</phase> - <goals> - <goal>directory-single</goal> - </goals> - <configuration> - <finalName>test-libs</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-bundles.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-test-jars</id> - <phase>integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="build.artifact" value="${project.build.finalName}" /> - <property name="artifactId" value="${artifactId}" /> - <ant antfile="scripts/antrun-test-jars.xml" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>surefire-integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <argLine>${surefire.jpda.args}</argLine> - <systemProperties> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <!-- Profiles --> - <profiles> - - <!-- - Name: jpda - Descr: Enable JPDA remote debuging - --> - <profile> - <id>jpda</id> - <activation> - <property> - <name>jpda</name> - </property> - </activation> - <properties> - <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args> - </properties> - </profile> - - </profiles> - -</project> Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/scripts/antrun-test-jars.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/scripts/antrun-test-jars.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<project default="build-test-jars"> - - <description>OSGi test archive builder</description> - - <!-- ================================================================== --> - <!-- Init --> - <!-- ================================================================== --> - - <target name="init"> - - <!-- Property override when not called from maven --> - <property name="maven.runtime.classpath" value="/usr/java/bnd.jar" /> - <property name="tests.output.dir" value="${basedir}/../target" /> - - <mkdir dir="${tests.output.dir}/test-libs" /> - <property name="tests.classes.dir" value="${tests.output.dir}/test-classes" /> - <property name="tests.resources.dir" value="${tests.output.dir}/test-classes" /> - - <taskdef resource="aQute/bnd/ant/taskdef.properties"> - <classpath> - <pathelement path="${maven.runtime.classpath}" /> - </classpath> - </taskdef> - - <!-- Copy build artifact to test-libs/bundles --> - <copy file="${tests.output.dir}/${build.artifact}.jar" tofile="${tests.output.dir}/test-libs/bundles/${artifactId}.jar" overwrite="true"/> - - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-test-jars" depends="init" description="Build the test deployments"> - - <!-- Please add alphabetically --> - - <!-- simple-unmarshaller --> - <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/simple-bundle.jar" files="${tests.resources.dir}/simple/simple-bundle.bnd" /> - - <!-- Please add alphabetically --> - - </target> - -</project> Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/scripts/assembly-bundles.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/scripts/assembly-bundles.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,35 +0,0 @@ -<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>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <!-- Dependency Sets --> - <dependencySets> - - <!-- bundle --> - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>*:jboss-osgi-apache-xerces:jar</include> - <include>*:jboss-osgi-common:jar</include> - <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-husky:jar</include> - <include>*:jboss-osgi-jaxb:jar</include> - <include>*:jboss-osgi-jndi:jar</include> - <include>*:jboss-osgi-jmx:jar</include> - <include>*:jboss-osgi-reflect:jar</include> - <include>*:jboss-osgi-xml-binding:jar</include> - <include>*:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - - </dependencySets> -</assembly> Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,212 +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.osgi.microcontainer; - -//$Id$ - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.deployers.client.spi.main.MainDeployer; -import org.jboss.deployers.spi.attachments.MutableAttachments; -import org.jboss.deployers.vfs.spi.client.VFSDeployment; -import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; -import org.jboss.osgi.deployment.deployer.AbstractDeployerService; -import org.jboss.osgi.deployment.deployer.DeployerService; -import org.jboss.osgi.deployment.deployer.Deployment; -import org.jboss.osgi.deployment.deployer.DeploymentRegistryService; -import org.jboss.virtual.VirtualFile; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * An abstract base implementation of the {@link DeployerService} that delegates to the MC - * provided deployer architecture. - * - * The jboss-osgi-microcontainer bundle and the jbossas integration both provide - * concrete implementations. - * - * @author thomas.diesler(a)jboss.com - * @since 02-Nov-2009 - */ -public abstract class AbstractMicrocontainerDeployerService extends AbstractDeployerService -{ - // Provide logging - private Logger log = LoggerFactory.getLogger(AbstractMicrocontainerDeployerService.class); - - private VFSDeploymentFactory deploymentFactory; - private ServiceTracker registryTracker; - - public abstract MainDeployer getMainDeployer(); - - public abstract BundleContext getBundleContext(); - - public void deploy(URL url) throws BundleException - { - Deployment dep = createDeployment(url); - deploy(new Deployment[] { dep }); - } - - public void undeploy(URL url) throws BundleException - { - DeploymentRegistryService registry = getDeploymentRegistry(); - Deployment dep = registry.getDeployment(url); - if (dep != null) - { - try - { - VFSDeployment vfsdep = dep.getAttachment(VFSDeployment.class); - if (vfsdep != null) - { - getMainDeployer().removeDeployment(vfsdep.getName()); - registry.unregisterDeployment(dep); - getMainDeployer().process(); - } - else - { - DeployerService service = getSystemDeployerService(); - service.undeploy(new Deployment[] { dep }); - } - } - catch (Exception ex) - { - log.warn("Cannot undeploy bundle", ex); - } - } - } - - public void deploy(Deployment[] depArr) throws BundleException - { - ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - try - { - Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); - - List<VFSDeployment> depList = new ArrayList<VFSDeployment>(); - DeploymentRegistryService registry = getDeploymentRegistry(); - - for (Deployment dep : depArr) - { - VirtualFile root = dep.getRoot(); - VFSDeployment vfsdep = createVFSDeployment(root); - dep.addAttachment(VFSDeployment.class, vfsdep); - registry.registerDeployment(dep); - depList.add(vfsdep); - - MutableAttachments att = (MutableAttachments)vfsdep.getPredeterminedManagedObjects(); - att.addAttachment(Deployment.class, dep); - - getMainDeployer().addDeployment(vfsdep); - } - - // Process the deployments - getMainDeployer().process(); - - // Check for completeness - VFSDeployment[] deploymentArr = depList.toArray(new VFSDeployment[depList.size()]); - getMainDeployer().checkComplete(deploymentArr); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new BundleException("Cannot deploy bundles", ex); - } - finally - { - Thread.currentThread().setContextClassLoader(ctxLoader); - } - } - - public void undeploy(Deployment[] depArr) throws BundleException - { - DeploymentRegistryService registry = getDeploymentRegistry(); - for (Deployment dep : depArr) - { - try - { - VFSDeployment vfsdep = dep.getAttachment(VFSDeployment.class); - if (vfsdep != null) - { - getMainDeployer().removeDeployment(vfsdep.getName()); - registry.unregisterDeployment(dep); - getMainDeployer().process(); - } - else - { - DeployerService service = getSystemDeployerService(); - service.undeploy(new Deployment[] { dep }); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - log.warn("Cannot undeploy bundles", ex); - } - } - } - - private DeployerService getSystemDeployerService() throws InvalidSyntaxException - { - BundleContext context = getBundleContext(); - ServiceReference[] srefs = context.getServiceReferences(DeployerService.class.getName(), "(provider=system)"); - if (srefs == null) - throw new IllegalStateException("Cannot obtain system DeployerService"); - - DeployerService service = (DeployerService)context.getService(srefs[0]); - return service; - } - - private VFSDeployment createVFSDeployment(VirtualFile root) - { - if (deploymentFactory == null) - deploymentFactory = VFSDeploymentFactory.getInstance(); - - return deploymentFactory.createVFSDeployment(root); - } - - private DeploymentRegistryService getDeploymentRegistry() - { - if (registryTracker == null) - { - registryTracker = new ServiceTracker(getBundleContext(), DeploymentRegistryService.class.getName(), null); - registryTracker.open(); - } - - DeploymentRegistryService service = (DeploymentRegistryService)registryTracker.getService(); - if (service == null) - throw new IllegalStateException("Cannot obtain DeploymentRegistryService"); - - return service; - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,157 +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.osgi.microcontainer; - -//$Id$ - -import static org.jboss.osgi.spi.management.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import javax.management.MBeanServer; -import javax.management.StandardMBean; - -import org.jboss.dependency.plugins.AbstractController; -import org.jboss.dependency.plugins.AbstractControllerContext; -import org.jboss.dependency.plugins.AbstractControllerContextActions; -import org.jboss.dependency.plugins.action.ControllerContextAction; -import org.jboss.dependency.spi.ControllerContext; -import org.jboss.dependency.spi.ControllerContextActions; -import org.jboss.dependency.spi.ControllerState; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * An abstract base implementation of the {@link MicrocontainerService}. - * - * The jboss-osgi-microcontainer bundle and the jbossas integration both provide - * concrete implementations. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Jan-2009 - */ -public abstract class AbstractMicrocontainerService implements MicrocontainerService -{ - // Provide logging - private Logger log = LoggerFactory.getLogger(AbstractMicrocontainerService.class); - - public abstract Kernel getKernel(); - - public List<String> getRegisteredBeans() - { - List<String> names = new ArrayList<String>(); - - AbstractController controller = (AbstractController)getKernel().getController(); - for (ControllerContext ctx : controller.getAllContexts()) - { - if (ctx instanceof KernelControllerContext || ctx instanceof PreInstalledControllerContext) - names.add(ctx.getName().toString()); - } - - return names; - } - - public Object getRegisteredBean(String beanName) - { - ControllerContext context = getKernel().getController().getInstalledContext(beanName); - return context != null ? context.getTarget() : null; - } - - @SuppressWarnings("unchecked") - public <T> T getRegisteredBean(Class<T> clazz, String beanName) - { - return (T)getRegisteredBean(beanName); - } - - protected void installBean(KernelController controller, String beanName, Object beanImpl) - { - try - { - ControllerContextActions actions = new AbstractControllerContextActions(new HashMap<ControllerState, ControllerContextAction>()); - controller.install(new PreInstalledControllerContext(beanName, actions, beanImpl)); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Throwable ex) - { - throw new IllegalStateException("Cannot install bean: " + beanName, ex); - } - } - - protected void uninstallBean(KernelController controller, String beanName) - { - try - { - controller.uninstall(beanName); - } - catch (Throwable ex) - { - log.warn("Cannot uninstall bean: " + beanName, ex); - } - } - - protected void registerMicrocontainerServiceMBean(MBeanServer mbeanServer) - { - try - { - StandardMBean mbean = new StandardMBean((MicrocontainerServiceMBean)this, MicrocontainerServiceMBean.class); - mbeanServer.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE); - } - catch (Exception ex) - { - throw new IllegalStateException("Cannot register MicrocontainerServiceMBean", ex); - } - } - - protected void unregisterMicrocontainerServiceMBean(MBeanServer mbeanServer) - { - if (mbeanServer.isRegistered(MBEAN_MICROCONTAINER_SERVICE)) - { - try - { - log.debug("Unregister MicrocontainerServiceMBean"); - mbeanServer.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE); - } - catch (Exception ex) - { - log.warn("Cannot unregister MicrocontainerServiceMBean", ex); - } - } - } - - static class PreInstalledControllerContext extends AbstractControllerContext - { - public PreInstalledControllerContext(Object name, ControllerContextActions actions, Object target) - { - super(name, actions, null, target); - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,53 +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.osgi.microcontainer; - -//$Id$ - -import org.jboss.osgi.jbossxb.XMLBindingCapability; -import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.service.MicrocontainerService; - -/** - * Adds the Microcontainer capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link MicrocontainerService} is already registered. - * - * Installed bundles: jboss-osgi-microcontainer.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class MicrocontainerCapability extends Capability -{ - public MicrocontainerCapability() - { - super(MicrocontainerService.class.getName()); - - addDependency(new JMXCapability()); - addDependency(new XMLBindingCapability()); - - addBundle("bundles/jboss-osgi-microcontainer.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeanDeployer.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,137 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2006, 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.osgi.microcontainer.internal; - -// $Id$ - -import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer; -import org.jboss.kernel.spi.deployment.KernelDeployment; -import org.jboss.osgi.jbossxb.UnmarshallerService; -import org.jboss.osgi.spi.NotImplementedException; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; -import org.jboss.xb.util.JBossXBHelper; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.xml.sax.InputSource; - -/** - * A {@link BeanDeployer} that that delegates to the {@link UnmarshallerService}. - * - * @author thomas.diesler(a)jboss.com - * @since 30-Jun-2009 - */ -public class EmbeddedBeanDeployer extends BeanDeployer -{ - @Override - protected JBossXBHelper<KernelDeployment> getHelper() - { - return new EmbeddedDeployerHelper<KernelDeployment>(getOutput()); - } - - class EmbeddedDeployerHelper<T> extends JBossXBHelper<T> - { - protected EmbeddedDeployerHelper(Class<T> output) - { - super(output); - } - - @Override - public void setFeature(String featureName, boolean flag) throws Exception - { - // Get the UnmarshallerService in the context of the microcontainer bundle - BundleContext context = FrameworkUtil.getBundle(getClass()).getBundleContext(); - UnmarshallerService unmarshaller = EmbeddedXMLDeployer.getUnmarshallerService(context); - unmarshaller.setFeature(featureName, flag); - } - - @Override - @SuppressWarnings("unchecked") - public T parse(InputSource source) throws Exception - { - // Get the UnmarshallerService in the context of the microcontainer bundle - BundleContext context = FrameworkUtil.getBundle(getClass()).getBundleContext(); - UnmarshallerService unmarshaller = EmbeddedXMLDeployer.getUnmarshallerService(context); - return (T)unmarshaller.unmarshal(source); - } - - @Override - public <U> U parse(Class<U> expectedType, InputSource source, U root, ObjectModelFactory omf) throws Exception - { - throw new NotImplementedException(); - } - - @Override - public <U> U parse(Class<U> expectedType, InputSource source) throws Exception - { - throw new NotImplementedException(); - } - - @Override - public T parse(InputSource source, T root, ObjectModelFactory omf) throws Exception - { - throw new NotImplementedException(); - } - - @Override - public void addTypeBinding(String namespace, Class<?> metadata) - { - throw new NotImplementedException(); - } - - @Override - public DefaultSchemaResolver getResolver() - { - throw new NotImplementedException(); - } - - @Override - public boolean isUseSchemaValidation() - { - throw new NotImplementedException(); - } - - @Override - public boolean isUseValidation() - { - throw new NotImplementedException(); - } - - @Override - public void removeTypeBinding(String namespace) - { - throw new NotImplementedException(); - } - - @Override - public void setUseSchemaValidation(boolean useSchemaValidation) - { - throw new NotImplementedException(); - } - - @Override - public void setUseValidation(boolean useValidation) - { - throw new NotImplementedException(); - } - } -} Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,59 +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.osgi.microcontainer.internal; - -// $Id$ - -import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Boostrap the Microcontainer - * - * @author thomas.diesler(a)jboss.com - * @since 27-Jun-2008 - */ -public class EmbeddedKernelBootstrap extends BasicBootstrap -{ - // Provide logging - private static Logger log = LoggerFactory.getLogger(EmbeddedKernelBootstrap.class); - - public EmbeddedKernelBootstrap(BundleContext context) - { - // Get or bootstrap the kernel - if (kernel == null) - { - try - { - super.bootstrap(); - log.debug("bootstrap kernel: " + kernel); - } - catch (Throwable e) - { - throw new IllegalStateException("Cannot bootstrap kernel", e); - } - kernel = getKernel(); - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedXMLDeployer.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedXMLDeployer.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedXMLDeployer.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,125 +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.osgi.microcontainer.internal; - -// $Id$ - -import java.net.URL; - -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.deployment.BasicKernelDeployer; -import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer; -import org.jboss.kernel.spi.deployment.KernelDeployment; -import org.jboss.logging.Logger; -import org.jboss.osgi.jbossxb.UnmarshallerService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -/** - * An XML deployer that unlike the {@link BasicXMLDeployer} does not cache - * classes in static singletons. - * - * @author thomas.diesler(a)jboss.com - * @since 27-Jun-2008 - */ -public class EmbeddedXMLDeployer extends BasicKernelDeployer -{ - // Provide Logging - private static final Logger log = Logger.getLogger(EmbeddedXMLDeployer.class); - - private BundleContext context; - - /** - * Create a new XML deployer - * - * @param context the bundle context - * @param kernel the kernel - */ - public EmbeddedXMLDeployer(BundleContext context, Kernel kernel) - { - super(kernel, null); - this.context = context; - } - - /** - * Deploy a url - * - * @param url the url to deploy - * @return the kernel deployment - * @throws Throwable for any error - */ - public KernelDeployment deploy(final URL url) throws Throwable - { - final boolean trace = log.isTraceEnabled(); - - if (url == null) - throw new IllegalArgumentException("Null url"); - - if (trace) - log.trace("Parsing " + url); - - long start = System.currentTimeMillis(); - - UnmarshallerService unmarshaller = EmbeddedXMLDeployer.getUnmarshallerService(context); - KernelDeployment deployment = (KernelDeployment)unmarshaller.unmarshal(url.toString()); - if (deployment == null) - throw new RuntimeException("The xml " + url + " is not well formed!"); - - deployment.setName(url.toString()); - - if (trace) - { - long now = System.currentTimeMillis(); - log.trace("Parsing " + url + " took " + (now - start) + " milliseconds"); - } - - deploy(deployment); - - if (trace) - { - long now = System.currentTimeMillis(); - log.trace("Deploying " + url + " took " + (now - start) + " milliseconds"); - } - - return deployment; - } - - static UnmarshallerService getUnmarshallerService(BundleContext context) - { - ServiceReference sref = context.getServiceReference(UnmarshallerService.class.getName()); - if (sref == null) - throw new IllegalStateException("Cannot obtain: " + UnmarshallerService.class.getName()); - - UnmarshallerService unmarshaller = (UnmarshallerService)context.getService(sref); - unmarshaller.addClassBinding("urn:jboss:aop-beans:1.0", "org.jboss.aop.microcontainer.beans.metadata.AOPDeployment"); - unmarshaller.addClassBinding("urn:jboss:bean-deployer", "org.jboss.kernel.plugins.deployment.AbstractKernelDeployment10"); - unmarshaller.addClassBinding("urn:jboss:bean-deployer:2.0", "org.jboss.kernel.plugins.deployment.AbstractKernelDeployment"); - unmarshaller.addClassBinding("urn:jboss:javabean:1.0", "org.jboss.javabean.plugins.jaxb.JavaBean10"); - unmarshaller.addClassBinding("urn:jboss:javabean:2.0", "org.jboss.javabean.plugins.jaxb.JavaBean20"); - unmarshaller.addClassBinding("urn:jboss:policy:1.0", "org.jboss.beans.metadata.plugins.policy.AbstractPolicyMetaData"); - unmarshaller.addClassBinding("urn:jboss:classloading:1.0", "org.jboss.classloading.spi.metadata.ClassLoadingMetaData10"); - unmarshaller.addClassBinding("urn:jboss:classloader:1.0", "org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10"); - unmarshaller.addClassBinding("urn:jboss:deployers:2.0", "org.jboss.deployers.vfs.plugins.xb.SchemaResolverDeployerMetaData"); - - return unmarshaller; - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocator.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocator.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocator.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,48 +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.osgi.microcontainer.internal; - -//$Id$ - -import org.jboss.kernel.Kernel; - -/** - * An MBean that allows the the microcontainer bundle to - * register its kernel instance with the MBeanServer. - * - * @author thomas.diesler(a)jboss.com - * @since 30-Nov-2009 - */ -public class KernelLocator implements KernelLocatorMBean -{ - private Kernel kernel; - - public KernelLocator(Kernel kernel) - { - this.kernel = kernel; - } - - public Kernel getKernel() - { - return kernel; - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocatorMBean.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocatorMBean.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/KernelLocatorMBean.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,46 +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.osgi.microcontainer.internal; - -//$Id$ - -import javax.management.ObjectName; - -import org.jboss.kernel.Kernel; -import org.jboss.osgi.spi.management.ObjectNameFactory; - -/** - * An MBean that allows the the microcontainer bundle to - * register its kernel instance with the MBeanServer. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Jan-2009 - */ -public interface KernelLocatorMBean -{ - /** - * The object name under which the KernelLocator is registered: 'jboss.osgi:service=KernelLocator' - */ - ObjectName MBEAN_KERNEL_LOCATOR = ObjectNameFactory.create("jboss.osgi:service=KernelLocator"); - - Kernel getKernel(); -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerDeployerServiceImpl.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerDeployerServiceImpl.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerDeployerServiceImpl.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,60 +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.osgi.microcontainer.internal; - -//$Id$ - -import org.jboss.deployers.client.spi.main.MainDeployer; -import org.jboss.osgi.deployment.deployer.DeployerService; -import org.jboss.osgi.microcontainer.AbstractMicrocontainerDeployerService; -import org.osgi.framework.BundleContext; - -/** - * An implementation of the {@link DeployerService} which is installed as a bundle. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Jan-2009 - */ -public class MicrocontainerDeployerServiceImpl extends AbstractMicrocontainerDeployerService -{ - private BundleContext context; - private MainDeployer mainDeployer; - - public MicrocontainerDeployerServiceImpl(BundleContext context, MainDeployer mainDeployer) - { - this.context = context; - this.mainDeployer = mainDeployer; - } - - @Override - public BundleContext getBundleContext() - { - return context; - } - - @Override - public MainDeployer getMainDeployer() - { - return mainDeployer; - } - -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,56 +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.osgi.microcontainer.internal; - -//$Id$ - -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * A BundleActivator that registers the {@link MicrocontainerService} - * - * @author thomas.diesler(a)jboss.com - * @since 24-Apr-2009 - */ -public class MicrocontainerServiceActivator implements BundleActivator -{ - private MicrocontainerServiceImpl mcService; - - public void start(BundleContext context) - { - // Do nothing if this bundle gets installed on the jbossmc framework - String systemBundleName = context.getBundle(0).getSymbolicName(); - if ("org.jboss.osgi.framework".equals(systemBundleName)) - return; - - mcService = new MicrocontainerServiceImpl(context); - mcService.start(); - } - - public void stop(BundleContext context) - { - if (mcService != null) - mcService.stop(); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,180 +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.osgi.microcontainer.internal; - -//$Id$ - -import static org.osgi.framework.Constants.OBJECTCLASS; - -import java.net.URL; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -import javax.management.MBeanServer; - -import org.jboss.deployers.client.spi.main.MainDeployer; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.osgi.deployment.deployer.DeployerService; -import org.jboss.osgi.jbossxb.UnmarshallerService; -import org.jboss.osgi.microcontainer.AbstractMicrocontainerService; -import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.jboss.virtual.VFS; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.Filter; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; - -/** - * An implementation of the {@link MicrocontainerService} - * which is installed as a bundle. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Jan-2009 - */ -public class MicrocontainerServiceImpl extends AbstractMicrocontainerService implements MicrocontainerServiceMBean -{ - private BundleContext context; - private Kernel kernel; - - public MicrocontainerServiceImpl(BundleContext context) - { - this.context = context; - VFS.init(); - } - - public Kernel getKernel() - { - return kernel; - } - - void start() - { - // Setup a filter to track the JMX and XMLBinding service - Filter filter; - try - { - String jmxService = "(" + OBJECTCLASS + "=" + MBeanServer.class.getName() + ")"; - String xmlService = "(" + OBJECTCLASS + "=" + UnmarshallerService.class.getName() + ")"; - filter = context.createFilter("(|" + jmxService + xmlService + ")"); - } - catch (InvalidSyntaxException ex) - { - throw new IllegalArgumentException("Invalid filter syntax"); - } - - final MicrocontainerService mcService = this; - - // Register the MicrocontainerServiceMBean - ServiceTracker tracker = new ServiceTracker(context, filter, null) - { - UnmarshallerService xmlService; - MBeanServer mbeanServer; - - @Override - public Object addingService(ServiceReference sref) - { - Object service = super.addingService(sref); - - List<String> classList = Arrays.asList((String[])sref.getProperty(OBJECTCLASS)); - if (classList.contains(MBeanServer.class.getName())) - mbeanServer = (MBeanServer)service; - - if (classList.contains(UnmarshallerService.class.getName())) - xmlService = (UnmarshallerService)service; - - if (mbeanServer != null && xmlService != null) - { - initializeMicrocontainerService(mbeanServer); - - // Register the MicrocontainerService - context.registerService(MicrocontainerService.class.getName(), mcService, null); - - // Register the Microcontainer DeployerService - registerMicrocontainerDeployerService(); - - // Register the MicrocontainerServiceMBean - registerMicrocontainerServiceMBean(mbeanServer); - } - - return service; - } - }; - tracker.open(); - } - - void stop() - { - ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); - if (sref != null) - { - MBeanServer mbeanServer = (MBeanServer)context.getService(sref); - unregisterMicrocontainerServiceMBean(mbeanServer); - } - } - - private void initializeMicrocontainerService(MBeanServer mbeanServer) - { - ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - try - { - Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); - EmbeddedKernelBootstrap bootstrap = new EmbeddedKernelBootstrap(context); - - kernel = bootstrap.getKernel(); - KernelController controller = kernel.getController(); - BundleContext sysContext = context.getBundle(0).getBundleContext(); - - // Preregister some beans - installBean(controller, BEAN_BUNDLE_CONTEXT, sysContext); - installBean(controller, BEAN_KERNEL, kernel); - installBean(controller, BEAN_KERNEL_CONTROLLER, controller); - installBean(controller, BEAN_MBEAN_SERVER, mbeanServer); - - // Deploy the deployer beans - URL deployersURL = context.getBundle().getResource("META-INF/base-deployers-beans.xml"); - new EmbeddedXMLDeployer(context, kernel).deploy(deployersURL); - } - catch (Throwable th) - { - throw new IllegalStateException("Cannot initilize the MicrocontainerService", th); - } - finally - { - Thread.currentThread().setContextClassLoader(ctxLoader); - } - } - - private void registerMicrocontainerDeployerService() - { - Properties props = new Properties(); - props.setProperty("provider", "microcontainer"); - props.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); - MainDeployer mainDeployer = (MainDeployer)getRegisteredBean("MainDeployer"); - MicrocontainerDeployerServiceImpl deployerService = new MicrocontainerDeployerServiceImpl(context, mainDeployer); - context.registerService(DeployerService.class.getName(), deployerService, props); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/main/resources/META-INF/base-deployers-beans.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - The base deployers - - $Id$ ---> -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- 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> - - <!-- ModificationType structure processor --> - <bean name="ModificationTypeStructureProcessor" class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor"> - <incallback method="addMatcher"/> - <uncallback method="removeMatcher"/> - </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 name="structureProcessor"><inject bean="ModificationTypeStructureProcessor"/></property> - </bean> - </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> - - <!-- JAR Structure --> - <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"/> - - <!-- WAR Structure --> - <bean name="WARStructure" class="org.jboss.deployers.vfs.plugins.structure.war.WARStructure"/> - - <!-- File Structure --> - <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"/> - - <!-- POJO Deployment --> - - <bean name="BeanDeployer" class="org.jboss.osgi.microcontainer.internal.EmbeddedBeanDeployer"> - <property name="suffix">jboss-beans.xml</property> - </bean> - <bean name="KernelDeploymentDeployer" class="org.jboss.osgi.deployer.BundleContainedBeansDeployer"> - </bean> - <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> - <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor> - </bean> - - <!-- OSGi Deployment --> - - <bean name="BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> - <bean name="BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> - <bean name="BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property> - </bean> - <bean name="BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property> - </bean> - <bean name="BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property> - </bean> - <bean name="BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> - <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property> - </bean> - -</deployment> \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,82 +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.microcontainer; - -//$Id: BasicXMLBindingTestCase.java 97031 2009-11-26 14:54:08Z thomas.diesler(a)jboss.com $ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import java.util.List; - -import javax.management.ObjectName; - -import org.jboss.osgi.microcontainer.MicrocontainerCapability; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; -import org.jboss.osgi.testing.OSGiBundle; -import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTest; -import org.jboss.test.osgi.microcontainer.simple.SomeBeanMBean; -import org.junit.Test; - -/** - * Test MicrocontainerService - * - * @author thomas.diesler(a)jboss.com - * @since 26-Nov-2009 - */ -public class BasicMicrocontainerTestCase extends OSGiTest -{ - @Test - public void testMicrocontainerService() throws Exception - { - OSGiRuntime runtime = getDefaultRuntime(); - try - { - runtime.addCapability(new MicrocontainerCapability()); - - OSGiBundle bundle = runtime.installBundle("simple-bundle.jar"); - bundle.start(); - - // The bean should have registered itself to the MBeanServer - SomeBeanMBean someBean = MBeanProxy.get(SomeBeanMBean.class, SomeBeanMBean.MBEAN_NAME, runtime.getMBeanServer()); - assertEquals("hello", someBean.echo("hello")); - - // The service should be able to access the bean via the MicrocontainerService - assertEquals("hello", someBean.callSomeService("hello")); - - // Uninstall the user bundle - bundle.uninstall(); - - // Check that the beans are unregistered - ObjectName serviceOName = MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE; - MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, serviceOName, runtime.getMBeanServer()); - List<String> beanNames = mcService.getRegisteredBeans(); - assertFalse("SomeBean unregistered " + beanNames, beanNames.contains("SomeBean")); - } - finally - { - runtime.shutdown(); - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/DeployerServiceTestCase.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/DeployerServiceTestCase.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/DeployerServiceTestCase.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,74 +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.microcontainer; - -//$Id$ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.jboss.osgi.deployment.deployer.DeployerService; -import org.jboss.osgi.microcontainer.MicrocontainerCapability; -import org.jboss.osgi.testing.OSGiBundle; -import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiTest; -import org.junit.Test; - -/** - * Test Microcontainer DeployerService - * - * @author thomas.diesler(a)jboss.com - * @since 26-Nov-2009 - */ -public class DeployerServiceTestCase extends OSGiTest -{ - @Test - public void testMicrocontainerService() throws Exception - { - OSGiRuntime runtime = getDefaultRuntime(); - try - { - OSGiServiceReference sref = runtime.getServiceReference(DeployerService.class.getName()); - assertNotNull("DeployerService", sref); - assertEquals("system", sref.getProperty("provider")); - - runtime.addCapability(new MicrocontainerCapability()); - OSGiBundle serviceBundle = runtime.getBundle("jboss-osgi-microcontainer", null); - - sref = runtime.getServiceReference(DeployerService.class.getName()); - assertNotNull("DeployerService", sref); - assertEquals("microcontainer", sref.getProperty("provider")); - - // Uninstall the mc service bundle - serviceBundle.uninstall(); - - sref = runtime.getServiceReference(DeployerService.class.getName()); - assertNotNull("DeployerService", sref); - assertEquals("system", sref.getProperty("provider")); - } - finally - { - runtime.shutdown(); - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/MicrocontainerServiceRefreshTestCase.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/MicrocontainerServiceRefreshTestCase.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/MicrocontainerServiceRefreshTestCase.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,89 +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.microcontainer; - -//$Id: BasicXMLBindingTestCase.java 97031 2009-11-26 14:54:08Z thomas.diesler(a)jboss.com $ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.jboss.osgi.microcontainer.MicrocontainerCapability; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.jboss.osgi.testing.OSGiBundle; -import org.jboss.osgi.testing.OSGiPackageAdmin; -import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiTest; -import org.jboss.test.osgi.microcontainer.simple.SomeBeanMBean; -import org.junit.Test; -import org.osgi.framework.Bundle; - -/** - * Test MicrocontainerService restart - * - * @author thomas.diesler(a)jboss.com - * @since 26-Nov-2009 - */ -public class MicrocontainerServiceRefreshTestCase extends OSGiTest -{ - @Test - public void testMicrocontainerService() throws Exception - { - OSGiRuntime runtime = getDefaultRuntime(); - try - { - runtime.addCapability(new MicrocontainerCapability()); - - OSGiBundle serviceBundle = runtime.getBundle("jboss-osgi-microcontainer", null); - assertEquals("MicrocontainerService ACTIVE", Bundle.ACTIVE, serviceBundle.getState()); - - OSGiBundle bundle = runtime.installBundle("simple-bundle.jar"); - bundle.start(); - - // The service should be able to access the bean via the MicrocontainerService - SomeBeanMBean someBean = MBeanProxy.get(SomeBeanMBean.class, SomeBeanMBean.MBEAN_NAME, runtime.getMBeanServer()); - assertEquals("hello", someBean.callSomeService("hello")); - - // Uninstall the user bundle - bundle.uninstall(); - - // Refresh all packages. This should stop/start the MC bundle - OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin(); - packageAdmin.refreshPackages(null); - - // Wait some time for the refresh to finish - Thread.sleep(1000); - - // Check if the MC bundle is still active (or could be restarted) - assertEquals("MicrocontainerService ACTIVE", Bundle.ACTIVE, serviceBundle.getState()); - - // Check if the service is available - OSGiServiceReference sref = runtime.getServiceReference(MicrocontainerService.class.getName()); - assertNotNull("MicrocontainerService available", sref); - } - finally - { - runtime.shutdown(); - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,54 +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.microcontainer.simple; - -//$Id: SomeServiceActivator.java 89664 2009-06-02 12:55:10Z thomas.diesler(a)jboss.com $ - -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -/** - * A Service Activator - * - * @author thomas.diesler(a)jboss.com - * @since 24-Apr-2009 - */ -public class SimpleActivator implements BundleActivator -{ - public void start(BundleContext context) - { - ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); - MicrocontainerService service = (MicrocontainerService)context.getService(sref); - - SomeBean bean = (SomeBean)service.getRegisteredBean("SomeBean"); - if (bean == null) - throw new IllegalStateException("No MC bean"); - - context.registerService(SomeService.class.getName(), new SomeService(context), null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,67 +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.microcontainer.simple; - -import javax.management.MBeanServer; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -//$Id: SomeBean.java 93025 2009-08-31 13:10:16Z thomas.diesler(a)jboss.com $ - -public class SomeBean implements SomeBeanMBean -{ - private BundleContext bundleContext; - private MBeanServer mbeanServer; - - public void setMbeanServer(MBeanServer server) - { - this.mbeanServer = server; - } - - public void setBundleContext(BundleContext systemContext) - { - this.bundleContext = systemContext; - } - - public String echo(String msg) - { - return msg; - } - - public String callSomeService(String msg) - { - ServiceReference sref = bundleContext.getServiceReference(SomeService.class.getName()); - SomeService service = (SomeService)bundleContext.getService(sref); - return service.callSomeBean(msg); - } - - public void create() throws Exception - { - mbeanServer.registerMBean(this, MBEAN_NAME); - } - - public void destroy() throws Exception - { - mbeanServer.unregisterMBean(MBEAN_NAME); - } -} Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBeanMBean.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBeanMBean.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBeanMBean.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,37 +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.microcontainer.simple; - -import javax.management.ObjectName; - -import org.jboss.osgi.spi.management.ObjectNameFactory; - -//$Id: SomeBeanMBean.java 93025 2009-08-31 13:10:16Z thomas.diesler(a)jboss.com $ - -public interface SomeBeanMBean -{ - ObjectName MBEAN_NAME = ObjectNameFactory.create("jboss.osgi:bean=SomeBean"); - - String callSomeService(String msg); - - String echo(String msg); -} Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,54 +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.microcontainer.simple; - -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -//$Id: SomeService.java 93025 2009-08-31 13:10:16Z thomas.diesler(a)jboss.com $ - -public class SomeService -{ - private BundleContext context; - - public SomeService(BundleContext context) - { - this.context = context; - } - - public String callSomeBean(String msg) - { - MicrocontainerService mcService = getMicrocontainerService(); - SomeBean bean = (SomeBean)mcService.getRegisteredBean("SomeBean"); - return bean.echo(msg); - } - - private MicrocontainerService getMicrocontainerService() - { - ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); - if (sref == null) - throw new IllegalStateException("No MicrocontainerService"); - - return (MicrocontainerService)context.getService(sref); - } -} Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2010-03-31 08:16:05 UTC (rev 103296) @@ -1 +0,0 @@ -org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider \ No newline at end of file Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,44 +0,0 @@ -# -# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider -# -# $Id: jboss-osgi-framework.properties 97021 2009-11-26 12:40:11Z thomas.diesler(a)jboss.com $ -# - -# Felix config properties -felix.bootdelegation.implicit=false - -# Properties to configure the Framework -org.osgi.framework.storage=${test.archive.directory}/../osgi-store -org.osgi.framework.storage.clean=onFirstInit - -# Framework bootdelegation -org.osgi.framework.bootdelegation=sun.reflect - -# Extra System Packages -org.osgi.framework.system.packages.extra=\ - org.apache.log4j;version=1.2, \ - org.jboss.logging, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ - org.jboss.osgi.deployment.interceptor;version=1.0, \ - org.jboss.osgi.spi;version=1.0, \ - org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.management;version=1.0, \ - org.jboss.osgi.spi.service;version=1.0, \ - org.jboss.osgi.spi.util;version=1.0, \ - org.jboss.virtual;version=2.1, \ - org.jboss.virtual.plugins.registry;version=2.1, \ - org.jboss.virtual.plugins.context.jar;version=2.1, \ - org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ - org.jboss.virtual.plugins.vfs;version=2.1, \ - org.jboss.virtual.protocol;version=2.1, \ - org.osgi.framework;version=1.5, \ - org.slf4j;version=1.5 - -# Bundles that need to be installed with the Framework automatically -org.jboss.osgi.spi.framework.autoInstall=\ - file://${test.archive.directory}/bundles/org.osgi.compendium.jar - -# Bundles that need to be started automatically -org.jboss.osgi.spi.framework.autoStart=\ - file://${test.archive.directory}/bundles/jboss-osgi-common.jar Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/log4j.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/log4j.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <!-- ================================= --> - <!-- Preserve messages in a local file --> - <!-- ================================= --> - - <appender name="FILE" class="org.apache.log4j.FileAppender"> - <param name="File" value="${log4j.output.dir}/test.log"/> - <param name="Append" value="false"/> - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> - </layout> - </appender> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - <param name="Threshold" value="INFO" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" /> - </layout> - </appender> - - <!-- ================ --> - <!-- Limit categories --> - <!-- ================ --> - - <!-- Show jboss deployer traces - <category name="org.jboss.deployers"> - <priority value="TRACE" /> - </category> - --> - - <!-- Show jboss deployer traces --> - <category name="org.jboss.xb"> - <priority value="TRACE" /> - </category> - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root> - <!--appender-ref ref="CONSOLE"/--> - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-bundle.bnd =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-bundle.bnd 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-bundle.bnd 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,8 +0,0 @@ -# bnd build -classpath target/test-classes -output target/test-libs/simple-bundleA.jar src/test/resources/simple/simple-bundleA.bnd - -Bundle-SymbolicName: simple-bundleA -Bundle-Activator: org.jboss.test.osgi.microcontainer.simple.SimpleActivator -Export-Package: org.jboss.test.osgi.microcontainer.simple -Import-Package: org.slf4j, javax.management, org.jboss.osgi.spi.management, org.jboss.osgi.spi.service, org.osgi.framework -Include-Resource: META-INF/simple-jboss-beans.xml=simple-jboss-beans.xml --removeheaders: Include-Resource Deleted: projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-jboss-beans.xml =================================================================== --- projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-jboss-beans.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/legacy/microcontainer/trunk/src/test/resources/simple/simple-jboss-beans.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,9 +0,0 @@ -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - - <bean name="SomeBean" class="org.jboss.test.osgi.microcontainer.simple.SomeBean"> - <property name="bundleContext"><inject bean="jboss.osgi:service=BundleContext"/></property> - <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property> - </bean> - -</deployment> - Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Wed Feb 17 12:13:47 CET 2010 +#Tue Mar 30 18:57:01 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 @@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Wed Feb 17 12:14:28 CET 2010 +#Tue Mar 30 18:57:23 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -181,7 +181,6 @@ } @Test - @SuppressWarnings("unchecked") public void getComponentIds() throws Exception { if (context == null) @@ -201,7 +200,6 @@ } @Test - @SuppressWarnings("unchecked") public void testBeanMetadata() throws Exception { if (context == null) @@ -221,7 +219,6 @@ } @Test - @SuppressWarnings("unchecked") public void testServiceMetadata() throws Exception { if (context == null) @@ -254,7 +251,6 @@ } @Test - @SuppressWarnings("unchecked") public void testServiceReferenceMetadata() throws Exception { if (context == null) Modified: projects/jboss-osgi/projects/bundles/common/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/common/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Wed Feb 17 12:14:50 CET 2010 +#Tue Mar 30 18:57:47 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 @@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,5 +1,13 @@ -#Fri Mar 06 10:50:43 CET 2009 +#Tue Mar 30 19:01:00 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Fri Feb 19 13:11:57 CET 2010 +#Tue Mar 30 19:01:21 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,5 +1,13 @@ -#Mon May 25 10:37:00 CEST 2009 +#Tue Mar 30 19:01:44 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,5 +1,12 @@ -#Mon May 25 10:37:00 CEST 2009 +#Tue Mar 30 18:58:08 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.5</version> </parent> <!-- Subversion --> Modified: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**" kind="src" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Thu Feb 25 11:17:38 CET 2010 +#Tue Mar 30 19:02:39 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Tue Mar 16 19:25:11 CET 2010 +#Tue Mar 30 19:02:06 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,6 +1,13 @@ -#Fri Feb 19 14:29:59 CET 2010 +#Tue Mar 30 19:03:25 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,6 +1,13 @@ -#Fri Feb 19 14:37:55 CET 2010 +#Tue Mar 30 19:03:04 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/jta/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jta/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jta/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" path="src/test/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/bundles/jta/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jta/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/jta/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,5 +1,13 @@ -#Tue Apr 14 17:48:49 CEST 2009 +#Tue Mar 30 19:03:48 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,5 +1,12 @@ -#Fri Feb 13 10:13:14 CET 2009 +#Tue Mar 30 18:08:21 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.5</version> </parent> <!-- SCM --> @@ -46,8 +46,8 @@ <version.felix.scr>1.0.0</version.felix.scr> <version.felix.webconsole>1.2.10</version.felix.webconsole> <version.javax.servlet>2.4</version.javax.servlet> - <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> - <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment> + <version.jboss.osgi.spi>1.0.5</version.jboss.osgi.spi> <version.json>20070829</version.json> <version.osgi>4.2.0</version.osgi> </properties> @@ -61,7 +61,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.osgi.runtime</groupId> + <groupId>org.jboss.osgi.deployment</groupId> <artifactId>jboss-osgi-deployment</artifactId> <version>${version.jboss.osgi.deployment}</version> <scope>provided</scope> Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Thu Mar 04 13:45:30 CET 2010 +#Tue Mar 30 18:36:14 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Thu Mar 04 13:45:44 CET 2010 +#Tue Mar 30 18:37:37 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/pom.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/vfs30/pom.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -28,7 +28,7 @@ </parent> <properties> - <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers> + <version.jboss.deployers>2.2.0.Alpha4</version.jboss.deployers> </properties> <!-- Dependencies --> Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Tue Mar 02 21:52:19 CET 2010 +#Tue Mar 30 19:06:37 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -3,7 +3,7 @@ <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,5 +1,13 @@ -#Wed Apr 01 10:32:07 CEST 2009 +#Tue Mar 30 19:06:58 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/runtime/felix/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/felix/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Wed Feb 17 12:16:33 CET 2010 +#Tue Mar 30 19:07:17 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 @@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="src" path="src/main/resources"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java 2010-03-31 08:16:05 UTC (rev 103296) @@ -135,7 +135,30 @@ public ExportedPackage[] getExportedPackages(Bundle bundle) { List<ExportedPackage> exported = new ArrayList<ExportedPackage>(); + if (bundle != null) + { + exported = getExportedPackagesInternal(bundle); + } + else + { + for (Bundle aux : getBundleManager().getBundles()) + { + exported.addAll(getExportedPackagesInternal(aux)); + } + } + if (exported.size() == 0) + return null; + + ExportedPackage[] result = new ExportedPackage[exported.size()]; + exported.toArray(result); + + return result; + } + + private List<ExportedPackage> getExportedPackagesInternal(Bundle bundle) + { + List<ExportedPackage> exported = new ArrayList<ExportedPackage>(); AbstractBundleState absBundleState = AbstractBundleState.assertBundleState(bundle); if (absBundleState instanceof OSGiSystemState) { @@ -164,14 +187,7 @@ } } } - - if (exported.size() == 0) - return null; - - ExportedPackage[] result = new ExportedPackage[exported.size()]; - exported.toArray(result); - - return result; + return exported; } public ExportedPackage[] getExportedPackages(String name) Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Thu Feb 25 12:26:19 CET 2010 +#Tue Mar 30 19:07:41 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/runtime/vfs/trunk/api/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/vfs/trunk/api/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/vfs/trunk/api/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/vfs/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Thu Mar 11 22:29:34 CET 2010 +#Tue Mar 30 19:08:25 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.classpath 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.classpath 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/projects/runtime/vfs/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-31 08:16:05 UTC (rev 103296) @@ -1,4 +1,4 @@ -#Thu Mar 11 22:18:50 CET 2010 +#Tue Mar 30 19:08:43 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-03-31 08:08:37 UTC (rev 103295) +++ projects/jboss-osgi/trunk/pom.xml 2010-03-31 08:16:05 UTC (rev 103296) @@ -58,11 +58,11 @@ <version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.4</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> - <version.jboss.osgi.deployers>1.0.5</version.jboss.osgi.deployers> + <version.jboss.osgi.deployers>1.0.6-SNAPSHOT</version.jboss.osgi.deployers> <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment> <version.jboss.osgi.equinox>3.5.2</version.jboss.osgi.equinox> <version.jboss.osgi.felix>2.0.4</version.jboss.osgi.felix> - <version.jboss.osgi.framework>1.0.0.Alpha4</version.jboss.osgi.framework> + <version.jboss.osgi.framework>1.0.0.Alpha5-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.5</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.4</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP4</version.jboss.osgi.jaxb> @@ -75,7 +75,7 @@ <version.jboss.osgi.spi>1.0.5.SP1</version.jboss.osgi.spi> <version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs> <version.jboss.osgi.webapp>0.7.2.SP2</version.jboss.osgi.webapp> - <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> + <version.jboss.osgi.webconsole>1.0.3-SNAPSHOT</version.jboss.osgi.webconsole> <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP1</version.jboss.osgi.xml.binding> <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi>