svn commit: r694172 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java

[sisbell]

Author: sisbell
Date: Thu Sep 11 01:27:13 2008
New Revision: 694172

URL: http://svn.apache.org/viewvc?rev=694172view=rev
Log:
Dumped most of project restorer code.

Modified:

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java?rev=694172r1=694171r2=694172view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java
 Thu Sep 11 01:27:13 2008
@@ -64,7 +64,7 @@
 {
 return;
 }
-
+/*
 restoreBuildRoots( project, config );
 if ( project.getBuild() != null )
 {
@@ -77,7 +77,7 @@
 {
 restoreDynamicState( executionProject, config );
 }
-
+*/
 project.setConcrete( false );
 }
 
@@ -89,439 +89,24 @@
 return;
 }
 
-Build build = project.getBuild();
-if ( build != null )
-{
-initResourceMergeIds( build.getResources() );
-initResourceMergeIds( build.getTestResources() );
-}
-
 Model model = ModelUtils.cloneModel( project.getModel() );
 
 File basedir = project.getBasedir();
 
-model = modelInterpolator.interpolate( model, basedir, config, 
getLogger().isDebugEnabled() );
-
-List originalInterpolatedCompileSourceRoots =
-interpolateListOfStrings( project.getCompileSourceRoots(), model, 
project.getBasedir(), config );
-
-project.preserveCompileSourceRoots( 
originalInterpolatedCompileSourceRoots );
-
-project.setCompileSourceRoots( originalInterpolatedCompileSourceRoots 
== null
-? null
-: translateListOfPaths( originalInterpolatedCompileSourceRoots, 
basedir ) );
-
-List originalInterpolatedTestCompileSourceRoots =
-interpolateListOfStrings( project.getTestCompileSourceRoots(), 
model, project.getBasedir(), config );
-
-project.preserveTestCompileSourceRoots( 
originalInterpolatedTestCompileSourceRoots );
-project.setTestCompileSourceRoots( 
originalInterpolatedTestCompileSourceRoots == null
-? null
-: translateListOfPaths( 
originalInterpolatedTestCompileSourceRoots, basedir ) );
-
-List originalInterpolatedScriptSourceRoots =
-interpolateListOfStrings( project.getScriptSourceRoots(), model, 
project.getBasedir(), config );
-
-project.preserveScriptSourceRoots( 
originalInterpolatedScriptSourceRoots );
-project.setScriptSourceRoots( originalInterpolatedScriptSourceRoots == 
null
-? null
-: translateListOfPaths( originalInterpolatedScriptSourceRoots, 
basedir ) );
-
 Model model2 = ModelUtils.cloneModel( model );
-
 pathTranslator.alignToBaseDirectory( model, basedir );
-
 project.preserveBuild( model2.getBuild() );
-project.setBuild( model.getBuild() );
 
-calculateConcreteProjectReferences( project, config );
+project.setBuild( model.getBuild() );
 
+   //
+/*
 MavenProject executionProject = project.getExecutionProject();
 if ( executionProject != null  executionProject != project )
 {
 calculateConcreteState( executionProject, config );
 }
-
+*/
 project.setConcrete( true );
 }
