Permalink
Browse files

[maven-release-plugin] copy for tag karaf-2.2.4

git-svn-id: https://svn.apache.org/repos/asf/karaf/tags/karaf-2.2.4@1182765 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
2 parents 4103c44 + 996d8cc commit 6342ae4d4ab3785b6476da2f49e0be8bd15d233e @jgoodyear jgoodyear committed Oct 13, 2011
View
@@ -51,6 +51,8 @@
* [KARAF-921] - maven eclipse plugin 2.8 does not work correctly with karaf
* [KARAF-922] - features-maven-plugin ignores repository tags in feature files
* [KARAF-923] - features-maven-plugin#AddFeaturesToRepoMojo does not handle spaces in repository urls well
+ * [KARAF-929] - MBean bundles should be seen as system bundles
+ * [KARAF-932] - ConfigMBean raise a NPE when dictionnary is null
** Dependency upgrade
* [KARAF-901] - Upgrade to Pax Web 1.0.7
@@ -71,6 +73,7 @@
* [KARAF-900] - Shutdown command should display the instance name
* [KARAF-907] - Include 64 bits wrapper library
* [KARAF-925] - Karaf config.properties doesn't define J2SE-1.6 and J2SE-1.7 execution environment
+ * [KARAF-930] - Bundles MBean should mimic the BundleSelector like osgi:* commands
** New Feature
* [KARAF-541] - Support JMX SSL via etc/org.apache.karaf.management.cfg
@@ -145,7 +145,7 @@
<bundle>mvn:org.ops4j.pax.url/pax-url-obr/${pax.url.version}</bundle>
</feature>
<feature name="config" version="${project.version}">
- <bundle start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
</feature>
<feature name="jetty" version="${jetty.version}" resolver="(obr)">
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
@@ -220,21 +220,21 @@
sshRealm=karaf
hostKey=${karaf.base}/etc/host.key
</config>
- <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
- <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
+ <bundle start-level="30" dependency='true'>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
+ <bundle start-level="30" dependency='true'>mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
<feature name="management" version="${project.version}">
- <bundle>mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
- <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
- <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
- <bundle>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.system/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.config/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.log/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.packages/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.dev/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.system/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.config/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.log/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.packages/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.dev/${project.version}</bundle>
</feature>
<feature name="eventadmin" version="${project.version}">
<bundle start-level='30'>mvn:org.apache.felix/org.apache.felix.eventadmin/${felix.eventadmin.version}</bundle>
@@ -28,6 +28,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.karaf.features.internal.FeatureImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -130,7 +131,13 @@ public void bundleChanged(BundleEvent bundleEvent) {
for (Repository repo : featuresService.listRepositories()) {
if (repo.getURI().equals(url.toURI())) {
Set<Feature> features = new HashSet<Feature>(Arrays.asList(repo.getFeatures()));
- featuresService.installFeatures(features, EnumSet.noneOf(FeaturesService.Option.class));
+ Set<Feature> autoInstallFeatures = new HashSet<Feature>();
+ for(Feature feature:features) {
+ if(feature.getInstall().equals(Feature.DEFAULT_INSTALL_MODE)){
+ autoInstallFeatures.add(feature);
+ }
+ }
+ featuresService.installFeatures(autoInstallFeatures, EnumSet.noneOf(FeaturesService.Option.class));
}
}
urls.add(url);
@@ -24,6 +24,8 @@
*/
public interface Feature {
+ public static String DEFAULT_INSTALL_MODE = "auto";
+
String getId();
String getName();
@@ -36,6 +38,8 @@
String getResolver();
+ String getInstall();
+
List<Feature> getDependencies();
List<BundleInfo> getBundles();
@@ -36,6 +36,7 @@
private String details;
private String version;
private String resolver;
+ private String install = DEFAULT_INSTALL_MODE;
private List<Feature> dependencies = new ArrayList<Feature>();
private List<BundleInfo> bundles = new ArrayList<BundleInfo>();
private Map<String, Map<String,String>> configs = new HashMap<String, Map<String,String>>();
@@ -97,6 +98,14 @@ public void setResolver(String resolver) {
this.resolver = resolver;
}
+ public String getInstall() {
+ return install;
+ }
+
+ public void setInstall(String install) {
+ this.install = install;
+ }
+
public List<Feature> getDependencies() {
return dependencies;
}
@@ -136,6 +136,11 @@ public void load() throws IOException {
f.setResolver(resolver);
}
+ String install = e.getAttribute("install");
+ if (install != null && install.length() > 0) {
+ f.setInstall(install);
+ }
+
String description = e.getAttribute("description");
if (description != null && description.length() > 0) {
f.setDescription(description);
Oops, something went wrong. Retry.

0 comments on commit 6342ae4

Please sign in to comment.