You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2011/01/02 18:40:40 UTC
svn commit: r1054437 -
/felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java
Author: clement
Date: Sun Jan 2 17:40:40 2011
New Revision: 1054437
URL: http://svn.apache.org/viewvc?rev=1054437&view=rev
Log:
FELIX-2755 Allow the manipulator and the different front end to use several metadata files
If src/main/ipojo and target/classes/metadata.xml do not exist, try ./metadata.xml
This was the previous behavior, broken by the last commit.
Modified:
felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java
Modified: felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java?rev=1054437&r1=1054436&r2=1054437&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java (original)
+++ felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java Sun Jan 2 17:40:40 2011
@@ -150,7 +150,7 @@ public class ManipulatorMojo extends Abs
File meta = new File(m_outputDirectory + File.separator + "metadata.xml");
if (! meta.exists()) {
// If it still does not exist, try ./metadata.xml
- meta = new File(m_project.getBasedir() + File.separator + m_metadata);
+ meta = new File(m_project.getBasedir() + File.separator + "metadata.xml");
}
if (meta.exists()) {