[jboss-osgi-commits] JBoss-OSGI SVN: r96801 - in projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT: .settings and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-11-24 05:10:55 -0500 (Tue, 24 Nov 2009) New Revision: 96801 Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/pom.xml projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java Log: Rollback to kernel-2.0.9.GA Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/.settings/org.eclipse.jdt.core.prefs 2009-11-24 09:56:39 UTC (rev 96800) +++ projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/.settings/org.eclipse.jdt.core.prefs 2009-11-24 10:10:55 UTC (rev 96801) @@ -1,12 +1,6 @@ -#Thu Nov 19 14:05:44 CET 2009 +#Tue Nov 24 10:55:44 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.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.5 Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/pom.xml 2009-11-24 09:56:39 UTC (rev 96800) +++ projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/pom.xml 2009-11-24 10:10:55 UTC (rev 96801) @@ -43,7 +43,7 @@ <version.jboss.aop>2.1.0.CR3</version.jboss.aop> <version.jboss.classloading>2.0.8.GA</version.jboss.classloading> <version.jboss.deployers>2.0.9.GA</version.jboss.deployers> - <version.jboss.kernel>2.2.0-SNAPSHOT</version.jboss.kernel> + <version.jboss.kernel>2.0.9.GA</version.jboss.kernel> <version.jboss.osgi.apache.xerces>2.9.1.SP2</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> @@ -134,268 +134,48 @@ </dependency> <dependency> <groupId>org.jboss.cl</groupId> - <artifactId>jboss-classloader</artifactId> - <version>${version.jboss.classloading}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.cl</groupId> <artifactId>jboss-classloading</artifactId> <version>${version.jboss.classloading}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.cl</groupId> <artifactId>jboss-classloading-vfs</artifactId> <version>${version.jboss.classloading}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-impl</artifactId> <version>${version.jboss.deployers}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs-spi</artifactId> <version>${version.jboss.deployers}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs</artifactId> <version>${version.jboss.deployers}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>org.jboss.kernel</groupId> + <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <version>${version.jboss.kernel}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - <version>${version.jboss.kernel}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployers</artifactId> <version>${version.jboss.osgi.runtime.deployers}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployment</artifactId> <version>${version.jboss.osgi.deployment}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-dependency</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.kernel</groupId> - <artifactId>jboss-kernel</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Provided Dependencies --> Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java 2009-11-24 09:56:39 UTC (rev 96800) +++ projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2-SNAPSHOT/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java 2009-11-24 10:10:55 UTC (rev 96801) @@ -51,36 +51,36 @@ @Override public void testOptionalImportPackageWired() throws Exception { - System.out.println("WONTFIX: testOptionalImportPackageWired"); + // WONTFIX: testOptionalImportPackageWired } @Override public void testRequireBundleVersionFails() throws Exception { - System.out.println("WONTFIX: testRequireBundleVersionFails"); + // WONTFIX: testRequireBundleVersionFails } @Override public void testPreferredExporterHigherVersion() throws Exception { - System.out.println("WONTFIX: testPreferredExporterHigherVersion"); + // WONTFIX: testPreferredExporterHigherVersion } @Override public void testPreferredExporterLowerId() throws Exception { - System.out.println("WONTFIX: testPreferredExporterLowerId"); + // WONTFIX: testPreferredExporterLowerId } @Override public void testPreferredExporterLowerIdReverse() throws Exception { - System.out.println("WONTFIX: testPreferredExporterLowerIdReverse"); + // WONTFIX: testPreferredExporterLowerIdReverse } @Override public void testPackageAttributeMandatoryFails() throws Exception { - System.out.println("WONTFIX: testPackageAttributeMandatoryFails"); + // WONTFIX: testPackageAttributeMandatoryFails } } \ No newline at end of file