Author: jvanzyl Date: Thu Mar 30 13:25:09 2006 New Revision: 390243 URL: http://svn.apache.org/viewcvs?rev=390243&view=rev Log: o merging trunk changes into this branch
Added: maven/components/branches/maven-embedder-refactor/doap_Maven.rdf - copied unchanged from r390242, maven/components/trunk/doap_Maven.rdf maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0096/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/goals.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/plugin/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/main/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/main/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/main/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/main/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/main/java/org/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/main/java/org/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/main/java/org/apache/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/main/java/org/apache/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/main/java/org/apache/maven/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/main/java/org/apache/maven/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/main/java/org/apache/maven/it0096/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/main/java/org/apache/maven/it0096/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/src/main/java/org/apache/maven/it0096/It0096Mojo.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/plugin/src/main/java/org/apache/maven/it0096/It0096Mojo.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/project/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/App.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/App.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/ - copied from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0096/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0097/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/expected-results.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/expected-results.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/goals.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/plugin/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/main/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/main/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/main/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/main/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/main/java/org/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/main/java/org/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/main/java/org/apache/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/main/java/org/apache/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/main/java/org/apache/maven/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/main/java/org/apache/maven/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/main/java/org/apache/maven/it0096/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/main/java/org/apache/maven/it0096/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/src/main/java/org/apache/maven/it0096/It0096Mojo.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/plugin/src/main/java/org/apache/maven/it0096/It0096Mojo.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/main/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/main/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/stchome/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/stchome/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/stchome/mavenTest/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/stchome/mavenTest/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/stchome/mavenTest/App.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/main/java/com/stchome/mavenTest/App.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/test/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/test/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/stchome/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/stchome/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/stchome/mavenTest/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/stchome/mavenTest/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/stchome/mavenTest/AppTest.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/project-level2/project-level3/src/test/java/com/stchome/mavenTest/AppTest.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/main/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/main/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/main/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/main/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/App.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/App.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/test/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/test/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/test/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/test/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/AppTest.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/AppTest.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/relative-project-level2/ - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/relative-project-level2/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/relative-project-level2/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/relative-project-level2/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0098/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/cli-options.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/cli-options.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/expected-results.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/expected-results.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/goals.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/test project/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/main/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/main/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/main/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/main/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/main/java/org/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/main/java/org/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/main/java/org/someproject/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/main/java/org/someproject/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/main/java/org/someproject/App.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/main/java/org/someproject/App.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/test/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/test/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/test/java/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/test/java/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/test/java/org/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/test/java/org/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/test/java/org/someproject/ - copied from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/test/java/org/someproject/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/test project/src/test/java/org/someproject/AppTest.java - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/test project/src/test/java/org/someproject/AppTest.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/verifier.properties - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0098/verifier.properties maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0099/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/child/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0099/child/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/child/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0099/child/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/goals.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0099/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0099/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/prebuild-hook.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0099/prebuild-hook.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0100/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/goals.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0100/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/ - copied from r390242, maven/components/trunk/maven-core-it/it0100/parent/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/child/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0100/parent/child/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/child/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0100/parent/child/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/child/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0100/parent/child/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/child/src/test/ - copied from r390242, maven/components/trunk/maven-core-it/it0100/parent/child/src/test/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/child/src/test/verifier/ - copied from r390242, maven/components/trunk/maven-core-it/it0100/parent/child/src/test/verifier/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/child/src/test/verifier/verifications.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0100/parent/child/src/test/verifier/verifications.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0100/parent/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0100/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0101/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/cli-options.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0101/cli-options.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/goals.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0101/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/lib/ - copied from r390242, maven/components/trunk/maven-core-it/it0101/lib/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/lib/test-dep.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0101/lib/test-dep.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0101/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/settings.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0101/settings.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/ (props changed) - copied from r390242, maven/components/trunk/maven-core-it/it0102/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/goals.txt - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0102/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/pom.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0102/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/profiles.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0102/profiles.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/src/ - copied from r390242, maven/components/trunk/maven-core-it/it0102/src/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/src/test/ - copied from r390242, maven/components/trunk/maven-core-it/it0102/src/test/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/src/test/verifier/ - copied from r390242, maven/components/trunk/maven-core-it/it0102/src/test/verifier/ maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/src/test/verifier/verifications.xml - copied unchanged from r390242, maven/components/trunk/maven-core-it/it0102/src/test/verifier/verifications.xml maven/components/branches/maven-embedder-refactor/maven-meeper/src/bin/m2-sync/xfire-m2-sync.sh - copied unchanged from r390242, maven/components/trunk/maven-meeper/src/bin/m2-sync/xfire-m2-sync.sh Removed: maven/components/branches/maven-embedder-refactor/maven-core-it/it0059/src/test/ Modified: maven/components/branches/maven-embedder-refactor/ci.sh maven/components/branches/maven-embedder-refactor/integration-tests/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java maven/components/branches/maven-embedder-refactor/maven-core-it/README.txt maven/components/branches/maven-embedder-refactor/maven-core-it/integration-tests.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0043/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0075/goals.txt maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/pom.xml maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java maven/components/branches/maven-embedder-refactor/maven-core-it/it0094/test/ (props changed) maven/components/branches/maven-embedder-refactor/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven/components/branches/maven-embedder-refactor/maven-model/maven.mdo maven/components/branches/maven-embedder-refactor/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java maven/components/branches/maven-embedder-refactor/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java maven/components/branches/maven-embedder-refactor/maven-plugin-tools/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/MavenProject.java maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java maven/components/branches/maven-embedder-refactor/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java maven/components/branches/maven-embedder-refactor/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java maven/components/branches/maven-embedder-refactor/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java maven/components/branches/maven-embedder-refactor/maven-reporting/maven-reporting-impl/pom.xml maven/components/branches/maven-embedder-refactor/pom.xml Modified: maven/components/branches/maven-embedder-refactor/ci.sh URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/ci.sh?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/ci.sh (original) +++ maven/components/branches/maven-embedder-refactor/ci.sh Thu Mar 30 13:25:09 2006 @@ -21,7 +21,7 @@ fi [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] DATE=`date` PID=$$ Modified: maven/components/branches/maven-embedder-refactor/integration-tests/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/integration-tests/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/integration-tests/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java (original) +++ maven/components/branches/maven-embedder-refactor/integration-tests/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java Thu Mar 30 13:25:09 2006 @@ -26,6 +26,16 @@ */ private String projectBuildDirectory; + /** + * @parameter expression="${targetDirectoryString}" + */ + private String targetDirectoryString; + + /** + * @parameter expression="${targetDirectoryFile}" + */ + private File targetDirectoryFile; + public void execute() throws MojoExecutionException { @@ -34,6 +44,14 @@ Properties mojoGeneratedPropeties = new Properties(); mojoGeneratedPropeties.put( "project.build.directory", projectBuildDirectory ); + if ( targetDirectoryString != null ) + { + mojoGeneratedPropeties.put( "targetDirectoryString", targetDirectoryString ); + } + if ( targetDirectoryFile != null ) + { + mojoGeneratedPropeties.put( "targetDirectoryFile", targetDirectoryFile.getAbsolutePath() ); + } FileOutputStream fos = new FileOutputStream( new File( basedir, "target/mojo-generated.properties" ) ); Modified: maven/components/branches/maven-embedder-refactor/maven-core-it/README.txt URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core-it/README.txt?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core-it/README.txt (original) +++ maven/components/branches/maven-embedder-refactor/maven-core-it/README.txt Thu Mar 30 13:25:09 2006 @@ -258,6 +258,25 @@ it0095: Test URL calculation when modules are in sibling dirs of parent. (MNG-2006) +it0096: Test that plugin executions from >1 step of inheritance don't run multiple times. + +it0097: Test that the implied relative path for the parent POM works, even two + levels deep. + +it0098: Test that quoted system properties are processed correctly. [MNG-1415] + +it0099: Test that parent-POMs cached during a build are available as parents + to other POMs in the multimodule build. [MNG-2130] + +it0100: Test that ${parent.artifactId} resolves correctly. [MNG-2124] + +it0101: Test that properties defined in an active profile in the user's + settings are available for interpolation of systemPath in a dependency. + [MNG-2052] + +it0102: Test that <activeByDefault/> calculations for profile activation only + use profiles defined in the POM. [MNG-2136] + ------------------------------------------------------------------------------- - generated sources Modified: maven/components/branches/maven-embedder-refactor/maven-core-it/integration-tests.txt URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core-it/integration-tests.txt?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core-it/integration-tests.txt (original) +++ maven/components/branches/maven-embedder-refactor/maven-core-it/integration-tests.txt Thu Mar 30 13:25:09 2006 @@ -1,3 +1,10 @@ +it0102 +it0101 +it0100 +it0099 +it0098 +it0097 +it0096 it0095 it0094 it0092 Modified: maven/components/branches/maven-embedder-refactor/maven-core-it/it0043/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core-it/it0043/pom.xml?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core-it/it0043/pom.xml (original) +++ maven/components/branches/maven-embedder-refactor/maven-core-it/it0043/pom.xml Thu Mar 30 13:25:09 2006 @@ -32,7 +32,7 @@ <build> <plugins> <plugin> - <artifactId>maven-projecthelp-plugin</artifactId> + <artifactId>maven-help-plugin</artifactId> <executions> <execution> <phase>generate-test-resources</phase> Modified: maven/components/branches/maven-embedder-refactor/maven-core-it/it0075/goals.txt URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core-it/it0075/goals.txt?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core-it/it0075/goals.txt (original) +++ maven/components/branches/maven-embedder-refactor/maven-core-it/it0075/goals.txt Thu Mar 30 13:25:09 2006 @@ -1,4 +1,4 @@ -projecthelp:active-profiles +help:active-profiles package eclipse:eclipse clean:clean Modified: maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/pom.xml?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/pom.xml (original) +++ maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/pom.xml Thu Mar 30 13:25:09 2006 @@ -29,6 +29,8 @@ <phase>process-resources</phase> <configuration> <projectBuildDirectory>${project.build.directory}</projectBuildDirectory> + <targetDirectoryString>target</targetDirectoryString> + <targetDirectoryFile>target</targetDirectoryFile> </configuration> <goals> <goal>generate-properties</goal> @@ -40,9 +42,9 @@ </build> <pluginRepositories> <pluginRepository> - <id>snapshots</id> - <name>Maven Central Plugins Development Repository</name> - <url>http://snapshots.maven.codehaus.org/maven2</url> + <id>apache.snapshots</id> + <name>Maven Plugins Development Repository</name> + <url>http://cvs.apache.org/maven-snapshot-repository</url> </pluginRepository> </pluginRepositories> </project> Modified: maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java (original) +++ maven/components/branches/maven-embedder-refactor/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java Thu Mar 30 13:25:09 2006 @@ -30,10 +30,10 @@ File projectBuildDirectory = new File( basedir, "target" ); - assertEquals( testProperties.getProperty( "project.build.directory" ), projectBuildDirectory.getAbsolutePath() ); + assertEquals( projectBuildDirectory.getAbsolutePath(), testProperties.getProperty( "project.build.directory" ) ); } - public void testProjectBuildDirectoryAfterForMojoExecution() + public void testProjectBuildDirectoryForMojoExecution() throws Exception { Properties testProperties = new Properties(); @@ -46,6 +46,8 @@ File projectBuildDirectory = new File( basedir, "target" ); - assertEquals( testProperties.getProperty( "project.build.directory" ), projectBuildDirectory.getAbsolutePath() ); + assertEquals( projectBuildDirectory.getAbsolutePath(), testProperties.getProperty( "project.build.directory" ) ); + assertEquals( projectBuildDirectory.getAbsolutePath(), testProperties.getProperty( "targetDirectoryFile" ) ); + assertEquals( "target", testProperties.getProperty( "targetDirectoryString" ) ); } } Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0094/test/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1 @@ +target Modified: maven/components/branches/maven-embedder-refactor/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml (original) +++ maven/components/branches/maven-embedder-refactor/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml Thu Mar 30 13:25:09 2006 @@ -2,7 +2,7 @@ <files> <file> <location>target/effective-pom.xml</location> - <contains>scp://host/path/sub1</contains> + <contains>scp://host/path/parent/sub1</contains> </file> </files> </verifications> Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1 @@ +log.txt Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/plugin/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0096/project/project-level2/project-level3/project-jar/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1 @@ +target Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +log.txt + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/plugin/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-level2/project-level3/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/project-sibling-level2/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0098/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +log.txt + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +log.txt + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0099/child/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +log.txt + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0100/parent/child/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +target + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0101/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,2 @@ +log.txt + Propchange: maven/components/branches/maven-embedder-refactor/maven-core-it/it0102/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 30 13:25:09 2006 @@ -0,0 +1,3 @@ +log.txt +target + Modified: maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=390243&r1=390242&r2=390243&view=diff ============================================================================== --- maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original) +++ maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Thu Mar 30 13:25:09 2006 @@ -426,7 +426,7 @@ messageBuffer.append( name ); - int dotCount = 55; + int dotCount = 54; dotCount -= name.length(); @@ -821,9 +821,9 @@ protected void line() { - getLogger().info( "----------------------------------------------------------------------------" ); + getLogger().info( "------------------------------------------------------------------------" ); } - + protected static String formatTime( long ms ) { long secs = ms / MS_PER_SEC;