svn commit: r1084374 - in /karaf/trunk: assemblies/features/framework/src/main/feature/feature.xml tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java

[dj...@apache.org]

Author: djencks
Date: Tue Mar 22 22:01:55 2011
New Revision: 1084374

URL: http://svn.apache.org/viewvc?rev=1084374&view=rev
Log:
KARAF-424 filter source feature.xml files

Modified:
    karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
    karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java

Modified: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml?rev=1084374&r1=1084373&r2=1084374&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Tue Mar 22 22:01:55 2011
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="&lt;unnamed&gt;">
     <feature version="2.99.99-SNAPSHOT" name="karaf-framework">
-        <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-mvn/1.2.5</bundle>
-        <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/1.2.5</bundle>
-        <bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/1.6.1</bundle>
-        <bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/1.6.1</bundle>
-        <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.2.8</bundle>
-        <bundle dependency="false" start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/3.1.10</bundle>
-        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_1</bundle>
-        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/0.3</bundle>
-        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/0.3</bundle>
-        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/0.3</bundle>
+        <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-mvn/${pax.url.version}</bundle>
+        <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle>
+        <bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
+        <bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
+        <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
+        <bundle dependency="false" start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
+        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
+        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
+        <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
 
 
 <!--

Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java?rev=1084374&r1=1084373&r2=1084374&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java Tue Mar 22 22:01:55 2011
@@ -242,7 +242,8 @@ public class GenerateFeaturesXmlMojo2 ex
         ObjectFactory objectFactory = new ObjectFactory();
         Features features;
         if (inputFile.exists()) {
-            features = readFeaturesFile(inputFile);
+            filter(inputFile, outputFile);
+            features = readFeaturesFile(outputFile);
         } else {
             features = objectFactory.createFeaturesRoot();
         }