Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.versions2
-rw-r--r--org.eclipse.virgo.kernel.artifact/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java101
-rwxr-xr-xorg.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java90
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile6
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.deployer/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.osgi/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.osgi/template.mf4
-rw-r--r--org.eclipse.virgo.kernel.services/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.shell/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml5
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile6
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.userregion/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.userregion/template.mf2
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/template.mf2
20 files changed, 27 insertions, 213 deletions
diff --git a/build.versions b/build.versions
index 5ac7e3c0..0baeaafa 100644
--- a/build.versions
+++ b/build.versions
@@ -6,7 +6,7 @@ org.eclipse.equinox.ds=1.3.0.v20110124-0830
org.eclipse.equinox.cm=1.0.300.v20101204
org.eclipse.equinox.region=1.0.0.v20110503
org.eclipse.equinox.console.supportability=1.0.0.N20110815-2000
-org.aspectj=1.6.6.RELEASE
+org.aspectj=1.6.12.RELEASE
org.eclipse.osgi=3.7.1.R37x_v20110808-1106
ch.qos.logback=0.9.28
org.eclipse.virgo.medic=3.5.0.D-20120125141154
diff --git a/org.eclipse.virgo.kernel.artifact/.classpath b/org.eclipse.virgo.kernel.artifact/.classpath
index 13eeee86..8323e269 100644
--- a/org.eclipse.virgo.kernel.artifact/.classpath
+++ b/org.eclipse.virgo.kernel.artifact/.classpath
@@ -30,7 +30,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120125141154/org.eclipse.virgo.medic-3.5.0.D-20120125141154.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.D-20120125141154/org.eclipse.virgo.medic.core-3.5.0.D-20120125141154.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.D-20120125141154/org.eclipse.virgo.medic.core-sources-3.5.0.D-20120125141154.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java
deleted file mode 100644
index b58693e4..00000000
--- a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package org.eclipse.virgo.kernel.config.internal;
-
-import java.io.IOException;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.ConfigurationListener;
-
-import org.eclipse.virgo.kernel.config.internal.commandline.CommandLinePropertiesSource;
-import org.eclipse.virgo.kernel.config.internal.ovf.OvfPropertiesSource;
-import org.eclipse.virgo.medic.dump.DumpContributor;
-import org.eclipse.virgo.medic.eventlog.EventLogger;
-import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
-
-/**
- * ConfigurationInitialiser
- * <p />
- *
- * <strong>Concurrent Semantics</strong><br />
- * threadsafe
- *
- */
-public final class ConfigurationInitialiser {
-
- private final ServiceRegistrationTracker tracker = new ServiceRegistrationTracker();
-
- private volatile ConfigurationAdminExporter configAdminExporter;
-
- public KernelConfiguration start(BundleContext context, EventLogger eventLogger) throws IOException {
-
- ServiceReference<ConfigurationAdmin> configurationAdminReference = context.getServiceReference(ConfigurationAdmin.class);
-
- ConfigurationAdmin configAdmin = null;
-
- if (configurationAdminReference != null) {
- configAdmin = (ConfigurationAdmin) context.getService(configurationAdminReference);
- }
-
- if (configAdmin == null) {
- throw new IllegalStateException("ConfigurationAdmin service missing");
- }
- KernelConfiguration configuration = new KernelConfiguration(context);
-
- publishConfiguration(context, eventLogger, configuration, configAdmin);
- this.configAdminExporter = initializeConfigAdminExporter(context, configuration, configAdmin);
- initializeDumpContributor(context, configAdmin);
- initializeConsoleConfigurationConvertor(context, configAdmin);
- return configuration;
-
- }
-
- private void publishConfiguration(BundleContext context, EventLogger eventLogger, KernelConfiguration configuration,
- ConfigurationAdmin configAdmin) throws IOException {
- PropertiesSource[] sources = new PropertiesSource[] { new UserConfigurationPropertiesSource(configuration.getConfigDirectories()),
- new OvfPropertiesSource(context, eventLogger), new KernelConfigurationPropertiesSource(configuration),
- new CommandLinePropertiesSource(context, eventLogger) };
- ConfigurationPublisher configPublisher = new ConfigurationPublisher(configAdmin, sources);
- configPublisher.publishConfigurations();
- configPublisher.registerConfigurationExporterService(context);
- }
-
- private void initializeDumpContributor(BundleContext context, ConfigurationAdmin configAdmin) {
- ConfigurationAdminDumpContributor dumpContributor = new ConfigurationAdminDumpContributor(configAdmin);
- this.tracker.track(context.registerService(DumpContributor.class.getName(), dumpContributor, null));
- }
-
- private ConfigurationAdminExporter initializeConfigAdminExporter(BundleContext context, KernelConfiguration configuration, ConfigurationAdmin configAdmin) {
- ConfigurationAdminExporter exporter = new ConfigurationAdminExporter(configuration.getDomain(), configAdmin);
- this.tracker.track(context.registerService(ConfigurationListener.class.getName(), exporter, null));
- exporter.init();
- return exporter;
- }
-
- private void initializeConsoleConfigurationConvertor(BundleContext context, ConfigurationAdmin configAdmin) {
- ConsoleConfigurationConvertor consoleConfigurationConvertor = new ConsoleConfigurationConvertor(context, configAdmin);
- consoleConfigurationConvertor.start();
- }
-
- public void stop() {
- this.tracker.unregisterAll();
-
- ConfigurationAdminExporter local = this.configAdminExporter;
-
- if (local != null) {
- this.configAdminExporter = null;
- local.stop();
- }
- }
-}
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java
deleted file mode 100755
index fbf34ed0..00000000
--- a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.virgo.kernel.config.internal;
-
-import java.io.IOException;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.ConfigurationException;
-import org.osgi.service.cm.ManagedService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ConsoleConfigurationConvertor {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- private BundleContext context;
- private ConfigurationAdmin configAdmin;
- private ServiceRegistration<ManagedService> configuratorRegistration;
-
- private static final String CONSOLE_PID = "osgi.console";
- private static final String TELNET_PID = "osgi.console.telnet";
- private static final String SSH_PID = "osgi.console.ssh";
- private static final String TELNET_PORT = "telnet.port";
- private static final String TELNET_HOST = "telnet.host";
- private static final String TELNET_ENABLED = "telnet.enabled";
- private static final String SSH_PORT = "ssh.port";
- private static final String SSH_HOST = "ssh.host";
- private static final String SSH_ENABLED = "ssh.enabled";
- private static final String HOST = "host";
- private static final String PORT = "port";
- private static final String ENABLED = "enabled";
-
- ConsoleConfigurationConvertor (BundleContext context, ConfigurationAdmin configAdmin) {
- this.context = context;
- this.configAdmin = configAdmin;
- }
-
- public void start() {
- Dictionary<String, String> consoleProperties = new Hashtable<String, String>();
- consoleProperties.put(Constants.SERVICE_PID, CONSOLE_PID);
- configuratorRegistration = context.registerService(ManagedService.class, new ConsoleConfigurator(), consoleProperties);
- }
-
- private void updateConfiguration(String pid, String host, String port, String enabled) {
- try {
- Configuration configuration = configAdmin.getConfiguration(pid, null);
- Properties properties = new Properties();
- properties.put(HOST, host);
- properties.put(PORT, port);
- properties.put(ENABLED, enabled);
- configuration.update(properties);
- } catch (IOException e) {
- String message = String.format("Unable to update configuration with pid '%s'", pid);
- logger.error(message);
- logger.trace(message, e);
- }
- }
-
- class ConsoleConfigurator implements ManagedService {
- private Dictionary properties;
- @Override
- public void updated(Dictionary props) throws ConfigurationException {
- if (props != null) {
- this.properties = props;
- properties.put(Constants.SERVICE_PID, CONSOLE_PID);
- } else {
- return;
- }
-
- configuratorRegistration.setProperties(properties);
-
- String telnetHost = (String)properties.get(TELNET_HOST);
- String telnetPort = (String)properties.get(TELNET_PORT);
- String telnetEnabled = (String)properties.get(TELNET_ENABLED);
- updateConfiguration(TELNET_PID, telnetHost, telnetPort, telnetEnabled);
-
- String sshHost = (String)properties.get(SSH_HOST);
- String sshPort = (String)properties.get(SSH_PORT);
- String sshEnabled = (String)properties.get(SSH_ENABLED);
- updateConfiguration(SSH_PID, sshHost, sshPort, sshEnabled);
- }
- }
-}
-
-
diff --git a/org.eclipse.virgo.kernel.deployer.test/.classpath b/org.eclipse.virgo.kernel.deployer.test/.classpath
index cd7d38b7..3d947573 100644
--- a/org.eclipse.virgo.kernel.deployer.test/.classpath
+++ b/org.eclipse.virgo.kernel.deployer.test/.classpath
@@ -19,7 +19,7 @@
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-0.9.1.2.jar" sourcepath="/KERNEL_IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-sources-0.9.1.2.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-2.0.0.b41-beta2.jar" sourcepath="/KERNEL_IVY_CACHE/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-sources-2.0.0.b41-beta2.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.6.RELEASE/com.springsource.org.aspectj.weaver-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.6.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.12.RELEASE/com.springsource.org.aspectj.weaver-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.12.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="/KERNEL_IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-sources-1.8.0.9.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
index 72c7529e..7cf885b1 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
@@ -145,6 +145,10 @@ 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.5.0",\
+ org.eclipse.virgo.osgi.extensions.equinox.hooks;version="3.5.0",\
+ org.eclipse.virgo.osgi.launcher;version="3.5.0",\
+ org.eclipse.virgo.osgi.launcher.parser;version="3.5.0",\
org.ietf.jgss,\
org.omg.CORBA,\
org.omg.CORBA_2_3,\
@@ -188,8 +192,6 @@ org.osgi.framework.system.packages = \
org.xml.sax.ext,\
org.xml.sax.helpers
org.osgi.framework.bootdelegation = \
- org.eclipse.virgo.osgi.extensions.*,\
- org.eclipse.virgo.osgi.launcher.*,\
org.eclipse.virgo.kernel.authentication,\
com.sun.*,\
javax.xml.*,\
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
index 78f1aa19..cecee728 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
@@ -51,7 +51,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
-osgi.parentClassloader=fwk
+osgi.parentClassloader=ext
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
index 108323b5..9ef84d17 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
@@ -51,7 +51,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
-osgi.parentClassloader=fwk
+osgi.parentClassloader=ext
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index 18094a19..ab20ff38 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -51,7 +51,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
-osgi.parentClassloader=fwk
+osgi.parentClassloader=ext
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
diff --git a/org.eclipse.virgo.kernel.deployer/.classpath b/org.eclipse.virgo.kernel.deployer/.classpath
index 98380d57..41e2e419 100644
--- a/org.eclipse.virgo.kernel.deployer/.classpath
+++ b/org.eclipse.virgo.kernel.deployer/.classpath
@@ -23,7 +23,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120125140456/org.eclipse.virgo.util.common-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120125140456/org.eclipse.virgo.util.common-sources-3.5.0.D-20120125140456.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120125140456/org.eclipse.virgo.util.io-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120125140456/org.eclipse.virgo.util.io-sources-3.5.0.D-20120125140456.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120125140456/org.eclipse.virgo.util.math-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120125140456/org.eclipse.virgo.util.math-sources-3.5.0.D-20120125140456.jar"/>
diff --git a/org.eclipse.virgo.kernel.osgi/.classpath b/org.eclipse.virgo.kernel.osgi/.classpath
index 9b5aba84..77ca9267 100644
--- a/org.eclipse.virgo.kernel.osgi/.classpath
+++ b/org.eclipse.virgo.kernel.osgi/.classpath
@@ -26,7 +26,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120125141737/org.eclipse.virgo.repository-3.5.0.D-20120125141737.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120125141737/org.eclipse.virgo.repository-sources-3.5.0.D-20120125141737.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120125140456/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120125140456/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120125140456.jar"/>
diff --git a/org.eclipse.virgo.kernel.osgi/template.mf b/org.eclipse.virgo.kernel.osgi/template.mf
index c56e3749..cd212933 100644
--- a/org.eclipse.virgo.kernel.osgi/template.mf
+++ b/org.eclipse.virgo.kernel.osgi/template.mf
@@ -7,14 +7,14 @@ Excluded-Exports:
*.internal.*
Excluded-Imports:
org.eclipse.virgo.kernel.services.repository.internal.*,
- org.eclipse.virgo.osgi.extensions.*,
- org.eclipse.virgo.osgi.launcher.*,
org.eclipse.virgo.repository.internal
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
+ org.eclipse.virgo.osgi.extensions.*;version="${org.eclipse.virgo.osgi:[=.=.=, =.+1)}",
+ org.eclipse.virgo.osgi.launcher.*;version="${org.eclipse.virgo.osgi:[=.=.=, =.+1)}",
org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
org.eclipse.osgi.*;version="0",
org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
diff --git a/org.eclipse.virgo.kernel.services/.classpath b/org.eclipse.virgo.kernel.services/.classpath
index 2af576bd..89583998 100644
--- a/org.eclipse.virgo.kernel.services/.classpath
+++ b/org.eclipse.virgo.kernel.services/.classpath
@@ -23,7 +23,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120125140456/org.eclipse.virgo.util.common-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120125140456/org.eclipse.virgo.util.common-sources-3.5.0.D-20120125140456.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120125140456/org.eclipse.virgo.util.io-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120125140456/org.eclipse.virgo.util.io-sources-3.5.0.D-20120125140456.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
diff --git a/org.eclipse.virgo.kernel.shell/.classpath b/org.eclipse.virgo.kernel.shell/.classpath
index 934f887f..bd5e565a 100644
--- a/org.eclipse.virgo.kernel.shell/.classpath
+++ b/org.eclipse.virgo.kernel.shell/.classpath
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120125140456/org.eclipse.virgo.util.common-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120125140456/org.eclipse.virgo.util.common-sources-3.5.0.D-20120125140456.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index dc887625..d65348e4 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -26,7 +26,7 @@
<dependency org="org.apache.felix" name="org.apache.felix.gogo.command" rev="${org.apache.felix.gogo.command}" conf="test->runtime"/>
<dependency org="org.apache.felix" name="org.apache.felix.gogo.shell" rev="${org.apache.felix.gogo.shell}" conf="test->runtime"/>
<dependency org="org.apache.mina" name="com.springsource.org.apache.mina.core" rev="${com.springsource.org.apache.mina.core}" conf="test->runtime" />
- <dependency org="org.apache.mina" name="com.springsource.org.apache.sshd.core" rev="${com.springsource.org.apache.sshd.core}" conf="test->runtime" />
+ <dependency org="org.apache.mina" name="com.springsource.org.apache.sshd.core" rev="${com.springsource.org.apache.sshd.core}" conf="test->runtime" />
<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="test->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="test->runtime"/>
@@ -52,7 +52,8 @@
<dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.launcher" rev="${org.eclipse.virgo.osgi}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.extensions.equinox" rev="${org.eclipse.virgo.osgi}" conf="test->runtime"/>
-
+
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="${org.aspectj}" conf="test->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.commons.logging" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.bridge" rev="${org.slf4j}" conf="test->runtime"/>
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 72c7529e..7cf885b1 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,6 +145,10 @@ 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.5.0",\
+ org.eclipse.virgo.osgi.extensions.equinox.hooks;version="3.5.0",\
+ org.eclipse.virgo.osgi.launcher;version="3.5.0",\
+ org.eclipse.virgo.osgi.launcher.parser;version="3.5.0",\
org.ietf.jgss,\
org.omg.CORBA,\
org.omg.CORBA_2_3,\
@@ -188,8 +192,6 @@ org.osgi.framework.system.packages = \
org.xml.sax.ext,\
org.xml.sax.helpers
org.osgi.framework.bootdelegation = \
- org.eclipse.virgo.osgi.extensions.*,\
- org.eclipse.virgo.osgi.launcher.*,\
org.eclipse.virgo.kernel.authentication,\
com.sun.*,\
javax.xml.*,\
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 632d96ef..21587748 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
@@ -51,7 +51,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
-osgi.parentClassloader=fwk
+osgi.parentClassloader=ext
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
diff --git a/org.eclipse.virgo.kernel.userregion/.classpath b/org.eclipse.virgo.kernel.userregion/.classpath
index 91847745..474e6958 100644
--- a/org.eclipse.virgo.kernel.userregion/.classpath
+++ b/org.eclipse.virgo.kernel.userregion/.classpath
@@ -26,7 +26,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120125141737/org.eclipse.virgo.repository-3.5.0.D-20120125141737.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120125141737/org.eclipse.virgo.repository-sources-3.5.0.D-20120125141737.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120125140456/org.eclipse.virgo.util.osgi-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120125140456/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120125140456.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120125140456/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120125140456/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120125140456.jar"/>
diff --git a/org.eclipse.virgo.kernel.userregion/template.mf b/org.eclipse.virgo.kernel.userregion/template.mf
index 9e872e7d..e574a229 100644
--- a/org.eclipse.virgo.kernel.userregion/template.mf
+++ b/org.eclipse.virgo.kernel.userregion/template.mf
@@ -7,7 +7,6 @@ Excluded-Exports:
*.internal.*
Excluded-Imports:
org.eclipse.virgo.kernel.services.repository.internal.*,
- org.eclipse.virgo.osgi.extensions.*,
org.eclipse.virgo.repository.internal
Import-Template:
org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
@@ -15,6 +14,7 @@ Import-Template:
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
+ org.eclipse.virgo.osgi.extensions.*;version="${org.eclipse.virgo.osgi:[=.=.=, =.+1)}",
org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
org.slf4j.*;version="${org.slf4j:[=.=.=, +1)}",
org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
diff --git a/org.eclipse.virgo.kernel.userregionfactory/template.mf b/org.eclipse.virgo.kernel.userregionfactory/template.mf
index 82c39394..d02451c6 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/template.mf
+++ b/org.eclipse.virgo.kernel.userregionfactory/template.mf
@@ -7,6 +7,7 @@ Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
+ org.eclipse.virgo.osgi.launcher.*;version="${org.eclipse.virgo.osgi:[=.=.=, =.+1)}",
org.eclipse.osgi.framework.*;version="0",
org.eclipse.osgi.service.resolver.*;version="0",
org.osgi.framework.*;version="0",
@@ -15,6 +16,5 @@ Import-Template:
org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}"
Import-Package: org.aspectj.lang;version="0"
Excluded-Imports: org.easymock,
- org.eclipse.virgo.osgi.launcher.*,
org.eclipse.virgo.teststubs.*
Excluded-Exports: *

Back to the top