Author: anierbeck
Date: Tue May 21 09:38:15 2013
New Revision: 1484718
URL: http://svn.apache.org/r1484718
Log:
fixing latest build issue
Modified:
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
karaf/trunk/wrapper/core/pom.xml
Modified:
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java?rev=1484718&r1=1484717&r2=1484718&view=diff
==============================================================================
---
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
(original)
+++
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
Tue May 21 09:38:15 2013
@@ -19,9 +19,13 @@ package org.apache.karaf.tooling.exam.re
import static junit.framework.Assert.assertTrue;
import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
+import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
+import java.io.File;
+
import javax.inject.Inject;
import org.apache.karaf.features.BootFinished;
@@ -49,7 +53,7 @@ public class FeaturesScannerProvisionTes
return new Option[]{
karafDistributionConfiguration().frameworkUrl(
maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip")
- .versionAsInProject()),
+ .versionAsInProject()).unpackDirectory(new
File("target/paxexam/feature/")),
scanFeatures(
maven().groupId("org.apache.karaf.features").artifactId("standard").type("xml")
.classifier("features").versionAsInProject(), "scheduler",
"wrapper").start() };
Modified: karaf/trunk/wrapper/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/pom.xml?rev=1484718&r1=1484717&r2=1484718&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/pom.xml (original)
+++ karaf/trunk/wrapper/core/pom.xml Tue May 21 09:38:15 2013
@@ -115,6 +115,7 @@
<Import-Package>
!org.apache.felix.utils.properties,
!org.apache.karaf.util.properties,
+ !org.apache.karaf.info,
*
</Import-Package>
</instructions>
