Author: jbonofre
Date: Wed Apr 27 12:48:41 2011
New Revision: 1097100
URL: http://svn.apache.org/viewvc?rev=1097100&view=rev
Log:
[KARAF-589] Shell console ExampleSubclassMain unit test is broken.
Modified:
karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
karaf/branches/karaf-2.2.x/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
Modified:
karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java?rev=1097100&r1=1097099&r2=1097100&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
(original)
+++
karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
Wed Apr 27 12:48:41 2011
@@ -95,7 +95,6 @@ public abstract class AbstractArchetypeT
FileUtils.deleteDirectory(targetDir);
targetDir.mkdirs();
MavenEmbedderConsoleLogger logger = new MavenEmbedderConsoleLogger();
-// logger.setThreshold(MavenEmbedderConsoleLogger.LEVEL_DEBUG);
EventMonitor eventMonitor = new DefaultEventMonitor(new
PlexusLoggerAdapter(logger));
String catalog = "file://" + new
File(maven.getLocalRepositoryDirectory().getParent(),
"archetype-catalog.xml").getAbsolutePath();
Modified:
karaf/branches/karaf-2.2.x/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java?rev=1097100&r1=1097099&r2=1097100&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java
(original)
+++
karaf/branches/karaf-2.2.x/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java
Wed Apr 27 12:48:41 2011
@@ -74,17 +74,6 @@ public class ExampleSubclassMain extends
}
/**
- * If you don't overwrite then Karaf displays stack traces based
on setting
- * of the karaf.printStackTraces system property.
- *
- * @return
- */
- @Override
- protected boolean isPrintStackTraces() {
- return true;
- }
-
- /**
* If you don't overwrite, then karaf automatically adds session
properties
* found in the following resource files:
* <ul>
Modified:
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java?rev=1097100&r1=1097099&r2=1097100&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
(original)
+++
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
Wed Apr 27 12:48:41 2011
@@ -46,7 +46,6 @@ import org.apache.maven.artifact.metadat
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.DefaultArtifactCollector;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Modified:
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java?rev=1097100&r1=1097099&r2=1097100&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
(original)
+++
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
Wed Apr 27 12:48:41 2011
@@ -43,14 +43,12 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.DefaultArtifactCollector;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
-import org.osgi.framework.Constants;
/**
* Validates a features XML file
