Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 21322 invoked from network); 23 Apr 2008 13:53:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2008 13:53:10 -0000 Received: (qmail 14876 invoked by uid 500); 23 Apr 2008 13:53:11 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 14855 invoked by uid 500); 23 Apr 2008 13:53:10 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 14844 invoked by uid 99); 23 Apr 2008 13:53:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 06:53:10 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 13:52:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 784AB1A9832; Wed, 23 Apr 2008 06:52:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@felix.apache.org From: mcculls@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080423135246.784AB1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }