felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r540140 - in /felix/trunk: bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java framework/src/main/resources/org/apache/felix/framework/Felix.properties
Date Mon, 21 May 2007 13:37:44 GMT
Author: rickhall
Date: Mon May 21 06:37:43 2007
New Revision: 540140

URL: http://svn.apache.org/viewvc?view=rev&rev=540140
Log:
Applied patch (FELIX-261) to fix resource clashes between BND and Maven.

Modified:
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
    felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?view=diff&rev=540140&r1=540139&r2=540140
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
(original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Mon May 21 06:37:43 2007
@@ -154,7 +154,7 @@
    if (mavenResourcePaths.length() > 0) {
      final String includeResource = (String)properties.get(Analyzer.INCLUDE_RESOURCE);
      if (includeResource != null) {
-       properties.put(Analyzer.INCLUDE_RESOURCE, includeResource + ',' + mavenResourcePaths);
+       getLog().warn(Analyzer.INCLUDE_RESOURCE + ": overriding " + mavenResourcePaths + "
with " + includeResource );
      } else {
        properties.put(Analyzer.INCLUDE_RESOURCE, mavenResourcePaths);
      }

Modified: felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties?view=diff&rev=540140&r1=540139&r2=540140
==============================================================================
--- felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties (original)
+++ felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties Mon
May 21 06:37:43 2007
@@ -1 +1 @@
-felix.version=0.9.0-incubator-SNAPSHOT
+felix.version=${pom.version}



Mime
View raw message