servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pdo...@apache.org
Subject svn commit: r384935 - /incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/org/apache/servicemix/maven/plugin/EclipsePluginMojo.java
Date Fri, 10 Mar 2006 22:14:06 GMT
Author: pdodds
Date: Fri Mar 10 14:14:04 2006
New Revision: 384935

URL: http://svn.apache.org/viewcvs?rev=384935&view=rev
Log:
Fixed problem in the handling of MANIFEST Bundle-ClassPath

Modified:
    incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/org/apache/servicemix/maven/plugin/EclipsePluginMojo.java

Modified: incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/org/apache/servicemix/maven/plugin/EclipsePluginMojo.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/org/apache/servicemix/maven/plugin/EclipsePluginMojo.java?rev=384935&r1=384934&r2=384935&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/org/apache/servicemix/maven/plugin/EclipsePluginMojo.java
(original)
+++ incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/org/apache/servicemix/maven/plugin/EclipsePluginMojo.java
Fri Mar 10 14:14:04 2006
@@ -25,6 +25,8 @@
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -161,9 +163,10 @@
 		File destinationDir = new File(projectBuildDirectory);
 		for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
 			Artifact artifact = (Artifact) iter.next();
+			ArtifactFilter filter = new ScopeArtifactFilter(
+					Artifact.SCOPE_RUNTIME);
 			try {
-				if (!artifact.isOptional()
-						&& Artifact.SCOPE_RUNTIME.equals(artifact.getScope())) {
+				if (!artifact.isOptional() && filter.include(artifact)) {
 					String type = artifact.getType();
 					if ("jar".equals(type)) {
 						uris.add("target/" + artifact.getFile().getName());



Mime
View raw message