Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2010-09-17 10:33:34 -0400
committerChristopher Frost2010-09-17 10:33:34 -0400
commit3a82db2f2cead304fae963a9f868539502e5eb8c (patch)
tree658f753641edfaf2175a35a6d6d87b3d5125988d
parentf2a8d33f4b3af6c7f4f836fb3cc48a414ef9e9aa (diff)
downloadorg.eclipse.virgo.kernel-3a82db2f2cead304fae963a9f868539502e5eb8c.tar.gz
org.eclipse.virgo.kernel-3a82db2f2cead304fae963a9f868539502e5eb8c.tar.xz
org.eclipse.virgo.kernel-3a82db2f2cead304fae963a9f868539502e5eb8c.zip
319393 removing kernel.dm
-rw-r--r--build-kernel/build.xml1
-rw-r--r--build-kernel/lib/org.eclipse.virgo.kernel.launch.properties1
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/.classpath1
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties1
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties1
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties1
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/BundleDelegatingClassLoaderFactory.java36
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/ServiceProxyInspector.java33
-rw-r--r--org.eclipse.virgo.kernel.dm/.classpath50
-rw-r--r--org.eclipse.virgo.kernel.dm/.project37
-rw-r--r--org.eclipse.virgo.kernel.dm/.settings/com.springsource.server.ide.bundlor.core.prefs3
-rw-r--r--org.eclipse.virgo.kernel.dm/.settings/org.eclipse.wst.common.project.facet.core.xml4
-rw-r--r--org.eclipse.virgo.kernel.dm/.springBeans13
-rw-r--r--org.eclipse.virgo.kernel.dm/build.xml8
-rw-r--r--org.eclipse.virgo.kernel.dm/ivy.xml42
-rw-r--r--org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardBundleDelegatingClassLoaderFactory.java43
-rw-r--r--org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardServiceProxyInspector.java33
-rw-r--r--org.eclipse.virgo.kernel.dm/src/main/resources/META-INF/spring/kernel-dm-context.xml25
-rw-r--r--org.eclipse.virgo.kernel.dm/src/test/java/.gitignore0
-rw-r--r--org.eclipse.virgo.kernel.dm/src/test/resources/.gitignore0
-rw-r--r--org.eclipse.virgo.kernel.dm/template.mf18
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties1
-rw-r--r--org.eclipse.virgo.kernel/ivy.xml1
24 files changed, 2 insertions, 354 deletions
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index 2ca0ffff..9894da9f 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -13,7 +13,6 @@
<pathelement location="../org.eclipse.virgo.kernel.agent.dm"/>
<pathelement location="../org.eclipse.virgo.kernel.kerneldmfragment"/>
<pathelement location="../org.eclipse.virgo.kernel.dmfragment"/>
- <pathelement location="../org.eclipse.virgo.kernel.dm"/>
<pathelement location="../org.eclipse.virgo.kernel.deployer.dm"/>
<pathelement location="../org.eclipse.virgo.kernel.model"/>
<pathelement location="../org.eclipse.virgo.kernel.shell"/>
diff --git a/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties b/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
index c0500854..f20a4159 100644
--- a/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
+++ b/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
@@ -31,7 +31,6 @@ launcher.bundles =\
file:lib/kernel/org.eclipse.virgo.kernel.services-@KERNEL.VERSION@.jar@start,\
file:lib/kernel/org.eclipse.virgo.kernel.osgi-@KERNEL.VERSION@.jar@start,\
file:lib/kernel/org.eclipse.virgo.kernel.deployer-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.dm-@KERNEL.VERSION@.jar@start,\
file:lib/kernel/org.eclipse.virgo.kernel.model-@KERNEL.VERSION@.jar@start,\
file:lib/kernel/org.eclipse.virgo.kernel.kerneldmfragment-@KERNEL.VERSION@.jar,\
file:lib/kernel/org.eclipse.virgo.kernel.shell-@KERNEL.VERSION@.jar@start
diff --git a/org.eclipse.virgo.kernel.deployer.test/.classpath b/org.eclipse.virgo.kernel.deployer.test/.classpath
index e38a8eda..55063399 100644
--- a/org.eclipse.virgo.kernel.deployer.test/.classpath
+++ b/org.eclipse.virgo.kernel.deployer.test/.classpath
@@ -41,6 +41,5 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100907105528/org.eclipse.virgo.osgi.launcher-2.1.0.D-20100907105528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100907105528/org.eclipse.virgo.osgi.launcher-sources-2.1.0.D-20100907105528.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100907110255/org.eclipse.virgo.test.framework-2.1.0.D-20100907110255.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100907110255/org.eclipse.virgo.test.framework-sources-2.1.0.D-20100907110255.jar"/>
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.model"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.dm"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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 186a0f1f..4a891afe 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
@@ -31,7 +31,6 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
file:../org.eclipse.virgo.kernel.deployer/target/classes@start,\
- file:../org.eclipse.virgo.kernel.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.model/target/classes@start,\
file:../org.eclipse.virgo.kernel.kerneldmfragment/target/classes
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 94eec9b2..369bcdfe 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
@@ -31,7 +31,6 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
file:../org.eclipse.virgo.kernel.deployer/target/classes@start,\
- file:../org.eclipse.virgo.kernel.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.model/target/classes@start,\
file:../org.eclipse.virgo.kernel.kerneldmfragment/target/classes
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 ffdaeab6..f905283c 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
@@ -31,7 +31,6 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
file:../org.eclipse.virgo.kernel.deployer/target/classes@start,\
- file:../org.eclipse.virgo.kernel.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.model/target/classes@start,\
file:../org.eclipse.virgo.kernel.kerneldmfragment/target/classes
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/BundleDelegatingClassLoaderFactory.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/BundleDelegatingClassLoaderFactory.java
deleted file mode 100644
index 3495c4e0..00000000
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/BundleDelegatingClassLoaderFactory.java
+++ /dev/null
@@ -1,36 +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.module;
-
-import org.osgi.framework.Bundle;
-
-/**
- * {@link BundleDelegatingClassLoaderFactory} is used to create class loaders that can delegate to a sequence of
- * bundles. <p />
- *
- * <strong>Concurrent Semantics</strong><br />
- *
- * Thread safe.
- *
- */
-public interface BundleDelegatingClassLoaderFactory {
-
- /**
- * Create a {@link ClassLoader} that delegates to the given bundles in turn until class loading or resource finding
- * succeeds or the end of the sequence of bundles is reached.
- *
- * @param bundles bundles to delegate to
- * @return a delegating class loader
- */
- ClassLoader createBundleDelegatingClassLoader(Bundle... bundles);
-
-}
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/ServiceProxyInspector.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/ServiceProxyInspector.java
deleted file mode 100644
index b600a09c..00000000
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/ServiceProxyInspector.java
+++ /dev/null
@@ -1,33 +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.module;
-
-/**
- * {@link ServiceProxyInspector} is the kernel standard interface for probing
- * service proxies. Its purpose is to isolate the kernel and server code from
- * Spring DM service proxy related types which vary by Spring DM and Spring
- * release and which are multiply loaded, for instance due to cloning.
- *
- */
-public interface ServiceProxyInspector {
-
- /**
- * Given a service proxy, determine whether or not the service is currently available.
- * <p />
- * Given an object that is not a service proxy, return <code>true</code>.
- *
- * @param proxy the service proxy to be checked
- * @return <code>true</code> if and only if the service proxy is currently available
- */
- boolean isLive(Object proxy);
-
-}
diff --git a/org.eclipse.virgo.kernel.dm/.classpath b/org.eclipse.virgo.kernel.dm/.classpath
deleted file mode 100644
index 9e3e0b7d..00000000
--- a/org.eclipse.virgo.kernel.dm/.classpath
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="src/main/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-sources-1.2.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-sources-1.2.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
- <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.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="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.D-20100907110508/org.eclipse.virgo.medic-2.1.0.D-20100907110508.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.D-20100907110508/org.eclipse.virgo.medic-sources-2.1.0.D-20100907110508.jar">
- <attributes>
- <attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
- </attributes>
- </classpathentry>
- <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 combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.1.0.D-20100907110508/org.eclipse.virgo.medic.test-2.1.0.D-20100907110508.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M04-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M04-incubation.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/1.0.0.CI-B38/org.eclipse.virgo.teststubs.osgi-sources-1.0.0.CI-B38.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.virgo.kernel.dm/.project b/org.eclipse.virgo.kernel.dm/.project
deleted file mode 100644
index 2ea32a85..00000000
--- a/org.eclipse.virgo.kernel.dm/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.virgo.kernel.dm</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ajdt.core.ajbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.springsource.server.ide.bundlor.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.ajdt.ui.ajnature</nature>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.springsource.server.dev.eclipse.serverdevelopmentnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.virgo.kernel.dm/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.kernel.dm/.settings/com.springsource.server.ide.bundlor.core.prefs
deleted file mode 100644
index 2fe7581e..00000000
--- a/org.eclipse.virgo.kernel.dm/.settings/com.springsource.server.ide.bundlor.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 06 09:07:01 BST 2009
-com.springsource.server.ide.bundlor.core.template.properties.files=../build.versions
-eclipse.preferences.version=1
diff --git a/org.eclipse.virgo.kernel.dm/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 801f856c..00000000
--- a/org.eclipse.virgo.kernel.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
-</faceted-project>
diff --git a/org.eclipse.virgo.kernel.dm/.springBeans b/org.eclipse.virgo.kernel.dm/.springBeans
deleted file mode 100644
index 4dbe37b1..00000000
--- a/org.eclipse.virgo.kernel.dm/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.7.200910202224-RELEASE]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/org.eclipse.virgo.kernel.dm/build.xml b/org.eclipse.virgo.kernel.dm/build.xml
deleted file mode 100644
index b9783dcd..00000000
--- a/org.eclipse.virgo.kernel.dm/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.kernel.dm">
-
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/../virgo-build/weaving/default.xml"/>
-
-</project>
diff --git a/org.eclipse.virgo.kernel.dm/ivy.xml b/org.eclipse.virgo.kernel.dm/ivy.xml
deleted file mode 100644
index 11e56a12..00000000
--- a/org.eclipse.virgo.kernel.dm/ivy.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
-
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
-
- <configurations>
- <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
- </configurations>
-
- <publications>
- <artifact name="${ant.project.name}"/>
- <artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
- </publications>
-
- <dependencies>
- <dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="compile->runtime"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="compile->runtime"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="compile->runtime"/>
-
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.test" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
-
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.core" rev="latest.integration" conf="compile->compile"/>
-
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.extender" rev="${org.springframework.osgi}" conf="compile->compile"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="aspects, compile->runtime"/>
- <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="runtime->runtime"/>
-
- <override org="org.springframework" rev="${org.springframework}"/>
- <override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
- </dependencies>
-
-</ivy-module>
diff --git a/org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardBundleDelegatingClassLoaderFactory.java b/org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardBundleDelegatingClassLoaderFactory.java
deleted file mode 100644
index d573fe65..00000000
--- a/org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardBundleDelegatingClassLoaderFactory.java
+++ /dev/null
@@ -1,43 +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.dm.internal;
-
-import org.eclipse.virgo.kernel.serviceability.Assert;
-import org.osgi.framework.Bundle;
-import org.springframework.osgi.util.BundleDelegatingClassLoader;
-
-import org.eclipse.virgo.kernel.module.BundleDelegatingClassLoaderFactory;
-
-/**
- */
-final class StandardBundleDelegatingClassLoaderFactory implements BundleDelegatingClassLoaderFactory {
-
- /**
- * {@inheritDoc}
- */
- public ClassLoader createBundleDelegatingClassLoader(Bundle... bundles) {
-
- Assert.notEmpty(bundles, "at least one bundle must be specified");
-
- int delegates = bundles.length;
- Bundle head = bundles[0];
-
- if (delegates == 1) {
- return BundleDelegatingClassLoader.createBundleClassLoaderFor(head);
- } else {
- Bundle[] tail = new Bundle[delegates - 1];
- System.arraycopy(bundles, 1, tail, 0, delegates - 1);
- return BundleDelegatingClassLoader.createBundleClassLoaderFor(head, createBundleDelegatingClassLoader(tail));
- }
- }
-
-}
diff --git a/org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardServiceProxyInspector.java b/org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardServiceProxyInspector.java
deleted file mode 100644
index 0e564f9d..00000000
--- a/org.eclipse.virgo.kernel.dm/src/main/java/org/eclipse/virgo/kernel/dm/internal/StandardServiceProxyInspector.java
+++ /dev/null
@@ -1,33 +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.dm.internal;
-
-import org.springframework.osgi.service.importer.ImportedOsgiServiceProxy;
-
-import org.eclipse.virgo.kernel.module.ServiceProxyInspector;
-
-/**
- */
-final class StandardServiceProxyInspector implements ServiceProxyInspector {
-
- /**
- * {@inheritDoc}
- */
- public boolean isLive(Object proxy) {
- if (proxy instanceof ImportedOsgiServiceProxy) {
- return ((ImportedOsgiServiceProxy) proxy).getServiceReference().getBundle() != null;
- } else {
- return true;
- }
- }
-
-}
diff --git a/org.eclipse.virgo.kernel.dm/src/main/resources/META-INF/spring/kernel-dm-context.xml b/org.eclipse.virgo.kernel.dm/src/main/resources/META-INF/spring/kernel-dm-context.xml
deleted file mode 100644
index 4050aad4..00000000
--- a/org.eclipse.virgo.kernel.dm/src/main/resources/META-INF/spring/kernel-dm-context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="serviceProxyInspector" class="org.eclipse.virgo.kernel.dm.internal.StandardServiceProxyInspector"/>
-
- <osgi:service ref="serviceProxyInspector" interface="org.eclipse.virgo.kernel.module.ServiceProxyInspector">
- <osgi:service-properties>
- <entry key="com.springsource.service.scope" value="global"/>
- </osgi:service-properties>
- </osgi:service>
-
- <bean id="bundleDelegatingClassLoaderFactory" class="org.eclipse.virgo.kernel.dm.internal.StandardBundleDelegatingClassLoaderFactory"/>
-
- <osgi:service ref="bundleDelegatingClassLoaderFactory" interface="org.eclipse.virgo.kernel.module.BundleDelegatingClassLoaderFactory">
- <osgi:service-properties>
- <entry key="com.springsource.service.scope" value="global"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:reference id="tracingService" interface="org.eclipse.virgo.kernel.shim.serviceability.TracingService"/>
-
- <osgi:reference id="eventLogger" interface="org.eclipse.virgo.medic.eventlog.EventLogger"/>
-</beans>
diff --git a/org.eclipse.virgo.kernel.dm/src/test/java/.gitignore b/org.eclipse.virgo.kernel.dm/src/test/java/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/org.eclipse.virgo.kernel.dm/src/test/java/.gitignore
+++ /dev/null
diff --git a/org.eclipse.virgo.kernel.dm/src/test/resources/.gitignore b/org.eclipse.virgo.kernel.dm/src/test/resources/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/org.eclipse.virgo.kernel.dm/src/test/resources/.gitignore
+++ /dev/null
diff --git a/org.eclipse.virgo.kernel.dm/template.mf b/org.eclipse.virgo.kernel.dm/template.mf
deleted file mode 100644
index 3abcd17b..00000000
--- a/org.eclipse.virgo.kernel.dm/template.mf
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: (incubation) Virgo Kernel OSGi Spring DM Integration
-Bundle-SymbolicName: org.eclipse.virgo.kernel.dm
-Bundle-Version: 2.1.0
-Import-Template:
- org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.slf4j.*;version="${org.slf4j:[=.=.=, +1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.osgi.framework.*;version="0",
- org.osgi.service.event.*;version="0",
- org.springframework.*;version="${org.springframework:[2.5.6, =.+1)}",
- org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1)}"
-Export-Template:
- org.eclipse.virgo.kernel.dm.internal;test=yes;mandatory:=test
-Excluded-Imports:
- org.eclipse.virgo.kernel.dm.internal
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index e52d58ed..8d3eef6c 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -20,8 +20,9 @@
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.dm" rev="latest.integration" conf="test->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.core" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration" conf="test->compile"/>
<dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
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 2b6cc8e1..820a5efc 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
@@ -31,7 +31,6 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
file:../org.eclipse.virgo.kernel.deployer/target/classes@start,\
- file:../org.eclipse.virgo.kernel.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.model/target/classes@start,\
file:../org.eclipse.virgo.kernel.kerneldmfragment/target/classes,\
file:../org.eclipse.virgo.kernel.shell/target/classes@start
diff --git a/org.eclipse.virgo.kernel/ivy.xml b/org.eclipse.virgo.kernel/ivy.xml
index 26130bd2..72020379 100644
--- a/org.eclipse.virgo.kernel/ivy.xml
+++ b/org.eclipse.virgo.kernel/ivy.xml
@@ -18,7 +18,6 @@
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.core" rev="latest.integration"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer.dm" rev="latest.integration"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.dm" rev="latest.integration"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.dmfragment" rev="latest.integration"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.kerneldmfragment" rev="latest.integration"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration"/>

Back to the top