You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2010/12/30 11:37:44 UTC
svn commit: r1053848 - in /karaf/branches/karaf-2.1.x:
features/core/src/main/java/org/apache/karaf/features/internal/
main/src/main/java/org/apache/karaf/main/
shell/obr/src/main/java/org/apache/karaf/shell/obr/
webconsole/gogo/src/main/java/org/apach...
Author: pieber
Date: Thu Dec 30 10:37:44 2010
New Revision: 1053848
URL: http://svn.apache.org/viewvc?rev=1053848&view=rev
Log:
[KARAF-299] Miscellaneous cleanup and minor fixes.
(cherry picked from commit 76248a6df43507a5a3707d8e5b444d84c18b9db6)
Conflicts:
features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
webconsole/admin/src/main/resources/res/ui/admin.js
Modified:
karaf/branches/karaf-2.1.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java
karaf/branches/karaf-2.1.x/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java
karaf/branches/karaf-2.1.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java
Modified: karaf/branches/karaf-2.1.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java?rev=1053848&r1=1053847&r2=1053848&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java (original)
+++ karaf/branches/karaf-2.1.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java Thu Dec 30 10:37:44 2010
@@ -43,14 +43,9 @@ import org.apache.karaf.features.Reposit
import org.apache.felix.utils.manifest.Clause;
import org.apache.felix.utils.manifest.Parser;
import org.apache.felix.utils.version.VersionRange;
-import org.apache.karaf.features.Resolver;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.Version;
+import org.apache.felix.utils.version.VersionTable;
+import org.apache.karaf.features.*;
+import org.osgi.framework.*;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.packageadmin.PackageAdmin;
@@ -59,6 +54,17 @@ import org.osgi.util.tracker.ServiceTrac
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.*;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import static java.lang.String.format;
/**
@@ -306,11 +312,6 @@ public class FeaturesServiceImpl impleme
try {
b.start();
} catch (BundleException be) {
- String[] msgdata = new String[]{
- b.getLocation(),
- getFeaturesContainingBundleList(b),
- be.getMessage()
- };
String msg = format("Could not start bundle %s in feature(s) %s: %s", b.getLocation(), getFeaturesContainingBundleList(b), be.getMessage());
throw new Exception(msg, be);
}
@@ -815,7 +816,6 @@ public class FeaturesServiceImpl impleme
protected Configuration findExistingConfiguration(ConfigurationAdmin configurationAdmin,
String pid, String factoryPid) throws IOException, InvalidSyntaxException {
- String key = (factoryPid == null ? pid : pid + "-" + factoryPid);
String filter;
if (factoryPid == null) {
filter = "(" + Constants.SERVICE_PID + "=" + pid + ")";
@@ -1030,7 +1030,7 @@ public class FeaturesServiceImpl impleme
Set<Feature> features = new HashSet<Feature>();
for (Map<String, Feature> featureMap : this.getFeatures().values()) {
for (Feature f : featureMap.values()) {
- if (f.getBundles().contains(bundle.getLocation())) {
+ if (f.getBundles().contains(bundle)) {
features.add(f);
}
}
Modified: karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java?rev=1053848&r1=1053847&r2=1053848&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java Thu Dec 30 10:37:44 2010
@@ -794,7 +794,6 @@ public class Main {
f = new File(karafHome, location);
} else {
f = new File(karafBase, location);
- f = new File(karafHome, location);
}
if (f.exists() && f.isDirectory()) {
bundleDirs.add(f);
Modified: karaf/branches/karaf-2.1.x/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java?rev=1053848&r1=1053847&r2=1053848&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java (original)
+++ karaf/branches/karaf-2.1.x/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java Thu Dec 30 10:37:44 2010
@@ -16,22 +16,18 @@
*/
package org.apache.karaf.shell.obr;
-import java.io.PrintStream;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.felix.bundlerepository.Capability;
-import org.apache.felix.bundlerepository.Repository;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Requirement;
import org.apache.felix.bundlerepository.Resource;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.Version;
+
+import java.io.PrintStream;
+import java.lang.reflect.Array;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
@Command(scope = "obr", name = "find", description = "Find OBR bundles for a given filter")
public class FindCommand extends ObrCommandSupport {
@@ -40,7 +36,6 @@ public class FindCommand extends ObrComm
List<String> requirements;
protected void doExecute(RepositoryAdmin admin) throws Exception {
- List<Resource> matching = new ArrayList<Resource>();
Resource[] resources = admin.discoverResources(parseRequirements(admin, requirements));
if (resources == null)
{
Modified: karaf/branches/karaf-2.1.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java?rev=1053848&r1=1053847&r2=1053848&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java (original)
+++ karaf/branches/karaf-2.1.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java Thu Dec 30 10:37:44 2010
@@ -580,7 +580,7 @@ public class Terminal {
// Alternate screen mode
if ((state && !vt100_mode_alt_screen) || (!state && vt100_mode_alt_screen)) {
int[] s = screen; screen = screen2; screen2 = s;
- Map<String, Object> map = vt100_saved; vt100_saved = vt100_saved2; vt100_saved = map;
+ Map<String, Object> map = vt100_saved; vt100_saved = vt100_saved2; vt100_saved2 = map;
}
vt100_mode_alt_screen = state;
// ?57 : DECNAKB: Greek keyboard mapping