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/24 18:50:15 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project DefaultMavenProjectBuilder.java MavenProject.java
jvanzyl 2004/06/24 09:50:15
Modified: maven-core/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java MavenProject.java
Log:
o activate the path translator in the maven project builder and remove the
path handling code from maven project itself.
Revision Changes Path
1.7 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultMavenProjectBuilder.java 24 Jun 2004 16:45:41 -0000 1.6
+++ DefaultMavenProjectBuilder.java 24 Jun 2004 16:50:15 -0000 1.7
@@ -140,7 +140,7 @@
project.setFile( projectDescriptor );
- project.initialize();
+ pathTranslator.alignToBaseDirectory( project.getModel(), projectDescriptor );
return project;
}
1.16 +0 -129 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MavenProject.java 24 Jun 2004 14:52:32 -0000 1.15
+++ MavenProject.java 24 Jun 2004 16:50:15 -0000 1.16
@@ -28,7 +28,6 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
import org.apache.maven.model.Repository;
-import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.codehaus.plexus.util.StringUtils;
@@ -111,11 +110,6 @@
return getFile().getParentFile();
}
- public void initialize()
- {
- alignToBaseDirectory();
- }
-
public void setDependencies( List denpendencies )
{
getModel().setDependencies( denpendencies );
@@ -585,129 +579,6 @@
|| "1".equals( value ) )
{
return true;
- }
-
- return false;
- }
-
- private void alignToBaseDirectory()
- {
- // build.directory
- // build.sourceDirectory
- // build.unitTestSourceDirectory
- // build.aspectSourceDirectory
- // build.resources.resource.directory
- // unitTest.resources.resource.directory
-
- // build.output
- // build.testOutput
-
- Build build = getModel().getBuild();
-
- if ( build != null )
- {
- String s = stripBasedirToken( build.getDirectory() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- build.setDirectory( new File( getFile().getParentFile(), s ).getPath() );
- }
-
- s = stripBasedirToken( build.getSourceDirectory() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- build.setSourceDirectory( new File( getFile().getParentFile(), s ).getPath() );
- }
-
- s = stripBasedirToken( build.getUnitTestSourceDirectory() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- build.setUnitTestSourceDirectory( new File( getFile().getParentFile(), s ).getPath() );
- }
-
- s = stripBasedirToken( build.getAspectSourceDirectory() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- build.setAspectSourceDirectory( new File( getFile().getParentFile(), s ).getPath() );
- }
-
- List buildResources = build.getResources();
-
- for ( Iterator i = buildResources.iterator(); i.hasNext(); )
- {
- Resource resource = (Resource) i.next();
-
- s = stripBasedirToken( resource.getDirectory() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- resource.setDirectory( new File( getFile().getParentFile(), s ).getPath() );
- }
- }
-
- List unitTestResources = build.getResources();
-
- for ( Iterator i = unitTestResources.iterator(); i.hasNext(); )
- {
- Resource resource = (Resource) i.next();
-
- s = stripBasedirToken( resource.getDirectory() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- resource.setDirectory( new File( getFile().getParentFile(), s ).getPath() );
- }
- }
-
- s = stripBasedirToken( build.getOutput() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- build.setOutput( new File( getFile().getParentFile(), s ).getPath() );
- }
-
- s = stripBasedirToken( build.getTestOutput() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- build.setTestOutput( new File( getFile().getParentFile(), s ).getPath() );
- }
- }
- }
-
- private String stripBasedirToken( String s )
- {
- if ( s != null )
- {
- s = s.trim();
-
- if ( s.startsWith( "${basedir}" ) )
- {
- // Take out ${basedir} and the leading slash
- s = s.substring( 11 );
- }
- }
-
- return s;
- }
-
- private boolean requiresBaseDirectoryAlignment( String s )
- {
- if ( s != null )
- {
- File f = new File( s );
-
- if ( s.startsWith( FILE_SEPARATOR ) || f.isAbsolute() )
- {
- return false;
- }
- else
- {
- return true;
- }
}
return false;