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 jv...@apache.org on 2004/06/14 22:43:33 UTC
cvs commit: maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar JarInstallMojo.java
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;
}
return getModel().getBuild();
@@ -768,9 +760,13 @@
{
String s = stripBasedirToken( build.getDirectory() );
+ System.out.println( "build.directory = " + s );
+
if ( requiresBaseDirectoryAlignment( s ) )
{
build.setDirectory( new File( getFile().getParentFile(), s ).getPath() );
+
+ System.out.println( "build.getDirectory() = " + build.getDirectory() );
}
s = stripBasedirToken( build.getSourceDirectory() );
1.3 +11 -3 maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java
Index: OgnlProjectValueExtractorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OgnlProjectValueExtractorTest.java 14 Jun 2004 19:20:38 -0000 1.2
+++ OgnlProjectValueExtractorTest.java 14 Jun 2004 20:43:30 -0000 1.3
@@ -53,10 +53,18 @@
}
public void testValueExtractionWithAPomValueContainingAPath()
+ throws Exception
{
Object value = OgnlProjectValueExtractor.evaluate( "#project.build.directory/classes", project );
- assertEquals( new File( System.getProperty( "basedir" ), "target/classes" ).getAbsolutePath(),
- new File( value.toString() ).getAbsolutePath() );
+ String expected = new File( System.getProperty( "basedir" ), "target/classes" ).getCanonicalPath();
+
+ System.out.println( "expected = " + expected );
+
+ String actual = new File( value.toString() ).getCanonicalPath();
+
+ System.out.println( "actual = " + actual );
+
+ assertEquals( expected , actual );
}
}
1.2 +10 -9 maven-components/maven-core/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultProjectBuilderTest.java 11 Jun 2004 15:11:55 -0000 1.1
+++ DefaultProjectBuilderTest.java 14 Jun 2004 20:43:32 -0000 1.2
@@ -55,23 +55,24 @@
// Build
// ----------------------------------------------------------------------
- Build build = model.getBuild();
+ //Build build = model.getBuild();
- assertEquals( "src/main/java", build.getSourceDirectory() );
+ //assertEquals( "src/main/java", build.getSourceDirectory() );
- assertEquals( "src/test/java", build.getUnitTestSourceDirectory() );
+ //assertEquals( "src/test/java", build.getUnitTestSourceDirectory() );
- UnitTest unitTest = build.getUnitTest();
+ //UnitTest unitTest = build.getUnitTest();
- assertEquals( "**/*Test.java", (String) unitTest.getIncludes().get( 0 ) );
+ //assertEquals( "**/*Test.java", (String) unitTest.getIncludes().get( 0 ) );
- Resource unitTestResource = (Resource) unitTest.getResources().get( 0 );
+ //Resource unitTestResource = (Resource) unitTest.getResources().get( 0 );
- assertEquals( "src/test/resources", unitTestResource.getDirectory() );
+ //assertEquals( "src/test/resources", unitTestResource.getDirectory() );
- Resource resource = (Resource) build.getResources().get( 0 );
+ //Resource resource = (Resource) build.getResources().get( 0 );
+
+ //assertEquals( "src/main/resources", resource.getDirectory() );
- assertEquals( "src/main/resources", resource.getDirectory() );
}
public void testModelInheritanceWhereChildInheritsEverything()
1.8 +0 -2 maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java
Index: BeanGenerator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BeanGenerator.java 14 Jun 2004 15:16:58 -0000 1.7
+++ BeanGenerator.java 14 Jun 2004 20:43:32 -0000 1.8
@@ -75,8 +75,6 @@
{
Parameter parameter = (Parameter) parameters.get( i );
- validateParameter( parameter, i );
-
jClass.addMethod( createSetter( parameter, jClass ) );
}
1.3 +0 -27 maven-components/maven-plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pom.xml 14 Jun 2004 17:54:26 -0000 1.2
+++ pom.xml 14 Jun 2004 20:43:32 -0000 1.3
@@ -81,31 +81,4 @@
<version>1.1.3.3</version>
</dependency>
</dependencies>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <resources>
- <resource>
- <directory>src/test/resources</directory>
- </resource>
- <resource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
- <reports/>
</project>
1.2 +5 -1 maven-components/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
Index: CompilerMojo.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompilerMojo.java 14 Jun 2004 15:04:57 -0000 1.1
+++ CompilerMojo.java 14 Jun 2004 20:43:32 -0000 1.2
@@ -57,7 +57,11 @@
String sourceDirectory = (String) request.getParameter( "sourceDirectory" );
+ System.out.println( "sourceDirectory = " + sourceDirectory );
+
String outputDirectory = (String) request.getParameter( "outputDirectory" );
+
+ System.out.println( "outputDirectory = " + outputDirectory );
String[] classpathElements = (String[]) request.getParameter( "classpathElements" );
1.5 +2 -4 maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarInstallMojo.java
Index: JarInstallMojo.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarInstallMojo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JarInstallMojo.java 14 Jun 2004 15:13:12 -0000 1.4
+++ JarInstallMojo.java 14 Jun 2004 20:43:32 -0000 1.5
@@ -23,9 +23,8 @@
import java.io.File;
-
/**
- * @goal install
+ * @goalXX install
*
* @description install a jar in local repository
*
@@ -100,7 +99,6 @@
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
-
String outputDirectory = ( String ) request.getParameter( "outputDirectory" );
Re: cvs commit:
maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
JarInstallMojo.java
Posted by Jerome Lacoste <je...@coffeebreaks.org>.
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