Index: maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java =================================================================== --- maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java (Revision 0) +++ maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java (Revision 0) @@ -0,0 +1,74 @@ +package org.apache.maven.shared.release.util; + +/* + * 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. + */ + +import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.logging.Logger; +import org.codehaus.plexus.logging.LoggerManager; + +import java.io.File; +import java.net.URL; + + +/** + * @author Mark Struberg + */ +public class PomFinderTest extends PlexusTestCase +{ + private Logger logger = null; + + protected void setUp() throws Exception + { + super.setUp(); + LoggerManager lm = (LoggerManager) lookup(LoggerManager.ROLE); + logger = lm.getLoggerForComponent(LoggerManager.ROLE); //X TODO use a better ROLE! + } + + public void testPomFinderParser() throws Exception + { + PomFinder pf = new PomFinder( logger ); + + boolean found = pf.parsePom( new File( "src/test/resources/pomfinder/pomNothere.xml" ) ); + assertFalse( found ); + + URL pomUrl = getClassLoader().getResource("pomfinder/pom1.xml"); + assertNotNull( pomUrl ); + + File pomFile = new File( pomUrl.getFile() ); + found = pf.parsePom( pomFile ); + assertTrue( found ); + + { + File foundPom = pf.findMatchingPom( pomFile.getParentFile() ); + assertNotNull( foundPom ); + + assertEquals( pomFile.getAbsolutePath(), foundPom.getAbsolutePath() ); + } + + { + // try from 1 directory higher + File foundPom = pf.findMatchingPom( pomFile.getParentFile().getParentFile() ); + assertNotNull( foundPom ); + + assertEquals( pomFile.getAbsolutePath(), foundPom.getAbsolutePath() ); + } + } + +} Index: maven-release-manager/src/test/resources/pomfinder/pom1.xml =================================================================== --- maven-release-manager/src/test/resources/pomfinder/pom1.xml (Revision 0) +++ maven-release-manager/src/test/resources/pomfinder/pom1.xml (Revision 0) @@ -0,0 +1,223 @@ + + + + + 4.0.0 + + + org.apache.maven.release + maven-release-testartifact + 2.1-SNAPSHOT + + + maven-release-manager + + Maven Release Manager testartifact + + + + + org.apache.maven + maven-repository-metadata + ${mavenVersion} + + + + + + + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9 + + + commons-lang + commons-lang + 2.4 + + + commons-cli + commons-cli + 1.0 + + + commons-lang + commons-lang + + + + + + + + org.apache.maven.scm + maven-scm-providers-standard + ${scmVersion} + pom + runtime + + + org.apache.maven.scm + maven-scm-manager-plexus + ${scmVersion} + runtime + + + org.apache.maven.scm + maven-scm-api + ${scmVersion} + + + org.apache.maven.scm + maven-scm-provider-svn-commons + ${scmVersion} + + + + org.jdom + jdom + + + jaxen + jaxen + 1.1-beta-8 + runtime + + + dom4j + dom4j + + + xerces + xmlParserAPIs + + + xerces + xercesImpl + + + xom + xom + + + + + + junit + junit + 3.8.2 + test + + + org.apache.maven.shared + maven-plugin-testing-harness + test + + + org.apache.maven.scm + maven-scm-test + ${scmVersion} + test + + + jmock + jmock + test + + + jmock + jmock-cglib + 1.0.1 + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + 1.4 + + + + maven-surefire-plugin + + -Xmx256m + + + **/ForkedMavenExecutorTest.java + + + + + org.codehaus.modello + modello-maven-plugin + 1.1 + + + + xpp3-reader + java + xpp3-writer + + + + + 2.0.0 + false + + src/main/mdo/release-descriptor.mdo + + + + + org.codehaus.plexus + plexus-maven-plugin + 1.3.8 + + + create-component-descriptor + generate-resources + + descriptor + + + + merge + + ${project.build.outputDirectory}/META-INF/plexus/components.xml + + ${project.build.outputDirectory}/META-INF/plexus/components.xml + src/main/components-fragment.xml + + + process-resources + + merge-descriptors + + + + + + + Index: maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java =================================================================== --- maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java (Revision 986305) +++ maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java (Arbeitskopie) @@ -23,6 +23,7 @@ import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.config.ReleaseDescriptor; import org.apache.maven.shared.release.env.ReleaseEnvironment; +import org.apache.maven.shared.release.util.PomFinder; import org.codehaus.plexus.util.StringUtils; import java.io.File; @@ -64,6 +65,33 @@ additionalArguments = "-f pom.xml"; } + String workDir = releaseDescriptor.getWorkingDirectory(); + if ( workDir == null) + { + workDir = System.getProperty("user.dir"); + } + + String pomFileName = releaseDescriptor.getPomFileName(); + if ( pomFileName == null ) + { + pomFileName = "pom.xml"; + } + + File pomFile = new File( workDir, pomFileName ); + PomFinder pomFinder = new PomFinder( getLogger() ); + boolean foundPom = pomFinder.parsePom( pomFile ); + + if ( foundPom ) + { + File matchingPom = pomFinder.findMatchingPom( new File( releaseDescriptor.getCheckoutDirectory() ) ); + if ( matchingPom != null ) + { + getLogger().info( "Invoking perform goals in directory " + matchingPom.getParent() ); + releaseDescriptor.setCheckoutDirectory( matchingPom.getParent() ); + } + + } + return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getCheckoutDirectory() ), additionalArguments ); } Index: maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java =================================================================== --- maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java (Revision 0) +++ maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java (Revision 0) @@ -0,0 +1,316 @@ +package org.apache.maven.shared.release.util; + +/* + * 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. + */ + +import org.apache.maven.model.Model; +import org.apache.maven.model.Parent; +import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.codehaus.plexus.logging.Logger; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; + + + +/** + *

This utility class helps with finding a maven pom file + * which got parsed previously. It uses the fact that the + * combination of any parent ids plus the ids of the current + * pom itself is unique.

+ * + *

Usage:

+ *
    + *
  1. + * Parse a pom in a given directory with {@link #parsePom(java.io.File)} + * This will act as the information what to search for. + *
    2. + *
  2. + * Search for the matching pom in a given tree using + * {@link #findMatchingPom(java.io.File)} + *
    3. + *
+ * + * @author Mark Struberg + */ +public class PomFinder +{ + + private Logger log; + private PomInfo foundPomInfo; + + public PomFinder(Logger log) + { + this.log = log; + } + + /** + * + * @param originPom the pom File which should be used as blueprint for the search + * @return true if a pom got parsed successfully, false otherwise + */ + public boolean parsePom(File originPom) + { + if ( !originPom.exists() ) + { + return false; + } + + try + { + foundPomInfo = readPomInfo(originPom); + } + catch (IOException e) + { + log.error("Error while parsing pom file", e); + return false; + } + catch (XmlPullParserException e) + { + log.error("Error while parsing pom file", e); + return false; + } + + return foundPomInfo != null; + } + + /** + * Search for the previously with {@link #parsePom(java.io.File)} + * parsed pom in the given directory. + * @param startDirectory + * @return the pom file which matches the previously parsed pom or null if nothing found + */ + public File findMatchingPom( File startDirectory ) + { + if ( !startDirectory.exists() ) + { + return null; + } + + if ( !startDirectory.isDirectory() ) + { + log.error("PomFinder must be started with a directory! Got " + startDirectory.getAbsolutePath() ); + return null; + } + + if ( foundPomInfo == null) + { + log.error( "Please run parsePom first!" ); + return null; + } + + // look for the file in the current directory + File matchingPom = new File( startDirectory, foundPomInfo.getFileName() ); + if ( matchingPom.exists() ) + { + PomInfo pi = null; + try + { + pi = readPomInfo( matchingPom ); + } + catch (IOException e) + { + log.error( "Error while parsing pom file", e); + return null; + } + catch (XmlPullParserException e) + { + log.error( "Error while parsing pom file", e); + return null; + } + + if ( pi == null || !pi.equals( foundPomInfo ) ) + { + matchingPom = null; + } + } + else + { + matchingPom = null; + } + + if ( matchingPom == null ) + { + String[] childFiles = startDirectory.list(); + for ( int i = 0; i < childFiles.length; i++ ) + { + String childFile = childFiles[ i ]; + + File subDir = new File( startDirectory, childFile ); + if ( subDir.isDirectory() && !subDir.isHidden() ) + { + matchingPom = findMatchingPom( subDir ); + } + + if ( matchingPom != null ) + { + break; + } + } + } + + + return matchingPom; + } + + + /** + * Read the {@link PomInfo} from the given pom file + * @param pomFile pom.xml file + * @return the PomInfo or null