[jboss-osgi-commits] JBoss-OSGI SVN: r102231 - in projects/jboss-osgi/projects/runtime/framework/trunk: bundle and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-10 11:46:31 -0500 (Wed, 10 Mar 2010) New Revision: 102231 Removed: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml Log: Update to the latest stable kernel Use jboss-vfs-3.0.x from now on Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-10 16:34:39 UTC (rev 102230) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-10 16:46:31 UTC (rev 102231) @@ -167,14 +167,19 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers-vfs30</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs21</artifactId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> <version>${version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs21</artifactId> + <artifactId>jboss-osgi-vfs30</artifactId> <scope>test</scope> </dependency> <dependency> @@ -312,7 +317,7 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs21</artifactId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> <version>${version}</version> </dependency> </dependencies> @@ -333,7 +338,7 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs21</artifactId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> <version>${version}</version> </dependency> </dependencies> Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java 2010-03-10 16:34:39 UTC (rev 102230) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java 2010-03-10 16:46:31 UTC (rev 102231) @@ -1,112 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2009, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file 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.classloader; - -// $Id$ - -import static org.junit.Assert.fail; - -import java.net.URL; - -import org.jboss.classloader.plugins.jdk.AbstractJDKChecker; -import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem; -import org.jboss.classloader.spi.ClassLoaderDomain; -import org.jboss.classloader.spi.ClassLoaderPolicy; -import org.jboss.classloader.spi.ClassLoaderSystem; -import org.jboss.classloader.spi.ParentPolicy; -import org.jboss.classloader.spi.filter.ClassFilterUtils; -import org.jboss.classloader.spi.filter.PackageClassFilter; -import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy; -import org.jboss.logging.Logger; -import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.testing.OSGiTestHelper; -import org.jboss.virtual.VFS; -import org.jboss.virtual.VirtualFile; -import org.junit.Before; -import org.junit.Test; -import org.osgi.framework.Bundle; - -/** - * ClassLoaderDomainUnitTestCase. - * - * @author Thomas.Diesler(a)jboss.com - * @since 03-Sep-2009 - */ -public class ClassLoaderDomainUnitTestCase -{ - private static final String OSGI_CLASSLOADER_DOMAIN = "OSGiDomain"; - private ClassLoaderSystem classLoaderSystem; - - @Before - public void setUp() - { - classLoaderSystem = new DefaultClassLoaderSystem(); - AbstractJDKChecker.getExcluded().add(getClass()); - } - - @Test - public void testSystemPolicy() throws Exception - { - ClassLoaderDomain domain = new ClassLoaderDomain(OSGI_CLASSLOADER_DOMAIN); - classLoaderSystem.registerDomain(domain); - - // Setup the class filter - String filteredPackages = Logger.class.getPackage().getName(); - PackageClassFilter classFilter = PackageClassFilter.createPackageClassFilterFromString(filteredPackages); - classFilter.setIncludeJava(true); - - domain.setParentPolicy(new ParentPolicy(classFilter, ClassFilterUtils.NOTHING)); - - URL coreURL = new OSGiTestHelper().getTestArchiveURL("bundles/org.osgi.core.jar"); - VirtualFile coreVF = VFS.createNewRoot(coreURL); - - ClassLoaderPolicy systemPolicy = new VFSClassLoaderPolicy("OSGiSystemPolicy", new VirtualFile[] { coreVF }); - ClassLoader classLoader = classLoaderSystem.registerClassLoaderPolicy(OSGI_CLASSLOADER_DOMAIN, systemPolicy); - - // Load JDK class - assertLoadClass(classLoader, String.class.getName(), true); - - // Load from org.osgi.core - assertLoadClass(classLoader, Bundle.class.getName(), true); - - // Load from system classpath - assertLoadClass(classLoader, Logger.class.getName(), true); - - // No access to implementation - assertLoadClass(classLoader, OSGiBundleManager.class.getName(), false); - } - - private void assertLoadClass(ClassLoader classLoader, String name, boolean success) - { - try - { - classLoader.loadClass(name); - if (success == false) - fail("Expected ClassNotFoundException for '" + name + "' from " + classLoader); - } - catch (ClassNotFoundException ex) - { - if (success) - fail("Cannot load '" + name + "' from " + classLoader); - } - } -} Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-10 16:34:39 UTC (rev 102230) +++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-10 16:46:31 UTC (rev 102231) @@ -140,10 +140,6 @@ <artifactId>jboss-osgi-spi</artifactId> </dependency> <dependency> - <groupId>org.jboss.osgi.deployers</groupId> - <artifactId>jboss-osgi-deployers-vfs21</artifactId> - </dependency> - <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployment</artifactId> </dependency> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-10 16:34:39 UTC (rev 102230) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-10 16:46:31 UTC (rev 102231) @@ -11,7 +11,12 @@ <!-- $Id$ --> -<!-- Set these VM properties in your IDE debugger -Dlog4j.output.dir=${workspace_loc:jboss-osgi-framework/target} -Dlog4j.configuration=log4j-console.xml --> +<!-- + Set these VM properties in your IDE debugger + + -Dlog4j.output.dir=${workspace_loc:jboss-osgi-framework/target} + -Dlog4j.configuration=log4j-console.xml +--> <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> @@ -41,11 +46,11 @@ <version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin> <version.apache.felix.log>1.0.0</version.apache.felix.log> <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype> - <version.jboss.classloading>2.2.0.Alpha1</version.jboss.classloading> - <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> - <version.jboss.kernel>2.2.0.Alpha5</version.jboss.kernel> - <version.jboss.logging>2.1.0.GA</version.jboss.logging> - <version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr> + <version.jboss.classloading>2.2.0.Alpha3</version.jboss.classloading> + <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers> + <version.jboss.kernel>2.2.0.Alpha8</version.jboss.kernel> + <version.jboss.logging>2.2.0.CR1</version.jboss.logging> + <version.jboss.mdr>2.2.0.Alpha2</version.jboss.mdr> <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces> <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> @@ -282,7 +287,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs21</artifactId> + <artifactId>jboss-osgi-vfs30</artifactId> <version>${version.jboss.osgi.vfs}</version> </dependency> </dependencies> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-10 16:34:39 UTC (rev 102230) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-10 16:46:31 UTC (rev 102231) @@ -29,6 +29,8 @@ <!-- Properties --> <properties> + <version.jboss.classloading>2.2.0.Alpha1</version.jboss.classloading> + <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> </properties> <!-- Dependencies --> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml 2010-03-10 16:34:39 UTC (rev 102230) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml 2010-03-10 16:46:31 UTC (rev 102231) @@ -27,12 +27,6 @@ <version>1.0.0.Alpha4-SNAPSHOT</version> </parent> - <!-- Properties --> - <properties> - <version.jboss.classloading>2.2.0.Alpha3</version.jboss.classloading> - <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers> - </properties> - <!-- Dependencies --> <dependencies> <dependency>