servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r919613 - in /servicemix/smx4/nmr/trunk/assembly: pom.xml src/main/descriptors/unix-bin.xml src/main/descriptors/windows-bin.xml
Date Fri, 05 Mar 2010 21:01:24 GMT
Author: jbonofre
Date: Fri Mar  5 21:01:23 2010
New Revision: 919613

URL: http://svn.apache.org/viewvc?rev=919613&view=rev
Log:
Add a workaround to add Felix framework 2.0.4 in the assembly as Karaf 1.3.0-SNAPSHOT uses
framework 2.0.3.

Modified:
    servicemix/smx4/nmr/trunk/assembly/pom.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml

Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=919613&r1=919612&r2=919613&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Fri Mar  5 21:01:23 2010
@@ -33,6 +33,12 @@
     <name>Apache ServiceMix NMR :: Assembly</name>
 
     <dependencies>
+        <!-- normaly, felix framework is provided by karaf distribution -->
+        <!-- this is a temporary workaround waiting for karaf 1.4.0 -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.felix.karaf</groupId>
             <artifactId>apache-felix-karaf</artifactId>
@@ -293,6 +299,11 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
+                                    <groupId>org.apache.felix</groupId>
+                                    <artifactId>org.apache.felix.framework</artifactId>
+                                    <outputDirectory>target/dependencies</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>org.apache.servicemix.nmr</groupId>
                                     <artifactId>org.apache.servicemix.nmr.branding</artifactId>
                                     <outputDirectory>target/dependencies</outputDirectory>

Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=919613&r1=919612&r2=919613&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Mar  5 21:01:23
2010
@@ -80,6 +80,15 @@
             <directory>${basedir}/target/features-repo</directory>
             <outputDirectory>system</outputDirectory>
         </fileSet>
+
+        <!-- temporary workaround waiting for Karaf 1.4.0 which will provide the correct
felix framework version -->
+        <fileSet>
+            <directory>target/dependencies</directory>
+            <includes>
+               <include>org.apache.felix.framework-${felix.framework.version}.jar</include>
+            </includes>
+            <outputDirectory>system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}</outputDirectory>
+        </fileSet>
   
         <!-- Copy over jar files -->
         <fileSet>

Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=919613&r1=919612&r2=919613&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Mar  5 21:01:23
2010
@@ -81,6 +81,15 @@
             <outputDirectory>system</outputDirectory>
         </fileSet>
 
+        <!-- temporary workaround waiting for Karaf 1.4.0 which will provide the correct
Felix framework version -->
+        <fileSet>
+            <directory>target/dependencies</directory>
+            <includes>
+               <include>org.apache.felix.framework-${felix.framework.version}.jar</include>
+            </includes>
+            <outputDirectory>system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}</outputDirectory>
+        </fileSet>
+
         <!-- Copy over jar files -->
         <fileSet>
             <directory>target/dependencies</directory>



Mime
View raw message