felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r628950 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin: ObrDeploy.java ObrInstall.java
Date Tue, 19 Feb 2008 01:20:05 GMT
Author: mcculls
Date: Mon Feb 18 17:20:04 2008
New Revision: 628950

URL: http://svn.apache.org/viewvc?rev=628950&view=rev
Log:
FELIX-493: only install/deploy bundle type artifacts to OBR

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

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=628950&r1=628949&r2=628950&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 Mon Feb
18 17:20:04 2008
@@ -241,7 +241,7 @@
     private void updateRemoteBundleMetadata( Artifact artifact, URI repoXml, URI obrXml,
String mavenRepo )
         throws MojoExecutionException
     {
-        if ( null == artifact.getFile() || artifact.getFile().isDirectory() )
+        if ( !"bundle".equals( artifact.getType() ) || null == artifact.getFile() || artifact.getFile().isDirectory()
)
         {
             return;
         }

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=628950&r1=628949&r2=628950&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 Mon
Feb 18 17:20:04 2008
@@ -118,7 +118,7 @@
     private void updateLocalBundleMetadata( Artifact artifact, URI repoXml, URI obrXml, String
mavenRepo )
         throws MojoExecutionException
     {
-        if ( null == artifact.getFile() || artifact.getFile().isDirectory() )
+        if ( !"bundle".equals( artifact.getType() ) || null == artifact.getFile() || artifact.getFile().isDirectory()
)
         {
             return;
         }



Mime
View raw message