You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2015/04/12 20:54:31 UTC
karaf git commit: [KARAF-3514] Reorganized feature template entires,
and force initial boot at level 1 before rising to lock level.
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 9b85f046d -> 2cecfdf1b
[KARAF-3514] Reorganized feature template entires, and force initial boot at level 1 before rising to lock level.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2cecfdf1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2cecfdf1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2cecfdf1
Branch: refs/heads/karaf-3.0.x
Commit: 2cecfdf1be601f6839894f38e8808cf081056e89
Parents: 9b85f04
Author: jgoodyear <jg...@apache.org>
Authored: Sun Apr 12 16:23:51 2015 -0230
Committer: jgoodyear <jg...@apache.org>
Committed: Sun Apr 12 16:23:51 2015 -0230
----------------------------------------------------------------------
.../framework/src/main/feature/feature.xml | 28 ++++++++++++++++----
.../org/apache/karaf/main/ConfigProperties.java | 3 ++-
pom.xml | 1 +
3 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2cecfdf1/assemblies/features/framework/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index 33db04a..6ef17ea 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -22,27 +22,45 @@
including the correct start-level for the generation of the startup.propertie file -->
<feature version="${project.version}" description="Karaf core feature" name="framework">
+ <bundle start="true" start-level="3">mvn:log4j/log4j/${log4j.version}</bundle>
+ <bundle start="true" start-level="4">mvn:org.slf4j/slf4j-log4j12/${slf4j.version}</bundle>
+ <bundle start="true" start-level="4">mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
+ <bundle start="true" start-level="7">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
+ <bundle start="true" start-level="9">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
+ <bundle start="true" start-level="9">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
+ <bundle start="true" start-level="9">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.version}</bundle>
<bundle start="true" start-level="10">mvn:org.apache.karaf.service/org.apache.karaf.service.guard/${project.version}</bundle>
- <bundle start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<bundle start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
<bundle start="true" start-level="12">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
- <bundle start="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
- <bundle start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
- <bundle start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}</bundle>
- <bundle start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/${aries.blueprint.core.compatibility.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}</bundle>
+ <bundle start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}</bundle>
<bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
<bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle>
<bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle>
<bundle start="true" start-level="25">mvn:org.apache.karaf.region/org.apache.karaf.region.core/${project.version}</bundle>
<bundle start="true" start-level="25">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
<bundle start="true" start-level="26">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:jline/jline/${jline.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.jledit/core/${jledit.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.core/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.system/org.apache.karaf.system.core/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/${aries.quiesce.api.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.table/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.help/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.commands/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.system/org.apache.karaf.system.command/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
+ <bundle start="true" start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.command/${project.version}</bundle>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/karaf/blob/2cecfdf1/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
index 5a88ae8..ac4498e 100644
--- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
+++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
@@ -156,6 +156,7 @@ public class ConfigProperties {
String[] securityProviders;
int defaultStartLevel = 100;
int lockStartLevel = 1;
+ int lockDefaultBootLevel = 1;
int lockDelay;
int shutdownTimeout = 5 * 60 * 1000;
boolean useLock;
@@ -221,7 +222,7 @@ public class ConfigProperties {
System.setProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, Integer.toString(this.defaultStartLevel));
this.lockStartLevel = Integer.parseInt(props.getProperty(PROPERTY_LOCK_LEVEL, Integer.toString(lockStartLevel)));
this.lockDelay = Integer.parseInt(props.getProperty(PROPERTY_LOCK_DELAY, DEFAULT_LOCK_DELAY));
- this.props.setProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, Integer.toString(lockStartLevel));
+ this.props.setProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, Integer.toString(lockDefaultBootLevel));
this.shutdownTimeout = Integer.parseInt(props.getProperty(KARAF_SHUTDOWN_TIMEOUT, Integer.toString(shutdownTimeout)));
this.useLock = Boolean.parseBoolean(props.getProperty(PROPERTY_USE_LOCK, "true"));
this.lockClass = props.getProperty(PROPERTY_LOCK_CLASS, PROPERTY_LOCK_CLASS_DEFAULT);
http://git-wip-us.apache.org/repos/asf/karaf/blob/2cecfdf1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 41cdffa..2023db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,6 +199,7 @@
<aries.jndi.url.version>1.1.0</aries.jndi.url.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.proxy.api.version>1.0.1</aries.proxy.api.version>
+ <aries.quiesce.api.version>1.0.0</aries.quiesce.api.version>
<aries.transaction.manager.version>1.1.1</aries.transaction.manager.version>
<aries.transaction.blueprint.version>1.0.2</aries.transaction.blueprint.version>
<aries.transaction.jdbc.version>2.1.1</aries.transaction.jdbc.version>