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 2012/11/02 12:27:06 UTC
svn commit: r1404927 - in /karaf/branches/karaf-2.3.x:
assemblies/apache-karaf/src/main/filtered-resources/etc/
features/core/src/main/java/org/apache/karaf/features/internal/
features/core/src/test/java/org/apache/karaf/features/
features/core/src/tes...
Author: cschneider
Date: Fri Nov 2 11:27:05 2012
New Revision: 1404927
URL: http://svn.apache.org/viewvc?rev=1404927&view=rev
Log:
Reverting last commit as I had some additional files in it
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java
karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/internal/FeaturesServiceImplTest.java
karaf/branches/karaf-2.3.x/itests/pom.xml
karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg?rev=1404927&r1=1404926&r2=1404927&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg Fri Nov 2 11:27:05 2012
@@ -26,4 +26,3 @@ activemq=org.apache.activemq:activemq-ka
jclouds=org.jclouds.karaf:jclouds-karaf:xml:features:(0,]
openejb=org.apache.openejb:openejb-feature:xml:features:(0,]
wicket=org.ops4j.pax.wicket:features:xml:features:(0,]
-cxf-dosgi=org.apache.cxf.dosgi:cxf-dosgi:xml:features:(0,]
Modified: karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java?rev=1404927&r1=1404926&r2=1404927&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java (original)
+++ karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java Fri Nov 2 11:27:05 2012
@@ -16,8 +16,6 @@
*/
package org.apache.karaf.features.internal;
-import static java.lang.String.format;
-
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -57,7 +55,6 @@ import org.apache.felix.utils.manifest.C
import org.apache.felix.utils.manifest.Parser;
import org.apache.felix.utils.version.VersionRange;
import org.apache.felix.utils.version.VersionTable;
-import org.apache.karaf.features.BootFinished;
import org.apache.karaf.features.BundleInfo;
import org.apache.karaf.features.ConfigFileInfo;
import org.apache.karaf.features.Feature;
@@ -77,7 +74,6 @@ import org.osgi.framework.FrameworkListe
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.Version;
-import org.osgi.framework.startlevel.BundleStartLevel;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.packageadmin.PackageAdmin;
@@ -86,6 +82,8 @@ import org.osgi.util.tracker.ServiceTrac
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.lang.String.format;
+
/**
* The Features service implementation.
* Adding a repository url will load the features contained in this repository and
@@ -451,9 +449,10 @@ public class FeaturesServiceImpl impleme
List<Bundle> bundlesSortedByStartLvl = new ArrayList<Bundle>(state.bundles);
if (respectStartLvlDuringFeatureStartup) {
Collections.sort(bundlesSortedByStartLvl, new Comparator<Bundle>() {
+ @Override
public int compare(Bundle bundle, Bundle bundle1) {
- return bundle.adapt(BundleStartLevel.class).getStartLevel() -
- bundle1.adapt(BundleStartLevel.class).getStartLevel();
+ return state.bundleInfos.get(bundle.getBundleId()).getStartLevel() -
+ state.bundleInfos.get(bundle1.getBundleId()).getStartLevel();
}
});
}
@@ -472,7 +471,6 @@ public class FeaturesServiceImpl impleme
if (bundleInfo == null || bundleInfo.isStart()) {
try {
b.start();
- LOGGER.debug("Starting bundle " + b.getBundleId() + "-" + b.getSymbolicName() + " at level " + b.adapt(BundleStartLevel.class).getStartLevel());
} catch (BundleException be) {
String msg = format("Could not start bundle %s in feature(s) %s: %s", b.getLocation(), getFeaturesContainingBundleList(b), be.getMessage());
throw new Exception(msg, be);
@@ -1146,48 +1144,8 @@ public class FeaturesServiceImpl impleme
}
bootFeaturesInstalled = true;
saveState();
- publishBootFinished();
- LOGGER.info("Boot features installed");
- //restartSpringDm();
}
}.start();
- } else {
- publishBootFinished();
- }
- }
-
- /**
- * Fix for issue where bundles using spring dm are sometimes not initialized
- */
- protected void restartSpringDm() {
- Bundle springDmExtender = getBundleByName("org.springframework.osgi.extender");
- if (springDmExtender != null) {
- try {
- LOGGER.info("Restarting spring dm extender");
- springDmExtender.stop();
- springDmExtender.start();
- } catch (BundleException e) {
- LOGGER.error("Error restarting spring dm");
- }
- }
- }
-
- private Bundle getBundleByName(String name) {
- if (bundleContext == null) {
- return null;
- }
- for (Bundle bundle : bundleContext.getBundles()) {
- if (name.equals(bundle.getSymbolicName())) {
- return bundle;
- }
- }
- return null;
- }
-
- private void publishBootFinished() {
- if (bundleContext != null) {
- BootFinished bootFinished = new BootFinished() {};
- bundleContext.registerService(BootFinished.class.getName(), bootFinished, new Hashtable<String, String>());
}
}
Modified: karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java?rev=1404927&r1=1404926&r2=1404927&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java (original)
+++ karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java Fri Nov 2 11:27:05 2012
@@ -513,11 +513,7 @@ public class FeaturesServiceTest extends
URI uri = tmp.toURI();
- FeaturesServiceImpl svc = new FeaturesServiceImpl() {
- @Override
- protected void saveState() {
- }
- };
+ FeaturesServiceImpl svc = new FeaturesServiceImpl();
svc.addRepository(uri);
Feature feature = svc.getFeature("f2", "[0.1,0.3)");
Modified: karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/internal/FeaturesServiceImplTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/internal/FeaturesServiceImplTest.java?rev=1404927&r1=1404926&r2=1404927&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/internal/FeaturesServiceImplTest.java (original)
+++ karaf/branches/karaf-2.3.x/features/core/src/test/java/org/apache/karaf/features/internal/FeaturesServiceImplTest.java Fri Nov 2 11:27:05 2012
@@ -22,7 +22,6 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.Dictionary;
import java.util.HashMap;
import java.util.List;
import java.util.LinkedList;
@@ -42,7 +41,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.InvalidSyntaxException;
/**
* Test cases for {@link FeaturesServiceImpl}
@@ -113,14 +111,11 @@ public class FeaturesServiceImplTest ext
assertSame("2.0.0", impl.getFeature("transaction", FeatureImpl.DEFAULT_VERSION).getVersion());
}
- public void testStartDoesNotFailWithOneInvalidUri() throws InvalidSyntaxException {
+ public void testStartDoesNotFailWithOneInvalidUri() {
BundleContext bundleContext = EasyMock.createMock(BundleContext.class);
expect(bundleContext.getDataFile(EasyMock.<String>anyObject())).andReturn(dataFile).anyTimes();
bundleContext.addFrameworkListener(EasyMock.<FrameworkListener>anyObject());
bundleContext.removeFrameworkListener(EasyMock.<FrameworkListener>anyObject());
- expect(bundleContext.registerService(EasyMock.<String>anyObject(), EasyMock.anyObject(), EasyMock.<Dictionary<String, ?>>anyObject()))
- .andReturn(null);
- expect(bundleContext.createFilter("(objectClass=org.osgi.service.event.EventAdmin)")).andReturn(null);
replay(bundleContext);
FeaturesServiceImpl service = new FeaturesServiceImpl();
service.setBundleContext(bundleContext);
@@ -134,11 +129,10 @@ public class FeaturesServiceImplTest ext
/**
* This test checks KARAF-388 which allows you to specify version of boot feature.
- * @throws InvalidSyntaxException
*/
- public void testStartDoesNotFailWithNonExistentVersion() throws InvalidSyntaxException {
- BundleContext bundleContext = EasyMock.createNiceMock(BundleContext.class);
- replay(bundleContext);
+ public void testStartDoesNotFailWithNonExistentVersion() {
+ BundleContext bundleContext = EasyMock.createMock(BundleContext.class);
+
final Map<String, Map<String, Feature>> features = new HashMap<String, Map<String,Feature>>();
Map<String, Feature> versions = new HashMap<String, Feature>();
versions.put("1.0.0", new FeatureImpl("transaction", "1.0.0"));
Modified: karaf/branches/karaf-2.3.x/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/pom.xml?rev=1404927&r1=1404926&r2=1404927&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/itests/pom.xml Fri Nov 2 11:27:05 2012
@@ -50,10 +50,6 @@
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -67,10 +63,6 @@
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -97,11 +89,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1404927&r1=1404926&r2=1404927&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Fri Nov 2 11:27:05 2012
@@ -15,7 +15,6 @@ package org.apache.karaf.itests;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
-import org.apache.karaf.features.BootFinished;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.tooling.exam.options.LogLevelOption;
@@ -57,12 +56,6 @@ public class KarafTestSupport {
@Inject
protected FeaturesService featuresService;
-
- /**
- * Make sure the boot features are installed before starting the test
- */
- @Inject
- protected BootFinished bootFinished;
@ProbeBuilder
public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {