commit 6cb86db90e4b345123bf1d48a33d046be30b80b1
author Stuart McCulloch <mcculls@apache.org> Sat Mar 15 21:38:26 2008 +0000
committer Stuart McCulloch <mcculls@apache.org> Sat Mar 15 21:38:26 2008 +0000
tree 3f8ecdf32bf21822d442468f03b237363b385a40
parent a86a9bfd67078d90e762cf4bc1760de2d096447e

FELIX-517: use StringUtils to replace {maven-dependencies}

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@637483 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 37dd6dc..37b8658 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -57,6 +57,7 @@
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.StringInputStream;
+import org.codehaus.plexus.util.StringUtils;
 
 import aQute.lib.osgi.Analyzer;
 import aQute.lib.osgi.Builder;
@@ -173,7 +174,7 @@
     private Maven2OsgiConverter m_maven2OsgiConverter;
 
     private static final String MAVEN_RESOURCES = "{maven-resources}";
-    private static final String MAVEN_RESOURCES_REGEX = "\\{maven-resources\\}";
+
     private static final String[] EMPTY_STRING_ARRAY =
         {};
     private static final String[] DEFAULT_INCLUDES =
@@ -416,7 +417,7 @@
                 }
                 else
                 {
-                    String combinedResource = includeResource.replaceAll( MAVEN_RESOURCES_REGEX, mavenResourcePaths );
+                    String combinedResource = StringUtils.replace( includeResource, MAVEN_RESOURCES, mavenResourcePaths );
                     properties.put( Analyzer.INCLUDE_RESOURCE, combinedResource );
                 }
             }

bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
index 878c416..7d405c1 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
@@ -28,6 +28,7 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.util.StringUtils;
 
 import aQute.lib.header.OSGiHeader;
 import aQute.lib.osgi.Analyzer;
@@ -48,7 +49,6 @@
     public static final String EMBED_TRANSITIVE = "Embed-Transitive";
 
     private static final String MAVEN_DEPENDENCIES = "{maven-dependencies}";
-    private static final String MAVEN_DEPENDENCIES_REGEX = "\\{maven-dependencies\\}";
 
     private String m_embedDirectory;
     private String m_embedStripGroup;
@@ -417,7 +417,7 @@
                 }
                 else
                 {
-                    String mergedInstruction = instruction.replaceAll( MAVEN_DEPENDENCIES_REGEX, mavenDependencies );
+                    String mergedInstruction = StringUtils.replace( instruction, MAVEN_DEPENDENCIES, mavenDependencies );
                     properties.setProperty( directiveName, mergedInstruction );
                 }
             }