Author: bentmann
Date: Sat Jul 17 13:42:57 2010
New Revision: 965076
URL: http://svn.apache.org/viewvc?rev=965076&view=rev
Log:
o Polished code
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/default-configuration/pom.xml
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadoc-sources/pom.xml
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadocjar/pom.xml
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-scm/pom.xml
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-sourcesjar/pom.xml
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java?rev=965076&r1=965075&r2=965076&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
Sat Jul 17 13:42:57 2010
@@ -44,12 +44,12 @@ public class BundleCreateMojo
public static final String POM = "pom.xml";
/**
- * Base directory.
+ * Output directory.
*
- * @parameter default-value="${basedir}"
+ * @parameter default-value="${project.build.directory}"
* @readonly
*/
- private String basedir;
+ private File outputDirectory;
/**
* The current Maven project.
@@ -161,10 +161,9 @@ public class BundleCreateMojo
final String finalName = project.getBuild().getFinalName();
- String outputDirectory = project.getBuild().getDirectory();
-
boolean batchMode = settings == null ? false :
!settings.isInteractiveMode();
- List<File> files = BundleUtils.selectProjectFiles( new File(
outputDirectory ), inputHandler, finalName, pom, getLog(), batchMode );
+ List<File> files =
+ BundleUtils.selectProjectFiles( outputDirectory, inputHandler,
finalName, pom, getLog(), batchMode );
File bundle = new File( outputDirectory, finalName + "-bundle.jar" );
Modified:
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/default-configuration/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/default-configuration/pom.xml?rev=965076&r1=965075&r2=965076&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/default-configuration/pom.xml
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/default-configuration/pom.xml
Sat Jul 17 13:42:57 2010
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project
implementation="org.apache.maven.plugins.repository.stubs.DefaultConfigurationMavenProjectStub"/>
-
<basedir>${basedir}/src/test/resources/unit/default-configuration</basedir>
+
<outputDirectory>${basedir}/target/test/unit/default-configuration/target</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadoc-sources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadoc-sources/pom.xml?rev=965076&r1=965075&r2=965076&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadoc-sources/pom.xml
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadoc-sources/pom.xml
Sat Jul 17 13:42:57 2010
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project
implementation="org.apache.maven.plugins.repository.stubs.NoJavadocSourcesMavenProjectStub"/>
-
<basedir>${basedir}/src/test/resources/unit/no-javadoc-sources</basedir>
+
<outputDirectory>${basedir}/target/test/unit/no-javadoc-sources/target</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadocjar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadocjar/pom.xml?rev=965076&r1=965075&r2=965076&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadocjar/pom.xml
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-javadocjar/pom.xml
Sat Jul 17 13:42:57 2010
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project
implementation="org.apache.maven.plugins.repository.stubs.NoJavadocJarMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/no-javadocjar</basedir>
+
<outputDirectory>${basedir}/target/test/unit/no-javadocjar/target</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-scm/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-scm/pom.xml?rev=965076&r1=965075&r2=965076&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-scm/pom.xml
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-scm/pom.xml
Sat Jul 17 13:42:57 2010
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project
implementation="org.apache.maven.plugins.repository.stubs.NoScmMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/no-scm</basedir>
+
<outputDirectory>${basedir}/target/test/unit/no-scm/target</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-sourcesjar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-sourcesjar/pom.xml?rev=965076&r1=965075&r2=965076&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-sourcesjar/pom.xml
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/no-sourcesjar/pom.xml
Sat Jul 17 13:42:57 2010
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project
implementation="org.apache.maven.plugins.repository.stubs.NoSourcesJarMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/no-sourcesjar</basedir>
+
<outputDirectory>${basedir}/target/test/unit/no-sourcesjar/target</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml?rev=965076&r1=965075&r2=965076&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml
Sat Jul 17 13:42:57 2010
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project
implementation="org.apache.maven.plugins.repository.stubs.PomOnlyMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/pom-only</basedir>
+
<outputDirectory>${basedir}/target/test/unit/pom-only/target</outputDirectory>
</configuration>
</plugin>
</plugins>
