From 5b95e901a332499a474b388cb4aa1f228ef25337 Mon Sep 17 00:00:00 2001 From: Christopher Frost Date: Thu, 9 Aug 2012 20:50:14 +0100 Subject: 385314 wip --- org.eclipse.virgo.kernel.test/.classpath | 6 +++--- ...onContextDependencyMonitorIntegrationTests.java | 4 ++-- .../test/ModuleBeanFactoryPostProcessorTests.java | 2 +- .../virgo/kernel/test/ServiceUtilsTests.java | 2 +- .../test/StandardBundleStarterSignallingTests.java | 4 ++-- .../kernel/test/StandardBundleStarterTests.java | 2 +- .../test/StandardKernelIntegrationTests.java | 2 +- .../org/eclipse/virgo/kernel/test/TestSignal.java | 2 +- .../src/test/resources/META-INF/MANIFEST.MF | 4 ++-- .../META-INF/java-profile/java6-server.profile | 8 +++----- .../test/resources/META-INF/test.config.properties | 8 ++++---- .../org.eclipse.virgo.kernel.userregion.properties | 24 +++++++++++----------- org.eclipse.virgo.kernel.test/template.mf | 5 +++-- 13 files changed, 36 insertions(+), 37 deletions(-) (limited to 'org.eclipse.virgo.kernel.test') diff --git a/org.eclipse.virgo.kernel.test/.classpath b/org.eclipse.virgo.kernel.test/.classpath index 31ac1f5b..43447de0 100644 --- a/org.eclipse.virgo.kernel.test/.classpath +++ b/org.eclipse.virgo.kernel.test/.classpath @@ -15,13 +15,13 @@ - + - - + + diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java index 958dd377..3838686f 100644 --- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java +++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.eclipse.virgo.kernel.core.AbortableSignal; -import org.eclipse.virgo.kernel.core.BundleStarter; +import org.eclipse.virgo.nano.core.AbortableSignal; +import org.eclipse.virgo.nano.core.BundleStarter; import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils; import org.eclipse.virgo.kernel.osgi.quasi.QuasiBundle; import org.eclipse.virgo.kernel.osgi.quasi.QuasiFramework; diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java index dabee43d..4ef72ed6 100644 --- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java +++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java @@ -20,7 +20,7 @@ import java.io.File; import org.eclipse.gemini.blueprint.context.support.OsgiBundleXmlApplicationContext; import org.eclipse.gemini.blueprint.service.importer.support.ImportContextClassLoaderEnum; import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean; -import org.eclipse.virgo.kernel.core.BundleStarter; +import org.eclipse.virgo.nano.core.BundleStarter; import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils; import org.eclipse.virgo.kernel.osgi.framework.OsgiServiceHolder; import org.eclipse.virgo.kernel.test.AbstractKernelIntegrationTest; diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/ServiceUtilsTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/ServiceUtilsTests.java index 29acdd95..69acae78 100644 --- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/ServiceUtilsTests.java +++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/ServiceUtilsTests.java @@ -16,7 +16,7 @@ import static org.eclipse.virgo.kernel.osgi.framework.ServiceUtils.getWaitLimitS import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer; +import org.eclipse.virgo.nano.deployer.api.core.ApplicationDeployer; import org.junit.Test; diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java index 2eb9bcbe..303519af 100644 --- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java +++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertTrue; import java.io.File; -import org.eclipse.virgo.kernel.core.AbortableSignal; -import org.eclipse.virgo.kernel.core.BundleStarter; +import org.eclipse.virgo.nano.core.AbortableSignal; +import org.eclipse.virgo.nano.core.BundleStarter; import org.junit.Before; import org.junit.Test; import org.osgi.framework.Bundle; diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterTests.java index d72ec01c..07b5f1ab 100644 --- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterTests.java +++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterTests.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertNotNull; import java.io.File; -import org.eclipse.virgo.kernel.core.BundleStarter; +import org.eclipse.virgo.nano.core.BundleStarter; import org.junit.Before; import org.junit.Test; import org.osgi.framework.Bundle; diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java index 02b3dbd3..3f683096 100644 --- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java +++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java @@ -13,7 +13,7 @@ package org.eclipse.virgo.kernel.test; import static org.junit.Assert.assertNotNull; -import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer; +import org.eclipse.virgo.nano.deployer.api.core.ApplicationDeployer; import org.junit.Test; import org.osgi.framework.ServiceReference; diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/TestSignal.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/TestSignal.java index 8105d27d..abc60649 100644 --- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/TestSignal.java +++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/TestSignal.java @@ -19,7 +19,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.virgo.kernel.core.AbortableSignal; +import org.eclipse.virgo.nano.core.AbortableSignal; public final class TestSignal implements AbortableSignal { diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF index 677bb1c8..b8468a5f 100644 --- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF +++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.virgo.kernel.concurrent.test;version="3.0. - 0";uses:="org.eclipse.virgo.kernel.core,org.eclipse.virgo.kernel.test + 0";uses:="org.eclipse.virgo.nano.core,org.eclipse.virgo.kernel.test ,org.junit",org.eclipse.virgo.kernel.dm.test;version="3.0.0";uses:="o rg.eclipse.virgo.kernel.test,org.junit",org.eclipse.virgo.kernel.ffdc .test;version="3.0.0";uses:="org.eclipse.virgo.kernel.test,org.junit" @@ -8,7 +8,7 @@ Export-Package: org.eclipse.virgo.kernel.concurrent.test;version="3.0. e.virgo.kernel.test,org.junit",org.eclipse.virgo.kernel.osgicommand.h elper.test;version="3.0.0";uses:="org.eclipse.virgo.kernel.test,org.j unit,org.junit.runner",org.eclipse.virgo.kernel.test;version="3.0.0"; - uses:="org.eclipse.virgo.kernel.core,org.junit,org.junit.runner" + uses:="org.eclipse.virgo.nano.core,org.junit,org.junit.runner" Bundle-ClassPath: .,quasi/simpleexporter.jar,quasi/simpleimporter.jar, QuickConsumer.jar,SlowService.jar,quasi/simpleexporter.jar,quasi/simp leimporter.jar,QuickConsumer.jar,SlowService.jar diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile index c5b5a76c..0e391fc6 100644 --- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile +++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile @@ -145,10 +145,8 @@ org.osgi.framework.system.packages = \ javax.xml.ws.spi,\ javax.xml.ws.spi;version="2.1.1",\ javax.xml.xpath,\ - org.eclipse.virgo.osgi.extensions.equinox;version="3.6.0",\ - org.eclipse.virgo.osgi.extensions.equinox.hooks;version="3.6.0",\ - org.eclipse.virgo.osgi.launcher;version="3.6.0",\ - org.eclipse.virgo.osgi.launcher.parser;version="3.6.0",\ + org.eclipse.virgo.kernel.equinox.extensions;version="3.6.0",\ + org.eclipse.virgo.kernel.equinox.extensions.hooks;version="3.6.0",\ org.ietf.jgss,\ org.omg.CORBA,\ org.omg.CORBA_2_3,\ @@ -192,7 +190,7 @@ org.osgi.framework.system.packages = \ org.xml.sax.ext,\ org.xml.sax.helpers org.osgi.framework.bootdelegation = \ - org.eclipse.virgo.kernel.authentication,\ + org.eclipse.virgo.nano.authentication,\ com.sun.*,\ javax.xml.*,\ org.apache.xerces.jaxp.*,\ diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties index ba52d09e..d38d3b60 100644 --- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties +++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties @@ -30,9 +30,9 @@ launcher.bundles =\ file:../ivy-cache/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\ file:../ivy-cache/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\ file:../ivy-cache/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\ - file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.kernel.core-${org.eclipse.virgo.nano}.jar@start,\ - file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.api-${org.eclipse.virgo.nano}.jar,\ - file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.hot-${org.eclipse.virgo.nano}.jar,\ + file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\ + file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\ + file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\ file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\ file:../ivy-cache/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar,\ file:../ivy-cache/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\ @@ -68,7 +68,7 @@ gosh.args=--nointeractive osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile osgi.java.profile.bootdelegation=override -osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator +osgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator org.eclipse.virgo.kernel.home=target org.eclipse.virgo.kernel.domain=org.eclipse.virgo.kernel diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties index 68d1cbf0..f7b3ea50 100644 --- a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties +++ b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties @@ -30,20 +30,20 @@ bundleImports = org.eclipse.osgi;bundle-version="0" packageImports =\ org.eclipse.virgo.kernel.artifact.*;version="0",\ - org.eclipse.virgo.kernel.core;version="0",\ + org.eclipse.virgo.nano.core;version="0",\ org.eclipse.virgo.kernel.deployer.core;version="0",\ org.eclipse.virgo.kernel.deployer.core.event;version="0",\ org.eclipse.virgo.kernel.deployer.config;version="0",\ org.eclipse.virgo.kernel.install.*;version="0",\ org.eclipse.virgo.kernel.osgi.*;version="0",\ org.eclipse.virgo.kernel.module;version="0",\ - org.eclipse.virgo.kernel.serviceability;version="0",\ - org.eclipse.virgo.kernel.serviceability.dump;version="0",\ - org.eclipse.virgo.kernel.serviceability.enforcement;version="0",\ + org.eclipse.virgo.nano.serviceability;version="0",\ + org.eclipse.virgo.nano.serviceability.dump;version="0",\ + org.eclipse.virgo.nano.serviceability.enforcement;version="0",\ org.eclipse.virgo.kernel.services.work;version="0",\ org.eclipse.virgo.kernel.shell;version="0",\ org.eclipse.virgo.kernel.shell.*;version="0",\ - org.eclipse.virgo.kernel.shim.*;version="0",\ + org.eclipse.virgo.nano.shim.*;version="0",\ org.eclipse.virgo.medic.*;version="0",\ org.eclipse.virgo.repository;version="0",\ org.eclipse.virgo.util.*;version="0",\ @@ -64,8 +64,8 @@ packageImports =\ serviceImports =\ org.eclipse.equinox.region.Region,\ org.eclipse.equinox.region.RegionDigraph,\ - org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer,\ - org.eclipse.virgo.kernel.deployer.core.DeployUriNormaliser,\ + org.eclipse.virgo.nano.deployer.api.core.ApplicationDeployer,\ + org.eclipse.virgo.nano.deployer.api.core.DeployUriNormaliser,\ org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository,\ org.eclipse.virgo.kernel.services.work.WorkArea,\ org.eclipse.virgo.repository.ArtifactBridge,\ @@ -74,18 +74,18 @@ serviceImports =\ org.eclipse.virgo.repository.RepositoryFactory,\ org.eclipse.virgo.medic.eventlog.EventLoggerFactory,\ org.eclipse.virgo.repository.Repository,\ - org.eclipse.virgo.kernel.core.Shutdown,\ + org.eclipse.virgo.nano.core.Shutdown,\ org.osgi.framework.hooks.resolver.ResolverHookFactory,\ org.osgi.service.cm.ConfigurationAdmin,\ org.osgi.service.event.EventAdmin,\ org.osgi.service.log.LogService,\ org.eclipse.virgo.medic.eventlog.EventLogger,\ org.eclipse.virgo.medic.dump.DumpGenerator,\ - org.eclipse.virgo.kernel.shim.scope.ScopeFactory,\ - org.eclipse.virgo.kernel.shim.serviceability.TracingService,\ + org.eclipse.virgo.nano.shim.scope.ScopeFactory,\ + org.eclipse.virgo.nano.shim.serviceability.TracingService,\ org.eclipse.osgi.service.resolver.PlatformAdmin,\ org.osgi.service.packageadmin.PackageAdmin,\ - org.eclipse.virgo.kernel.core.ConfigurationExporter + org.eclipse.virgo.nano.core.ConfigurationExporter serviceExports =\ org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener,\ @@ -103,4 +103,4 @@ serviceExports =\ org.osgi.service.cm.ManagedService,\ org.osgi.service.cm.ManagedServiceFactory,\ org.osgi.framework.BundleContext,\ - org.eclipse.virgo.kernel.deployer.config.ConfigurationDeployer + org.eclipse.virgo.nano.deployer.api.config.ConfigurationDeployer diff --git a/org.eclipse.virgo.kernel.test/template.mf b/org.eclipse.virgo.kernel.test/template.mf index 8648f659..5209d40f 100644 --- a/org.eclipse.virgo.kernel.test/template.mf +++ b/org.eclipse.virgo.kernel.test/template.mf @@ -13,8 +13,9 @@ Import-Template: org.osgi.*;version="0", org.springframework.*;version="${org.springframework:[2.5.6, +1)}", org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1)}" -Excluded-Imports: subsystem.installation, +Excluded-Imports: + subsystem.installation, com.springsource, - org.eclipse.virgo.osgi.extensions.*, + org.eclipse.virgo.kernel.equinox.*, org.eclipse.virgo.test.* Excluded-Exports: delay,quick,slow,test,config,quasi -- cgit v1.2.1