Author: carlos
Date: Mon Feb 19 16:42:52 2007
New Revision: 509395
URL: http://svn.apache.org/viewvc?view=rev&rev=509395
Log:
Fix errors with artifacts scope and add a lot of debug info
Modified:
maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
Modified:
maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java?view=diff&rev=509395&r1=509394&r2=509395
==============================================================================
---
maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
(original)
+++
maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
Mon Feb 19 16:42:52 2007
@@ -22,11 +22,9 @@
import java.io.FilenameFilter;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.jar.Manifest;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -123,12 +121,9 @@
*/
private MavenProjectBuilder mavenProjectBuilder;
- private Set artifactsProcessed;
-
public void execute()
throws MojoExecutionException
{
- artifactsProcessed = new HashSet();
bundleAll( project );
}
@@ -142,9 +137,9 @@
throws MojoExecutionException
{
- if ( artifactsProcessed.contains( project.getArtifact() ) )
+ if ( alreadyBundled( project.getArtifact() ) )
{
- getLog().info( "Ignoring project already processed " +
project.getArtifact() );
+ getLog().debug( "Ignoring project already processed " +
project.getArtifact() );
return;
}
@@ -160,7 +155,7 @@
throw new MojoExecutionException( "Unable to build dependency
tree", e );
}
- getLog().info( "Will bundle the following dependency tree\n" +
dependencyTree );
+ getLog().debug( "Will bundle the following dependency tree\n" +
dependencyTree );
for ( Iterator it = dependencyTree.inverseIterator(); it.hasNext(); )
{
@@ -171,27 +166,36 @@
break;
}
Artifact artifact = resolveArtifact( node.getArtifact() );
- if ( ( artifact.getScope() == Artifact.SCOPE_COMPILE ) || (
artifact.getScope() == Artifact.SCOPE_RUNTIME ) )
+ MavenProject childProject;
+ try
+ {
+ childProject = mavenProjectBuilder.buildFromRepository(
artifact, remoteRepositories, localRepository,
+ true );
+ }
+ catch ( ProjectBuildingException e )
+ {
+ throw new MojoExecutionException( "Unable to build project
object for artifact " + artifact, e );
+ }
+ childProject.setArtifact( artifact );
+ getLog().debug( "Child project artifact location: " +
childProject.getArtifact().getFile() );
+
+ if ( ( artifact.getScope().equals( Artifact.SCOPE_COMPILE ) )
+ || ( artifact.getScope().equals( Artifact.SCOPE_RUNTIME ) ) )
{
- MavenProject childProject;
- try
- {
- childProject = mavenProjectBuilder.buildFromRepository(
artifact, remoteRepositories,
-
localRepository, true );
- }
- catch ( ProjectBuildingException e )
- {
- throw new MojoExecutionException( "Unable to build project
object for artifact " + artifact, e );
- }
- childProject.setArtifact( artifact );
bundleAll( childProject );
}
+ else
+ {
+ getLog().debug(
+ "Not processing due to scope (" +
childProject.getArtifact().getScope() + "): "
+ + childProject.getArtifact() );
+ }
}
if ( this.project != project )
{
+ getLog().debug( "Project artifact location: " +
project.getArtifact().getFile() );
bundle( project );
- artifactsProcessed.add( project.getArtifact() );
}
}
@@ -206,8 +210,6 @@
{
Artifact artifact = project.getArtifact();
getLog().info( "Bundling " + artifact );
- getLog().info( " Artifacts:" + project.getArtifacts() );
- getLog().info( " Dependency Artifacts:" +
project.getDependencyArtifacts() );
try
{
@@ -219,8 +221,13 @@
if ( project.getFile().equals( outputFile ) )
{
- throw new IllegalStateException( "Trying to read and write to
the same file, try cleaning: "
- + outputFile );
+ /* TODO find the cause why it's getting here */
+ return;
+ // getLog().error(
+ // "Trying to read and write "
+ artifact + " to the same file, try cleaning: "
+ // + outputFile );
+ // throw new IllegalStateException( "Trying to
read and write " + artifact
+ // + " to the same file, try cleaning: " +
outputFile );
}
Manifest manifest = getManifest( project, getClasspath( project )
);
@@ -257,6 +264,11 @@
return getBundleNameFirstPart( artifact ) + "_" +
convertVersionToOsgi( artifact.getVersion() ) + ".jar";
}
+ private boolean alreadyBundled( Artifact artifact )
+ {
+ return getBuiltFile( artifact ) != null;
+ }
+
/**
* Use previously built bundles when available.
*
@@ -264,6 +276,18 @@
*/
protected File getFile( final Artifact artifact )
{
+ File bundle = getBuiltFile( artifact );
+
+ if ( bundle != null )
+ {
+ getLog().debug( "Using previously built OSGi bundle for " +
artifact + " in " + bundle );
+ return bundle;
+ }
+ return super.getFile( artifact );
+ }
+
+ private File getBuiltFile( final Artifact artifact )
+ {
File bundle = null;
/* if bundle was already built use it instead of jar from repo */
@@ -280,6 +304,10 @@
if ( ( bundle == null ) && artifact.isSnapshot() )
{
final File buildDirectory = new File( getBuildDirectory() );
+ if ( !buildDirectory.exists() )
+ {
+ buildDirectory.mkdirs();
+ }
File[] files = buildDirectory.listFiles( new FilenameFilter()
{
public boolean accept( File dir, String name )
@@ -302,12 +330,7 @@
}
}
- if ( bundle != null )
- {
- getLog().info( "Using previously built OSGi bundle for " +
artifact + " in " + bundle );
- return bundle;
- }
- return super.getFile( artifact );
+ return bundle;
}
/**
