[jboss-cvs] JBossAS SVN: r94103 - in projects/jboss-osgi/projects/aQute/trunk/bnd: scripts and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-09-29 10:16:56 -0400 (Tue, 29 Sep 2009)
New Revision: 94103

Added:
   projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/
   projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml
Modified:
   projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml
Log:
Add aQute.runtime.jar

Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml
===================================================================
--- projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml	2009-09-29 13:40:03 UTC (rev 94102)
+++ projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml	2009-09-29 14:16:56 UTC (rev 94103)
@@ -206,6 +206,26 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>assembly</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>directory-single</goal>
+            </goals>
+            <configuration>
+              <finalName>assembly</finalName>
+              <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>scripts/assembly-dependencies.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
@@ -228,9 +248,11 @@
             <Bundle-Vendor>aQute SARL http://www.aQute.biz</Bundle-Vendor>
             <Bundle-Version>${version}</Bundle-Version>
             <Conditional-Package>aQute.libg.*, aQute.lib.*, aQute.service.*</Conditional-Package>
-            <Embed-Dependency>
-              runtime;inline=false,
-            </Embed-Dependency>
+            <Include-Resource>
+              LICENSE=${project.build.outputDirectory}/LICENSE,
+              plugin.xml=${project.build.outputDirectory}/plugin.xml,
+              aQute/bnd/test/aQute.runtime.jar=${project.build.directory}/assembly/runtime.jar,
+            </Include-Resource>
             <Export-Package>
               aQute.bnd.build;uses:="aQute.lib.osgi,aQute.libg.sed,aQute.bnd.service,aQute.libg.reporter,aQute.bnd.service.action",
               aQute.bnd.service;uses:="aQute.lib.osgi,aQute.bnd.build,aQute.libg.reporter,aQute.libg.version",

Added: projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml
===================================================================
--- projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml	                        (rev 0)
+++ projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml	2009-09-29 14:16:56 UTC (rev 94103)
@@ -0,0 +1,24 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <!-- Dependency Sets -->
+  <dependencySets>
+  
+    <!-- bundles -->
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <includes>
+        <include>*:runtime:jar</include>
+      </includes>
+      <useStrictFiltering>true</useStrictFiltering>
+      <unpack>false</unpack>
+    </dependencySet>
+    
+  </dependencySets>
+</assembly>