Author: brett
Date: Mon Jun 20 22:17:39 2005
New Revision: 191622
URL: http://svn.apache.org/viewcvs?rev=191622&view=rev
Log:
reformat and optimize imports
Modified:
maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Modified:
maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=191622&r1=191621&r2=191622&view=diff
==============================================================================
---
maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
(original)
+++
maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Mon Jun 20 22:17:39 2005
@@ -18,7 +18,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
@@ -27,14 +26,14 @@
import org.codehaus.plexus.util.IOUtil;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.FileOutputStream;
import java.util.Iterator;
-import java.util.Set;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
/**
* @author <a href="[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -163,9 +162,8 @@
Artifact artifact = (Artifact) iter.next();
if ( "jar".equals( artifact.getType() ) )
{
- Manifest.Attribute archExtNameAttr = new
Manifest.Attribute( artifact.getArtifactId() +
-
"-Extension-Name",
-
artifact.getArtifactId() );
+ Manifest.Attribute archExtNameAttr = new
Manifest.Attribute(
+ artifact.getArtifactId() + "-Extension-Name",
artifact.getArtifactId() );
m.addConfiguredAttribute( archExtNameAttr );
String name = artifact.getArtifactId() +
"-Implementation-Version";
Manifest.Attribute archImplVersionAttr = new
Manifest.Attribute( name, artifact.getVersion() );
@@ -218,8 +216,7 @@
String groupId = project.getGroupId();
String artifactId = project.getArtifactId();
-
-
+
File exportReadyPom = writeExportReadyPom( project );
archiver.addFile( exportReadyPom, "META-INF/maven/" + groupId + "/" +
artifactId + "/pom.xml" );
@@ -276,25 +273,26 @@
pomPropertiesFile.delete();
}
- private File writeExportReadyPom( MavenProject project ) throws IOException
+ private File writeExportReadyPom( MavenProject project )
+ throws IOException
{
String buildDirectory = project.getBuild().getDirectory();
-
+
File fullPom = new File( buildDirectory, "exported-pom.xml" );
-
+
FileWriter fWriter = null;
-
+
try
{
fWriter = new FileWriter( fullPom );
-
+
project.writeModel( fWriter );
}
finally
{
IOUtil.close( fWriter );
}
-
+
return fullPom;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]