You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by Jerome Lacoste <je...@coffeebreaks.org> on 2004/06/17 19:06:16 UTC
Re: cvs commit:
maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
JarInstallMojo.java
On Mon, 2004-06-14 at 22:43, jvanzyl@apache.org wrote:
> jvanzyl 2004/06/14 13:43:33
>
> Modified: maven-core/src/main/java/org/apache/maven/project
> MavenProject.java
> maven-core/src/test/java/org/apache/maven/plugin
> OgnlProjectValueExtractorTest.java
> maven-core/src/test/java/org/apache/maven/project
> DefaultProjectBuilderTest.java
> maven-plugin/src/main/java/org/apache/maven/plugin/generator
> BeanGenerator.java
> maven-plugins pom.xml
> maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin
> CompilerMojo.java
> maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
> JarInstallMojo.java
> Log:
>
>
> Revision Changes Path
> 1.3 +10 -14 maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
>
> Index: MavenProject.java
> ===================================================================
> RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- MavenProject.java 14 Jun 2004 17:42:41 -0000 1.2
> +++ MavenProject.java 14 Jun 2004 20:43:30 -0000 1.3
> @@ -112,27 +112,16 @@
> return getParent() != null;
> }
>
> - /**
> - *
> - * @return
> - */
> public File getFile()
> {
> return file;
> }
>
> - /**
> - *
> - * @param file
> - */
> public void setFile( File file )
> {
> this.file = file;
> }
>
> - /**
> - * Returns base dir for this project
> - */
> public File getBasedir()
> {
> return getFile().getParentFile();
> @@ -312,7 +301,8 @@
>
> String[] classpathElements = new String[size + 1];
>
> - classpathElements[0] = getProperty( "maven.build.dest" );
> + //@todo This needs to go into the super model ...
> + classpathElements[0] = getBuild().getDirectory() + PS + "classes";
>
> for ( int i = 0; i < size; i++ )
> {
> @@ -584,9 +574,11 @@
>
> public Build getBuild()
> {
> - if ( !alignedToBaseDirectory )
> + if ( alignedToBaseDirectory )
> {
> alignToBaseDirectory();
> +
> + alignedToBaseDirectory = true;
> }
sounded like a Bug, except if alignToBaseDirectory() had a side effect
on the variable. But I think that this code was removed later on...
Jerome