Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2011-01-23 10:47:54 +0000
committerBorislav Kapukaranov2011-01-23 10:47:54 +0000
commitde9f6e395197d7976a7707af7cedacc4bb79fe07 (patch)
treee74811cad42cc544cfe9e1ac66af074b9c83ebb2
parent75ab61c668c67b76cbb1769936b3e7131f793229 (diff)
downloadorg.eclipse.virgo.kernel-de9f6e395197d7976a7707af7cedacc4bb79fe07.tar.gz
org.eclipse.virgo.kernel-de9f6e395197d7976a7707af7cedacc4bb79fe07.tar.xz
org.eclipse.virgo.kernel-de9f6e395197d7976a7707af7cedacc4bb79fe07.zip
bug333474: Remove Virgo's fixed startup order
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java30
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/src/main/resources/OSGI-INF/dm_agent.xml10
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/template.mf35
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigImpl.java37
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java7
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java12
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernel_config.xml9
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernelcore.xml16
-rw-r--r--org.eclipse.virgo.kernel.core/template.mf2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/configuration-context.xml16
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml620
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/management-context.xml52
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml151
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml94
-rw-r--r--org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/concurrent-context.xml68
-rw-r--r--org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/configuration-context.xml16
-rw-r--r--org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/io-context.xml43
-rw-r--r--org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/repository-context.xml126
18 files changed, 702 insertions, 642 deletions
diff --git a/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java b/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java
index 242acf95..b2de9403 100644
--- a/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java
+++ b/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java
@@ -14,20 +14,19 @@ package org.eclipse.virgo.kernel.agent.dm.internal;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.osgi.framework.BundleActivator;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
+import org.eclipse.virgo.medic.eventlog.EventLoggerFactory;
+import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
-import org.eclipse.virgo.medic.eventlog.EventLogger;
-import org.eclipse.virgo.medic.eventlog.EventLoggerFactory;
-import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
-
/**
- * {@link BundleActivator} for the Kernel's Agent bundle
+ * ComponentContext activator for the Kernel's Agent bundle
*
* <p />
*
@@ -36,15 +35,15 @@ import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
* Thread-safe.
*
*/
-public final class AgentActivator implements BundleActivator {
+public final class AgentActivator {
private final ServiceRegistrationTracker registrationTracker = new ServiceRegistrationTracker();
/**
* {@inheritDoc}
*/
- public void start(BundleContext context) {
- registerSpringDmToBlueprintEventAdapter(context);
+ public void activate(ComponentContext context) {
+ registerSpringDmToBlueprintEventAdapter(context.getBundleContext());
}
private void registerSpringDmToBlueprintEventAdapter(BundleContext context) {
@@ -66,11 +65,11 @@ public final class AgentActivator implements BundleActivator {
props.put(EventConstants.EVENT_TOPIC, new String[] { "org/osgi/service/blueprint/container/*" });
this.registrationTracker.track(context.registerService(EventHandler.class.getName(), failureListener, props));
}
-
+
/**
* {@inheritDoc}
*/
- public void stop(BundleContext context) throws Exception {
+ public void deactivate(ComponentContext context) throws Exception {
this.registrationTracker.unregisterAll();
}
@@ -82,10 +81,11 @@ public final class AgentActivator implements BundleActivator {
result = (T) context.getService(ref);
}
if (result == null) {
-//TODO: is consuming service references reasonable if failures are retried many times? May need the following code.
-// if (ref != null) {
-// context.ungetService(ref);
-// }
+ // TODO: is consuming service references reasonable if failures are retried many times? May need the
+ // following code.
+ // if (ref != null) {
+ // context.ungetService(ref);
+ // }
throw new IllegalStateException("Unable to access required service of type '" + clazz.getName() + "' from bundle '"
+ context.getBundle().getSymbolicName() + "'");
}
diff --git a/org.eclipse.virgo.kernel.agent.dm/src/main/resources/OSGI-INF/dm_agent.xml b/org.eclipse.virgo.kernel.agent.dm/src/main/resources/OSGI-INF/dm_agent.xml
new file mode 100644
index 00000000..1b52c6bb
--- /dev/null
+++ b/org.eclipse.virgo.kernel.agent.dm/src/main/resources/OSGI-INF/dm_agent.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="agentDM" immediate="true" xmlns:src="http://www.osgi.org/xmlns/src/v1.1.0">
+ <implementation class="org.eclipse.virgo.kernel.agent.dm.internal.AgentActivator"/>
+ <reference name="EventLogger"
+ interface="org.eclipse.virgo.medic.eventlog.EventLoggerFactory"
+ policy="dynamic"/>
+ <reference name="EventAdmin"
+ interface="org.osgi.service.event.EventAdmin"
+ policy="dynamic"/>
+</component> \ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.agent.dm/template.mf b/org.eclipse.virgo.kernel.agent.dm/template.mf
index baa0fc15..f8472b5f 100644
--- a/org.eclipse.virgo.kernel.agent.dm/template.mf
+++ b/org.eclipse.virgo.kernel.agent.dm/template.mf
@@ -1,17 +1,18 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Virgo Kernel Agent Spring DM integration
-Bundle-SymbolicName: org.eclipse.virgo.kernel.agent.dm
-Bundle-Version: 2.2.0
-Bundle-Activator: org.eclipse.virgo.kernel.agent.dm.internal.AgentActivator
-Excluded-Exports:
- *.internal.*
-Import-Template:
- org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.osgi.*;version="0",
- org.slf4j.*;version="${org.slf4j:[=.=.=, +1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.springframework.*;version="${org.springframework:[2.5.6, =.+1)}",
- org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1)}"
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Virgo Kernel Agent Spring DM integration
+Bundle-SymbolicName: org.eclipse.virgo.kernel.agent.dm
+Bundle-Version: 2.2.0
+Excluded-Exports:
+ *.internal.*
+Import-Template:
+ org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
+ org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
+ org.osgi.*;version="0",
+ org.slf4j.*;version="${org.slf4j:[=.=.=, +1)}",
+ org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
+ org.springframework.*;version="${org.springframework:[2.5.6, =.+1)}",
+ org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1)}"
+Service-Component: OSGI-INF/dm_agent.xml
+ \ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigImpl.java b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigImpl.java
new file mode 100644
index 00000000..68f15b35
--- /dev/null
+++ b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigImpl.java
@@ -0,0 +1,37 @@
+package org.eclipse.virgo.kernel.config.internal;
+
+import org.eclipse.virgo.kernel.core.KernelConfig;
+import org.osgi.service.component.ComponentContext;
+
+public class KernelConfigImpl implements KernelConfig {
+
+ ComponentContext context;
+
+ private final String DOMAIN = "domain";
+
+ protected void activate(ComponentContext context) {
+ this.context = context;
+ System.out
+ .println("Activating KernelConfigImpl component with properties "
+ + context.getProperties());
+ }
+
+ protected void deactivate(ComponentContext context) {
+ System.out.println("Deactivating KernelConfigImpl component");
+ this.context = null;
+ }
+
+ public String getProperty(String name) {
+ Object value = context.getProperties().get(name);
+ System.out.println("KernelConfig.getProperty() is called with name ["
+ + name + "] value is [" + value + "]");
+ if (value instanceof String) {
+ return (String) value;
+ } else if (value instanceof String[] && ((String[]) value).length > 0) {
+ return ((String[]) value)[0];
+ } else {
+ return value.toString();
+ }
+ }
+
+}
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java
new file mode 100644
index 00000000..0ff36861
--- /dev/null
+++ b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java
@@ -0,0 +1,7 @@
+package org.eclipse.virgo.kernel.core;
+
+public interface KernelConfig {
+
+ public String getProperty(String name);
+
+}
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
index ad21b735..099be1fd 100644
--- a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
+++ b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
@@ -38,22 +38,22 @@ import org.eclipse.virgo.kernel.shim.serviceability.internal.Slf4jTracingService
import org.eclipse.virgo.medic.dump.DumpGenerator;
import org.eclipse.virgo.medic.eventlog.EventLogger;
import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
-import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.launch.Framework;
+import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
/**
- * {@link BundleActivator} that initialises the core of the Kernel.
+ * ComponentContext activator that initialises the core of the Kernel.
*
* <strong>Concurrent Semantics</strong><br />
* Threadsafe.
*
*/
-public class CoreBundleActivator implements BundleActivator {
+public class CoreBundleActivator {
private static final String START_SIGNALLING_THREAD_NAME_PREFIX = "start-signalling-";
@@ -84,7 +84,9 @@ public class CoreBundleActivator implements BundleActivator {
/**
* {@inheritDoc}
*/
- public void start(BundleContext context) throws Exception {
+ public void activate(ComponentContext componentContext) throws Exception {
+ BundleContext context = componentContext.getBundleContext();
+
EventLogger eventLogger = getRequiredService(context, EventLogger.class);
KernelConfiguration configuration = this.configurationInitialiser.start(context, eventLogger);
@@ -156,7 +158,7 @@ public class CoreBundleActivator implements BundleActivator {
/**
* {@inheritDoc}
*/
- public void stop(BundleContext context) throws Exception {
+ public void deactivate(ComponentContext context) throws Exception {
this.tracker.unregisterAll();
this.startupTracker.stop();
this.configurationInitialiser.stop();
diff --git a/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernel_config.xml b/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernel_config.xml
new file mode 100644
index 00000000..cce44b31
--- /dev/null
+++ b/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernel_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
+ immediate="true" name="org.eclipse.virgo.kernel" configuration-policy="require">
+ <implementation
+ class="org.eclipse.virgo.kernel.config.internal.KernelConfigImpl" />
+ <service>
+ <provide interface="org.eclipse.virgo.kernel.core.KernelConfig" />
+ </service>
+</scr:component> \ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernelcore.xml b/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernelcore.xml
new file mode 100644
index 00000000..e08d39ab
--- /dev/null
+++ b/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernelcore.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="kernelcore" immediate="true" xmlns:src="http://www.osgi.org/xmlns/src/v1.1.0">
+ <implementation class="org.eclipse.virgo.kernel.core.internal.CoreBundleActivator"/>
+ <reference name="EventLogger"
+ interface="org.eclipse.virgo.medic.eventlog.EventLogger"
+ policy="dynamic"/>
+ <reference name="DumpGenerator"
+ interface="org.eclipse.virgo.medic.dump.DumpGenerator"
+ policy="dynamic"/>
+ <reference name="ConfigAdmin"
+ interface="org.osgi.service.cm.ConfigurationAdmin"
+ policy="dynamic"/>
+ <reference name="EventAdmin"
+ interface="org.osgi.service.event.EventAdmin"
+ policy="dynamic"/>
+</component> \ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.core/template.mf b/org.eclipse.virgo.kernel.core/template.mf
index 30876aa9..3b873aec 100644
--- a/org.eclipse.virgo.kernel.core/template.mf
+++ b/org.eclipse.virgo.kernel.core/template.mf
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Virgo Kernel Core
-Bundle-Activator: org.eclipse.virgo.kernel.core.internal.CoreBundleActivator
Bundle-SymbolicName: org.eclipse.virgo.kernel.core
Bundle-Version: 2.2.0
+Service-Component: OSGI-INF/kernel_config.xml,OSGI-INF/kernelcore.xml
Import-Template:
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/configuration-context.xml b/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/configuration-context.xml
deleted file mode 100644
index b368be7f..00000000
--- a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/configuration-context.xml
+++ /dev/null
@@ -1,16 +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"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:osgi-compendium="http://www.springframework.org/schema/osgi-compendium"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
- http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium-1.2.xsd">
-
- <osgi-compendium:cm-properties id="kernelConfig" persistent-id="org.eclipse.virgo.kernel"/>
-
- <context:property-placeholder properties-ref="kernelConfig"/>
-
-</beans>
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml b/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml
index 0a41f09b..2422fd1b 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml
+++ b/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml
@@ -1,309 +1,311 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
- 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-2.5.xsd">
-
- <service
- interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener">
- <beans:bean
- class="org.eclipse.virgo.kernel.install.artifact.internal.TreeRestrictingInstallArtifactLifecycleListener">
- <beans:constructor-arg ref="eventLogger" />
- </beans:bean>
- </service>
-
- <service id="applicationDeployer" ref="pipelinedApplicationDeployer"
- interface="org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer" />
-
- <beans:bean id="recoveryLog"
- class="org.eclipse.virgo.kernel.deployer.core.internal.recovery.DeployerRecoveryLog">
- <beans:constructor-arg value="#{workArea.workDirectory}" />
- </beans:bean>
-
- <beans:bean id="deploymentListener"
- class="org.eclipse.virgo.kernel.deployer.core.internal.recovery.DeployerRecoveryLogDeploymentListener">
- <beans:constructor-arg ref="recoveryLog" />
- </beans:bean>
-
- <beans:bean id="artifactStorageFactory"
- class="org.eclipse.virgo.kernel.install.artifact.internal.StandardArtifactStorageFactory">
- <beans:constructor-arg value="#{workArea.workDirectory}" />
- <beans:constructor-arg>
- <beans:bean
- class="org.eclipse.virgo.kernel.artifact.fs.StandardArtifactFSFactory" />
- </beans:constructor-arg>
- <beans:constructor-arg ref="eventLogger" />
- </beans:bean>
-
- <beans:bean id="syntheticContextCreatingTransformer"
- class="org.eclipse.virgo.kernel.install.pipeline.stage.transform.internal.SyntheticContextBundleCreatingTransformer">
- <beans:constructor-arg ref="bundleInstallArtifactTreeFactory" />
- <beans:constructor-arg ref="artifactStorageFactory" />
- </beans:bean>
-
- <beans:bean id="scopingTransformer"
- class="org.eclipse.virgo.kernel.install.pipeline.stage.transform.internal.ScopingTransformer" />
-
- <beans:bean id="bundleManifestVersionUpgrader"
- class="org.eclipse.virgo.kernel.deployer.core.internal.ManifestUpgrader" />
-
- <beans:bean id="planResolver"
- class="org.eclipse.virgo.kernel.deployer.core.internal.PlanResolver">
- <beans:constructor-arg ref="installArtifactTreeInclosure" />
- </beans:bean>
-
- <beans:bean id="importExpandingTransformer"
- class="org.eclipse.virgo.kernel.deployer.core.internal.ImportExpandingTransformer">
- <beans:constructor-arg ref="importExpander" />
- </beans:bean>
-
- <beans:bean id="bundleDeploymentProperties"
- class="org.eclipse.virgo.kernel.deployer.core.internal.BundleDeploymentPropertiesTransformer" />
-
- <beans:bean id="userInstalledTaggingTransformer"
- class="org.eclipse.virgo.kernel.install.pipeline.stage.transform.internal.UserInstalledTaggingTransformer" />
-
- <service
- interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
- ref="planResolver" ranking="1000" />
- <service
- interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
- ref="bundleManifestVersionUpgrader" ranking="2000" />
- <service
- interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
- ref="bundleDeploymentProperties" ranking="2500" />
- <service
- interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
- ref="userInstalledTaggingTransformer" ranking="2750" />
- <service
- interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
- ref="syntheticContextCreatingTransformer" ranking="3000" />
- <service
- interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
- ref="scopingTransformer" ranking="4000" />
- <service
- interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
- ref="importExpandingTransformer" ranking="5000" />
-
- <service id="recoveryMonitorService" ref="recoveryMonitor"
- interface="org.osgi.service.event.EventHandler">
- <service-properties>
- <beans:entry key="event.topics" value="org/eclipse/virgo/kernel/*" />
- </service-properties>
- </service>
-
- <beans:bean id="recoveryMonitor"
- class="org.eclipse.virgo.kernel.deployer.management.StandardRecoveryMonitor" />
-
- <service id="recoveryAgent" interface="org.osgi.service.event.EventHandler">
- <service-properties>
- <beans:entry key="event.topics" value="org/eclipse/virgo/kernel/*" />
- </service-properties>
- <beans:bean
- class="org.eclipse.virgo.kernel.deployer.core.internal.recovery.RecoveryAgent">
- <beans:constructor-arg ref="pipelinedApplicationDeployer" />
- <beans:constructor-arg ref="recoveryLog" />
- <beans:constructor-arg ref="eventLogger" />
- <beans:constructor-arg ref="eventAdmin" />
- </beans:bean>
- </service>
-
- <beans:bean id="mainPipeline" factory-bean="plumber"
- factory-method="getMainPipeline" />
- <beans:bean id="refreshSubpipeline" factory-bean="plumber"
- factory-method="getRefreshSubpipeline" />
-
- <beans:bean id="pipelinedApplicationDeployer"
- class="org.eclipse.virgo.kernel.deployer.core.internal.PipelinedApplicationDeployer">
- <beans:constructor-arg ref="mainPipeline" />
- <beans:constructor-arg ref="installArtifactTreeInclosure" />
- <beans:constructor-arg ref="installEnvironmentFactory" />
- <beans:constructor-arg ref="runtimeArtifactModel" />
- <beans:constructor-arg ref="deploymentListener" />
- <beans:constructor-arg ref="eventLogger" />
- <beans:constructor-arg ref="uriNormaliser" />
- <beans:constructor-arg ref="deployerConfig" />
- </beans:bean>
-
- <beans:bean id="stateCleanupListener"
- class="org.eclipse.virgo.kernel.deployer.core.internal.StateCleanupInstallArtifactLifecycleListener">
- <beans:constructor-arg ref="deploymentListener" />
- <beans:constructor-arg ref="runtimeArtifactModel" />
- </beans:bean>
-
- <service ref="stateCleanupListener"
- interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener" />
-
- <service ref="uriNormaliser"
- interface="org.eclipse.virgo.kernel.deployer.core.DeployUriNormaliser" />
-
- <beans:bean id="uriNormaliser"
- class="org.eclipse.virgo.kernel.deployer.core.internal.uri.CompoundDeployUriNormaliser">
- <beans:constructor-arg>
- <beans:list>
- <beans:bean
- class="org.eclipse.virgo.kernel.deployer.core.internal.uri.RepositoryDeployUriNormaliser">
- <beans:constructor-arg ref="repository" />
- <beans:constructor-arg ref="eventLogger" />
- </beans:bean>
- <beans:bean
- class="org.eclipse.virgo.kernel.deployer.core.internal.uri.FileDeployUriNormaliser" />
- </beans:list>
- </beans:constructor-arg>
- </beans:bean>
-
- <beans:bean id="plumber"
- class="org.eclipse.virgo.kernel.deployer.core.internal.Plumber">
- <beans:constructor-arg>
- <beans:bean factory-method="getPackageAdmin"
- class="org.eclipse.virgo.kernel.deployer.core.internal.RegionAwarePackageAdminAccessor">
- <beans:constructor-arg>
- <reference interface="org.eclipse.virgo.kernel.osgi.region.Region" />
- </beans:constructor-arg>
- </beans:bean>
- </beans:constructor-arg>
- <beans:constructor-arg ref="bundleContext" />
- <beans:constructor-arg ref="pipelineFactory" />
- <beans:constructor-arg ref="quasiFrameworkFactory" />
- </beans:bean>
-
- <beans:bean id="pipelineFactory"
- class="org.eclipse.virgo.kernel.install.pipeline.internal.StandardPipelineFactory" />
-
- <beans:bean id="installArtifactTreeInclosure"
- class="org.eclipse.virgo.kernel.install.artifact.internal.StandardInstallArtifactTreeInclosure">
- <beans:constructor-arg ref="artifactStorageFactory" />
- <beans:constructor-arg ref="bundleContext" />
- <beans:constructor-arg ref="repository" />
- <beans:constructor-arg ref="eventLogger" />
- <beans:constructor-arg ref="artifactIdentityDeterminer" />
- </beans:bean>
-
- <beans:bean id="installEnvironmentFactory"
- class="org.eclipse.virgo.kernel.install.environment.internal.StandardInstallEnvironmentFactory">
- <beans:constructor-arg ref="quasiFrameworkFactory" />
- <beans:constructor-arg ref="eventLogger" />
- </beans:bean>
-
- <beans:bean id="runtimeArtifactModel"
- class="org.eclipse.virgo.kernel.deployer.model.internal.StandardRuntimeArtifactModel">
- <beans:constructor-arg ref="uriNormaliser" />
- </beans:bean>
-
- <service ref="runtimeArtifactModel"
- interface="org.eclipse.virgo.kernel.deployer.model.RuntimeArtifactModel" />
-
- <service ref="loggingListener"
- interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener" />
-
- <beans:bean id="loggingListener"
- class="org.eclipse.virgo.kernel.install.artifact.internal.LoggingInstallArtifactLifecycleListener">
- <beans:constructor-arg ref="eventLogger" />
- </beans:bean>
-
- <beans:bean id="deployerConfig"
- class="org.eclipse.virgo.kernel.deployer.core.internal.StandardDeployerConfiguration">
- <beans:constructor-arg value="${deployer.timeout}" />
- <beans:constructor-arg value="${deployer.pickupDirectory}" />
- </beans:bean>
-
- <service ref="deployerConfig"
- interface="org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration" />
-
- <beans:bean id="applicationDeploymentEventNotifier"
- class="org.eclipse.virgo.kernel.deployer.core.event.ApplicationDeploymentEventNotifier">
- <beans:constructor-arg ref="deploymentListeners" />
- </beans:bean>
-
- <set id="deploymentListeners"
- interface="org.eclipse.virgo.kernel.deployer.core.event.DeploymentListener"
- cardinality="0..N" />
-
- <reference id="packageAdminUtil"
- interface="org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil" />
-
- <!-- scoping -->
- <reference id="scopeFactory"
- interface="org.eclipse.virgo.kernel.shim.scope.ScopeFactory" />
-
- <beans:bean id="scopeServiceRepository"
- class="org.eclipse.virgo.kernel.install.artifact.internal.StandardScopeServiceRepository" />
-
- <service ref="scopeServiceRepository"
- interface="org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository" />
-
- <!-- basic artifact identity determination -->
- <service
- interface="org.eclipse.virgo.kernel.install.artifact.ArtifactIdentityDeterminer">
- <beans:bean
- class="org.eclipse.virgo.kernel.install.artifact.internal.StandardArtifactIdentityDeterminer">
- <beans:constructor-arg>
- <set id="artifactBridges" interface="org.eclipse.virgo.repository.ArtifactBridge" />
- </beans:constructor-arg>
- </beans:bean>
- </service>
-
- <beans:bean id="artifactIdentityDeterminer"
- class="org.eclipse.virgo.kernel.install.artifact.internal.DelegatingServiceRegistryBackedArtifactIdentityDeterminer"
- init-method="init" destroy-method="destroy">
- <beans:constructor-arg ref="bundleContext" />
- </beans:bean>
-
- <beans:bean id="refreshHandler"
- class="org.eclipse.virgo.kernel.install.artifact.internal.StandardInstallArtifactRefreshHandler">
- <beans:constructor-arg ref="installEnvironmentFactory" />
- <beans:constructor-arg ref="refreshSubpipeline" />
- </beans:bean>
-
- <!-- basic artifact type factories -->
- <beans:bean id="bundleInstallArtifactTreeFactory"
- class="org.eclipse.virgo.kernel.install.artifact.internal.bundle.BundleInstallArtifactTreeFactory">
- <beans:constructor-arg ref="osgiFramework" />
- <beans:constructor-arg ref="bundleContext" />
- <beans:constructor-arg ref="refreshHandler" />
- <beans:constructor-arg ref="bundleStarter" />
- <beans:constructor-arg ref="tracingService" />
- <beans:constructor-arg ref="packageAdminUtil" />
- <beans:constructor-arg value="#{region.getBundleContext()}" />
- <beans:constructor-arg ref="eventLogger" />
- <beans:constructor-arg ref="artifactIdentityDeterminer" />
- </beans:bean>
-
- <service ref="bundleInstallArtifactTreeFactory"
- interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactTreeFactory" />
-
- <beans:bean id="configInstallArtifactTreeFactory"
- class="org.eclipse.virgo.kernel.install.artifact.internal.ConfigInstallArtifactTreeFactory">
- <beans:constructor-arg ref="bundleContext" />
- <beans:constructor-arg ref="configAdmin" />
- <beans:constructor-arg ref="eventLogger" />
- </beans:bean>
-
- <service ref="configInstallArtifactTreeFactory"
- interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactTreeFactory" />
-
- <service
- interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactTreeFactory">
- <beans:bean
- class="org.eclipse.virgo.kernel.install.artifact.internal.PlanInstallArtifactTreeFactory">
- <beans:constructor-arg ref="bundleContext" />
- <beans:constructor-arg ref="scopeServiceRepository" />
- <beans:constructor-arg ref="scopeFactory" />
- <beans:constructor-arg ref="eventLogger" />
- <beans:constructor-arg ref="bundleInstallArtifactTreeFactory" />
- <beans:constructor-arg ref="refreshHandler" />
- <beans:constructor-arg ref="configInstallArtifactTreeFactory" />
- <beans:constructor-arg ref="artifactStorageFactory" />
- <beans:constructor-arg ref="artifactIdentityDeterminer" />
- </beans:bean>
- </service>
-
- <service
- interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener">
- <beans:bean
- class="org.eclipse.virgo.kernel.install.artifact.internal.AtomicInstallArtifactLifecycleListener" />
- </service>
-
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+ 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-2.5.xsd">
+
+ <service
+ interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener">
+ <beans:bean
+ class="org.eclipse.virgo.kernel.install.artifact.internal.TreeRestrictingInstallArtifactLifecycleListener">
+ <beans:constructor-arg ref="eventLogger" />
+ </beans:bean>
+ </service>
+
+ <service id="applicationDeployer" ref="pipelinedApplicationDeployer"
+ interface="org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer" />
+
+ <beans:bean id="recoveryLog"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.recovery.DeployerRecoveryLog">
+ <beans:constructor-arg value="#{workArea.workDirectory}" />
+ </beans:bean>
+
+ <beans:bean id="deploymentListener"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.recovery.DeployerRecoveryLogDeploymentListener">
+ <beans:constructor-arg ref="recoveryLog" />
+ </beans:bean>
+
+ <beans:bean id="artifactStorageFactory"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.StandardArtifactStorageFactory">
+ <beans:constructor-arg value="#{workArea.workDirectory}" />
+ <beans:constructor-arg>
+ <beans:bean
+ class="org.eclipse.virgo.kernel.artifact.fs.StandardArtifactFSFactory" />
+ </beans:constructor-arg>
+ <beans:constructor-arg ref="eventLogger" />
+ </beans:bean>
+
+ <beans:bean id="syntheticContextCreatingTransformer"
+ class="org.eclipse.virgo.kernel.install.pipeline.stage.transform.internal.SyntheticContextBundleCreatingTransformer">
+ <beans:constructor-arg ref="bundleInstallArtifactTreeFactory" />
+ <beans:constructor-arg ref="artifactStorageFactory" />
+ </beans:bean>
+
+ <beans:bean id="scopingTransformer"
+ class="org.eclipse.virgo.kernel.install.pipeline.stage.transform.internal.ScopingTransformer" />
+
+ <beans:bean id="bundleManifestVersionUpgrader"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.ManifestUpgrader" />
+
+ <beans:bean id="planResolver"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.PlanResolver">
+ <beans:constructor-arg ref="installArtifactTreeInclosure" />
+ </beans:bean>
+
+ <beans:bean id="importExpandingTransformer"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.ImportExpandingTransformer">
+ <beans:constructor-arg ref="importExpander" />
+ </beans:bean>
+
+ <beans:bean id="bundleDeploymentProperties"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.BundleDeploymentPropertiesTransformer" />
+
+ <beans:bean id="userInstalledTaggingTransformer"
+ class="org.eclipse.virgo.kernel.install.pipeline.stage.transform.internal.UserInstalledTaggingTransformer" />
+
+ <service
+ interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
+ ref="planResolver" ranking="1000" />
+ <service
+ interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
+ ref="bundleManifestVersionUpgrader" ranking="2000" />
+ <service
+ interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
+ ref="bundleDeploymentProperties" ranking="2500" />
+ <service
+ interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
+ ref="userInstalledTaggingTransformer" ranking="2750" />
+ <service
+ interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
+ ref="syntheticContextCreatingTransformer" ranking="3000" />
+ <service
+ interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
+ ref="scopingTransformer" ranking="4000" />
+ <service
+ interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer"
+ ref="importExpandingTransformer" ranking="5000" />
+
+ <service id="recoveryMonitorService" ref="recoveryMonitor"
+ interface="org.osgi.service.event.EventHandler">
+ <service-properties>
+ <beans:entry key="event.topics" value="org/eclipse/virgo/kernel/*" />
+ </service-properties>
+ </service>
+
+ <beans:bean id="recoveryMonitor"
+ class="org.eclipse.virgo.kernel.deployer.management.StandardRecoveryMonitor" />
+
+ <service id="recoveryAgent" interface="org.osgi.service.event.EventHandler">
+ <service-properties>
+ <beans:entry key="event.topics" value="org/eclipse/virgo/kernel/*" />
+ </service-properties>
+ <beans:bean
+ class="org.eclipse.virgo.kernel.deployer.core.internal.recovery.RecoveryAgent">
+ <beans:constructor-arg ref="pipelinedApplicationDeployer" />
+ <beans:constructor-arg ref="recoveryLog" />
+ <beans:constructor-arg ref="eventLogger" />
+ <beans:constructor-arg ref="eventAdmin" />
+ </beans:bean>
+ </service>
+
+ <beans:bean id="mainPipeline" factory-bean="plumber"
+ factory-method="getMainPipeline" />
+ <beans:bean id="refreshSubpipeline" factory-bean="plumber"
+ factory-method="getRefreshSubpipeline" />
+
+ <beans:bean id="pipelinedApplicationDeployer"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.PipelinedApplicationDeployer">
+ <beans:constructor-arg ref="mainPipeline" />
+ <beans:constructor-arg ref="installArtifactTreeInclosure" />
+ <beans:constructor-arg ref="installEnvironmentFactory" />
+ <beans:constructor-arg ref="runtimeArtifactModel" />
+ <beans:constructor-arg ref="deploymentListener" />
+ <beans:constructor-arg ref="eventLogger" />
+ <beans:constructor-arg ref="uriNormaliser" />
+ <beans:constructor-arg ref="deployerConfig" />
+ </beans:bean>
+
+ <beans:bean id="stateCleanupListener"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.StateCleanupInstallArtifactLifecycleListener">
+ <beans:constructor-arg ref="deploymentListener" />
+ <beans:constructor-arg ref="runtimeArtifactModel" />
+ </beans:bean>
+
+ <service ref="stateCleanupListener"
+ interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener" />
+
+ <service ref="uriNormaliser"
+ interface="org.eclipse.virgo.kernel.deployer.core.DeployUriNormaliser" />
+
+ <beans:bean id="uriNormaliser"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.uri.CompoundDeployUriNormaliser">
+ <beans:constructor-arg>
+ <beans:list>
+ <beans:bean
+ class="org.eclipse.virgo.kernel.deployer.core.internal.uri.RepositoryDeployUriNormaliser">
+ <beans:constructor-arg ref="repository" />
+ <beans:constructor-arg ref="eventLogger" />
+ </beans:bean>
+ <beans:bean
+ class="org.eclipse.virgo.kernel.deployer.core.internal.uri.FileDeployUriNormaliser" />
+ </beans:list>
+ </beans:constructor-arg>
+ </beans:bean>
+
+ <beans:bean id="plumber"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.Plumber">
+ <beans:constructor-arg>
+ <beans:bean factory-method="getPackageAdmin"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.RegionAwarePackageAdminAccessor">
+ <beans:constructor-arg>
+ <reference interface="org.eclipse.virgo.kernel.osgi.region.Region" />
+ </beans:constructor-arg>
+ </beans:bean>
+ </beans:constructor-arg>
+ <beans:constructor-arg ref="bundleContext" />
+ <beans:constructor-arg ref="pipelineFactory" />
+ <beans:constructor-arg ref="quasiFrameworkFactory" />
+ </beans:bean>
+
+ <beans:bean id="pipelineFactory"
+ class="org.eclipse.virgo.kernel.install.pipeline.internal.StandardPipelineFactory" />
+
+ <beans:bean id="installArtifactTreeInclosure"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.StandardInstallArtifactTreeInclosure">
+ <beans:constructor-arg ref="artifactStorageFactory" />
+ <beans:constructor-arg ref="bundleContext" />
+ <beans:constructor-arg ref="repository" />
+ <beans:constructor-arg ref="eventLogger" />
+ <beans:constructor-arg ref="artifactIdentityDeterminer" />
+ </beans:bean>
+
+ <beans:bean id="installEnvironmentFactory"
+ class="org.eclipse.virgo.kernel.install.environment.internal.StandardInstallEnvironmentFactory">
+ <beans:constructor-arg ref="quasiFrameworkFactory" />
+ <beans:constructor-arg ref="eventLogger" />
+ </beans:bean>
+
+ <beans:bean id="runtimeArtifactModel"
+ class="org.eclipse.virgo.kernel.deployer.model.internal.StandardRuntimeArtifactModel">
+ <beans:constructor-arg ref="uriNormaliser" />
+ </beans:bean>
+
+ <service ref="runtimeArtifactModel"
+ interface="org.eclipse.virgo.kernel.deployer.model.RuntimeArtifactModel" />
+
+ <service ref="loggingListener"
+ interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener" />
+
+ <beans:bean id="loggingListener"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.LoggingInstallArtifactLifecycleListener">
+ <beans:constructor-arg ref="eventLogger" />
+ </beans:bean>
+
+ <reference id="kernelConfig" interface="org.eclipse.virgo.kernel.core.KernelConfig"/>
+
+ <beans:bean id="deployerConfig"
+ class="org.eclipse.virgo.kernel.deployer.core.internal.StandardDeployerConfiguration">
+ <beans:constructor-arg value="#{kernelConfig.getProperty('deployer.timeout')}" />
+ <beans:constructor-arg value="#{kernelConfig.getProperty('deployer.pickupDirectory')}" />
+ </beans:bean>
+
+ <service ref="deployerConfig"
+ interface="org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration" />
+
+ <beans:bean id="applicationDeploymentEventNotifier"
+ class="org.eclipse.virgo.kernel.deployer.core.event.ApplicationDeploymentEventNotifier">
+ <beans:constructor-arg ref="deploymentListeners" />
+ </beans:bean>
+
+ <set id="deploymentListeners"
+ interface="org.eclipse.virgo.kernel.deployer.core.event.DeploymentListener"
+ cardinality="0..N" />
+
+ <reference id="packageAdminUtil"
+ interface="org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil" />
+
+ <!-- scoping -->
+ <reference id="scopeFactory"
+ interface="org.eclipse.virgo.kernel.shim.scope.ScopeFactory" />
+
+ <beans:bean id="scopeServiceRepository"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.StandardScopeServiceRepository" />
+
+ <service ref="scopeServiceRepository"
+ interface="org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository" />
+
+ <!-- basic artifact identity determination -->
+ <service
+ interface="org.eclipse.virgo.kernel.install.artifact.ArtifactIdentityDeterminer">
+ <beans:bean
+ class="org.eclipse.virgo.kernel.install.artifact.internal.StandardArtifactIdentityDeterminer">
+ <beans:constructor-arg>
+ <set id="artifactBridges" interface="org.eclipse.virgo.repository.ArtifactBridge" />
+ </beans:constructor-arg>
+ </beans:bean>
+ </service>
+
+ <beans:bean id="artifactIdentityDeterminer"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.DelegatingServiceRegistryBackedArtifactIdentityDeterminer"
+ init-method="init" destroy-method="destroy">
+ <beans:constructor-arg ref="bundleContext" />
+ </beans:bean>
+
+ <beans:bean id="refreshHandler"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.StandardInstallArtifactRefreshHandler">
+ <beans:constructor-arg ref="installEnvironmentFactory" />
+ <beans:constructor-arg ref="refreshSubpipeline" />
+ </beans:bean>
+
+ <!-- basic artifact type factories -->
+ <beans:bean id="bundleInstallArtifactTreeFactory"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.bundle.BundleInstallArtifactTreeFactory">
+ <beans:constructor-arg ref="osgiFramework" />
+ <beans:constructor-arg ref="bundleContext" />
+ <beans:constructor-arg ref="refreshHandler" />
+ <beans:constructor-arg ref="bundleStarter" />
+ <beans:constructor-arg ref="tracingService" />
+ <beans:constructor-arg ref="packageAdminUtil" />
+ <beans:constructor-arg value="#{region.getBundleContext()}" />
+ <beans:constructor-arg ref="eventLogger" />
+ <beans:constructor-arg ref="artifactIdentityDeterminer" />
+ </beans:bean>
+
+ <service ref="bundleInstallArtifactTreeFactory"
+ interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactTreeFactory" />
+
+ <beans:bean id="configInstallArtifactTreeFactory"
+ class="org.eclipse.virgo.kernel.install.artifact.internal.ConfigInstallArtifactTreeFactory">
+ <beans:constructor-arg ref="bundleContext" />
+ <beans:constructor-arg ref="configAdmin" />
+ <beans:constructor-arg ref="eventLogger" />
+ </beans:bean>
+
+ <service ref="configInstallArtifactTreeFactory"
+ interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactTreeFactory" />
+
+ <service
+ interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactTreeFactory">
+ <beans:bean
+ class="org.eclipse.virgo.kernel.install.artifact.internal.PlanInstallArtifactTreeFactory">
+ <beans:constructor-arg ref="bundleContext" />
+ <beans:constructor-arg ref="scopeServiceRepository" />
+ <beans:constructor-arg ref="scopeFactory" />
+ <beans:constructor-arg ref="eventLogger" />
+ <beans:constructor-arg ref="bundleInstallArtifactTreeFactory" />
+ <beans:constructor-arg ref="refreshHandler" />
+ <beans:constructor-arg ref="configInstallArtifactTreeFactory" />
+ <beans:constructor-arg ref="artifactStorageFactory" />
+ <beans:constructor-arg ref="artifactIdentityDeterminer" />
+ </beans:bean>
+ </service>
+
+ <service
+ interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener">
+ <beans:bean
+ class="org.eclipse.virgo.kernel.install.artifact.internal.AtomicInstallArtifactLifecycleListener" />
+ </service>
+
+</beans:beans>
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/management-context.xml b/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/management-context.xml
index e80bd4e7..6badf422 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/management-context.xml
+++ b/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/management-context.xml
@@ -1,25 +1,27 @@
-<?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/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <!-- Deployer -->
- <bean class="org.eclipse.virgo.kernel.management.ManagementExporter">
- <constructor-arg>
- <bean class="org.eclipse.virgo.kernel.deployer.management.StandardDeployer">
- <constructor-arg ref="pipelinedApplicationDeployer" />
- </bean>
- </constructor-arg>
- <constructor-arg
- value="${domain}:category=Control,type=Deployer" />
- </bean>
-
- <!-- RecoveryMonitor -->
- <bean class="org.eclipse.virgo.kernel.management.ManagementExporter">
- <constructor-arg ref="recoveryMonitor" />
- <constructor-arg
- value="${domain}:category=Control,type=RecoveryMonitor" />
- </bean>
-</beans>
+<?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/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+ <!-- Deployer -->
+ <bean class="org.eclipse.virgo.kernel.management.ManagementExporter">
+ <constructor-arg>
+ <bean class="org.eclipse.virgo.kernel.deployer.management.StandardDeployer">
+ <constructor-arg ref="pipelinedApplicationDeployer" />
+ </bean>
+ </constructor-arg>
+ <constructor-arg
+ value="#{kernelConfig.getProperty('domain')}:category=Control,type=Deployer" />
+ </bean>
+
+ <!-- RecoveryMonitor -->
+ <bean class="org.eclipse.virgo.kernel.management.ManagementExporter">
+ <constructor-arg ref="recoveryMonitor" />
+ <constructor-arg
+ value="#{kernelConfig.getProperty('domain')}:category=Control,type=RecoveryMonitor" />
+ </bean>
+
+ <osgi:reference id="kernelConfig" interface="org.eclipse.virgo.kernel.core.KernelConfig"/>
+</beans>
diff --git a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml
index 78edaead..c07ea468 100644
--- a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml
+++ b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml
@@ -1,75 +1,76 @@
-<?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:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <bean class="org.eclipse.virgo.kernel.model.internal.bundle.ModelBundleListenerInitializer">
- <constructor-arg ref="artifactRepository"/>
- <constructor-arg ref="packageAdminUtil"/>
- <constructor-arg ref="bundleContext"/>
- <constructor-arg ref="userBundleContext"/>
- </bean>
-
- <bean class="org.eclipse.virgo.kernel.model.internal.configurationadmin.ModelConfigurationListenerInitializer">
- <constructor-arg ref="artifactRepository"/>
- <constructor-arg ref="bundleContext"/>
- <constructor-arg ref="configurationAdmin"/>
- </bean>
-
- <bean class="org.eclipse.virgo.kernel.model.internal.deployer.ModelInstallArtifactLifecycleListenerInitializer">
- <constructor-arg ref="artifactRepository"/>
- <constructor-arg ref="bundleContext"/>
- <constructor-arg ref="runtimeArtifactModel"/>
- </bean>
-
- <bean id="bundleDependencyDeterminer" class="org.eclipse.virgo.kernel.model.internal.bundle.BundleDependencyDeterminer">
- <constructor-arg ref="quasiFrameworkFactory"/>
- <constructor-arg ref="artifactRepository"/>
- </bean>
-
- <bean id="deployerCompositeArtifactDependencyDeterminer"
- class="org.eclipse.virgo.kernel.model.internal.deployer.DeployerCompositeArtifactDependencyDeterminer">
- <constructor-arg ref="artifactRepository"/>
- </bean>
-
- <bean id="artifactRepository" class="org.eclipse.virgo.kernel.model.internal.NotifyingRuntimeArtifactRepository">
- <constructor-arg ref="artifactRepositoryListener"/>
- </bean>
-
- <bean id="artifactRepositoryListener" class="org.eclipse.virgo.kernel.model.management.internal.JmxArtifactRepositoryListener"
- destroy-method="destroy">
- <constructor-arg ref="runtimeArtifactModelObjectNameCreator"/>
- </bean>
-
- <bean id="runtimeArtifactModelObjectNameCreator" class="org.eclipse.virgo.kernel.model.management.internal.DefaultRuntimeArtifactModelObjectNameCreator">
- <constructor-arg value="${domain}"/>
- </bean>
-
- <bean id="installer" class="org.eclipse.virgo.kernel.model.management.internal.DelegatingInstaller">
- <constructor-arg ref="applicationDeployer"/>
- <constructor-arg ref="runtimeArtifactModelObjectNameCreator"/>
- </bean>
-
- <context:property-placeholder properties-ref="config-admin"/>
-
- <context:annotation-config/>
-
- <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter">
- <property name="beans">
- <map>
- <entry key="installer" value-ref="installer"/>
- </map>
- </property>
- <property name="namingStrategy">
- <bean class="org.springframework.jmx.export.naming.KeyNamingStrategy">
- <property name="mappings">
- <props>
- <prop key="installer">${domain}:type=Model,name=installer</prop>
- </props>
- </property>
- </bean>
- </property>
- </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:osgi="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+ <bean class="org.eclipse.virgo.kernel.model.internal.bundle.ModelBundleListenerInitializer">
+ <constructor-arg ref="artifactRepository"/>
+ <constructor-arg ref="packageAdminUtil"/>
+ <constructor-arg ref="bundleContext"/>
+ <constructor-arg ref="userBundleContext"/>
+ </bean>
+
+ <bean class="org.eclipse.virgo.kernel.model.internal.configurationadmin.ModelConfigurationListenerInitializer">
+ <constructor-arg ref="artifactRepository"/>
+ <constructor-arg ref="bundleContext"/>
+ <constructor-arg ref="configurationAdmin"/>
+ </bean>
+
+ <bean class="org.eclipse.virgo.kernel.model.internal.deployer.ModelInstallArtifactLifecycleListenerInitializer">
+ <constructor-arg ref="artifactRepository"/>
+ <constructor-arg ref="bundleContext"/>
+ <constructor-arg ref="runtimeArtifactModel"/>
+ </bean>
+
+ <bean id="bundleDependencyDeterminer" class="org.eclipse.virgo.kernel.model.internal.bundle.BundleDependencyDeterminer">
+ <constructor-arg ref="quasiFrameworkFactory"/>
+ <constructor-arg ref="artifactRepository"/>
+ </bean>
+
+ <bean id="deployerCompositeArtifactDependencyDeterminer"
+ class="org.eclipse.virgo.kernel.model.internal.deployer.DeployerCompositeArtifactDependencyDeterminer">
+ <constructor-arg ref="artifactRepository"/>
+ </bean>
+
+ <bean id="artifactRepository" class="org.eclipse.virgo.kernel.model.internal.NotifyingRuntimeArtifactRepository">
+ <constructor-arg ref="artifactRepositoryListener"/>
+ </bean>
+
+ <bean id="artifactRepositoryListener" class="org.eclipse.virgo.kernel.model.management.internal.JmxArtifactRepositoryListener"
+ destroy-method="destroy">
+ <constructor-arg ref="runtimeArtifactModelObjectNameCreator"/>
+ </bean>
+
+ <bean id="runtimeArtifactModelObjectNameCreator" class="org.eclipse.virgo.kernel.model.management.internal.DefaultRuntimeArtifactModelObjectNameCreator">
+ <constructor-arg value="#{kernelConfig.getProperty('domain')}"/>
+ </bean>
+
+ <bean id="installer" class="org.eclipse.virgo.kernel.model.management.internal.DelegatingInstaller">
+ <constructor-arg ref="applicationDeployer"/>
+ <constructor-arg ref="runtimeArtifactModelObjectNameCreator"/>
+ </bean>
+
+ <osgi:reference id="kernelConfig" interface="org.eclipse.virgo.kernel.core.KernelConfig"/>
+
+ <context:annotation-config/>
+
+ <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter">
+ <property name="beans">
+ <map>
+ <entry key="installer" value-ref="installer"/>
+ </map>
+ </property>
+ <property name="namingStrategy">
+ <bean class="org.springframework.jmx.export.naming.KeyNamingStrategy">
+ <property name="mappings">
+ <props>
+ <prop key="installer">#{kernelConfig.getProperty('domain')}:type=Model,name=installer</prop>
+ </props>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+</beans>
diff --git a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml
index d47d47e8..62a60c80 100644
--- a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml
@@ -1,48 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans
- xmlns="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:osgi-compendium="http://www.springframework.org/schema/osgi-compendium"
- xsi:schemaLocation="
- http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium-1.2.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
- <service ref="artifactRepository" interface="org.eclipse.virgo.kernel.model.RuntimeArtifactRepository"/>
-
- <service ref="bundleDependencyDeterminer" interface="org.eclipse.virgo.kernel.model.internal.DependencyDeterminer">
- <service-properties>
- <beans:entry key="artifactType" value="bundle"/>
- </service-properties>
- </service>
-
- <service ref="deployerCompositeArtifactDependencyDeterminer" interface="org.eclipse.virgo.kernel.model.internal.DependencyDeterminer">
- <service-properties>
- <beans:entry key="artifactType" value="plan"/>
- </service-properties>
- </service>
-
- <service ref="deployerCompositeArtifactDependencyDeterminer" interface="org.eclipse.virgo.kernel.model.internal.DependencyDeterminer">
- <service-properties>
- <beans:entry key="artifactType" value="par"/>
- </service-properties>
- </service>
-
- <service ref="runtimeArtifactModelObjectNameCreator" interface="org.eclipse.virgo.kernel.model.management.RuntimeArtifactModelObjectNameCreator"/>
-
- <reference id="packageAdminUtil" interface="org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil"/>
-
- <reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
-
- <reference id="quasiFrameworkFactory" interface="org.eclipse.virgo.kernel.osgi.quasi.QuasiFrameworkFactory"/>
-
- <reference id="runtimeArtifactModel" interface="org.eclipse.virgo.kernel.deployer.model.RuntimeArtifactModel"/>
-
- <reference id="userBundleContext" interface="org.osgi.framework.BundleContext" filter="(org.eclipse.virgo.kernel.regionContext=true)"/>
-
- <reference id="applicationDeployer" interface="org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer"/>
-
- <osgi-compendium:cm-properties id="config-admin" persistent-id="org.eclipse.virgo.kernel"/>
-
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans
+ xmlns="http://www.springframework.org/schema/osgi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:osgi-compendium="http://www.springframework.org/schema/osgi-compendium"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium-1.2.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+ <service ref="artifactRepository" interface="org.eclipse.virgo.kernel.model.RuntimeArtifactRepository"/>
+
+ <service ref="bundleDependencyDeterminer" interface="org.eclipse.virgo.kernel.model.internal.DependencyDeterminer">
+ <service-properties>
+ <beans:entry key="artifactType" value="bundle"/>
+ </service-properties>
+ </service>
+
+ <service ref="deployerCompositeArtifactDependencyDeterminer" interface="org.eclipse.virgo.kernel.model.internal.DependencyDeterminer">
+ <service-properties>
+ <beans:entry key="artifactType" value="plan"/>
+ </service-properties>
+ </service>
+
+ <service ref="deployerCompositeArtifactDependencyDeterminer" interface="org.eclipse.virgo.kernel.model.internal.DependencyDeterminer">
+ <service-properties>
+ <beans:entry key="artifactType" value="par"/>
+ </service-properties>
+ </service>
+
+ <service ref="runtimeArtifactModelObjectNameCreator" interface="org.eclipse.virgo.kernel.model.management.RuntimeArtifactModelObjectNameCreator"/>
+
+ <reference id="packageAdminUtil" interface="org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil"/>
+
+ <reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
+
+ <reference id="quasiFrameworkFactory" interface="org.eclipse.virgo.kernel.osgi.quasi.QuasiFrameworkFactory"/>
+
+ <reference id="runtimeArtifactModel" interface="org.eclipse.virgo.kernel.deployer.model.RuntimeArtifactModel"/>
+
+ <reference id="userBundleContext" interface="org.osgi.framework.BundleContext" filter="(org.eclipse.virgo.kernel.regionContext=true)"/>
+
+ <reference id="applicationDeployer" interface="org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer"/>
+
+</beans:beans>
diff --git a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/concurrent-context.xml b/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/concurrent-context.xml
index 453fb92d..9f262ff4 100644
--- a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/concurrent-context.xml
+++ b/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/concurrent-context.xml
@@ -1,33 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.5.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-
- <reference id="dumpGenerator" interface="org.eclipse.virgo.medic.dump.DumpGenerator"/>
-
- <reference id="eventLogger" interface="org.eclipse.virgo.medic.eventlog.EventLogger"/>
-
- <reference id="tracingService" interface="org.eclipse.virgo.kernel.shim.serviceability.TracingService" />
-
- <beans:bean id="exporter" class="org.eclipse.virgo.kernel.services.concurrent.management.JmxExecutorServiceExporter" destroy-method="destroy">
- <beans:constructor-arg value="${domain}"/>
- </beans:bean>
-
- <beans:bean id="deadlockMonitor" class="org.eclipse.virgo.kernel.services.concurrent.monitor.DeadlockMonitor" init-method="start" destroy-method="stop">
- <beans:constructor-arg>
- <beans:bean class="org.eclipse.virgo.kernel.services.concurrent.KernelScheduledThreadPoolExecutor">
- <beans:constructor-arg value="1"/>
- <beans:constructor-arg value="deadlock-monitor"/>
- <beans:constructor-arg ref="tracingService"/>
- </beans:bean>
- </beans:constructor-arg>
- <beans:constructor-arg ref="dumpGenerator"/>
- <beans:constructor-arg ref="eventLogger"/>
- </beans:bean>
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-2.5.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+
+ <reference id="dumpGenerator" interface="org.eclipse.virgo.medic.dump.DumpGenerator"/>
+
+ <reference id="eventLogger" interface="org.eclipse.virgo.medic.eventlog.EventLogger"/>
+
+ <reference id="tracingService" interface="org.eclipse.virgo.kernel.shim.serviceability.TracingService" />
+
+ <reference id="kernelConfig" interface="org.eclipse.virgo.kernel.core.KernelConfig"/>
+
+ <beans:bean id="exporter" class="org.eclipse.virgo.kernel.services.concurrent.management.JmxExecutorServiceExporter" destroy-method="destroy">
+ <beans:constructor-arg value="#{kernelConfig.getProperty('domain')}"/>
+ </beans:bean>
+
+ <beans:bean id="deadlockMonitor" class="org.eclipse.virgo.kernel.services.concurrent.monitor.DeadlockMonitor" init-method="start" destroy-method="stop">
+ <beans:constructor-arg>
+ <beans:bean class="org.eclipse.virgo.kernel.services.concurrent.KernelScheduledThreadPoolExecutor">
+ <beans:constructor-arg value="1"/>
+ <beans:constructor-arg value="deadlock-monitor"/>
+ <beans:constructor-arg ref="tracingService"/>
+ </beans:bean>
+ </beans:constructor-arg>
+ <beans:constructor-arg ref="dumpGenerator"/>
+ <beans:constructor-arg ref="eventLogger"/>
+ </beans:bean>
+</beans:beans>
diff --git a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/configuration-context.xml b/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/configuration-context.xml
deleted file mode 100644
index b368be7f..00000000
--- a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/configuration-context.xml
+++ /dev/null
@@ -1,16 +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"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:osgi-compendium="http://www.springframework.org/schema/osgi-compendium"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
- http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium-1.2.xsd">
-
- <osgi-compendium:cm-properties id="kernelConfig" persistent-id="org.eclipse.virgo.kernel"/>
-
- <context:property-placeholder properties-ref="kernelConfig"/>
-
-</beans>
diff --git a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/io-context.xml b/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/io-context.xml
index c0b46830..0990c347 100644
--- a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/io-context.xml
+++ b/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/io-context.xml
@@ -1,20 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:beans="http://www.springframework.org/schema/beans"
- 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-2.5.xsd">
-
- <beans:bean id="workAreaFactory" class="org.eclipse.virgo.kernel.services.work.WorkAreaServiceFactory">
- <beans:constructor-arg value="${work.directory}"/>
- </beans:bean>
-
- <beans:bean id="kernelWorkArea" class="org.eclipse.virgo.kernel.services.work.StandardWorkArea">
- <beans:constructor-arg value="${work.directory}"/>
- <beans:constructor-arg value="#{bundleContext.bundle}"/>
- </beans:bean>
-
- <service interface="org.eclipse.virgo.kernel.services.work.WorkArea" ref="workAreaFactory"/>
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ 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-2.5.xsd">
+
+ <beans:bean id="workAreaFactory" class="org.eclipse.virgo.kernel.services.work.WorkAreaServiceFactory">
+ <beans:constructor-arg value="#{kernelConfig.getProperty('work.directory')}"/>
+ </beans:bean>
+
+ <beans:bean id="kernelWorkArea" class="org.eclipse.virgo.kernel.services.work.StandardWorkArea">
+ <beans:constructor-arg value="#{kernelConfig.getProperty('work.directory')}"/>
+ <beans:constructor-arg value="#{bundleContext.bundle}"/>
+ </beans:bean>
+
+ <service interface="org.eclipse.virgo.kernel.services.work.WorkArea" ref="workAreaFactory"/>
+
+ <reference id="kernelConfig" interface="org.eclipse.virgo.kernel.core.KernelConfig"/>
+
+</beans:beans>
diff --git a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/repository-context.xml b/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/repository-context.xml
index f802edaa..c8a3de66 100644
--- a/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/repository-context.xml
+++ b/org.eclipse.virgo.kernel.services/src/main/resources/META-INF/spring/repository-context.xml
@@ -1,62 +1,64 @@
-<?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"
- xmlns:osgi-compendium="http://www.springframework.org/schema/osgi-compendium"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium-1.2.xsd">
-
- <bean id="repository" class="org.eclipse.virgo.kernel.services.repository.internal.RepositoryFactoryBean" destroy-method="destroy">
- <constructor-arg>
- <osgi-compendium:cm-properties persistent-id="org.eclipse.virgo.repository"/>
- </constructor-arg>
- <constructor-arg ref="eventLogger"/>
- <constructor-arg ref="repositoryFactory"/>
- <constructor-arg value="${work.directory}"/>
- <constructor-arg >
- <set>
- <ref bean="bundleBridge"/>
- <ref bean="libraryBridge"/>
- <ref bean="parBridge"/>
- <ref bean="planBridge"/>
- <ref bean="propertiesBridge"/>
- </set>
- </constructor-arg>
- <constructor-arg value="${domain}"/>
- </bean>
-
- <bean id="bundleBridge" class="org.eclipse.virgo.kernel.artifact.bundle.BundleBridge">
- <constructor-arg ref="hashGenerator"/>
- </bean>
- <osgi:service ref="bundleBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
-
- <bean id="libraryBridge" class="org.eclipse.virgo.kernel.artifact.library.LibraryBridge">
- <constructor-arg ref="hashGenerator"/>
- </bean>
- <osgi:service ref="libraryBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
-
- <bean id="parBridge" class="org.eclipse.virgo.kernel.artifact.par.ParBridge">
- <constructor-arg ref="hashGenerator"/>
- </bean>
- <osgi:service ref="parBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
-
- <bean id="planBridge" class="org.eclipse.virgo.kernel.artifact.plan.PlanBridge">
- <constructor-arg ref="hashGenerator"/>
- </bean>
- <osgi:service ref="planBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
-
- <bean id="propertiesBridge" class="org.eclipse.virgo.kernel.artifact.properties.PropertiesBridge">
- <constructor-arg ref="hashGenerator"/>
- </bean>
- <osgi:service ref="propertiesBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
-
- <osgi:reference id="repositoryFactory" interface="org.eclipse.virgo.repository.RepositoryFactory" />
-
- <osgi:reference id="eventLogger" interface="org.eclipse.virgo.medic.eventlog.EventLogger" />
-
- <osgi:service ref="repository" interface="org.eclipse.virgo.repository.Repository"/>
-
- <osgi:reference id="hashGenerator" interface="org.eclipse.virgo.repository.HashGenerator"/>
-
-</beans>
+<?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"
+ xmlns:osgi-compendium="http://www.springframework.org/schema/osgi-compendium"
+ xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium-1.2.xsd">
+
+ <bean id="repository" class="org.eclipse.virgo.kernel.services.repository.internal.RepositoryFactoryBean" destroy-method="destroy">
+ <constructor-arg>
+ <osgi-compendium:cm-properties persistent-id="org.eclipse.virgo.repository"/>
+ </constructor-arg>
+ <constructor-arg ref="eventLogger"/>
+ <constructor-arg ref="repositoryFactory"/>
+ <constructor-arg value="#{kernelConfig.getProperty('work.directory')}"/>
+ <constructor-arg >
+ <set>
+ <ref bean="bundleBridge"/>
+ <ref bean="libraryBridge"/>
+ <ref bean="parBridge"/>
+ <ref bean="planBridge"/>
+ <ref bean="propertiesBridge"/>
+ </set>
+ </constructor-arg>
+ <constructor-arg value="#{kernelConfig.getProperty('domain')}"/>
+ </bean>
+
+ <bean id="bundleBridge" class="org.eclipse.virgo.kernel.artifact.bundle.BundleBridge">
+ <constructor-arg ref="hashGenerator"/>
+ </bean>
+ <osgi:service ref="bundleBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
+
+ <bean id="libraryBridge" class="org.eclipse.virgo.kernel.artifact.library.LibraryBridge">
+ <constructor-arg ref="hashGenerator"/>
+ </bean>
+ <osgi:service ref="libraryBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
+
+ <bean id="parBridge" class="org.eclipse.virgo.kernel.artifact.par.ParBridge">
+ <constructor-arg ref="hashGenerator"/>
+ </bean>
+ <osgi:service ref="parBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
+
+ <bean id="planBridge" class="org.eclipse.virgo.kernel.artifact.plan.PlanBridge">
+ <constructor-arg ref="hashGenerator"/>
+ </bean>
+ <osgi:service ref="planBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
+
+ <bean id="propertiesBridge" class="org.eclipse.virgo.kernel.artifact.properties.PropertiesBridge">
+ <constructor-arg ref="hashGenerator"/>
+ </bean>
+ <osgi:service ref="propertiesBridge" interface="org.eclipse.virgo.repository.ArtifactBridge"/>
+
+ <osgi:reference id="repositoryFactory" interface="org.eclipse.virgo.repository.RepositoryFactory" />
+
+ <osgi:reference id="eventLogger" interface="org.eclipse.virgo.medic.eventlog.EventLogger" />
+
+ <osgi:service ref="repository" interface="org.eclipse.virgo.repository.Repository"/>
+
+ <osgi:reference id="hashGenerator" interface="org.eclipse.virgo.repository.HashGenerator"/>
+
+ <osgi:reference id="kernelConfig" interface="org.eclipse.virgo.kernel.core.KernelConfig"/>
+
+</beans>

Back to the top