Author: justin Date: Mon Jan 25 21:53:05 2010 New Revision: 902989 URL: http://svn.apache.org/viewvc?rev=902989&view=rev Log: SLING-1322 - removing extraneous project variable
Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java?rev=902989&r1=902988&r2=902989&view=diff ============================================================================== --- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java (original) +++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java Mon Jan 25 21:53:05 2010 @@ -29,7 +29,7 @@ /** * Initialize a Sling application project by extracting bundles into the correct * locations. - * + * * @goal prepare-package * @requiresDependencyResolution test * @phase process-sources @@ -39,14 +39,14 @@ /** * Any additional bundles to include in the project's bundles directory. - * + * * @parameter */ private ArtifactDefinition[] additionalBundles; /** * If true, install the default bundles. - * + * * @parameter default-value="true" */ private boolean installDefaultBundles; @@ -55,29 +55,21 @@ * The output directory for the default bundles in a WAR-packaged project, * the base JAR (in the subdirectory named in the baseDestination * parameter), and any additional bundles. - * + * * @parameter default-value="${project.build.directory}/launchpad-bundles" */ private File warOutputDirectory; /** - * The Maven project. - * - * @parameter expression="${project}" - * @readonly - */ - private MavenProject project; - - /** * The project's packaging type. - * + * * @parameter expression="${project.packaging}" */ private String packaging; /** * The definition of the base JAR. - * + * * @parameter */ private ArtifactDefinition base; @@ -85,14 +77,14 @@ /** * The definition of the package to be included to provide web support for * JAR-packaged projects (i.e. pax-web). - * + * * @parameter */ private ArtifactDefinition jarWebSupport; /** * The project's build output directory (i.e. target/classes). - * + * * @parameter expression="${project.build.outputDirectory}" * @readonly */ @@ -179,7 +171,7 @@ return buildOutputDirectory; } } - + protected void initArtifactDefinitions(Properties dependencies) { @@ -193,7 +185,7 @@ } jarWebSupport.initDefaults(dependencies.getProperty("jarWebSupport")); } - + private void unpackBaseArtifact() throws MojoExecutionException { Artifact artifact = getBaseDependency(); if (artifact == null) {