You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/04/08 14:57:01 UTC
[1/2] karaf git commit: [KARAF-3650] Make sun.misc optional and load
DumpHandler dynamically
Repository: karaf
Updated Branches:
refs/heads/master 8b7f604c5 -> 989dac12c
[KARAF-3650] Make sun.misc optional and load DumpHandler dynamically
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/989dac12
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/989dac12
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/989dac12
Branch: refs/heads/master
Commit: 989dac12c2e441f571470fa2e83ab8b1e3ae1609
Parents: a265e2b
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Apr 8 14:55:29 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Apr 8 14:56:36 2015 +0200
----------------------------------------------------------------------
diagnostic/boot/pom.xml | 4 ++
.../diagnostic/core/internal/Activator.java | 44 +++++-----------
.../diagnostic/core/internal/DumpHandler.java | 55 ++++++++++++++++++++
3 files changed, 72 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/989dac12/diagnostic/boot/pom.xml
----------------------------------------------------------------------
diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml
index 9e79fad..fcd751b 100644
--- a/diagnostic/boot/pom.xml
+++ b/diagnostic/boot/pom.xml
@@ -62,6 +62,10 @@
org.apache.karaf.diagnostic.core.internal,
org.apache.karaf.diagnostic.core.providers
</Private-Package>
+ <Import-Package>
+ sun.misc;resolution:=optional,
+ *
+ </Import-Package>
<Karaf-Activator>
org.apache.karaf.diagnostic.core.internal.Activator
</Karaf-Activator>
http://git-wip-us.apache.org/repos/asf/karaf/blob/989dac12/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/Activator.java
----------------------------------------------------------------------
diff --git a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/Activator.java b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/Activator.java
index 3b9ee88..a7e7676 100644
--- a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/Activator.java
+++ b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/Activator.java
@@ -16,52 +16,34 @@
*/
package org.apache.karaf.diagnostic.core.internal;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.io.Closeable;
-import org.apache.karaf.diagnostic.core.Dump;
-import org.apache.karaf.diagnostic.core.DumpDestination;
-import org.apache.karaf.diagnostic.core.common.ZipDumpDestination;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
-public class Activator implements BundleActivator, SignalHandler {
-
- private static final String SIGNAL = "HUP";
-
- private BundleContext bundleContext;
- private SignalHandler previous;
+public class Activator implements BundleActivator {
+ Closeable dumpHandler;
public void start(BundleContext context) throws Exception {
- bundleContext = context;
if (!isWindows()) {
- previous = sun.misc.Signal.handle(new Signal(SIGNAL), this);
+ ClassLoader cl = this.getClass().getClassLoader();
+ try {
+ Class<?> dumpHandlerClazz = cl.loadClass("org.apache.karaf.diagnostic.core.internal.DumpHandler");
+ dumpHandler = (Closeable)dumpHandlerClazz.getConstructor(BundleContext.class).newInstance(context);
+ } catch (Exception e) {
+ // Will happen if sun.misc.SignalHandler is not available
+ }
}
}
public void stop(BundleContext context) throws Exception {
- if (!isWindows()) {
- sun.misc.Signal.handle(new Signal(SIGNAL), previous);
+ if (dumpHandler != null && !isWindows()) {
+ dumpHandler.close();
}
}
- public void handle(Signal signal) {
- SimpleDateFormat dumpFormat = new SimpleDateFormat("yyyy-MM-dd_HHmmss-SSS");
- String fileName = "dump-" + dumpFormat.format(new Date()) + ".zip";
- DumpDestination destination = new ZipDumpDestination(new File(fileName));
- Dump.dump(bundleContext, destination);
- }
-
private boolean isWindows() {
- String os = System.getProperty("os.name", "Unknown");
- if (os.startsWith("Win")) {
- return true;
- } else {
- return false;
- }
+ return System.getProperty("os.name", "Unknown").startsWith("Win");
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/989dac12/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java
----------------------------------------------------------------------
diff --git a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java
new file mode 100644
index 0000000..7ec1f00
--- /dev/null
+++ b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.diagnostic.core.internal;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.karaf.diagnostic.core.Dump;
+import org.apache.karaf.diagnostic.core.DumpDestination;
+import org.apache.karaf.diagnostic.core.common.ZipDumpDestination;
+import org.osgi.framework.BundleContext;
+
+import sun.misc.Signal;
+import sun.misc.SignalHandler;
+
+public class DumpHandler implements SignalHandler, Closeable {
+ private static final String SIGNAL = "HUP";
+ private BundleContext context;
+ private SignalHandler previous;
+
+ public DumpHandler(BundleContext context) {
+ this.context = context;
+ previous = sun.misc.Signal.handle(new Signal(SIGNAL), this);
+ }
+
+ public void handle(Signal signal) {
+ SimpleDateFormat dumpFormat = new SimpleDateFormat("yyyy-MM-dd_HHmmss-SSS");
+ String fileName = "dump-" + dumpFormat.format(new Date()) + ".zip";
+ DumpDestination destination = new ZipDumpDestination(new File(fileName));
+ Dump.dump(context, destination);
+ }
+
+ @Override
+ public void close() throws IOException {
+ sun.misc.Signal.handle(new Signal(SIGNAL), previous);
+ }
+
+}
[2/2] karaf git commit: [KARAF-3102] Small refactoring
Posted by cs...@apache.org.
[KARAF-3102] Small refactoring
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a265e2bd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a265e2bd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a265e2bd
Branch: refs/heads/master
Commit: a265e2bd8c3476ad79205b11715dbcb22405014e
Parents: 8b7f604
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Apr 8 13:03:03 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Apr 8 14:56:36 2015 +0200
----------------------------------------------------------------------
.../features/internal/service/Deployer.java | 25 +++++---
.../internal/service/FeaturesServiceImpl.java | 62 +++++++++-----------
2 files changed, 44 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a265e2bd/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index f852fe6..7de999f 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -224,19 +224,14 @@ public class Deployer {
for (Iterator<String> iterator = prereqs.iterator(); iterator.hasNext(); ) {
String prereq = iterator.next();
String[] parts = prereq.split("/");
- VersionRange range;
- if (parts[1].equals("0.0.0")) {
- range = VersionRange.ANY_VERSION;
- } else if (!parts[1].startsWith("[") && !parts[1].startsWith("(")) {
- range = new VersionRange(Macro.transform(request.featureResolutionRange, parts[1]));
- } else {
- range = new VersionRange(parts[1]);
- }
+ String name = parts[0];
+ String version = parts[1];
+ VersionRange range = getRange(version, request.featureResolutionRange);
boolean found = false;
for (Set<String> featureSet : dstate.state.installedFeatures.values()) {
for (String feature : featureSet) {
String[] p = feature.split("/");
- found = parts[0].equals(p[0]) && range.contains(VersionTable.getVersion(p[1]));
+ found = name.equals(p[0]) && range.contains(VersionTable.getVersion(p[1]));
if (found) break;
}
if (found) break;
@@ -815,6 +810,18 @@ public class Deployer {
print("Done.", verbose);
}
+ private VersionRange getRange(String version, String featureResolutionRange) {
+ VersionRange range;
+ if (version.equals("0.0.0")) {
+ range = VersionRange.ANY_VERSION;
+ } else if (!version.startsWith("[") && !version.startsWith("(")) {
+ range = new VersionRange(Macro.transform(featureResolutionRange, version));
+ } else {
+ range = new VersionRange(version);
+ }
+ return range;
+ }
+
private void propagateState(Map<Resource, FeaturesService.RequestedState> states, Resource resource, FeaturesService.RequestedState state, SubsystemResolver resolver) {
if (!isSubsystem(resource)) {
FeaturesService.RequestedState reqState = mergeStates(state, states.get(resource));
http://git-wip-us.apache.org/repos/asf/karaf/blob/a265e2bd/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
index e60e40b..2f83605 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
@@ -505,16 +505,8 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
@Override
public String getRepositoryName(URI uri) throws Exception {
- // Make sure the cache is loaded
- getFeatures();
- synchronized (lock) {
- for (Repository repo : this.repositoryCache.values()) {
- if (repo.getURI().equals(uri)) {
- return repo.getName();
- }
- }
- return null;
- }
+ Repository repo = getRepository(uri);
+ return (repo != null) ? repo.getName() : null;
}
//
@@ -807,15 +799,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
}
}
featuresToAdd = new ArrayList<>(new LinkedHashSet<>(featuresToAdd));
- StringBuilder sb = new StringBuilder();
- sb.append("Adding features: ");
- for (int i = 0; i < featuresToAdd.size(); i++) {
- if (i > 0) {
- sb.append(", ");
- }
- sb.append(featuresToAdd.get(i));
- }
- print(sb.toString(), options.contains(Option.Verbose));
+ print("Adding features: " + join(featuresToAdd), options.contains(Option.Verbose));
Set<String> fl = required.get(region);
if (fl == null) {
fl = new HashSet<>();
@@ -844,6 +828,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
List<String> toRemove = new ArrayList<>();
feature = normalize(feature);
if (feature.endsWith("/0.0.0")) {
+ // Match only on name
String nameSep = "feature:" + feature.substring(0, feature.indexOf("/") + 1);
for (String f : fl) {
Pattern pattern = Pattern.compile(nameSep.substring(0, nameSep.length() - 1));
@@ -853,15 +838,11 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
}
}
} else {
+ // Match on name and version
String name = feature.substring(0, feature.indexOf("/"));
String version = feature.substring(feature.indexOf("/") + 1);
+ Pattern pattern = getFeaturePattern(name, version);
for (String f : fl) {
- String req = "feature:" + name + "/" + new VersionRange(version, true);
- req = req.replace("[", "\\[");
- req = req.replace("(", "\\(");
- req = req.replace("]", "\\]");
- req = req.replace(")", "\\)");
- Pattern pattern = Pattern.compile(req);
Matcher matcher = pattern.matcher(f);
if (matcher.matches()) {
toRemove.add(f);
@@ -876,15 +857,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
featuresToRemove.addAll(toRemove);
}
featuresToRemove = new ArrayList<>(new LinkedHashSet<>(featuresToRemove));
- StringBuilder sb = new StringBuilder();
- sb.append("Removing features: ");
- for (int i = 0; i < featuresToRemove.size(); i++) {
- if (i > 0) {
- sb.append(", ");
- }
- sb.append(featuresToRemove.get(i));
- }
- print(sb.toString(), options.contains(Option.Verbose));
+ print("Removing features: " + join(featuresToRemove), options.contains(Option.Verbose));
fl.removeAll(featuresToRemove);
if (fl.isEmpty()) {
required.remove(region);
@@ -1281,4 +1254,25 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
}
digraph.replace(temp);
}
+
+ private Pattern getFeaturePattern(String name, String version) {
+ String req = "feature:" + name + "/" + new VersionRange(version, true);
+ req = req.replace("[", "\\[");
+ req = req.replace("(", "\\(");
+ req = req.replace("]", "\\]");
+ req = req.replace(")", "\\)");
+ Pattern pattern = Pattern.compile(req);
+ return pattern;
+ }
+
+ private String join(List<String> list) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < list.size(); i++) {
+ if (i > 0) {
+ sb.append(", ");
+ }
+ sb.append(list.get(i));
+ }
+ return sb.toString();
+ }
}