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 2008/05/15 18:15:16 UTC
svn commit: r656719 - in
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin:
ObrDeploy.java ObrInstall.java
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;
}