commit 6a66fdb895b98e7db3de37525b76104d5f4a7d92
author Stuart McCulloch <mcculls@apache.org> Thu Sep 08 18:38:42 2011 +0000
committer Stuart McCulloch <mcculls@apache.org> Thu Sep 08 18:38:42 2011 +0000
tree fadf6a5621bc4b49e82c65a1358dbb57b3c3d805
parent 6436a8fbd3edbd015319ea556628e800ed68be0a

FELIX-3061: keep a record of artifacts embedded using Embed-Dependency

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1166847 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
index 9c01de8..1c83892 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
@@ -47,6 +47,8 @@
     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 @@
     {
         StringBuffer includeResource = new StringBuffer();
         StringBuffer bundleClassPath = new StringBuffer();
+        StringBuffer embeddedArtifacts = new StringBuffer();
 
         m_inlinedPaths.clear();
         m_embeddedArtifacts.clear();
@@ -104,7 +107,7 @@
             }
             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 @@
 
         appendDependencies( analyzer, Analyzer.INCLUDE_RESOURCE, includeResource.toString() );
         appendDependencies( analyzer, Analyzer.BUNDLE_CLASSPATH, bundleClassPath.toString() );
+        appendDependencies( analyzer, EMBEDDED_ARTIFACTS, embeddedArtifacts.toString() );
     }
 
 
@@ -168,7 +172,8 @@
     }
 
 
-    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 @@
                 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 )
+                targetFileName.append( '-' ).append( dependency.getVersion() );
+                if ( dependency.getClassifier() != null )
                 {
-                    targetFile = new File( embedDirectory, dependency.getArtifactId() + "." + extension );
-                }
-                else
-                {
-                    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 @@
             }
 
             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( '"' );
+            }
         }
     }