Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2011-01-23 05:47:54 -0500
committerBorislav Kapukaranov2011-01-23 05:47:54 -0500
commitde9f6e395197d7976a7707af7cedacc4bb79fe07 (patch)
treee74811cad42cc544cfe9e1ac66af074b9c83ebb2 /org.eclipse.virgo.kernel.services
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
Diffstat (limited to 'org.eclipse.virgo.kernel.services')
-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
4 files changed, 122 insertions, 131 deletions
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