-
-
-private void restoreDynamicProjectReferences( MavenProject project, 
ProjectBuilderConfiguration config )
-throws ModelInterpolationException
-{
-Map projectRefs = project.getProjectReferences();
-if ( projectRefs != null )
-{
-for ( Iterator it = projectRefs.values().iterator(); it.hasNext(); 
)
-{
-MavenProject projectRef = (MavenProject) it.next();
-restoreDynamicState( projectRef, config );
-}
-}
-}
-
-private void restoreBuildRoots( MavenProject project, 
ProjectBuilderConfiguration config )
-throws ModelInterpolationException
-{
-project.setCompileSourceRoots( restoreListOfStrings( 
project.getDynamicCompileSourceRoots(),
- 
project.getOriginalInterpolatedCompileSourceRoots(),
- 
project.getCompileSourceRoots(), project, config ) );
-
-project.setTestCompileSourceRoots( restoreListOfStrings( 
project.getDynamicTestCompileSourceRoots(),
- 

svn commit: r694209 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/

[sisbell]

Author: sisbell
Date: Thu Sep 11 03:33:16 2008
New Revision: 694209

URL: http://svn.apache.org/viewvc?rev=694209view=rev
Log:
Tests related to dynamic/concrete states of pom values disabled for 3.0.

Modified:

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3694ReactorProjectsDynamismTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3704LifecycleExecutorWrapperTest.java

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java?rev=694209r1=694208r2=694209view=diff
==
--- 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
 Thu Sep 11 03:33:16 2008
@@ -6,6 +6,7 @@
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.FileUtils;
 import org.apache.maven.it.util.ResourceExtractor;
+import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 
 /**
  * Test that changes to a project's POM file reference 
(MavenProject.setFile(..))
@@ -18,6 +19,12 @@
 public class MavenITmng3693PomFileBasedirChangeTest
 extends AbstractMavenIntegrationTestCase
 {
+public MavenITmng3693PomFileBasedirChangeTest()
+throws InvalidVersionSpecificationException
+{
+super( [,2.1.99) );
+}
+
 public void testitMNG3693 ()
 throws Exception
 {

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3694ReactorProjectsDynamismTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3694ReactorProjectsDynamismTest.java?rev=694209r1=694208r2=694209view=diff
==
--- 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3694ReactorProjectsDynamismTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3694ReactorProjectsDynamismTest.java
 Thu Sep 11 03:33:16 2008
@@ -7,6 +7,7 @@
 import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
+import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 
 /**
  * Verify that any plugin injecting reactorProjects gets project instances that
@@ -17,6 +18,12 @@
 public class MavenITmng3694ReactorProjectsDynamismTest
 extends AbstractMavenIntegrationTestCase
 {
+public MavenITmng3694ReactorProjectsDynamismTest()
+throws InvalidVersionSpecificationException
+{
+super( [,2.1.99) );
+}
+
 public void testitMNG3694 ()
 throws Exception
 {

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java?rev=694209r1=694208r2=694209view=diff
==
--- 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
 Thu Sep 11 03:33:16 2008
@@ -38,7 +38,7 @@
 public MavenITmng3703ExecutionProjectWithRelativePathsTest()
 throws InvalidVersionSpecificationException
 {
-super( (2.0.99,) ); // only test in 2.1.0+
+super( (2.0.99,2.1.99) ); // only test in 

svn commit: r694255 - /maven/components/branches/maven-2.1.0-M1-RC/pom.xml

[brett]

Author: brett
Date: Thu Sep 11 07:00:19 2008
New Revision: 694255

URL: http://svn.apache.org/viewvc?rev=694255view=rev
Log:
fix SCM URL

Modified:
maven/components/branches/maven-2.1.0-M1-RC/pom.xml

Modified: maven/components/branches/maven-2.1.0-M1-RC/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/pom.xml?rev=694255r1=694254r2=694255view=diff
==
--- maven/components/branches/maven-2.1.0-M1-RC/pom.xml (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/pom.xml Thu Sep 11 07:00:19 2008
@@ -98,9 +98,9 @@
   /mailingLists
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/components/branches/maven-2.1.0-M1-RC/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.1.0-M1-RC/developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/url
   /scm
 
   build

svn commit: r694296 - /maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 08:25:13 2008
New Revision: 694296

URL: http://svn.apache.org/viewvc?rev=694296view=rev
Log:
bumping to M2 version

Modified:

maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml

Modified: 
maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml?rev=694296r1=694295r2=694296view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml
 Thu Sep 11 08:25:13 2008
@@ -23,7 +23,7 @@
   parent
 artifactIdmaven-reporting/artifactId
 groupIdorg.apache.maven.reporting/groupId
-version2.1.0-SNAPSHOT/version
+version2.1.0-M2-SNAPSHOT/version
   /parent
   modelVersion4.0.0/modelVersion
   artifactIdmaven-reporting-api/artifactId

svn commit: r694297 - in /maven/components/branches/maven-2.1.x/maven-script: maven-script-ant/pom.xml maven-script-beanshell/pom.xml

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 08:26:41 2008
New Revision: 694297

URL: http://svn.apache.org/viewvc?rev=694297view=rev
Log:
bumping to M2 version.

Modified:
maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml

maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml

Modified: 
maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml?rev=694297r1=694296r2=694297view=diff
==
--- maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml 
(original)
+++ maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml 
Thu Sep 11 08:26:41 2008
@@ -23,7 +23,7 @@
   parent
 artifactIdmaven-script/artifactId
 groupIdorg.apache.maven/groupId
-version2.1.0-SNAPSHOT/version
+version2.1.0-M2-SNAPSHOT/version
   /parent
   modelVersion4.0.0/modelVersion
   artifactIdmaven-script-ant/artifactId

Modified: 
maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml?rev=694297r1=694296r2=694297view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml
 Thu Sep 11 08:26:41 2008
@@ -23,7 +23,7 @@
   parent
 artifactIdmaven-script/artifactId
 groupIdorg.apache.maven/groupId
-version2.1.0-SNAPSHOT/version
+version2.1.0-M2-SNAPSHOT/version
   /parent
   modelVersion4.0.0/modelVersion
   artifactIdmaven-script-beanshell/artifactId

svn commit: r694311 - in /maven/shared/trunk/file-management/src: main/java/org/apache/maven/shared/model/fileset/util/ test/java/org/apache/maven/shared/model/fileset/util/ test/resources/testDeleteD

[bentmann]

Author: bentmann
Date: Thu Sep 11 08:40:04 2008
New Revision: 694311

URL: http://svn.apache.org/viewvc?rev=694311view=rev
Log:
[MSHARED-64] FileSetManager.delete() does not delete empty directories if they 
contained symlink that was deleted

Added:

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/dir0/

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/dir0/dummy.txt
   (with props)

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/dir1/

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/dir1/dummy.txt
   (with props)

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/excluded/

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/excluded.txt
   (with props)

maven/shared/trunk/file-management/src/test/resources/testDeleteDontFollowSymlinksButDeleteThem/excluded/dummy.txt
   (with props)
Modified:

maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java

maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java

Modified: 
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=694311r1=694310r2=694311view=diff
==
--- 
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
 (original)
+++ 
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
 Thu Sep 11 08:40:04 2008
@@ -37,6 +37,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -450,7 +451,7 @@
 excludes.removeAll( includedDirsAndSymlinks );
 }
 
-excludeParentDirectoriesOfExcludedPaths( excludedDirs, includes );
+excludeParentDirectoriesOfExcludedPaths( excludes, includes );
 
 includes.addAll( linksForDeletion );
 
@@ -510,7 +511,7 @@
 excludes.removeAll( includedFilesAndSymlinks );
 }
 
-excludeParentDirectoriesOfExcludedPaths( excludedFiles, includes );
+excludeParentDirectoriesOfExcludedPaths( excludes, includes );
 
 includes.addAll( linksForDeletion );
 
@@ -526,11 +527,11 @@
  * @param deletablePaths The relative paths to files/directories which are 
scheduled for deletion, must not be
  *codenull/code.
  */
-private void excludeParentDirectoriesOfExcludedPaths( String 
excludedPaths[], Set deletablePaths )
+private void excludeParentDirectoriesOfExcludedPaths( Collection 
excludedPaths, Set deletablePaths )
 {
-for ( int i = 0; i  excludedPaths.length; i++ )
+for ( Iterator it = excludedPaths.iterator(); it.hasNext(); )
 {
-String path = excludedPaths[i];
+String path = (String) it.next();
 
 String parentPath = new File( path ).getParent();
 
@@ -553,7 +554,7 @@
 }
 }
 
-if ( excludedPaths.length  0 )
+if ( !excludedPaths.isEmpty() )
 {
 if ( messages != null  messages.isDebugEnabled() )
 {

Modified: 
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=694311r1=694310r2=694311view=diff
==
--- 
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
 (original)
+++ 
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
 Thu Sep 11 08:40:04 2008
@@ -280,29 +280,55 @@
 }
 
 /**
- * @param from
- * @param to
+ * @throws Exception if any
+ */
+public void testDeleteDontFollowSymlinksButDeleteThem()
+throws Exception
+{
+File directory = setupTestDirectory( 
testDeleteDontFollowSymlinksButDeleteThem );
+
+createSymlink( new File( directory, excluded ), new File( directory, 
dir0/dirlink ) );
+createSymlink( new File( directory, excluded.txt ), new File( 
directory, 

svn commit: r694312 - /maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java

[bentmann]

Author: bentmann
Date: Thu Sep 11 08:46:15 2008
New Revision: 694312

URL: http://svn.apache.org/viewvc?rev=694312view=rev
Log:
o Polished code

Modified:

maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java

Modified: 
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=694312r1=694311r2=694312view=diff
==
--- 
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
 (original)
+++ 
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
 Thu Sep 11 08:46:15 2008
@@ -413,12 +413,9 @@
 return Collections.EMPTY_SET;
 }
 
-String[] includedDirs = scanner.getIncludedDirectories();
-String[] excludedDirs = scanner.getExcludedDirectories();
-
-Set includes = new HashSet( Arrays.asList( includedDirs ) );
-List excludes = new ArrayList( Arrays.asList( excludedDirs ) );
-List linksForDeletion = new ArrayList();
+Set includes = new HashSet( Arrays.asList( 
scanner.getIncludedDirectories() ) );
+Collection excludes = new ArrayList( Arrays.asList( 
scanner.getExcludedDirectories() ) );
+Collection linksForDeletion = new ArrayList();
 
 if ( !fileSet.isFollowSymlinks() )
 {
@@ -472,13 +469,10 @@
 return deletableDirectories;
 }
 
-String[] includedFiles = scanner.getIncludedFiles();
-String[] excludedFiles = scanner.getExcludedFiles();
-
 Set includes = deletableDirectories;
-includes.addAll( Arrays.asList( includedFiles ) );
-List excludes = new ArrayList( Arrays.asList( excludedFiles ) );
-List linksForDeletion = new ArrayList();
+includes.addAll( Arrays.asList( scanner.getIncludedFiles() ) );
+Collection excludes = new ArrayList( Arrays.asList( 
scanner.getExcludedFiles() ) );
+Collection linksForDeletion = new ArrayList();
 
 if ( !fileSet.isFollowSymlinks() )
 {

svn commit: r694316 - in /maven/components/branches/maven-2.1.x: ./ maven-core/src/main/java/org/apache/maven/cli/ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-core/src/main/resources/ME

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 08:51:17 2008
New Revision: 694316

URL: http://svn.apache.org/viewvc?rev=694316view=rev
Log:
Merging up to RC17 code from the 2.1.0-M1-RC branch.

Modified:
maven/components/branches/maven-2.1.x/   (props changed)

maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java

maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml

maven/components/branches/maven-2.1.x/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java

maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java

maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java

maven/components/branches/maven-2.1.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java

Propchange: maven/components/branches/maven-2.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 11 08:51:17 2008
@@ -1,4 +1,4 @@
 /maven/components/branches/maven-2.0.10-RC:679193-679867,680477-62
 /maven/components/branches/maven-2.0.x:679552-679867
-/maven/components/branches/maven-2.1.0-M1-RC:690315,691793
+/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
 /maven/components/branches/maven-2.1.0-RC:63,689695,689990

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=694316r1=694315r2=694316view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 Thu Sep 11 08:51:17 2008
@@ -353,7 +353,7 @@
 }
 catch ( XmlPullParserException e )
 {
-throw new SettingsConfigurationException( e.getMessage(), 
e.getDetail(), e.getLineNumber(),
+throw new SettingsConfigurationException( e.getMessage(), e, 
e.getLineNumber(),
   e.getColumnNumber() );
 }
 

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=694316r1=694315r2=694316view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Thu Sep 11 08:51:17 2008
@@ -1025,6 +1025,8 @@
MavenProject project )
 throws LifecycleExecutionException, BuildFailureException, 
PluginNotFoundException
 {
+project = project.getExecutionProject();
+
 forkEntryPoints.push( mojoDescriptor );
 
 PluginDescriptor pluginDescriptor = 
mojoDescriptor.getPluginDescriptor();
@@ -1174,15 +1176,13 @@
 {
 Lifecycle lifecycle = getLifecycleForPhase( targetPhase );
 
-executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, 
lifecycleMappings, project.getExecutionProject(),
-  lifecycle );
+executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, 
lifecycleMappings, project, lifecycle );
 }
 else
 {
 String goal = mojoDescriptor.getExecuteGoal();
 MojoDescriptor desc = getMojoDescriptor( pluginDescriptor, goal );
-executeGoals( Collections.singletonList( new MojoExecution( desc ) 
), forkEntryPoints, session,
-  project.getExecutionProject() );
+executeGoals( Collections.singletonList( new MojoExecution( desc ) 
), forkEntryPoints, session, project );
 }
 }
 

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: 

svn commit: r694321 - /maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java

[bentmann]

Author: bentmann
Date: Thu Sep 11 08:56:47 2008
New Revision: 694321

URL: http://svn.apache.org/viewvc?rev=694321view=rev
Log:
o Tightened test

Modified:

maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java

Modified: 
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=694321r1=694320r2=694321view=diff
==
--- 
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
 (original)
+++ 
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
 Thu Sep 11 08:56:47 2008
@@ -287,6 +287,8 @@
 {
 File directory = setupTestDirectory( 
testDeleteDontFollowSymlinksButDeleteThem );
 
+createSymlink( new File( directory, excluded ), new File( directory, 
dirlink ) );
+createSymlink( new File( directory, excluded.txt ), new File( 
directory, filelink ) );
 createSymlink( new File( directory, excluded ), new File( directory, 
dir0/dirlink ) );
 createSymlink( new File( directory, excluded.txt ), new File( 
directory, dir1/filelink ) );
 
@@ -301,6 +303,8 @@
 
 Assert.assertTrue( excluded file has been deleted, new File( 
directory, excluded.txt ).exists() );
 Assert.assertTrue( excluded directory has been deleted, new File( 
directory, excluded ).exists() );
+Assert.assertFalse( included dirlink has not been deleted, new File( 
directory, dirlink ).exists() );
+Assert.assertFalse( included filelink has not been deleted, new 
File( directory, filelink ).exists() );
 Assert.assertFalse( included directory has not been deleted, new 
File( directory, dir0 ).exists() );
 Assert.assertFalse( included directory has not been deleted, new 
File( directory, dir1 ).exists() );
 }

svn commit: r694326 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 09:02:59 2008
New Revision: 694326

URL: http://svn.apache.org/viewvc?rev=694326view=rev
Log:
bumping upper range limit to 2.99.99 to allow 2.2 code to run these tests 
unless we consciously restrict them.

Modified:

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3694ReactorProjectsDynamismTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java

maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3704LifecycleExecutorWrapperTest.java

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java?rev=694326r1=694325r2=694326view=diff
==
--- 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
 Thu Sep 11 09:02:59 2008
@@ -13,7 +13,7 @@
 public MavenIT0026Test()
 throws InvalidVersionSpecificationException
 {
-super( [,2.1.99) );
+super( [,2.99.99) );
 }
 
 /**

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java?rev=694326r1=694325r2=694326view=diff
==
--- 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
 Thu Sep 11 09:02:59 2008
@@ -14,7 +14,7 @@
 public MavenIT0051Test()   
   
 throws InvalidVersionSpecificationException
   
 {  
   
-super( [,2.1.99) );
+super( [,2.99.99) );
 }
 
 /**

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
URL: 

svn commit: r694345 - in /maven/components/branches/maven-2.1.x: ./ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-project/src/test/java/org/apache/maven/project/ maven-project/src/test/ja

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 09:42:51 2008
New Revision: 694345

URL: http://svn.apache.org/viewvc?rev=694345view=rev
Log:
Fixing executionProject sync, merged from 688259 of 2.1.0-M1-RC branch.

Modified:

maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java

maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
   (props changed)
maven/components/branches/maven-2.1.x/pom.xml

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=694345r1=694344r2=694345view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Thu Sep 11 09:42:51 2008
@@ -703,20 +703,30 @@
 {
 throw new LifecycleExecutionException( e.getMessage(), e );
 }
-
-// NOTE: Ordinarily, we might be tempted to set all pertinent 
executionProjects
-// to null here, to release some memory. HOWEVER, the problem is 
that
-// the reactorProjects construct doesn't track successive levels of
-// forked execution properly, so we MUST NOT SET THE 
executionProject
-// INSTANCES TO NULL. If we do this inside a two-or-more-level-deep
-// fork, it can result in passing a null project instance through
-// to the plugin manager, since successive iterations of the n-1
-// fork to execute fork n with each project in reactorProjects MUST
-// HAVE ACCESS TO THE executionProject for every project.
-//
-// Just please don't set executionProjects == null here. Not until
-// we have a mechanism for tracking (stack push/pull) successive
-// forked lifecycles in the reactorProjects collection.
+
+if ( hasFork )
+{
+project.setExecutionProject( null );
+
+if ( usesReactorProjects )
+{
+List reactorProjects = session.getSortedProjects();
+for ( Iterator it = reactorProjects.iterator(); 
it.hasNext(); )
+{
+MavenProject reactorProject = (MavenProject) it.next();
+reactorProject.setExecutionProject( null );
+}
+}
+}
+
+//if ( usesReactorProjects )
+//{
+//restoreAllDynamicStates( session );
+//}
+//else
+//{
+//restoreDynamicState( project, session, true );
+//}
 }
 }
 

Modified: 
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java?rev=694345r1=694344r2=694345view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
 Thu Sep 11 09:42:51 2008
@@ -563,8 +563,7 @@
 assertEquals( First test source root should be absolute ref to 
src/test/java, new File( basedir, src/test/java ).getAbsolutePath(), 
project.getTestCompileSourceRoots().get( 0 ) );
 
 assertEquals( Before adding source roots, project should contain one 
script source root, 1, project.getScriptSourceRoots().size() );
-// TODO: MNG-3731
-//assertEquals( First script source root should be absolute ref to 
src/main/scripts, new File( basedir, src/main/scripts ).getAbsolutePath(), 
project.getScriptSourceRoots().get( 0 ) );
+assertEquals( First script source root should be absolute ref to 
src/main/scripts, new File( basedir, src/main/scripts ).getAbsolutePath(), 
project.getScriptSourceRoots().get( 0 ) );
 
 project.addCompileSourceRoot( new File( basedir, 
target/generated/src/main/java ).getAbsolutePath() );
 project.addTestCompileSourceRoot( new File( basedir, 

svn commit: r694349 - /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 10:03:12 2008
New Revision: 694349

URL: http://svn.apache.org/viewvc?rev=694349view=rev
Log:
correcting unit test for script roots, which have to stay relative for now due 
to a problem in the maven-plugin-tools-api that has been corrected but isn't 
widely used (or released, I think) yet.

Modified:

maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java

Modified: 
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java?rev=694349r1=694348r2=694349view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
 Thu Sep 11 10:03:12 2008
@@ -563,7 +563,7 @@
 assertEquals( First test source root should be absolute ref to 
src/test/java, new File( basedir, src/test/java ).getAbsolutePath(), 
project.getTestCompileSourceRoots().get( 0 ) );
 
 assertEquals( Before adding source roots, project should contain one 
script source root, 1, project.getScriptSourceRoots().size() );
-assertEquals( First script source root should be absolute ref to 
src/main/scripts, new File( basedir, src/main/scripts ).getAbsolutePath(), 
project.getScriptSourceRoots().get( 0 ) );
+assertEquals( First script source root should be relative ref to 
src/main/scripts, src/main/scripts, project.getScriptSourceRoots().get( 0 ) 
);
 
 project.addCompileSourceRoot( new File( basedir, 
target/generated/src/main/java ).getAbsolutePath() );
 project.addTestCompileSourceRoot( new File( basedir, 
target/generated/src/test/java ).getAbsolutePath() );
@@ -585,8 +585,8 @@
 assertEquals( Second test source root should be absolute ref to 
target/generated/src/test/java, new File( basedir, 
target/generated/src/test/java ).getAbsolutePath(), 
project.getTestCompileSourceRoots().get( 1 ) );
 
 assertEquals( After adding source roots and transitioning, project 
should contain two script source roots, 2, 
project.getScriptSourceRoots().size() );
-assertEquals( First script source root should be absolute ref to 
src/main/scripts, new File( basedir, src/main/scripts ).getAbsolutePath(), 
project.getScriptSourceRoots().get( 0 ) );
-assertEquals( Second script source root should be absolute ref to 
target/generated/src/main/scripts, new File( basedir, 
target/generated/src/main/scripts ).getAbsolutePath(), 
project.getScriptSourceRoots().get( 1 ) );
+assertEquals( First script source root should be relative ref to 
src/main/scripts, src/main/scripts, project.getScriptSourceRoots().get( 0 ) 
);
+assertEquals( Second script source root should be relative ref to 
target/generated/src/main/scripts, target/generated/src/main/scripts, 
project.getScriptSourceRoots().get( 1 ) );
 }
 
 public void testShouldInterpolatePluginLevelDependency()

svn commit: r694350 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 10:04:17 2008
New Revision: 694350

URL: http://svn.apache.org/viewvc?rev=694350view=rev
Log:
cosmetic parameter name change

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java?rev=694350r1=694349r2=694350view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
 Thu Sep 11 10:04:17 2008
@@ -45,7 +45,7 @@
 this.logger = logger;
 }
 
-public File formatFileSetForAssembly( File archiveBaseDir, 
org.apache.maven.plugin.assembly.model.FileSet set )
+public File formatFileSetForAssembly( File fileSetDir, 
org.apache.maven.plugin.assembly.model.FileSet set )
 throws AssemblyFormattingException, IOException
 {
 String lineEndingHint = set.getLineEnding();
@@ -60,7 +60,7 @@
 
 if(set.getDirectory() == null)
 {
-   fileSet.setDirectory(archiveBaseDir.getAbsolutePath());
+   fileSet.setDirectory(fileSetDir.getAbsolutePath());
 }
 else
 {
@@ -97,7 +97,7 @@
 
 targetFile.getParentFile().mkdirs();
 
-File sourceFile = new File( archiveBaseDir, file );
+File sourceFile = new File( fileSetDir, file );
 try
 {
 sourceFile = fileFormatter.format( sourceFile, 
set.isFiltered(), lineEndingHint, formattedDir );
@@ -118,7 +118,7 @@
 }
 }
 
-return archiveBaseDir;
+return fileSetDir;
 }
 
 private static void deleteDirectory( File formattedDir )

svn commit: r694360 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/plugin/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/main/java/org/apache/maven/p

[sisbell]

Author: sisbell
Date: Thu Sep 11 10:11:34 2008
New Revision: 694360

URL: http://svn.apache.org/viewvc?rev=694360view=rev
Log:
Refactored out restorer class and related MavenProjectBuilder methods.

Removed:

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java
Modified:

maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml

maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java

maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml

maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=694360r1=694359r2=694360view=diff
==
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Thu Sep 11 10:11:34 2008
@@ -41,6 +41,7 @@
 import org.apache.maven.lifecycle.statemgmt.StateManagementUtils;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.Model;
 import org.apache.maven.monitor.event.EventDispatcher;
 import org.apache.maven.monitor.event.MavenEvents;
 import org.apache.maven.monitor.logging.DefaultLog;
@@ -56,6 +57,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ModelUtils;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.artifact.MavenMetadataSource;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
@@ -89,6 +91,7 @@
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -516,14 +519,16 @@
 
 if ( !project.isConcrete() )
 {
-try
-{
-mavenProjectBuilder.calculateConcreteState( project, 
session.getProjectBuilderConfiguration() );
-}
-catch ( ModelInterpolationException e )
-{
-throw new PluginManagerException( mojoDescriptor, project, 
Failed to calculate concrete state for project., e );
-}
+Model model = ModelUtils.cloneModel( project.getModel() );
+
+File basedir = project.getBasedir();
+
+Model model2 = ModelUtils.cloneModel( model );
+pathTranslator.alignToBaseDirectory( model, basedir );
+project.preserveBuild( model2.getBuild() );
+
+project.setBuild( model.getBuild() );
+project.setConcrete( true );
 }
 
 if ( mojoDescriptor.isDependencyResolutionRequired() != null )
@@ -734,14 +739,7 @@
 Thread.currentThread().setContextClassLoader( oldClassLoader );
 }
 
-try
-{
-mavenProjectBuilder.restoreDynamicState( project, 
session.getProjectBuilderConfiguration() );
-}
-catch ( ModelInterpolationException e )
-{
-throw new PluginManagerException( mojoDescriptor, project, Failed 
to restore dynamic state for project., e );
-}
+project.setConcrete( false );
 }
 
 private Plugin createDummyPlugin( PluginDescriptor pluginDescriptor )

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=694360r1=694359r2=694360view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 

svn commit: r694365 - /maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml

[sisbell]

Author: sisbell
Date: Thu Sep 11 10:14:18 2008
New Revision: 694365

URL: http://svn.apache.org/viewvc?rev=694365view=rev
Log:
Computer a bit laggy, caught svn ci command into component.xml. Removed this.

Modified:

maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml

Modified: 
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=694365r1=694364r2=694365view=diff
==
--- 
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
 (original)
+++ 
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
 Thu Sep 11 10:14:18 2008
@@ -17,7 +17,7 @@
 under the License.
 --
 
-plexus   svn ci-
+plexus
   components!--Eliminate this component after Mercury Integration--
 component
   roleorg.apache.maven.project.RepositoryHelper/role

svn commit: r694376 - in /maven/components/branches/maven-2.1.x: ./ maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java maven-project/src/test/java/org/apache/maven/proje

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 10:40:00 2008
New Revision: 694376

URL: http://svn.apache.org/viewvc?rev=694376view=rev
Log:
Merging in fix for MNG-3729, for real this time.

Modified:
maven/components/branches/maven-2.1.x/   (props changed)

maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
   (props changed)

Propchange: maven/components/branches/maven-2.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 11 10:40:00 2008
@@ -1,4 +1,4 @@
 /maven/components/branches/maven-2.0.10-RC:679193-679867,680477-62
 /maven/components/branches/maven-2.0.x:679552-679867
 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
-/maven/components/branches/maven-2.1.0-RC:63,689695,689990
+/maven/components/branches/maven-2.1.0-RC:63,689695,689976,689990

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=694376r1=694375r2=694376view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Thu Sep 11 10:40:00 2008
@@ -601,22 +601,21 @@
 
 if ( hasFork )
 {
+// NOTE: This must always happen, regardless of treatment of 
reactorProjects below, because
+// if we're in a forked execution right now, the current 
project will itself be an execution project of
+// something in the reactorProjects list, and won't have a 
next-stage executionProject created
+// for it otherwise, which leaves the project == null for the 
upcoming forked execution.
+createExecutionProject( project, session, true );
+
 if ( usesReactorProjects )
 {
 List reactorProjects = session.getSortedProjects();
 for ( Iterator it = reactorProjects.iterator(); 
it.hasNext(); )
 {
 MavenProject reactorProject = (MavenProject) it.next();
-if ( reactorProject.getExecutionProject() == null )
-{
-createExecutionProject( reactorProject, session, 
false );
-}
+createExecutionProject( reactorProject, session, false 
);
 }
 }
-else
-{
-createExecutionProject( project, session, true );
-}
 }
 
 if ( mojoDescriptor.getExecutePhase() != null || 
mojoDescriptor.getExecuteGoal() != null )
@@ -652,6 +651,12 @@
 
 if ( hasFork )
 {
+// NOTE: This must always happen, regardless of treatment of 
reactorProjects below, because
+// if we're in a forked execution right now, the current 
project will itself be an execution project of
+// something in the reactorProjects list, and may not have had 
its own executionProject instance reset to 
+// a concrete state again after the previous forked executions.
+calculateConcreteState( project.getExecutionProject(), 
session, true );
+
 // FIXME: Would be nice to find a way to cause the execution 
project to stay in a concrete state...
 // TODO: Test this! It should be fixed, but I don't want to 
destabilize until I have the issue I'm working on fixed.
 if ( usesReactorProjects )
@@ -664,10 +669,6 @@
 calculateConcreteState( 
reactorProject.getExecutionProject(), session, false );
 }
 }
-else
-{
-calculateConcreteState( project.getExecutionProject(), 
session, true );
-}
 }
 
 try
@@ -703,44 +704,17 @@
 {
 throw new LifecycleExecutionException( e.getMessage(), e );
 }
-
-if ( hasFork )
-{
-project.setExecutionProject( null );
-
-if ( usesReactorProjects )
-{
-List reactorProjects = session.getSortedProjects();
-  

svn commit: r694394 - in /maven/plugins/trunk/maven-clean-plugin: ./ src/it/file-sets-includes-excludes/ src/it/file-sets-includes-excludes/dirs/ src/it/file-sets-includes-excludes/dirs/dir0/ src/it/f

[bentmann]

Author: bentmann
Date: Thu Sep 11 11:23:27 2008
New Revision: 694394

URL: http://svn.apache.org/viewvc?rev=694394view=rev
Log:
[MCLEAN-29] Maven clean plugin doesn't filter resources from exclude list

Added:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/sub0/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/sub0/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/sub0/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/sub1/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/sub1/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/sub2/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir0/sub2/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/sub0/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/sub0/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/sub0/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/sub1/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/sub1/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/sub2/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir1/sub2/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/sub0/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/sub0/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/sub0/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/sub1/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/sub1/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/sub2/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir2/sub2/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/sub0/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/sub0/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/sub0/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/sub1/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/sub1/included.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/sub2/

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/dirs/dir3/sub2/excluded.txt
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/pom.xml
   (with props)

maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/verify.bsh
   (with props)

svn commit: r694437 - in /maven/plugins/trunk/maven-assembly-plugin: integration-test-archetype/src/main/resources/archetype-resources/ src/it/projects/file-sets/filtered-module-sources/ src/it/projec

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 12:40:30 2008
New Revision: 694437

URL: http://svn.apache.org/viewvc?rev=694437view=rev
Log:
[MASSEMBLY-293][MASSEMBLY-322][MASSEMBLY-340] Fixing file-set filtering.

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/goals.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/goals.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
   (with props)
Modified:

maven/plugins/trunk/maven-assembly-plugin/integration-test-archetype/src/main/resources/archetype-resources/pom.xml

svn commit: r694443 - /maven/plugins/trunk/maven-install-plugin/pom.xml

[bentmann]

Author: bentmann
Date: Thu Sep 11 12:55:18 2008
New Revision: 694443

URL: http://svn.apache.org/viewvc?rev=694443view=rev
Log:
o Fixed dependency

Modified:
maven/plugins/trunk/maven-install-plugin/pom.xml

Modified: maven/plugins/trunk/maven-install-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=694443r1=694442r2=694443view=diff
==
--- maven/plugins/trunk/maven-install-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/pom.xml Thu Sep 11 12:55:18 2008
@@ -72,9 +72,9 @@
   version2.0.6/version
 /dependency
 dependency
-  groupIdorg.apache.maven/groupId
+  groupIdorg.apache.maven.plugin-testing/groupId
   artifactIdmaven-plugin-testing-harness/artifactId
-  version2.4-SNAPSHOT/version
+  version1.2/version
   scopetest/scope
 /dependency
 dependency

svn commit: r694444 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets: multimodule-unix-lineEndings/ multimodule-unix-lineEndings/child/ multimodule-unix-lineEndings/child/src/

[jdcasey]

Author: jdcasey
Date: Thu Sep 11 12:56:02 2008
New Revision: 69

URL: http://svn.apache.org/viewvc?rev=69view=rev
Log:
[MASSEMBLY-237] Adding integration tests to verify that the fix for 
MASSEMBLY-293 also fixed this issue.

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly-resources/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly-resources/test.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/goals.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/bin.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly-resources/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly-resources/test.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/goals.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/

svn commit: r694451 - /maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java

[ogusakov]

Author: ogusakov
Date: Thu Sep 11 13:11:59 2008
New Revision: 694451

URL: http://svn.apache.org/viewvc?rev=694451view=rev
Log:
added failing nio test

Added:

maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java

Added: 
maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java?rev=694451view=auto
==
--- 
maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java
 (added)
+++ 
maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java
 Thu Sep 11 13:11:59 2008
@@ -0,0 +1,68 @@
+package org.apache.maven.mercury.util;
+
+import java.io.File;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class NioTest
+extends TestCase
+{
+  
+  public void testNio()
+  {
+boolean ok = false;
+
+try
+{
+  File file = File.createTempFile( test-nio-, -file );
+  
+  String fn = file.getAbsolutePath();
+  
+  File f1 = new File( fn ); 
+  FileChannel c1 = new RandomAccessFile( f1, rw).getChannel();
+  
+  FileLock l1 = c1.lock();
+  assertNotNull( cannot obtain even the first lock, l1 );
+  
+  File f2 = new File( fn ); 
+  FileChannel c2 = new RandomAccessFile( f2, rw).getChannel();
+  FileLock l2 = null;
+  try
+  {
+  l2 = c2.tryLock();
+  
+  if( l2 == null )
+throw new OverlappingFileLockException();
+  
+  l2.release();
+  }
+  catch (OverlappingFileLockException e)
+  {
+  ok = true;
+  }
+  
+  l1.release();
+  c1.close();
+  
+  file.delete();
+
+  assertTrue( java.nio does not work !!, ok );
+}
+catch (Exception e)
+{
+  e.printStackTrace();
+}
+  }
+
+}

svn commit: r694473 - /maven/enforcer/trunk/src/site/site.xml

[brianf]

Author: brianf
Date: Thu Sep 11 13:54:46 2008
New Revision: 694473

URL: http://svn.apache.org/viewvc?rev=694473view=rev
Log:
fix the links because they are in the menu section from the parent now

Modified:
maven/enforcer/trunk/src/site/site.xml

Modified: maven/enforcer/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/src/site/site.xml?rev=694473r1=694472r2=694473view=diff
==
--- maven/enforcer/trunk/src/site/site.xml (original)
+++ maven/enforcer/trunk/src/site/site.xml Thu Sep 11 13:54:46 2008
@@ -19,18 +19,6 @@
 --
 project
   body
-!-- TODO: use breadcrumbs more structure --
-links
-  item name=Apache href=http://www.apache.org//
-  item name=Maven 1.x href=http://maven.apache.org/maven-1.x/
-  item name=Maven 2.x href=http://maven.apache.org//
-  item name=Maven 2.x Plugins href=http://maven.apache.org/plugins//
-  item name=SCM href=http://maven.apache.org/scm/
-  item name=Wagon href=http://maven.apache.org/wagon/
-  item name=JXR href=http://maven.apache.org/jxr/
-  item name=Doxia href=http://maven.apache.org/doxia/
-/links
-
 menu ref=modules /
   /body
 /project

svn commit: r694477 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java test/java/org/apache/maven/plugin/dependency/TestCopyD

[brianf]

Author: brianf
Date: Thu Sep 11 13:59:11 2008
New Revision: 694477

URL: http://svn.apache.org/viewvc?rev=694477view=rev
Log:
MDEP-181 use installer to produce the repository layout. Patch from Igor 
Fedorenko 

Modified:

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java?rev=694477r1=694476r2=694477view=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
 Thu Sep 11 13:59:11 2008
@@ -20,10 +20,16 @@
  */
 
 import java.io.File;
+import java.net.MalformedURLException;
 import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.installer.ArtifactInstallationException;
+import org.apache.maven.artifact.installer.ArtifactInstaller;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
 import org.apache.maven.plugin.dependency.utils.DependencyUtil;
@@ -47,6 +53,20 @@
 {
 
 /**
+ * @parameter 
expression=${component.org.apache.maven.artifact.installer.ArtifactInstaller}
+ * @required
+ * @readonly
+ */
+protected ArtifactInstaller installer;
+
+/**
+ * @parameter 
expression=${component.org.apache.maven.artifact.repository.ArtifactRepositoryFactory}
+ * @required
+ * @readonly
+ */
+protected ArtifactRepositoryFactory repositoryFactory;
+
+/**
  * Main entry into mojo. Gets the list of dependencies and iterates through
  * calling copyArtifact.
  * 
@@ -62,9 +82,30 @@
 DependencyStatusSets dss = getDependencySets( 
this.failOnMissingClassifierArtifact );
 Set artifacts = dss.getResolvedDependencies();
 
-for ( Iterator i = artifacts.iterator(); i.hasNext(); )
-{
-copyArtifact( (Artifact) i.next(), this.stripVersion );
+   if ( !useRepositoryLayout )
+   {
+   for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+   {
+   copyArtifact( (Artifact) i.next(), this.stripVersion );
+   }
+   }
+   else
+   {
+   try {
+   ArtifactRepository targetRepository = 
repositoryFactory.createDeploymentArtifactRepository(
+   local, 
+   
outputDirectory.toURL().toExternalForm(), 
+   new DefaultRepositoryLayout(),
+   false /*uniqueVersion*/ );
+   for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+   {
+   installArtifact( (Artifact) i.next(), 
targetRepository );
+   }
+   } 
+   catch ( MalformedURLException e ) 
+   {
+   throw new MojoExecutionException(Could not 
create outputDirectory repository, e);
+   }
 }
 
 artifacts = dss.getSkippedDependencies();
@@ -75,7 +116,48 @@
 }
 }
 
-/**
+private void installArtifact( Artifact artifact, ArtifactRepository 
targetRepository) 
+{
+   try
+   {
+   if ( pom.equals( artifact.getType() ) ) 
+   {
+   installer.install( artifact.getFile(), 
artifact, targetRepository );
+   }
+   else
+   {
+   installer.install( artifact.getFile(), artifact, 
targetRepository );
+   installBaseSnapshot( artifact, targetRepository );
+
+   if ( isCopyPom() )
+   {
+   Artifact pomArtifact = getResolvedPomArtifact( 
artifact );
+   if ( pomArtifact.getFile() != null  
pomArtifact.getFile().exists() )
+   {
+   

svn commit: r694481 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

[hboutemy]

Author: hboutemy
Date: Thu Sep 11 14:03:34 2008
New Revision: 694481

URL: http://svn.apache.org/viewvc?rev=694481view=rev
Log:
fixed typos

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties?rev=694481r1=694480r2=694481view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
 Thu Sep 11 14:03:34 2008
@@ -46,7 +46,7 @@
 report.dependencies.column.type= Type
 report.dependencies.column.url = URL
 report.dependencies.column.version = Version
-report.dependencies.description= Ce 
document liste les d\u00e9pendances du projet et fournit les informations sur 
chaque d\u00e9pendance.
+report.dependencies.description= Ce 
document liste les d\u00e9pendances du projet et fournit des informations sur 
chaque d\u00e9pendance.
 report.dependencies.file.details.column.classes= Classes
 report.dependencies.file.details.column.debug  = Debug
 report.dependencies.file.details.column.entries= 
Entr\u00e9es
@@ -80,7 +80,7 @@
 report.dependencies.repo.locations.cell.blacklisted.enabled= Oui
 report.dependencies.repo.locations.column.artifact = Artefact
 report.dependencies.repo.locations.column.blacklisted  = 
Blacklist\u00e9
-report.dependencies.repo.locations.column.release  = 
D\u00e9gagement
+report.dependencies.repo.locations.column.release  = Release
 report.dependencies.repo.locations.column.repoid   = 
R\u00e9f\u00e9rentiel ID
 report.dependencies.repo.locations.column.snapshot = Snapshot
 report.dependencies.repo.locations.column.url  = URL
@@ -239,9 +239,9 @@
 report.dependencyManagement.intro.system   = Ce qui 
suit est la liste des d\u00e9pendances d\u00e9finies dans dependencyManagement 
de port\u00e9e system pour ce projet. Ces d\u00e9pendances sont requises pour 
compiler l\u0092application :
 report.dependencyManagement.intro.test = Ce qui 
suit est la liste des d\u00e9pendances d\u00e9finies dans dependencyManagement 
de port\u00e9e test pour ce projet. Ces d\u00e9pendances sont requises 
seulement pour compiler et ex\u00e9cuter les tests unitaires de 
l\u0092application :
 report.pluginManagement.name   = Gestion 
des plugins
-report.pluginManagement.description= Ce 
document liste les plugins d\u00e9finis \u00e0 travers plugins.
-report.pluginManagement.title  = Gestion 
des plugins du project
-report.plugins.name= Plugins 
du projets
+report.pluginManagement.description= Ce 
document liste les plugins d\u00e9finis par pluginManagement.
+report.pluginManagement.title  = Gestion 
des plugins du projet
+report.plugins.name= Plugins 
du projet
 report.plugins.description = Ce 
document liste les plugins de type build et rapport utilis\u00e9s par ce projet.
 report.plugins.title   = Plugins 
du projet de type build
 report.plugins.report.title= Plugins 
du projet de type rapport

svn commit: r694491 - /maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java

[bentmann]

Author: bentmann
Date: Thu Sep 11 14:27:57 2008
New Revision: 694491

URL: http://svn.apache.org/viewvc?rev=694491view=rev
Log:
o Synched style of HTTP user agent with the one used for Wagon

Modified:

maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java

Modified: 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java?rev=694491r1=694490r2=694491view=diff
==
--- 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
 Thu Sep 11 14:27:57 2008
@@ -114,11 +114,13 @@
 
 protected AbstractCheckDocumentationMojo()
 {
+String httpUserAgent = maven-docck-plugin/1.x +  (Java  + 
System.getProperty( java.version ) + ; 
++ System.getProperty( os.name ) +   + System.getProperty( 
os.version ) + );
+
 httpClient = new HttpClient();
 
 
httpClient.getHttpConnectionManager().getParams().setConnectionTimeout( 5000 );
-httpClient.getParams().setParameter( HttpMethodParams.USER_AGENT,
- Apache Maven/2.0 (Maven 
Documentation Checker Plugin) );
+httpClient.getParams().setParameter( HttpMethodParams.USER_AGENT, 
httpUserAgent );
 }
 
 protected List getReactorProjects()

svn commit: r694493 - in /maven/sandbox/trunk/mercury: mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/rep

[ogusakov]

Author: ogusakov
Date: Thu Sep 11 14:29:24 2008
New Revision: 694493

URL: http://svn.apache.org/viewvc?rev=694493view=rev
Log:
mutli-threaded local repo write works somehow, breaks if too many threads on 
too fast a box try to bang it. No solution yet - posted a question on dev@ list

Added:

maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileLockBundle.java
Modified:

maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java

maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java

maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java

maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java

maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties

maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java

maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/Messages.properties

maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java

maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java

Modified: 
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=694493r1=694492r2=694493view=diff
==
--- 
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
 (original)
+++ 
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
 Thu Sep 11 14:29:24 2008
@@ -1,6 +1,8 @@
 package org.apache.maven.mercury.repository.tests;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.net.MalformedURLException;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -20,6 +22,8 @@
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.api.RepositoryReader;
 import org.apache.maven.mercury.repository.api.RepositoryWriter;
+import org.apache.maven.mercury.repository.metadata.Metadata;
+import org.apache.maven.mercury.repository.metadata.MetadataBuilder;
 import org.apache.maven.mercury.transport.api.Server;
 import org.apache.maven.mercury.util.FileUtil;
 import org.codehaus.plexus.PlexusContainer;
@@ -220,10 +224,175 @@
 assertEquals( 7785, ap.length() );  
   }
   
-  public void testWriteContention()
+  public void testWriteContentionSingleArtifact()
   throws Exception
   {
+setSnapshots();
+
+SetArtifact set = new HashSetArtifact(40);
+
+// prep. artifacts
+for( int i=0; i20; i++ )
+{
+  String si = +i;
+  
+  DefaultArtifact da = new DefaultArtifact( new 
ArtifactBasicMetadata(org.apache.maven:maven-core:2.0.9-20080805.215925-+si) 
);
+  da.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( 
/maven-core-2.0.9.pom ) ) );
+  File ab = File.createTempFile( test-core-, -bin );
+  FileUtil.writeRawData( ab, getClass().getResourceAsStream( 
/maven-core-2.0.9.jar ) );
+  da.setFile( ab );
+  set.add( da );
+}
+
+assertEquals( 20, set.size() );
+
+long start = System.currentTimeMillis();
+// write 'em
+writer.writeArtifact( set );
+
+System.out.println(Took +(System.currentTimeMillis()-start)+ millis to 
write +set.size()+ artifacts);
+System.out.flush();
+
+// check if the showed up in the repo
+for( int i=0; i20; i++ )
+{
+  String si = +i;
+
+  String fn = 
targetDirectory.getAbsolutePath()+/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080805.215925-+si+.jar;
+  File af = new File( fn );
+  assertTrue( fn+ does not exist, af.exists() );
+  assertEquals( 159630, af.length() );
+  
+  // is pom there also?
+  fn = 
targetDirectory.getAbsolutePath()+/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080805.215925-+si+.pom;
+  File ap = new File( fn );
+  assertTrue( fn+ does not exist, ap.exists() );
+  assertEquals( 7785, ap.length() );
+}
+
+// check GAV metadata has all versions
+String mdFile = 
targetDirectory.getAbsolutePath()+/org/apache/maven/maven-core/2.0.9-SNAPSHOT/+repo.getMetadataName();
+byte 

svn commit: r694498 - /maven/plugins/trunk/maven-reactor-plugin/pom.xml

[bentmann]

Author: bentmann
Date: Thu Sep 11 14:37:09 2008
New Revision: 694498

URL: http://svn.apache.org/viewvc?rev=694498view=rev
Log:
o Reordered POM

Modified:
maven/plugins/trunk/maven-reactor-plugin/pom.xml

Modified: maven/plugins/trunk/maven-reactor-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/pom.xml?rev=694498r1=694497r2=694498view=diff
==
--- maven/plugins/trunk/maven-reactor-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-reactor-plugin/pom.xml Thu Sep 11 14:37:09 2008
@@ -1,15 +1,18 @@
 project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
   modelVersion4.0.0/modelVersion
+
   parent
  artifactIdmaven-plugins/artifactId
  groupIdorg.apache.maven.plugins/groupId
  version11/version
   /parent
+
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-reactor-plugin/artifactId
-  packagingmaven-plugin/packaging
   version1.0-SNAPSHOT/version
+  packagingmaven-plugin/packaging
+
   namemaven-reactor-plugin/name
   descriptionBuild a subset of interdependent projects in a 
reactor/description
   urlhttp://maven.apache.org/url
@@ -20,6 +23,7 @@
   distributionrepo/distribution
 /license
   /licenses
+
   developers
 developer
   iddfabulich/id
@@ -27,6 +31,7 @@
   timezone-8/timezone
 /developer
   /developers
+
   dependencies
 dependency
   groupIdorg.apache.maven/groupId

svn commit: r694503 - /maven/plugins/trunk/maven-reactor-plugin/pom.xml

[bentmann]

Author: bentmann
Date: Thu Sep 11 14:43:53 2008
New Revision: 694503

URL: http://svn.apache.org/viewvc?rev=694503view=rev
Log:
o Added license header
o Removed inherited stuff
o Added missing bits

Modified:
maven/plugins/trunk/maven-reactor-plugin/pom.xml

Modified: maven/plugins/trunk/maven-reactor-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/pom.xml?rev=694503r1=694502r2=694503view=diff
==
--- maven/plugins/trunk/maven-reactor-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-reactor-plugin/pom.xml Thu Sep 11 14:43:53 2008
@@ -1,28 +1,39 @@
-project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+?xml version=1.0 encoding=UTF-8?
+
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
   modelVersion4.0.0/modelVersion
 
   parent
- artifactIdmaven-plugins/artifactId
- groupIdorg.apache.maven.plugins/groupId
- version11/version
+artifactIdmaven-plugins/artifactId
+groupIdorg.apache.maven.plugins/groupId
+version11/version
   /parent
 
-  groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-reactor-plugin/artifactId
   version1.0-SNAPSHOT/version
   packagingmaven-plugin/packaging
 
-  namemaven-reactor-plugin/name
+  nameMaven Reactor Plugin/name
   descriptionBuild a subset of interdependent projects in a 
reactor/description
-  urlhttp://maven.apache.org/url
-  licenses
-license
-  nameApache License 2.0/name
-  urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
-  distributionrepo/distribution
-/license
-  /licenses
 
   developers
 developer
@@ -32,6 +43,20 @@
 /developer
   /developers
 
+  prerequisites
+maven2.0.9/maven
+  /prerequisites
+
+  scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-reactor-plugin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-reactor-plugin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin//url
+  /scm
+  issueManagement
+systemjira/system
+urlhttp://jira.codehaus.org/browse/MREACTOR/url
+  /issueManagement
+
   dependencies
 dependency
   groupIdorg.apache.maven/groupId
@@ -68,7 +93,7 @@
 dependency
   groupIdjunit/groupId
   artifactIdjunit/artifactId
-  version3.8.1/version
+  version3.8.2/version
   scopetest/scope
 /dependency
   /dependencies

svn commit: r694499 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/parser/ doxia-core/src/test/java/org/apache/maven/doxia/parser/ doxia-modules/doxia-module-docbook-si

[vsiveton]

Author: vsiveton
Date: Thu Sep 11 14:38:51 2008
New Revision: 694499

URL: http://svn.apache.org/viewvc?rev=694499view=rev
Log:
o revert DOXIA-251, will implement DOXIA-226

Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?rev=694499r1=694498r2=694499view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 Thu Sep 11 14:38:51 2008
@@ -138,10 +138,7 @@
 }
 else if ( eventType == XmlPullParser.TEXT )
 {
-if ( !parser.getText().trim().equals(  ) )
-{
-handleText( parser, sink );
-}
+handleText( parser, sink );
 }
 else if ( eventType == XmlPullParser.CDSECT )
 {
@@ -155,10 +152,6 @@
 {
 handleEntity( parser, sink );
 }
-else if ( eventType == XmlPullParser.IGNORABLE_WHITESPACE )
-{
-// nop
-}
 
 try
 {

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java?rev=694499r1=694498r2=694499view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
 Thu Sep 11 14:38:51 2008
@@ -148,12 +148,17 @@
 assertEquals( text, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( bold_, ( (SinkEventElement) it.next() ).getName() );
 
+SinkEventElement el = (SinkEventElement) it.next();
+assertEquals( text, el.getName() );
+assertEquals(  ,  (String) el.getArgs()[0] );
+
 assertEquals( italic, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( text, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( italic_, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( paragraph_, ( (SinkEventElement) it.next() ).getName() 
);
 assertFalse( it.hasNext() );
 
+
 // same test with EOL
 String EOL = System.getProperty( line.separator );
 text = pbword/b + EOL + iword/i/p;
@@ -167,6 +172,11 @@
 assertEquals( text, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( bold_, ( (SinkEventElement) it.next() ).getName() );
 
+el = (SinkEventElement) it.next();
+assertEquals( text, el.getName() );
+// according to section 2.11 of the XML spec, parsers must normalize 
line breaks to \n
+assertEquals( \n,  (String) el.getArgs()[0] );
+
 assertEquals( italic, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( text, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( italic_, ( (SinkEventElement) it.next() ).getName() );
@@ -187,7 +197,7 @@
 assertEquals( text, ( (SinkEventElement) it.next() ).getName() );
 assertEquals( italic_, ( (SinkEventElement) it.next() ).getName() );
 
-SinkEventElement el = (SinkEventElement) it.next();
+el = (SinkEventElement) it.next();
 assertEquals( text, el.getName() );
 assertEquals( .,  (String) el.getArgs()[0] );
 

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java?rev=694499r1=694498r2=694499view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
 (original)
+++ 

svn commit: r694504 - /maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml

[bentmann]

Author: bentmann
Date: Thu Sep 11 14:48:40 2008
New Revision: 694504

URL: http://svn.apache.org/viewvc?rev=694504view=rev
Log:
o Brought encoding in line with other files

Modified:
maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml

Modified: maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml?rev=694504r1=694503r2=694504view=diff
==
--- maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml Thu Sep 11 
14:48:40 2008
@@ -1,4 +1,4 @@
-?xml version=1.0 encoding=ISO-8859-1?
+?xml version=1.0 encoding=UTF-8?
 
 !--
   Licensed to the Apache Software Foundation (ASF) under one

svn commit: r694506 - in /maven/plugins/trunk/maven-reactor-plugin/src: main/java/org/apache/maven/plugin/reactor/ test/java/org/apache/maven/plugin/reactor/

[bentmann]

Author: bentmann
Date: Thu Sep 11 14:49:41 2008
New Revision: 694506

URL: http://svn.apache.org/viewvc?rev=694506view=rev
Log:
o Updated license headers

Modified:

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MissingProjectException.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/NonReactorException.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SimpleInvoker.java

maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java

maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/RelativePatherTest.java

Modified: 
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java?rev=694506r1=694505r2=694506view=diff
==
--- 
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
 Thu Sep 11 14:49:41 2008
@@ -1,22 +1,24 @@
 package org.apache.maven.plugin.reactor;
 
 /*
- * Copyright 2008 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
-
 import java.util.List;
 import java.util.Set;
 

Modified: 
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java?rev=694506r1=694505r2=694506view=diff
==
--- 
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
 Thu Sep 11 14:49:41 2008
@@ -1,19 +1,22 @@
 package org.apache.maven.plugin.reactor;
 
 /*
- * Copyright 2008 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or 

svn propchange: r694529 - svn:log

[jdcasey]

Author: jdcasey
Revision: 694529
Modified property: svn:log

Modified: svn:log at Thu Sep 11 16:03:42 2008
--
--- svn:log (original)
+++ svn:log Thu Sep 11 16:03:42 2008
@@ -1,5 +1,3 @@
-[MASSEMBLY-331] Fixing order of operations for expression interpolation in 
outputDirectory and outputFileNameMapping.
+[MASSEMBLY-331] Fixing order of operations for expression interpolation in 
outputDirectory and outputFileNameMapping. Patches applied, with minor 
modifications. Also, replaced deprecated plexus-utils interpolator references 
with updated library from plexus-interpolation v1.5.
 
 Submitted by: Petar Tahchiev
-
-I added minor modifications.

svn commit: r694543 - /maven/shared/branches/embedder-verifier/pom.xml

[jvanzyl]

Author: jvanzyl
Date: Thu Sep 11 16:35:53 2008
New Revision: 694543

URL: http://svn.apache.org/viewvc?rev=694543view=rev
Log:
o update to 3.0-SNAPSHOT

Modified:
maven/shared/branches/embedder-verifier/pom.xml

Modified: maven/shared/branches/embedder-verifier/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/branches/embedder-verifier/pom.xml?rev=694543r1=694542r2=694543view=diff
==
--- maven/shared/branches/embedder-verifier/pom.xml (original)
+++ maven/shared/branches/embedder-verifier/pom.xml Thu Sep 11 16:35:53 2008
@@ -38,7 +38,7 @@
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-embedder/artifactId
-  version2.1-SNAPSHOT/version
+  version3.0-SNAPSHOT/version
 /dependency
   /dependencies
   scm

svn commit: r694544 [3/3] - /maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/

[jvanzyl]

Modified: 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java?rev=694544r1=694543r2=694544view=diff
==
--- 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java
 (original)
+++ 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java
 Thu Sep 11 16:40:11 2008
@@ -26,7 +26,7 @@
 File dmDir = new File( testDir, dm-pom );
 IntegrationTestRunner itr = new IntegrationTestRunner( 
dmDir.getAbsolutePath() );
 
-itr.executeGoal( install );
+itr.invoke( install );
 
 itr.verifyErrorFreeLog();
 itr.resetStreams();
@@ -34,7 +34,7 @@
 File projectDir = new File( testDir, project );
 itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
 
-itr.executeGoal( package );
+itr.invoke( package );
 itr.verifyErrorFreeLog();
 itr.resetStreams();
 }
@@ -49,7 +49,7 @@
 
 try
 {
-itr.executeGoal( install );
+itr.invoke( install );
 fail( Should fail to build with missing junit version. );
 }
 catch ( IntegrationTestException e )

Modified: 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java?rev=694544r1=694543r2=694544view=diff
==
--- 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
 (original)
+++ 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
 Thu Sep 11 16:40:11 2008
@@ -33,7 +33,7 @@
 
 itr.deleteArtifact( tests, maven-forking-report-plugin, 1, 
jar );
 
-itr.executeGoal( install );
+itr.invoke( install );
 itr.verifyErrorFreeLog();
 itr.resetStreams();
 
@@ -75,7 +75,7 @@
 
 itr.deleteArtifact( tests, maven-forking-test-plugin, 1, 
jar );
 
-itr.executeGoal( install );
+itr.invoke( install );
 itr.verifyErrorFreeLog();
 itr.resetStreams();
 

Modified: 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java?rev=694544r1=694543r2=694544view=diff
==
--- 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java
 (original)
+++ 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java
 Thu Sep 11 16:40:11 2008
@@ -20,7 +20,7 @@
 itr.verifyErrorFreeLog();
 itr.resetStreams();
 itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
-itr.executeGoal( install );
+itr.invoke( install );
 itr.verifyErrorFreeLog();
 itr.resetStreams();
 }

Modified: 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java?rev=694544r1=694543r2=694544view=diff
==
--- 
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
 (original)
+++ 

svn commit: r694549 - in /maven/enforcer/trunk: ./ enforcer-api/ enforcer-api/src/site/ enforcer-api/src/site/apt/ enforcer-rules/ enforcer-rules/src/site/ maven-enforcer-plugin/ maven-enforcer-plugin

[brianf]

Author: brianf
Date: Thu Sep 11 16:55:34 2008
New Revision: 694549

URL: http://svn.apache.org/viewvc?rev=694549view=rev
Log:
rollback release, fix the poms and site urls

Modified:
maven/enforcer/trunk/enforcer-api/pom.xml
maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt
maven/enforcer/trunk/enforcer-api/src/site/site.xml
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/site/site.xml
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml

maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java
maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml
maven/enforcer/trunk/pom.xml

Modified: maven/enforcer/trunk/enforcer-api/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=694549r1=694548r2=694549view=diff
==
--- maven/enforcer/trunk/enforcer-api/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Sep 11 16:55:34 2008
@@ -23,11 +23,11 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version2-SNAPSHOT/version
+version1-SNAPSHOT/version
   /parent
   artifactIdenforcer-api/artifactId
   packagingjar/packaging
-  version1.0-alpha-5-SNAPSHOT/version
+  version1.0-alpha-4-SNAPSHOT/version
   nameEnforcer API/name
   description
 This component provides the generic interfaces needed to implement custom 
rules for the maven-enforcer-plugin.

Modified: maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt?rev=694549r1=694548r2=694549view=diff
==
--- maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt (original)
+++ maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt Thu Sep 11 
16:55:34 2008
@@ -26,7 +26,7 @@
 Maven Enforcer Rule API - Extending The Loving Iron Fist of Maven\x99
 
   Custom rules are easy to make with the maven-enforcer-rule-api. These 
rules can then be invoked with the 
-  
{{{http://maven.apache.org/plugins/maven-enforcer-plugin/}maven-enforcer-plugin}}.
 
+  {{{../../plugins/maven-enforcer-plugin/}maven-enforcer-plugin}}. 
   
   See {{{./writing-a-custom-rule.html}here}} for instructions on how to make 
your own rule.
  
\ No newline at end of file

Modified: maven/enforcer/trunk/enforcer-api/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/site/site.xml?rev=694549r1=694548r2=694549view=diff
==
--- maven/enforcer/trunk/enforcer-api/src/site/site.xml (original)
+++ maven/enforcer/trunk/enforcer-api/src/site/site.xml Thu Sep 11 16:55:34 2008
@@ -24,7 +24,7 @@
   item name=Writing a custom rule href=writing-a-custom-rule.html/
 /menu
 menu name=Rule Execution Engines
-  item name=Maven Enforcer Plugin 
href=http://maven.apache.org/plugins/maven-enforcer-plugin/
+  item name=Maven Enforcer Plugin 
href=../../plugins/maven-enforcer-plugin/
 /menu
   /body
 /project
\ No newline at end of file

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=694549r1=694548r2=694549view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Sep 11 16:55:34 2008
@@ -23,11 +23,11 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version2-SNAPSHOT/version
+version1-SNAPSHOT/version
   /parent
   artifactIdenforcer-rules/artifactId
   packagingjar/packaging
-  version1.0-alpha-5-SNAPSHOT/version
+  version1.0-alpha-4-SNAPSHOT/version
   nameEnforcer Rules/name
   descriptionThis component contains the standard Enforcer 
Rules/description
   build

Modified: maven/enforcer/trunk/enforcer-rules/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/site.xml?rev=694549r1=694548r2=694549view=diff
==
--- maven/enforcer/trunk/enforcer-rules/src/site/site.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/src/site/site.xml Thu Sep 11 16:55:34 
2008
@@ -21,11 +21,11 @@
   body
 menu name=Overview
   item name=Introduction href=index.html/
-  item name=Rule API 
href=http://maven.apache.org/enforcer/enforcer-api//
-  item name=Maven Enforcer Plugin 
href=http://maven.apache.org/plugins/maven-enforcer-plugin//
+  item name=Rule API href=../enforcer-api//
+  item name=Maven Enforcer Plugin 
href=../../plugins/maven-enforcer-plugin//
 /menu
 menu name=Custom Rules
-  

svn commit: r694550 - /maven/enforcer/tags/enforcer-1.0-alpha-4/

[brianf]

Author: brianf
Date: Thu Sep 11 16:59:37 2008
New Revision: 694550

URL: http://svn.apache.org/viewvc?rev=694550view=rev
Log:
rollback release

Removed:
maven/enforcer/tags/enforcer-1.0-alpha-4/

svn commit: r694551 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml

[brianf]

Author: brianf
Date: Thu Sep 11 17:01:20 2008
New Revision: 694551

URL: http://svn.apache.org/viewvc?rev=694551view=rev
Log:
[maven-release-plugin] prepare release enforcer-1.0-alpha-4

Modified:
maven/enforcer/trunk/enforcer-api/pom.xml
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/pom.xml

Modified: maven/enforcer/trunk/enforcer-api/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=694551r1=694550r2=694551view=diff
==
--- maven/enforcer/trunk/enforcer-api/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Sep 11 17:01:20 2008
@@ -23,11 +23,11 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version1-SNAPSHOT/version
+version1/version
   /parent
   artifactIdenforcer-api/artifactId
   packagingjar/packaging
-  version1.0-alpha-4-SNAPSHOT/version
+  version1.0-alpha-4/version
   nameEnforcer API/name
   description
 This component provides the generic interfaces needed to implement custom 
rules for the maven-enforcer-plugin.

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=694551r1=694550r2=694551view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Sep 11 17:01:20 2008
@@ -23,11 +23,11 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version1-SNAPSHOT/version
+version1/version
   /parent
   artifactIdenforcer-rules/artifactId
   packagingjar/packaging
-  version1.0-alpha-4-SNAPSHOT/version
+  version1.0-alpha-4/version
   nameEnforcer Rules/name
   descriptionThis component contains the standard Enforcer 
Rules/description
   build

Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=694551r1=694550r2=694551view=diff
==
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Sep 11 17:01:20 2008
@@ -23,14 +23,14 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version1-SNAPSHOT/version
+version1/version
   /parent
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-enforcer-plugin/artifactId
   packagingmaven-plugin/packaging
   nameMaven Enforcer Plugin/name
   descriptionThe Loving Iron Fist of Maven/description
-  version1.0-alpha-4-SNAPSHOT/version
+  version1.0-alpha-4/version
   urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url
   issueManagement
 systemJIRA/system

Modified: maven/enforcer/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=694551r1=694550r2=694551view=diff
==
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Thu Sep 11 17:01:20 2008
@@ -28,7 +28,7 @@
   artifactIdenforcer/artifactId
   packagingpom/packaging
   nameEnforcer/name
-  version1-SNAPSHOT/version
+  version1/version
   descriptionEnforcer is a build rule execution framework./description
   urlhttp://maven.apache.org/enforcer/url
   prerequisites
@@ -106,9 +106,9 @@
 /mailingList
   /mailingLists
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection
-urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/developerConnection
+
urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0-alpha-4/url
   /scm
   properties
 api.version1.0-alpha-4-SNAPSHOT/api.version
@@ -162,17 +162,17 @@
   dependency
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer-api/artifactId
-version${api.version}/version
+version1.0-alpha-4/version
   /dependency
   dependency
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer-rules/artifactId
-version${rules.version}/version
+version1.0-alpha-4/version
   /dependency
   dependency
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer-rules/artifactId
-version${rules.version}/version
+version1.0-alpha-4/version
 classifiertests/classifier
 

svn commit: r694552 - in /maven/enforcer/tags/enforcer-1.0-alpha-4: ./ enforcer-api/ enforcer-api/src/site/ enforcer-api/src/site/apt/ enforcer-rules/ enforcer-rules/src/site/ maven-enforcer-plugin/ m

[brianf]

Author: brianf
Date: Thu Sep 11 17:01:30 2008
New Revision: 694552

URL: http://svn.apache.org/viewvc?rev=694552view=rev
Log:
[maven-release-plugin]  copy for tag enforcer-1.0-alpha-4

Added:
maven/enforcer/tags/enforcer-1.0-alpha-4/
  - copied from r693195, maven/enforcer/trunk/
maven/enforcer/tags/enforcer-1.0-alpha-4/enforcer-api/pom.xml
  - copied unchanged from r694551, maven/enforcer/trunk/enforcer-api/pom.xml
maven/enforcer/tags/enforcer-1.0-alpha-4/enforcer-api/src/site/apt/index.apt
  - copied unchanged from r694549, 
maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt
maven/enforcer/tags/enforcer-1.0-alpha-4/enforcer-api/src/site/site.xml
  - copied unchanged from r694549, 
maven/enforcer/trunk/enforcer-api/src/site/site.xml
maven/enforcer/tags/enforcer-1.0-alpha-4/enforcer-rules/pom.xml
  - copied unchanged from r694551, 
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/tags/enforcer-1.0-alpha-4/enforcer-rules/src/site/site.xml
  - copied unchanged from r694549, 
maven/enforcer/trunk/enforcer-rules/src/site/site.xml
maven/enforcer/tags/enforcer-1.0-alpha-4/maven-enforcer-plugin/pom.xml
  - copied unchanged from r694551, 
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml

maven/enforcer/tags/enforcer-1.0-alpha-4/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java
  - copied unchanged from r694549, 
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java

maven/enforcer/tags/enforcer-1.0-alpha-4/maven-enforcer-plugin/src/site/site.xml
  - copied unchanged from r694549, 
maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml
maven/enforcer/tags/enforcer-1.0-alpha-4/pom.xml
  - copied unchanged from r694551, maven/enforcer/trunk/pom.xml
maven/enforcer/tags/enforcer-1.0-alpha-4/src/site/site.xml
  - copied unchanged from r694473, maven/enforcer/trunk/src/site/site.xml

svn commit: r694553 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml

[brianf]

Author: brianf
Date: Thu Sep 11 17:01:37 2008
New Revision: 694553

URL: http://svn.apache.org/viewvc?rev=694553view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/enforcer/trunk/enforcer-api/pom.xml
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/pom.xml

Modified: maven/enforcer/trunk/enforcer-api/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=694553r1=694552r2=694553view=diff
==
--- maven/enforcer/trunk/enforcer-api/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Sep 11 17:01:37 2008
@@ -23,11 +23,11 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version1/version
+version2-SNAPSHOT/version
   /parent
   artifactIdenforcer-api/artifactId
   packagingjar/packaging
-  version1.0-alpha-4/version
+  version1.0-alpha-5-SNAPSHOT/version
   nameEnforcer API/name
   description
 This component provides the generic interfaces needed to implement custom 
rules for the maven-enforcer-plugin.

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=694553r1=694552r2=694553view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Sep 11 17:01:37 2008
@@ -23,11 +23,11 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version1/version
+version2-SNAPSHOT/version
   /parent
   artifactIdenforcer-rules/artifactId
   packagingjar/packaging
-  version1.0-alpha-4/version
+  version1.0-alpha-5-SNAPSHOT/version
   nameEnforcer Rules/name
   descriptionThis component contains the standard Enforcer 
Rules/description
   build

Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=694553r1=694552r2=694553view=diff
==
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Sep 11 17:01:37 2008
@@ -23,14 +23,14 @@
   parent
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer/artifactId
-version1/version
+version2-SNAPSHOT/version
   /parent
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-enforcer-plugin/artifactId
   packagingmaven-plugin/packaging
   nameMaven Enforcer Plugin/name
   descriptionThe Loving Iron Fist of Maven/description
-  version1.0-alpha-4/version
+  version1.0-alpha-5-SNAPSHOT/version
   urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url
   issueManagement
 systemJIRA/system

Modified: maven/enforcer/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=694553r1=694552r2=694553view=diff
==
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Thu Sep 11 17:01:37 2008
@@ -28,7 +28,7 @@
   artifactIdenforcer/artifactId
   packagingpom/packaging
   nameEnforcer/name
-  version1/version
+  version2-SNAPSHOT/version
   descriptionEnforcer is a build rule execution framework./description
   urlhttp://maven.apache.org/enforcer/url
   prerequisites
@@ -106,9 +106,9 @@
 /mailingList
   /mailingLists
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/developerConnection
-
urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0-alpha-4/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection
+urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url
   /scm
   properties
 api.version1.0-alpha-4-SNAPSHOT/api.version
@@ -162,17 +162,17 @@
   dependency
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer-api/artifactId
-version1.0-alpha-4/version
+version1.0-alpha-5-SNAPSHOT/version
   /dependency
   dependency
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer-rules/artifactId
-version1.0-alpha-4/version
+version1.0-alpha-5-SNAPSHOT/version
   /dependency
   dependency
 groupIdorg.apache.maven.enforcer/groupId
 artifactIdenforcer-rules/artifactId
-version1.0-alpha-4/version
+version1.0-alpha-5-SNAPSHOT/version
 

svn commit: r694563 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath

[baerrach]

Author: baerrach
Date: Thu Sep 11 17:29:59 2008
New Revision: 694563

URL: http://svn.apache.org/viewvc?rev=694563view=rev
Log:
[MECLIPSE-486] fixing incorrect hard coded path

Modified:

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath?rev=694563r1=694562r2=694563view=diff
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
 Thu Sep 11 17:29:59 2008
@@ -32,5 +32,5 @@
   attribute value=/WEB-INF/lib 
name=org.eclipse.jst.component.dependency/
 /attributes
   /classpathentry
-  classpathentry kind=lib 
path=D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar/
+  classpathentry kind=lib 
path=${basedir}/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar/
 /classpath
\ No newline at end of file

svn commit: r694573 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven: profiles/ profiles/injection/ project/ project/inheritance/

[sisbell]

Author: sisbell
Date: Thu Sep 11 18:14:52 2008
New Revision: 694573

URL: http://svn.apache.org/viewvc?rev=694573view=rev
Log:
Removed a number of uneeded clone methods. Moved others out of ModelUtils and 
made them private.

Modified:

maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=694573r1=694572r2=694573view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
 Thu Sep 11 18:14:52 2008
@@ -22,11 +22,11 @@
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
+import org.apache.maven.model.Parent;
 import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
 import org.apache.maven.profiles.activation.ProfileActivationContext;
 import org.apache.maven.profiles.activation.ProfileActivationException;
 import org.apache.maven.profiles.activation.ProfileActivator;
-import org.apache.maven.project.ModelUtils;
 import org.apache.maven.realm.DefaultMavenRealmManager;
 import org.apache.maven.realm.MavenRealmManager;
 import org.codehaus.plexus.PlexusContainer;
@@ -197,8 +197,8 @@
 
 if ( ( model != null )  ( realmManager != null ) )
 {
-projectRealm = realmManager.getProjectRealm( 
ModelUtils.getGroupId( model ), model.getArtifactId(),
- 
ModelUtils.getVersion( model ) );
+projectRealm = realmManager.getProjectRealm( getGroupId( model ), 
model.getArtifactId(),
+ getVersion( model ) );
 oldLookupRealm = container.setLookupRealm( projectRealm );
 }
 
@@ -362,4 +362,30 @@
 {
 return profileActivationContext.getActiveByDefaultProfileIds();
 }
+
+private static String getVersion( Model model )
+{
+Parent parent = model.getParent();
+
+String version = model.getVersion();
+if ( ( parent != null )  ( version == null ) )
+{
+version = parent.getVersion();
+}
+
+return version;
+}
+
+public static String getGroupId( Model model )
+{
+Parent parent = model.getParent();
+
+String groupId = model.getGroupId();
+if ( ( parent != null )  ( groupId == null ) )
+{
+groupId = parent.getGroupId();
+}
+
+return groupId;
+}
 }

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java?rev=694573r1=694572r2=694573view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
 Thu Sep 11 18:14:52 2008
@@ -19,21 +19,7 @@
  * under the License.
  */
 
