You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2011/06/28 02:15:27 UTC
svn commit: r1140386 - in
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin:
ObrDeploy.java ObrInstall.java ObrUtils.java
Author: mcculls
Date: Tue Jun 28 00:15:26 2011
New Revision: 1140386
URL: http://svn.apache.org/viewvc?rev=1140386&view=rev
Log:
FELIX-1836: check output directory for filtered obr.xml before checking resource directories
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java?rev=1140386&r1=1140385&r2=1140386&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java Tue Jun 28 00:15:26 2011
@@ -224,7 +224,7 @@ public final class ObrDeploy extends Abs
String mavenRepository = localRepository.getBasedir();
URI repositoryXml = downloadedRepositoryXml.toURI();
- URI obrXmlFile = ObrUtils.findObrXml( project.getResources() );
+ URI obrXmlFile = ObrUtils.findObrXml( project );
Config userConfig = new Config();
userConfig.setRemoteFile( true );
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java?rev=1140386&r1=1140385&r2=1140386&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java Tue Jun 28 00:15:26 2011
@@ -133,7 +133,7 @@ public final class ObrInstall extends A
String mavenRepository = localRepository.getBasedir();
URI repositoryXml = ObrUtils.findRepositoryXml( mavenRepository, obrRepository );
- URI obrXmlFile = ObrUtils.findObrXml( project.getResources() );
+ URI obrXmlFile = ObrUtils.findObrXml( project );
Config userConfig = new Config();
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java?rev=1140386&r1=1140385&r2=1140386&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java Tue Jun 28 00:15:26 2011
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Resource;
+import org.apache.maven.project.MavenProject;
/**
@@ -85,15 +86,20 @@ public class ObrUtils
/**
- * @param resources collection of resource locations
+ * @param project current project
* @return URI pointing to correct obr.xml, null if not found
*/
- public static URI findObrXml( Collection resources )
+ public static URI findObrXml( MavenProject project )
{
- for ( Iterator i = resources.iterator(); i.hasNext(); )
+ File obrFile = new File( project.getBuild().getOutputDirectory(), OBR_XML );
+ if ( obrFile.exists() )
+ {
+ return obrFile.toURI();
+ }
+ for ( Iterator i = project.getResources().iterator(); i.hasNext(); )
{
Resource resource = ( Resource ) i.next();
- File obrFile = new File( resource.getDirectory(), OBR_XML );
+ obrFile = new File( resource.getDirectory(), OBR_XML );
if ( obrFile.exists() )
{
return obrFile.toURI();