felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r656719 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin: ObrDeploy.java ObrInstall.java
Date Thu, 15 May 2008 16:15:16 GMT
Author: mcculls
Date: Thu May 15 09:15:15 2008
New Revision: 656719

URL: http://svn.apache.org/viewvc?rev=656719&view=rev
Log:
FELIX-560: fix bundle:install and bundle:deploy to respect supportedProjectTypes setting

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=656719&r1=656718&r2=656719&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 Thu May
15 09:15:15 2008
@@ -74,7 +74,7 @@
      * @parameter
      */
     private List supportedProjectTypes = Arrays.asList( new String[]
-        { "bundle" } );
+        { "jar", "bundle" } );
 
     /**
      * @parameter expression="${project.distributionManagementArtifactRepository}"
@@ -277,7 +277,7 @@
 
     private void updateRemoteBundleMetadata( Artifact artifact, ObrUpdate update ) throws
MojoExecutionException
     {
-        if ( !"bundle".equals( artifact.getType() ) )
+        if ( !supportedProjectTypes.contains( artifact.getType() ) )
         {
             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=656719&r1=656718&r2=656719&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 Thu
May 15 09:15:15 2008
@@ -55,7 +55,7 @@
      * @parameter
      */
     private List supportedProjectTypes = Arrays.asList( new String[]
-        { "bundle" } );
+        { "jar", "bundle" } );
 
     /**
      * Local Repository.
@@ -156,7 +156,7 @@
 
     private void updateLocalBundleMetadata( Artifact artifact, ObrUpdate update ) throws
MojoExecutionException
     {
-        if ( !"bundle".equals( artifact.getType() ) )
+        if ( !supportedProjectTypes.contains( artifact.getType() ) )
         {
             return;
         }



Mime
View raw message