-import org.apache.maven.model.Build;
-import org.apache.maven.model.BuildBase;
-import org.apache.maven.model.ConfigurationContainer;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginContainer;
-import org.apache.maven.model.PluginExecution;
-import org.apache.maven.model.PluginManagement;
-import org.apache.maven.model.Profile;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.ReportSet;
-import org.apache.maven.model.Reporting;
+import org.apache.maven.model.*;
 import org.apache.maven.project.ModelUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -120,8 +106,8 @@
 }
 

svn commit: r694576 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/src/main/resources/ project-myeclipse-07-MECLIPSE-445/multymodule-2/sr

[baerrach]

Author: baerrach
Date: Thu Sep 11 18:35:29 2008
New Revision: 694576

URL: http://svn.apache.org/viewvc?rev=694576view=rev
Log:
[MECLIPSE-486] fixing incorrectly named files

Added:

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicationContext-foo.xml
  - copied unchanged from r694545, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicaitonContext-foo.xml

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicationContext-foo.xml
  - copied unchanged from r694545, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml
Removed:

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicaitonContext-foo.xml

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml

svn commit: r694577 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java

[baerrach]

Author: baerrach
Date: Thu Sep 11 18:36:16 2008
New Revision: 694577

URL: http://svn.apache.org/viewvc?rev=694577view=rev
Log:
[MECLIPSE-486] Adding more hacks into assertFile to handle generated values.

Modified:

maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=694577r1=694576r2=694577view=diff
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
 Thu Sep 11 18:36:16 2008
@@ -499,28 +499,44 @@
 }
 
 /*
- * NOTE: This is to account for the unfortunate fact that file: 
URIs differ between Windows and Unix. On a
- * Windows box, the path C:\dir is mapped to file:/C:/dir. On 
a Unix box, the path /home/dir is mapped
- * to file:/home/dir. So, in the first case the slash after 
file: is not part of the corresponding
- * filesystem path while in the later case it is. This discrepancy 
makes verifying the javadoc attachments
- * in .classpath a little tricky.
+ * Hacks for assertEquals problems.
  */
 if ( !expected.equals( actual ) )
 {
+/*
+ * NOTE: This is to account for the unfortunate fact that 
file: URIs differ between Windows and Unix.
+ * On a Windows box, the path C:\dir is mapped to 
file:/C:/dir. On a Unix box, the path /home/dir
+ * is mapped to file:/home/dir. So, in the first case the 
slash after file: is not part of the
+ * corresponding filesystem path while in the later case it 
is. This discrepancy makes verifying the
+ * javadoc attachments in .classpath a little tricky.
+ */
 // convert file:C:/dir to file:/C:/dir
 expected = expected.replaceAll( file:([a-zA-Z]), file:/$1 
);
-}
 
