svn commit: r611060 - in /maven/sandbox/trunk/plugins/maven-android: maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java

[sisbell]

Author: sisbell
Date: Thu Jan 10 22:03:03 2008
New Revision: 611060

URL: http://svn.apache.org/viewvc?rev=611060&view=rev
Log:
Also install jar file.

Modified:
    
maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java
    
maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java

Modified: 
maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java?rev=611060&r1=611059&r2=611060&view=diff
==============================================================================
--- 
maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java
 (original)
+++ 
maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java
 Thu Jan 10 22:03:03 2008
@@ -25,6 +25,7 @@
 import org.apache.maven.android.CommandExecutor;
 import org.apache.maven.android.ExecutionException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -86,6 +87,7 @@
         ArtifactRepositoryLayout defaultLayout = new DefaultRepositoryLayout();
 
         File androidJar = new File(localRepository, 
defaultLayout.pathOf(artifact));
+        artifact.setFile(androidJar);
 
         tmpOutputFile.deleteOnExit();
         File outputFile = new File(project.getBasedir(), "target" + 
File.separator + project.getArtifactId() + "-"
@@ -157,5 +159,6 @@
         }
 
         project.getArtifact().setFile(outputFile);
+
     }
 }

Modified: 
maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java?rev=611060&r1=611059&r2=611060&view=diff
==============================================================================
--- 
maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java
 (original)
+++ 
maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java
 Thu Jan 10 22:03:03 2008
@@ -23,6 +23,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.android.ExecutionException;
 import org.apache.maven.android.CommandExecutor;
 
@@ -47,6 +48,11 @@
      */
     private MavenProject project;
 
+    /**
+     * @component
+     */
+    private MavenProjectHelper mavenProjectHelper;
+
     public void execute() throws MojoExecutionException, MojoFailureException {
 
         CommandExecutor executor = 
CommandExecutor.Factory.createDefaultCommmandExecutor();
@@ -65,5 +71,7 @@
         } catch (ExecutionException e) {
             throw new MojoExecutionException("", e);
         }
+
+        mavenProjectHelper.attachArtifact(project, "jar", 
project.getArtifact().getClassifier(), inputFile);
     }
 }