You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2007/09/13 14:37:50 UTC

svn commit: r575292 - /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java

Author: fmeschbe
Date: Thu Sep 13 05:37:49 2007
New Revision: 575292

URL: http://svn.apache.org/viewvc?rev=575292&view=rev
Log:
Do not overwrite but append to Service-Component property if already existing in the project

Modified:
    felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java

Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java?rev=575292&r1=575291&r2=575292&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java Thu Sep 13 05:37:49 2007
@@ -209,8 +209,11 @@
             resource.setDirectory(this.outputDirectory.getAbsolutePath());
             this.project.addResource(resource);
         }
+        
         // and set include accordingly
-        this.project.getProperties().setProperty("Service-Component", "OSGI-INF/" + this.finalName);
+        String svcComp = project.getProperties().getProperty("Service-Component");
+        svcComp= (svcComp == null) ? "OSGI-INF/" + finalName : svcComp + ", " + "OSGI-INF/" + finalName;
+        project.getProperties().setProperty("Service-Component", svcComp);
     }
 
     /**