-/*
- * NOTE: This is another hack to compensate for some metadata 
files that contain a complete XML file as the
- * value for a key like org.eclipse.jdt.ui.formatterprofiles 
from org.eclipse.jdt.ui.prefs. Line
- * terminators in this value are platform-dependent.
- */
-if ( !expected.equals( actual )  
expectedFile.getName().endsWith( .prefs ) )
-{
-// normalize line terminators
-expected = expected.replaceAll( 
(rn)|(n)|(r), \\n );
-actual = actual.replaceAll( (rn)|(n)|(r), 
\\n );
+if ( expectedFile.getName().endsWith( .prefs ) )
+{
+/*
+ * NOTE: This is another hack to compensate for some 
metadata files that contain a complete XML file
+ * as the value for a key like 
org.eclipse.jdt.ui.formatterprofiles from
+ * org.eclipse.jdt.ui.prefs. Line terminators in this 
value are platform-dependent.
+ */
+// normalize line terminators
+expected = expected.replaceAll( 
(rn)|(n)|(r), \\n );
+actual = actual.replaceAll( 
(rn)|(n)|(r), \\n );
+}
+else if ( expectedFile.getName().equals( 
org.eclipse.wst.common.component )
+|| expectedFile.getName().equals( .modulemaps )
+|| expectedFile.getName().equals( application.xml ) )
+{
+/*
+ * NOTE: This is a hack to compensate for files that 
contain generated values like dependent-object
+ * in org.eclipse.wst.common.component.
+ * 
+ * Regex would be a better solution.
+ */
+expected = expected.replaceAll( _\\d+,  );
+actual = actual.replaceAll( _\\d+,  );
+}
 }
 
 assertEquals( Comparing ' + IdeUtils.getCanonicalPath( 
actualFile ) + ' against '

