Author: hboutemy
Date: Sun Apr 11 09:52:52 2010
New Revision: 932858
URL: http://svn.apache.org/viewvc?rev=932858&view=rev
Log:
[ARCHETYPE-293] added POM schema reference to generated pom.xml, and improved
general pom formatting
Added:
maven/archetype/trunk/archetype-common/src/main/resources/org/
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
(with props)
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java?rev=932858&r1=932857&r2=932858&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
Sun Apr 11 09:52:52 2010
@@ -133,7 +133,7 @@ public class MavenJDOMWriter
XMLOutputter outputter = new XMLOutputter();
outputter.setFormat(
- Format.getPrettyFormat().setIndent( " " ).setLineSeparator(
+ Format.getPrettyFormat().setIndent( " " ).setLineSeparator(
System.getProperty( "line.separator" )
)
);
@@ -399,7 +399,7 @@ public class MavenJDOMWriter
String starter = lineSeparator;
for ( int i = 0; i < counter.getDepth(); i++ )
{
- starter = starter + " "; // TODO make settable?
+ starter = starter + " "; // TODO make settable?
}
lastText = factory.text( starter );
}
@@ -409,7 +409,7 @@ public class MavenJDOMWriter
finalText.setText(
finalText.getText().substring(
0,
- finalText.getText().length() - " ".length()
+ finalText.getText().length() - " ".length()
)
);
parent.addContent( contentIndex, finalText );
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=932858&r1=932857&r2=932858&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Sun Apr 11 09:52:52 2010
@@ -63,6 +63,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.ArrayList;
@@ -346,6 +347,20 @@ public class FilesetArchetypeCreator
archetypePomFile.getParentFile().mkdirs();
+ InputStream in = null;
+ OutputStream out = null;
+ try
+ {
+ in = FilesetArchetypeCreator.class.getResourceAsStream(
"pom-prototype.xml" );
+ out = new FileOutputStream( archetypePomFile );
+ IOUtil.copy( in, out );
+ }
+ finally
+ {
+ IOUtil.close( in );
+ IOUtil.close( out );
+ }
+
pomManager.writePom( model, archetypePomFile, archetypePomFile );
return archetypePomFile;
Added:
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml?rev=932858&view=auto
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
(added)
+++
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
Sun Apr 11 09:52:52 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId></groupId>
+ <artifactId></artifactId>
+ <version></version>
+ <packaging>maven-archetype</packaging>
+
+ <name></name>
+
+ <build>
+ <extensions>
+ </extensions>
+
+ <plugins>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
