felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r650869 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin: ObrDeploy.java ObrInstall.java
Date Wed, 23 Apr 2008 13:52:44 GMT
Author: mcculls
Date: Wed Apr 23 06:52:42 2008
New Revision: 650869

URL: http://svn.apache.org/viewvc?rev=650869&view=rev
Log:
Additional feedback for when people use bundle:deploy on its own

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=650869&r1=650868&r2=650869&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 Wed Apr
23 06:52:42 2008
@@ -277,8 +277,13 @@
 
     private void updateRemoteBundleMetadata( Artifact artifact, ObrUpdate update ) throws
MojoExecutionException
     {
-        if ( !"bundle".equals( artifact.getType() ) || null == artifact.getFile() || artifact.getFile().isDirectory()
)
+        if ( !"bundle".equals( artifact.getType() ) )
         {
+            return;
+        }
+        else if ( null == artifact.getFile() || artifact.getFile().isDirectory() )
+        {
+            getLog().error( "No artifact found, try \"mvn install bundle:deploy\"" );
             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=650869&r1=650868&r2=650869&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 Wed
Apr 23 06:52:42 2008
@@ -156,8 +156,13 @@
 
     private void updateLocalBundleMetadata( Artifact artifact, ObrUpdate update ) throws
MojoExecutionException
     {
-        if ( !"bundle".equals( artifact.getType() ) || null == artifact.getFile() || artifact.getFile().isDirectory()
)
+        if ( !"bundle".equals( artifact.getType() ) )
         {
+            return;
+        }
+        else if ( null == artifact.getFile() || artifact.getFile().isDirectory() )
+        {
+            getLog().error( "No artifact found, try \"mvn install bundle:install\"" );
             return;
         }
 



Mime
View raw message