You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2011/09/08 20:38:42 UTC
svn commit: r1166847 -
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
Author: mcculls
Date: Thu Sep 8 18:38:42 2011
New Revision: 1166847
URL: http://svn.apache.org/viewvc?rev=1166847&view=rev
Log:
FELIX-3061: keep a record of artifacts embedded using Embed-Dependency
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java?rev=1166847&r1=1166846&r2=1166847&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java Thu Sep 8 18:38:42 2011
@@ -47,6 +47,8 @@ public final class DependencyEmbedder ex
public static final String EMBED_STRIP_VERSION = "Embed-StripVersion";
public static final String EMBED_TRANSITIVE = "Embed-Transitive";
+ public static final String EMBEDDED_ARTIFACTS = "Embedded-Artifacts";
+
private static final String MAVEN_DEPENDENCIES = "{maven-dependencies}";
private String m_embedDirectory;
@@ -84,6 +86,7 @@ public final class DependencyEmbedder ex
{
StringBuffer includeResource = new StringBuffer();
StringBuffer bundleClassPath = new StringBuffer();
+ StringBuffer embeddedArtifacts = new StringBuffer();
m_inlinedPaths.clear();
m_embeddedArtifacts.clear();
@@ -104,7 +107,7 @@ public final class DependencyEmbedder ex
}
for ( Iterator i = m_embeddedArtifacts.iterator(); i.hasNext(); )
{
- embedDependency( ( Artifact ) i.next(), includeResource, bundleClassPath );
+ embedDependency( ( Artifact ) i.next(), includeResource, bundleClassPath, embeddedArtifacts );
}
}
@@ -119,6 +122,7 @@ public final class DependencyEmbedder ex
appendDependencies( analyzer, Analyzer.INCLUDE_RESOURCE, includeResource.toString() );
appendDependencies( analyzer, Analyzer.BUNDLE_CLASSPATH, bundleClassPath.toString() );
+ appendDependencies( analyzer, EMBEDDED_ARTIFACTS, embeddedArtifacts.toString() );
}
@@ -168,7 +172,8 @@ public final class DependencyEmbedder ex
}
- private void embedDependency( Artifact dependency, StringBuffer includeResource, StringBuffer bundleClassPath )
+ private void embedDependency( Artifact dependency, StringBuffer includeResource, StringBuffer bundleClassPath,
+ StringBuffer embeddedArtifacts )
{
File sourceFile = dependency.getFile();
if ( null != sourceFile && sourceFile.exists() )
@@ -184,24 +189,24 @@ public final class DependencyEmbedder ex
embedDirectory = new File( embedDirectory, dependency.getGroupId() ).getPath();
}
- File targetFile;
- if ( Boolean.valueOf( m_embedStripVersion ).booleanValue() )
+ StringBuffer targetFileName = new StringBuffer();
+ targetFileName.append( dependency.getArtifactId() );
+ if ( false == Boolean.valueOf( m_embedStripVersion ).booleanValue() )
{
- String extension = dependency.getArtifactHandler().getExtension();
- if ( extension != null )
- {
- targetFile = new File( embedDirectory, dependency.getArtifactId() + "." + extension );
- }
- else
+ targetFileName.append( '-' ).append( dependency.getVersion() );
+ if ( dependency.getClassifier() != null )
{
- targetFile = new File( embedDirectory, dependency.getArtifactId() );
+ targetFileName.append( '-' ).append( dependency.getClassifier() );
}
}
- else
+ String extension = dependency.getArtifactHandler().getExtension();
+ if ( extension != null )
{
- targetFile = new File( embedDirectory, sourceFile.getName() );
+ targetFileName.append( '.' ).append( extension );
}
+ File targetFile = new File( embedDirectory, targetFileName.toString() );
+
String targetFilePath = targetFile.getPath();
// replace windows backslash with a slash
@@ -225,6 +230,20 @@ public final class DependencyEmbedder ex
}
bundleClassPath.append( targetFilePath );
+
+ if ( embeddedArtifacts.length() > 0 )
+ {
+ embeddedArtifacts.append( ',' );
+ }
+
+ embeddedArtifacts.append( targetFilePath ).append( ';' );
+ embeddedArtifacts.append( "g=\"" ).append( dependency.getGroupId() ).append( '"' );
+ embeddedArtifacts.append( ";a=\"" ).append( dependency.getArtifactId() ).append( '"' );
+ embeddedArtifacts.append( ";v=\"" ).append( dependency.getBaseVersion() ).append( '"' );
+ if ( dependency.getClassifier() != null )
+ {
+ embeddedArtifacts.append( ";c=\"" ).append( dependency.getClassifier() ).append( '"' );
+ }
}
}