svn commit: r694586 - /maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml

[brett]

Author: brett
Date: Thu Sep 11 19:28:59 2008
New Revision: 694586

URL: http://svn.apache.org/viewvc?rev=694586view=rev
Log:
fix parent version

Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml

Modified: 
maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml?rev=694586r1=694585r2=694586view=diff
==
--- maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml 
(original)
+++ maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml 
Thu Sep 11 19:28:59 2008
@@ -23,7 +23,7 @@
 modelVersion4.0.0/modelVersion
 
 groupIdorg.apache.maven/groupId
-version2.1.0-M1-RC14-SNAPSHOT/version
+version2.1.0-M1-RC17-SNAPSHOT/version
 artifactIdmaven-core-it-runner/artifactId
 nameIntegration Test Executor/name
 

svn commit: r694596 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: MavenProject.java MavenProjectBuilder.java

[sisbell]

Author: sisbell
Date: Thu Sep 11 20:12:06 2008
New Revision: 694596

URL: http://svn.apache.org/viewvc?rev=694596view=rev
Log:
Removed more clone methods.

Modified:

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=694596r1=694595r2=694596view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 Thu Sep 11 20:12:06 2008
@@ -47,7 +47,6 @@
 import org.apache.maven.model.Organization;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.PluginManagement;
 import org.apache.maven.model.Prerequisites;
 import org.apache.maven.model.ReportPlugin;
