servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1089868 - in /servicemix/smx4/features/trunk/assembly: pom.xml src/main/descriptors/unix-bin.xml src/main/descriptors/windows-bin.xml src/main/filtered-resources/features.xml
Date Thu, 07 Apr 2011 13:08:24 GMT
Author: gertv
Date: Thu Apr  7 13:08:24 2011
New Revision: 1089868

URL: http://svn.apache.org/viewvc?rev=1089868&view=rev
Log:
SMX4-798: Enable OBR support of features assembly

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

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1089868&r1=1089867&r2=1089868&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Apr  7 13:08:24 2011
@@ -145,6 +145,7 @@
                                 <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
                             </descriptors>
                             <features>
+                                <feature>obr</feature>
                                 <feature>activemq</feature>
                                 <feature>activemq-blueprint</feature>
                                 <feature>activemq-broker</feature>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1089868&r1=1089867&r2=1089868&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Apr  7 13:08:24
2011
@@ -36,6 +36,7 @@
               <exclude>etc/users.properties</exclude>
               <exclude>etc/custom.properties</exclude>
               <exclude>etc/jre.properties</exclude>
+              <exclude>etc/startup.properties</exclude>
               <!-- SMX4-764 - Override Felix Framework version -->
               <!-- begin snippet -->
               <exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
@@ -76,6 +77,16 @@
             <lineEnding>unix</lineEnding>
        </fileSet>
 
+       <!-- Using the NMR's startup.properties because that has OBR support enabled by
default -->
+       <fileSet>
+           <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/etc</directory>
+           <outputDirectory>/etc</outputDirectory>
+           <lineEnding>unix</lineEnding>
+           <includes>
+               <include>startup.properties</include>
+           </includes>
+       </fileSet>
+
        <!-- Copy over nmr examples files -->
        <fileSet>
             <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1089868&r1=1089867&r2=1089868&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Apr 
7 13:08:24 2011
@@ -64,6 +64,16 @@
             <lineEnding>dos</lineEnding>
        </fileSet>
 
+       <!-- Using the NMR's startup.properties because that has OBR support enabled by
default -->
+       <fileSet>
+           <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/etc</directory>
+           <outputDirectory>/etc</outputDirectory>
+           <lineEnding>unix</lineEnding>
+           <includes>
+               <include>startup.properties</include>
+           </includes>
+       </fileSet>
+
       <!-- Copy over nmr examples files -->
       <fileSet>
            <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1089868&r1=1089867&r2=1089868&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Thu Apr
 7 13:08:24 2011
@@ -185,7 +185,7 @@
     <feature name="servicemix-shared" version="${servicemix.components.version}" resolver="(obr)">
         <feature version="${servicemix.nmr.version}">jbi</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix.components.version}</bundle>
@@ -267,6 +267,7 @@
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt-core.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr-runtime.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix.components.version}</bundle>



Mime
View raw message