Author: joakime Date: Thu Feb 22 11:07:37 2007 New Revision: 510627 URL: http://svn.apache.org/viewvc?view=rev&rev=510627 Log: Initial import of maven-artifact-converter
Added: maven/shared/trunk/maven-artifact-converter/ (with props) maven/shared/trunk/maven-artifact-converter/pom.xml (with props) maven/shared/trunk/maven-artifact-converter/src/ maven/shared/trunk/maven-artifact-converter/src/main/ maven/shared/trunk/maven-artifact-converter/src/main/java/ maven/shared/trunk/maven-artifact-converter/src/main/java/org/ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java (with props) maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java (with props) maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java (with props) maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java (with props) maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java (with props) maven/shared/trunk/maven-artifact-converter/src/main/resources/ maven/shared/trunk/maven-artifact-converter/src/main/resources/org/ maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/ maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/ maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/artifact/ maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/ maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties maven/shared/trunk/maven-artifact-converter/src/test/ maven/shared/trunk/maven-artifact-converter/src/test/expected-files/ - copied from r510605, maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/expected-files/ maven/shared/trunk/maven-artifact-converter/src/test/java/ maven/shared/trunk/maven-artifact-converter/src/test/java/org/ maven/shared/trunk/maven-artifact-converter/src/test/java/org/apache/ maven/shared/trunk/maven-artifact-converter/src/test/java/org/apache/maven/ maven/shared/trunk/maven-artifact-converter/src/test/java/org/apache/maven/artifact/ maven/shared/trunk/maven-artifact-converter/src/test/java/org/apache/maven/artifact/converter/ maven/shared/trunk/maven-artifact-converter/src/test/java/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.java (with props) maven/shared/trunk/maven-artifact-converter/src/test/resources/ maven/shared/trunk/maven-artifact-converter/src/test/resources/org/ maven/shared/trunk/maven-artifact-converter/src/test/resources/org/apache/ maven/shared/trunk/maven-artifact-converter/src/test/resources/org/apache/maven/ maven/shared/trunk/maven-artifact-converter/src/test/resources/org/apache/maven/artifact/ maven/shared/trunk/maven-artifact-converter/src/test/resources/org/apache/maven/artifact/converter/ maven/shared/trunk/maven-artifact-converter/src/test/resources/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.xml (with props) maven/shared/trunk/maven-artifact-converter/src/test/source-modern-repository/ - copied from r510605, maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/source-modern-repository/ maven/shared/trunk/maven-artifact-converter/src/test/source-repository/ - copied from r510605, maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/source-repository/ maven/shared/trunk/maven-artifact-converter/src/test/target-repository/ - copied from r510605, maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/target-repository/ Propchange: maven/shared/trunk/maven-artifact-converter/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Feb 22 11:07:37 2007 @@ -0,0 +1,15 @@ +target +*~ +.*.swp +*.log +*.patch +*.diff +*.ipr +*.iws +*.iml +.classpath +.project +.m2eclipse +.settings +.wtpmodules +cobertura.ser Added: maven/shared/trunk/maven-artifact-converter/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-converter/pom.xml?view=auto&rev=510627 ============================================================================== --- maven/shared/trunk/maven-artifact-converter/pom.xml (added) +++ maven/shared/trunk/maven-artifact-converter/pom.xml Thu Feb 22 11:07:37 2007 @@ -0,0 +1,79 @@ +<?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"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-components</artifactId> + <version>6</version> + </parent> + <artifactId>maven-artifact-converter</artifactId> + <version>2.0.5-SNAPSHOT</version> + <name>Maven Artifact Converter</name> + <description>Converts between Legacy and Modern Layout Artifacts.</description> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-transaction</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-model-converter</artifactId> + <version>2.0.5-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + <version>1.0-alpha-9</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Propchange: maven/shared/trunk/maven-artifact-converter/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/shared/trunk/maven-artifact-converter/pom.xml ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/shared/trunk/maven-artifact-converter/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java?view=auto&rev=510627 ============================================================================== --- maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java (added) +++ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java Thu Feb 22 11:07:37 2007 @@ -0,0 +1,50 @@ +package org.apache.maven.artifact.converter; + +/* + * 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. + */ + +/** + * ArtifactConversionException + * + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @version $Id$ + */ +public class ArtifactConversionException + extends Exception +{ + + public ArtifactConversionException() + { + } + + public ArtifactConversionException( String message ) + { + super( message ); + } + + public ArtifactConversionException( Throwable cause ) + { + super( cause ); + } + + public ArtifactConversionException( String message, Throwable cause ) + { + super( message, cause ); + } +} Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java?view=auto&rev=510627 ============================================================================== --- maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java (added) +++ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java Thu Feb 22 11:07:37 2007 @@ -0,0 +1,58 @@ +package org.apache.maven.artifact.converter; + +/* + * 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.artifact.Artifact; +import org.apache.maven.artifact.repository.ArtifactRepository; + +import java.util.Map; + +/** + * ArtifactConverter + * + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @version $Id$ + */ +public interface ArtifactConverter +{ + public static final String ROLE = ArtifactConverter.class.getName(); + + /** + * Convert an provided artifact, and place it into the destination repository. + * + * @param artifact the artifact to convert. + * @param destinationRepository the respository to send the artifact to. + * @throws ArtifactConversionException + */ + void convert( Artifact artifact, ArtifactRepository destinationRepository ) + throws ArtifactConversionException; + + /** + * Get the map of accumulated warnings for the conversion. + * + * @return the [EMAIL PROTECTED] Map}<[EMAIL PROTECTED] Artifact}, [EMAIL PROTECTED] String}> warning messages. + */ + Map getWarnings(); + + /** + * Clear the list of warning messages. + */ + void clearWarnings(); +} Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java?view=auto&rev=510627 ============================================================================== --- maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java (added) +++ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java Thu Feb 22 11:07:37 2007 @@ -0,0 +1,81 @@ +package org.apache.maven.artifact.converter; + +/* + * 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.util.IOUtil; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; + +/** + * AsciiFileUtil - conveinence utility for reading / writing ascii files. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @version $Id$ + * @todo switch to commons-lang and use their high-performance versions of these utility methods. + */ +public class AsciiFileUtil +{ + /** + * Read a file into a [EMAIL PROTECTED] String} and return it. + * + * @param file the file to read + * @return the [EMAIL PROTECTED] String} contents of the file. + * @throws IOException if there was a problem performing this operation. + */ + public static String readFile( File file ) + throws IOException + { + FileInputStream in = null; + try + { + in = new FileInputStream( file ); + return IOUtil.toString( in ); + } + finally + { + IOUtil.close( in ); + } + } + + /** + * Write the contents of a [EMAIL PROTECTED] String} to a file. + * + * @param file the file to write to + * @param content the [EMAIL PROTECTED] String} contents to write. + * @throws IOException if there was a problem performing this operation. + */ + public static void writeFile( File file, String content ) + throws IOException + { + FileOutputStream out = null; + try + { + out = new FileOutputStream( file ); + IOUtil.copy( content, out ); + } + finally + { + IOUtil.close( out ); + } + } +} Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java?view=auto&rev=510627 ============================================================================== --- maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java (added) +++ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java Thu Feb 22 11:07:37 2007 @@ -0,0 +1,690 @@ +package org.apache.maven.artifact.converter; + +/* + * 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.artifact.Artifact; +import org.apache.maven.artifact.factory.ArtifactFactory; +import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; +import org.apache.maven.artifact.repository.metadata.Metadata; +import org.apache.maven.artifact.repository.metadata.RepositoryMetadata; +import org.apache.maven.artifact.repository.metadata.Snapshot; +import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata; +import org.apache.maven.artifact.repository.metadata.Versioning; +import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; +import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer; +import org.apache.maven.model.DistributionManagement; +import org.apache.maven.model.Model; +import org.apache.maven.model.Relocation; +import org.apache.maven.model.converter.ModelConverter; +import org.apache.maven.model.converter.PomTranslationException; +import org.apache.maven.model.io.xpp3.MavenXpp3Writer; +import org.apache.maven.transaction.FileTransaction; +import org.apache.maven.transaction.TransactionException; +import org.codehaus.plexus.digest.Digester; +import org.codehaus.plexus.digest.DigesterException; +import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.regex.Matcher; + +/** + * LegacyToDefaultConverter + * + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @version $Id$ + * + * @plexus.component role="org.apache.maven.artifact.converter.ArtifactConverter" + * role-hint="legacy-to-default" + */ +public class LegacyToDefaultConverter + implements ArtifactConverter +{ + /** + * [EMAIL PROTECTED] List}<[EMAIL PROTECTED] Digester}> + * + * @plexus.requirement role="org.codehaus.plexus.digest.Digester" + */ + private List digesters; + + /** + * @plexus.requirement + */ + private ModelConverter translator; + + /** + * @plexus.requirement + */ + private ArtifactFactory artifactFactory; + + /** + * @plexus.requirement + */ + private ArtifactHandlerManager artifactHandlerManager; + + /** + * @plexus.configuration default-value="false" + */ + private boolean force; + + /** + * @plexus.configuration default-value="false" + */ + private boolean dryrun; + + private Map warnings = new HashMap(); + + public void convert( Artifact artifact, ArtifactRepository targetRepository ) + throws ArtifactConversionException + { + if ( artifact.getRepository().getUrl().equals( targetRepository.getUrl() ) ) + { + throw new ArtifactConversionException( Messages.getString( "exception.repositories.match" ) ); //$NON-NLS-1$ + } + + if ( !validateMetadata( artifact ) ) + { + addWarning( artifact, Messages.getString( "unable.to.validate.metadata" ) ); //$NON-NLS-1$ + return; + } + + FileTransaction transaction = new FileTransaction(); + + if ( !copyPom( artifact, targetRepository, transaction ) ) + { + addWarning( artifact, Messages.getString( "unable.to.copy.pom" ) ); //$NON-NLS-1$ + return; + } + + if ( !copyArtifact( artifact, targetRepository, transaction ) ) + { + addWarning( artifact, Messages.getString( "unable.to.copy.artifact" ) ); //$NON-NLS-1$ + return; + } + + Metadata metadata = createBaseMetadata( artifact ); + Versioning versioning = new Versioning(); + versioning.addVersion( artifact.getBaseVersion() ); + metadata.setVersioning( versioning ); + updateMetadata( new ArtifactRepositoryMetadata( artifact ), targetRepository, metadata, transaction ); + + metadata = createBaseMetadata( artifact ); + metadata.setVersion( artifact.getBaseVersion() ); + versioning = new Versioning(); + + Matcher matcher = Artifact.VERSION_FILE_PATTERN.matcher( artifact.getVersion() ); + if ( matcher.matches() ) + { + Snapshot snapshot = new Snapshot(); + snapshot.setBuildNumber( Integer.valueOf( matcher.group( 3 ) ).intValue() ); + snapshot.setTimestamp( matcher.group( 2 ) ); + versioning.setSnapshot( snapshot ); + } + + // TODO: merge latest/release/snapshot from source instead + metadata.setVersioning( versioning ); + updateMetadata( new SnapshotArtifactRepositoryMetadata( artifact ), targetRepository, metadata, transaction ); + + if ( !dryrun ) + { + try + { + transaction.commit(); + } + catch ( TransactionException e ) + { + throw new ArtifactConversionException( Messages.getString( "transaction.failure", e.getMessage() ), e ); //$NON-NLS-1$ + } + } + } + + private boolean copyPom( Artifact artifact, ArtifactRepository targetRepository, FileTransaction transaction ) + throws ArtifactConversionException + { + Artifact pom = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact + .getVersion() ); + pom.setBaseVersion( artifact.getBaseVersion() ); + ArtifactRepository repository = artifact.getRepository(); + File file = new File( repository.getBasedir(), repository.pathOf( pom ) ); + + boolean result = true; + if ( file.exists() ) + { + File targetFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( pom ) ); + + String contents = null; + boolean checksumsValid = false; + try + { + if ( testChecksums( artifact, file ) ) + { + checksumsValid = true; + } + + // Even if the checksums for the POM are invalid we should still convert the POM + contents = AsciiFileUtil.readFile( file ); + } + catch ( IOException e ) + { + throw new ArtifactConversionException( + Messages.getString( "unable.to.read.source.pom", e.getMessage() ), e ); //$NON-NLS-1$ + } + + if ( checksumsValid && contents.indexOf( "modelVersion" ) >= 0 ) //$NON-NLS-1$ + { + // v4 POM + try + { + boolean matching = false; + if ( !force && targetFile.exists() ) + { + String targetContents = AsciiFileUtil.readFile( targetFile ); + matching = targetContents.equals( contents ); + } + if ( force || !matching ) + { + transaction.createFile( contents, targetFile, digesters ); + } + } + catch ( IOException e ) + { + throw new ArtifactConversionException( Messages + .getString( "unable.to.write.target.pom", e.getMessage() ), e ); //$NON-NLS-1$ + } + } + else + { + // v3 POM + StringReader stringReader = new StringReader( contents ); + StringWriter writer = null; + try + { + org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader v3Reader = new org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader(); + org.apache.maven.model.v3_0_0.Model v3Model = v3Reader.read( stringReader ); + + if ( doRelocation( artifact, v3Model, targetRepository, transaction ) ) + { + Artifact relocatedPom = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact + .getArtifactId(), artifact.getVersion() ); + targetFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( relocatedPom ) ); + } + + Model v4Model = translator.translate( v3Model ); + + translator.validateV4Basics( v4Model, v3Model.getGroupId(), v3Model.getArtifactId(), v3Model + .getVersion(), v3Model.getPackage() ); + + writer = new StringWriter(); + MavenXpp3Writer Xpp3Writer = new MavenXpp3Writer(); + Xpp3Writer.write( writer, v4Model ); + + transaction.createFile( writer.toString(), targetFile, digesters ); + + List warnings = translator.getWarnings(); + + for ( Iterator i = warnings.iterator(); i.hasNext(); ) + { + String message = (String) i.next(); + addWarning( artifact, message ); + } + } + catch ( XmlPullParserException e ) + { + addWarning( artifact, Messages.getString( "invalid.source.pom", e.getMessage() ) ); //$NON-NLS-1$ + result = false; + } + catch ( IOException e ) + { + throw new ArtifactConversionException( Messages.getString( "unable.to.write.converted.pom" ), e ); //$NON-NLS-1$ + } + catch ( PomTranslationException e ) + { + addWarning( artifact, Messages.getString( "invalid.source.pom", e.getMessage() ) ); //$NON-NLS-1$ + result = false; + } + finally + { + IOUtil.close( writer ); + } + } + } + else + { + addWarning( artifact, Messages.getString( "warning.missing.pom" ) ); //$NON-NLS-1$ + } + return result; + } + + private boolean testChecksums( Artifact artifact, File file ) + throws IOException + { + boolean result = true; + Iterator it = digesters.iterator(); + while ( it.hasNext() ) + { + Digester digester = (Digester) it.next(); + result &= verifyChecksum( file, file.getName() + "." + getDigesterFileExtension( digester ), digester, //$NON-NLS-1$ + artifact, "failure.incorrect." + getDigesterFileExtension( digester ) ); //$NON-NLS-1$ + } + return result; + } + + private boolean verifyChecksum( File file, String fileName, Digester digester, Artifact artifact, String key ) + throws IOException + { + boolean result = true; + + File checksumFile = new File( file.getParentFile(), fileName ); + if ( checksumFile.exists() ) + { + String checksum = AsciiFileUtil.readFile( checksumFile ); + try + { + digester.verify( file, checksum ); + } + catch ( DigesterException e ) + { + addWarning( artifact, Messages.getString( key ) ); + result = false; + } + } + return result; + } + + /** + * File extension for checksums + * TODO should be moved to plexus-digester ? + */ + private String getDigesterFileExtension( Digester digester ) + { + return digester.getAlgorithm().toLowerCase().replaceAll( "-", "" ); //$NON-NLS-1$ //$NON-NLS-2$ + } + + private boolean copyArtifact( Artifact artifact, ArtifactRepository targetRepository, FileTransaction transaction ) + throws ArtifactConversionException + { + File sourceFile = artifact.getFile(); + + if ( sourceFile.getAbsolutePath().indexOf( "/plugins/" ) > -1 ) //$NON-NLS-1$ + { + artifact.setArtifactHandler( artifactHandlerManager.getArtifactHandler( "maven-plugin" ) ); //$NON-NLS-1$ + } + + File targetFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) ); + + boolean result = true; + try + { + boolean matching = false; + if ( !force && targetFile.exists() ) + { + matching = FileUtils.contentEquals( sourceFile, targetFile ); + if ( !matching ) + { + addWarning( artifact, Messages.getString( "failure.target.already.exists" ) ); //$NON-NLS-1$ + result = false; + } + } + if ( result ) + { + if ( force || !matching ) + { + if ( testChecksums( artifact, sourceFile ) ) + { + transaction.copyFile( sourceFile, targetFile, digesters ); + } + else + { + result = false; + } + } + } + } + catch ( IOException e ) + { + throw new ArtifactConversionException( Messages.getString( "error.copying.artifact" ), e ); //$NON-NLS-1$ + } + return result; + } + + private Metadata createBaseMetadata( Artifact artifact ) + { + Metadata metadata = new Metadata(); + metadata.setArtifactId( artifact.getArtifactId() ); + metadata.setGroupId( artifact.getGroupId() ); + return metadata; + } + + private Metadata readMetadata( File file ) + throws ArtifactConversionException + { + Metadata metadata; + MetadataXpp3Reader reader = new MetadataXpp3Reader(); + FileReader fileReader = null; + try + { + fileReader = new FileReader( file ); + metadata = reader.read( fileReader ); + } + catch ( FileNotFoundException e ) + { + throw new ArtifactConversionException( Messages.getString( "error.reading.target.metadata" ), e ); //$NON-NLS-1$ + } + catch ( IOException e ) + { + throw new ArtifactConversionException( Messages.getString( "error.reading.target.metadata" ), e ); //$NON-NLS-1$ + } + catch ( XmlPullParserException e ) + { + throw new ArtifactConversionException( Messages.getString( "error.reading.target.metadata" ), e ); //$NON-NLS-1$ + } + finally + { + IOUtil.close( fileReader ); + } + return metadata; + } + + private boolean validateMetadata( Artifact artifact ) + throws ArtifactConversionException + { + ArtifactRepository repository = artifact.getRepository(); + + boolean result = true; + + RepositoryMetadata repositoryMetadata = new ArtifactRepositoryMetadata( artifact ); + File file = new File( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) ); + if ( file.exists() ) + { + Metadata metadata = readMetadata( file ); + result = validateMetadata( metadata, repositoryMetadata, artifact ); + } + + repositoryMetadata = new SnapshotArtifactRepositoryMetadata( artifact ); + file = new File( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) ); + if ( file.exists() ) + { + Metadata metadata = readMetadata( file ); + result = result && validateMetadata( metadata, repositoryMetadata, artifact ); + } + + return result; + } + + private boolean validateMetadata( Metadata metadata, RepositoryMetadata repositoryMetadata, Artifact artifact ) + { + String groupIdKey; + String artifactIdKey = null; + String snapshotKey = null; + String versionKey = null; + String versionsKey = null; + + if ( repositoryMetadata.storedInGroupDirectory() ) + { + groupIdKey = "failure.incorrect.groupMetadata.groupId"; //$NON-NLS-1$ + } + else if ( repositoryMetadata.storedInArtifactVersionDirectory() ) + { + groupIdKey = "failure.incorrect.snapshotMetadata.groupId"; //$NON-NLS-1$ + artifactIdKey = "failure.incorrect.snapshotMetadata.artifactId"; //$NON-NLS-1$ + versionKey = "failure.incorrect.snapshotMetadata.version"; //$NON-NLS-1$ + snapshotKey = "failure.incorrect.snapshotMetadata.snapshot"; //$NON-NLS-1$ + } + else + { + groupIdKey = "failure.incorrect.artifactMetadata.groupId"; //$NON-NLS-1$ + artifactIdKey = "failure.incorrect.artifactMetadata.artifactId"; //$NON-NLS-1$ + versionsKey = "failure.incorrect.artifactMetadata.versions"; //$NON-NLS-1$ + } + + boolean result = true; + + if ( metadata.getGroupId() == null || !metadata.getGroupId().equals( artifact.getGroupId() ) ) + { + addWarning( artifact, Messages.getString( groupIdKey ) ); + result = false; + } + if ( !repositoryMetadata.storedInGroupDirectory() ) + { + if ( metadata.getGroupId() == null || !metadata.getArtifactId().equals( artifact.getArtifactId() ) ) + { + addWarning( artifact, Messages.getString( artifactIdKey ) ); + result = false; + } + if ( !repositoryMetadata.storedInArtifactVersionDirectory() ) + { + // artifact metadata + + boolean foundVersion = false; + if ( metadata.getVersioning() != null ) + { + for ( Iterator i = metadata.getVersioning().getVersions().iterator(); i.hasNext() && !foundVersion; ) + { + String version = (String) i.next(); + if ( version.equals( artifact.getBaseVersion() ) ) + { + foundVersion = true; + } + } + } + + if ( !foundVersion ) + { + addWarning( artifact, Messages.getString( versionsKey ) ); + result = false; + } + } + else + { + // snapshot metadata + if ( !artifact.getBaseVersion().equals( metadata.getVersion() ) ) + { + addWarning( artifact, Messages.getString( versionKey ) ); + result = false; + } + + if ( artifact.isSnapshot() ) + { + Matcher matcher = Artifact.VERSION_FILE_PATTERN.matcher( artifact.getVersion() ); + if ( matcher.matches() ) + { + boolean correct = false; + if ( metadata.getVersioning() != null && metadata.getVersioning().getSnapshot() != null ) + { + Snapshot snapshot = metadata.getVersioning().getSnapshot(); + int build = Integer.valueOf( matcher.group( 3 ) ).intValue(); + String ts = matcher.group( 2 ); + if ( build == snapshot.getBuildNumber() && ts.equals( snapshot.getTimestamp() ) ) + { + correct = true; + } + } + + if ( !correct ) + { + addWarning( artifact, Messages.getString( snapshotKey ) ); + result = false; + } + } + } + } + } + return result; + } + + private void updateMetadata( RepositoryMetadata artifactMetadata, ArtifactRepository targetRepository, + Metadata newMetadata, FileTransaction transaction ) + throws ArtifactConversionException + { + File file = new File( targetRepository.getBasedir(), targetRepository + .pathOfRemoteRepositoryMetadata( artifactMetadata ) ); + + Metadata metadata; + boolean changed; + + if ( file.exists() ) + { + metadata = readMetadata( file ); + changed = metadata.merge( newMetadata ); + } + else + { + changed = true; + metadata = newMetadata; + } + + if ( changed ) + { + StringWriter writer = null; + try + { + writer = new StringWriter(); + + MetadataXpp3Writer mappingWriter = new MetadataXpp3Writer(); + + mappingWriter.write( writer, metadata ); + + transaction.createFile( writer.toString(), file, digesters ); + } + catch ( IOException e ) + { + throw new ArtifactConversionException( Messages.getString( "error.writing.target.metadata" ), e ); //$NON-NLS-1$ + } + finally + { + IOUtil.close( writer ); + } + } + } + + private boolean doRelocation( Artifact artifact, org.apache.maven.model.v3_0_0.Model v3Model, + ArtifactRepository repository, FileTransaction transaction ) + throws IOException + { + Properties properties = v3Model.getProperties(); + if ( properties.containsKey( "relocated.groupId" ) || properties.containsKey( "relocated.artifactId" ) //$NON-NLS-1$ //$NON-NLS-2$ + || properties.containsKey( "relocated.version" ) ) //$NON-NLS-1$ + { + String newGroupId = properties.getProperty( "relocated.groupId", v3Model.getGroupId() ); //$NON-NLS-1$ + properties.remove( "relocated.groupId" ); //$NON-NLS-1$ + + String newArtifactId = properties.getProperty( "relocated.artifactId", v3Model.getArtifactId() ); //$NON-NLS-1$ + properties.remove( "relocated.artifactId" ); //$NON-NLS-1$ + + String newVersion = properties.getProperty( "relocated.version", v3Model.getVersion() ); //$NON-NLS-1$ + properties.remove( "relocated.version" ); //$NON-NLS-1$ + + String message = properties.getProperty( "relocated.message", "" ); //$NON-NLS-1$ //$NON-NLS-2$ + properties.remove( "relocated.message" ); //$NON-NLS-1$ + + if ( properties.isEmpty() ) + { + v3Model.setProperties( null ); + } + + writeRelocationPom( v3Model.getGroupId(), v3Model.getArtifactId(), v3Model.getVersion(), newGroupId, + newArtifactId, newVersion, message, repository, transaction ); + + v3Model.setGroupId( newGroupId ); + v3Model.setArtifactId( newArtifactId ); + v3Model.setVersion( newVersion ); + + artifact.setGroupId( newGroupId ); + artifact.setArtifactId( newArtifactId ); + artifact.setVersion( newVersion ); + + return true; + } + else + { + return false; + } + } + + private void writeRelocationPom( String groupId, String artifactId, String version, String newGroupId, + String newArtifactId, String newVersion, String message, + ArtifactRepository repository, FileTransaction transaction ) + throws IOException + { + Model pom = new Model(); + pom.setGroupId( groupId ); + pom.setArtifactId( artifactId ); + pom.setVersion( version ); + + DistributionManagement dMngt = new DistributionManagement(); + + Relocation relocation = new Relocation(); + relocation.setGroupId( newGroupId ); + relocation.setArtifactId( newArtifactId ); + relocation.setVersion( newVersion ); + if ( message != null && message.length() > 0 ) + { + relocation.setMessage( message ); + } + + dMngt.setRelocation( relocation ); + + pom.setDistributionManagement( dMngt ); + + Artifact artifact = artifactFactory.createBuildArtifact( groupId, artifactId, version, "pom" ); //$NON-NLS-1$ + File pomFile = new File( repository.getBasedir(), repository.pathOf( artifact ) ); + + StringWriter strWriter = new StringWriter(); + MavenXpp3Writer pomWriter = new MavenXpp3Writer(); + pomWriter.write( strWriter, pom ); + + transaction.createFile( strWriter.toString(), pomFile, digesters ); + } + + private void addWarning( Artifact artifact, String message ) + { + List messages = (List) warnings.get( artifact ); + if ( messages == null ) + { + messages = new ArrayList(); + } + messages.add( message ); + warnings.put( artifact, messages ); + } + + public void clearWarnings() + { + warnings.clear(); + } + + public Map getWarnings() + { + return warnings; + } +} Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java?view=auto&rev=510627 ============================================================================== --- maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java (added) +++ maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java Thu Feb 22 11:07:37 2007 @@ -0,0 +1,71 @@ +package org.apache.maven.artifact.converter; + +/* + * 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 java.text.MessageFormat; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +/** + * Messages + * + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @version $Id$ + */ +public class Messages +{ + private static final String BUNDLE_NAME = "org.apache.maven.artifact.converter.messages"; //$NON-NLS-1$ + + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME ); + + private Messages() + { + } + + public static String getString( String key ) + { + try + { + return RESOURCE_BUNDLE.getString( key ); + } + catch ( MissingResourceException e ) + { + return '!' + key + '!'; + } + } + + public static String getString( String key, Object argument ) + { + return getString( key, new Object[] { argument } ); + } + + public static String getString( String key, Object arguments[] ) + { + try + { + String pattern = RESOURCE_BUNDLE.getString( key ); + return MessageFormat.format( pattern, arguments ); + } + catch ( MissingResourceException e ) + { + return '!' + key + '!'; + } + } +} Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/shared/trunk/maven-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties?view=auto&rev=510627 ============================================================================== --- maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties (added) +++ maven/shared/trunk/maven-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties Thu Feb 22 11:07:37 2007 @@ -0,0 +1,51 @@ +# +# 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. +# + +unable.to.validate.metadata=Unable to validate metadata +unable.to.copy.pom=Unable to copy pom. +unable.to.copy.artifact=Unable to copy artifact +unable.to.read.source.pom=Unable to read source POM: {0} +unable.to.write.target.pom=Unable to write target POM: {0} +unable.to.write.converted.pom=Unable to write converted POM + + +exception.repositories.match=Source repository of artifact, and target repository are the same. No conversion needed. +transaction.failure=Transaction failure: {0} +invalid.source.pom=Invalid source pom: {0} + +warning.missing.pom=The artifact had no POM in the source repository. + +error.copying.artifact=Error copying artifact +error.reading.target.metadata=Error reading target metadata +error.writing.target.metadata=Error writing target metadata + +failure.target.already.exists=The artifact could not be converted because it already exists. +failure.incorrect.groupMetadata.groupId=The group ID in the source group metadata is incorrect. + +failure.incorrect.artifactMetadata.artifactId=The artifact ID in the source artifact metadata is incorrect. +failure.incorrect.artifactMetadata.groupId=The group ID in the source artifact metadata is incorrect. +failure.incorrect.artifactMetadata.versions=The version list in the source artifact metadata is incorrect. + +failure.incorrect.snapshotMetadata.artifactId=The artifact ID in the source artifact version metadata is incorrect. +failure.incorrect.snapshotMetadata.groupId=The group ID in the source artifact version metadata is incorrect. +failure.incorrect.snapshotMetadata.version=The version in the source artifact version metadata is incorrect. +failure.incorrect.snapshotMetadata.snapshot=The snapshot information in the source artifact version metadata is incorrect. + +failure.incorrect.md5=The MD5 checksum value was incorrect. +failure.incorrect.sha1=The SHA1 checksum value was incorrect.