@@ -55,18 +54,14 @@
 import org.apache.maven.model.Reporting;
 import org.apache.maven.model.Resource;
 import org.apache.maven.model.Scm;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.apache.maven.project.artifact.ActiveProjectArtifact;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.artifact.MavenMetadataSource;
-import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
-import org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -251,7 +246,7 @@
 deepCopy( project );
 }
 
-private final void deepCopy( MavenProject project )
+private void deepCopy( MavenProject project )
 {
 // disown the parent
 
@@ -359,36 +354,6 @@
 setSnapshotArtifactRepository( 
project.getSnapshotArtifactRepository() );
 }
 
-if ( project.isConcrete() )
-{
-setDynamicBuild( cloneBuild( project.getDynamicBuild() ) );
-setOriginalInterpolatedBuild( cloneBuild( 
project.getOriginalInterpolatedBuild() ) );
-
-List dynamicRoots = project.getDynamicCompileSourceRoots();
-if ( dynamicRoots != null )
-{
-setDynamicCompileSourceRoots( new ArrayList( dynamicRoots ) );
-setOriginalInterpolatedCompileSourceRoots(
-new ArrayList( 
project.getOriginalInterpolatedCompileSourceRoots() ) );
-}
-
-dynamicRoots = project.getDynamicTestCompileSourceRoots();
-if ( dynamicRoots != null )
-{
-setDynamicTestCompileSourceRoots( new ArrayList( dynamicRoots 
) );
-setOriginalInterpolatedTestCompileSourceRoots(
-new ArrayList( 
project.getOriginalInterpolatedTestCompileSourceRoots() ) );
-}
-
-dynamicRoots = project.getDynamicScriptSourceRoots();
-if ( dynamicRoots != null )
-{
-setDynamicScriptSourceRoots( new ArrayList( dynamicRoots ) );
-setOriginalInterpolatedScriptSourceRoots(
-new ArrayList( 
project.getOriginalInterpolatedScriptSourceRoots() ) );
-}
-}
-
 setConcrete( project.isConcrete() );
 }
 
@@ -1629,53 +1594,6 @@
 return attachedArtifacts;
 }
 
-public Xpp3Dom getGoalConfiguration( String pluginGroupId, String 
pluginArtifactId, String executionId,
- String goalId )
-{
-Xpp3Dom dom = null;
-
-// 
--
-// I would like to be able to lookup the Mojo object using a key but
-// we have a limitation in modello that will be remedied shortly. So
-// for now I have to iterate through and see what we have.
-// 
--
-
-if ( getBuildPlugins() != null )
-{
-for ( Iterator iterator = getBuildPlugins().iterator(); 
iterator.hasNext(); )
-{
-Plugin plugin = (Plugin) iterator.next();
-
-if ( pluginGroupId.equals( plugin.getGroupId() )  
pluginArtifactId.equals( plugin.getArtifactId() ) )
-{
-dom = (Xpp3Dom) plugin.getConfiguration();
-
-if ( executionId != null )
-  

svn commit: r694598 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/plugin/ maven-project/src/main/java/org/apache/maven/project/

[sisbell]

Author: sisbell
Date: Thu Sep 11 20:45:45 2008
New Revision: 694598

URL: http://svn.apache.org/viewvc?rev=694598view=rev
Log:
Cleanup of code. Removed last of dynamic/concrete code.

Modified:

maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=694598r1=694597r2=694598view=diff
==
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Thu Sep 11 20:45:45 2008
@@ -517,19 +517,9 @@
 getLogger().warn( Mojo:  + mojoDescriptor.getGoal() +  is 
deprecated.\n + mojoDescriptor.getDeprecated() );
 }
 
-if ( !project.isConcrete() )
-{
-Model model = ModelUtils.cloneModel( project.getModel() );
-
-File basedir = project.getBasedir();
-
-Model model2 = ModelUtils.cloneModel( model );
-pathTranslator.alignToBaseDirectory( model, basedir );
-project.preserveBuild( model2.getBuild() );
-
-project.setBuild( model.getBuild() );
-project.setConcrete( true );
-}
+Model model = ModelUtils.cloneModel( project.getModel() );
+pathTranslator.alignToBaseDirectory( model, project.getBasedir() );
+project.setBuild( model.getBuild() );
 
 if ( mojoDescriptor.isDependencyResolutionRequired() != null )
 {
@@ -738,8 +728,6 @@
 
 Thread.currentThread().setContextClassLoader( oldClassLoader );
 }
-
-project.setConcrete( false );
 }
 
 private Plugin createDummyPlugin( PluginDescriptor pluginDescriptor )

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=694598r1=694597r2=694598view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Thu Sep 11 20:45:45 2008
@@ -70,39 +70,6 @@
 import java.util.List;
 import java.util.Map;
 
-/*:apt
-
- -
- POM lifecycle
- -
-
-POM Lifecycle
-
- Order of operations when building a POM
-
- * inheritance
- * path translation
- * interpolation
- * defaults injection
-
- Current processing is:
-
- * inheritance
- * interpolation
- * defaults injection
- * path translation
-
- I'm not sure how this is working at all ... i think i have a case where this 
is failing but i need to
- encapsulate as a test so i can fix it. Also need to think of the in working 
build directory versus looking
- things up from the repository i.e buildFromSource vs buildFromRepository.
-
-Notes
-
- * when the model is read it may not have a groupId, as it must be inherited
-
- * the inheritance assembler must use models that are unadulterated!
-
-*/
 
 /**
  * @version $Id$

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=694598r1=694597r2=694598view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 Thu Sep 11 20:45:45 2008
@@ -246,117 +246,6 @@
 deepCopy( project );
 }
 
-private void deepCopy( MavenProject project )
-{
-// disown the parent
-
-// copy fields
-setFile( project.getFile() );
-
-// don't need a deep copy, they don't get modified or added/removed 
to/from - but make them unmodifiable to be
-// sure!
-if ( project.getDependencyArtifacts() != null )
-{
-setDependencyArtifacts( Collections.unmodifiableSet( 
project.getDependencyArtifacts() ) );
-}
-
-if ( project.getArtifacts() != null )
-{
-setArtifacts( Collections.unmodifiableSet( 

svn commit: r694602 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/writers/ test/resources/projects/project-34

[baerrach]

Author: baerrach
Date: Thu Sep 11 21:39:45 2008
New Revision: 694602

URL: http://svn.apache.org/viewvc?rev=694602view=rev
Log:
Changed EclipseSourceDir so that path is always stored with / and not \s.
Modified unit test to use input path containing \\ and check that the results 
does not contain \\ but uses /
Changed expected .classpath for project-34 to use /s in file.

Modified:

maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java

maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=694602r1=694601r2=694602view=diff
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
 Thu Sep 11 21:39:45 2008
@@ -18,6 +18,8 @@
  */
 package org.apache.maven.plugin.eclipse;
 
+import org.apache.maven.plugin.ide.IdeUtils;
+
 /**
  * Represent an eclipse source dir. Eclipse has no main, test or 
resource concepts, so two source dirs with the
  * same path are equal.
@@ -45,7 +47,7 @@
 public EclipseSourceDir( String path, String output, boolean isResource, 
boolean test, String include,
  String exclude, boolean filtering )
 {
-this.path = path;
+setPath( path );
 this.output = output;
 this.isResource = isResource;
 this.test = test;
@@ -126,12 +128,13 @@
 
 /**
  * Setter for codepath/code.
+ * Converts \\ to / in path.
  * 
  * @param path The path to set.
  */
 public void setPath( String path )
 {
-this.path = path;
+this.path = IdeUtils.fixSeparator( path );
 }
 
 /**

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java?rev=694602r1=694601r2=694602view=diff
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
 Thu Sep 11 21:39:45 2008
@@ -74,7 +74,7 @@
 EclipseSourceDir dir =
 new EclipseSourceDir( src/main/resources, target/classes, 
true, false, null, null, false );
 EclipseSourceDir testDir =
-new EclipseSourceDir( src/test/resources, 
target/classes/test-resources, true, true, null, null, false );
+new EclipseSourceDir( src\\test\\resources, 
target/classes/test-resources, true, true, null, null, false );
 
 EclipseSourceDir[] dirs = { dir, testDir };
 

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath?rev=694602r1=694601r2=694602view=diff
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
 Thu Sep 11 21:39:45 2008
@@ -1,6 +1,6 @@
 classpath
   classpathentry kind=src path=src/main/java/
-  classpathentry kind=src path=target\generated-resources\eclipse 
excluding=**/*.java/
+  classpathentry kind=src path=target/generated-resources/eclipse 
excluding=**/*.java/
   classpathentry kind=output path=target/classes/
   classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/
   classpathentry kind=var 
path=M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar/

svn commit: r694608 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/expected/ project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/ pr

[baerrach]

Author: baerrach
Date: Thu Sep 11 22:47:42 2008
New Revision: 694608

URL: http://svn.apache.org/viewvc?rev=694608view=rev
Log:
Fixing incorrect filename .springbeans should have capital B as in 
.springBeans

Added:

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeansX
  - copied unchanged from r694563, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springbeans

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeansX
  - copied unchanged from r694563, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springBeansX
  - copied unchanged from r694563, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans
Removed:

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springbeans

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans

svn commit: r694610 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/expected/ project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/ pr

[baerrach]

Author: baerrach
Date: Thu Sep 11 22:49:28 2008
New Revision: 694610

URL: http://svn.apache.org/viewvc?rev=694610view=rev
Log:
Fixing incorrect filename .springbeans should have capital B as in 
.springBeans

Added:

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeans
  - copied unchanged from r694608, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeansX

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeans
  - copied unchanged from r694608, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeansX

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springBeans
  - copied unchanged from r694608, 
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springBeansX
Removed:

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeansX

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeansX

maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springBeansX