svn commit: r637483 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin: BundlePlugin.java DependencyEmbedder.java

[mcculls]

Author: mcculls
Date: Sat Mar 15 14:38:26 2008
New Revision: 637483

URL: http://svn.apache.org/viewvc?rev=637483&view=rev
Log:
FELIX-517: use StringUtils to replace {maven-dependencies}

Modified:
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java

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?rev=637483&r1=637482&r2=637483&view=diff
==============================================================================
--- 
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
 Sat Mar 15 14:38:26 2008
@@ -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 );
                 }
             }

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java?rev=637483&r1=637482&r2=637483&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
 Sat Mar 15 14:38:26 2008
@@ -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 );
                 }
             }