You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2007/09/17 23:31:53 UTC
svn commit: r576593 - in /maven/sandbox/trunk/archetypeng:
archetype-creator/src/main/java/org/apache/maven/archetype/creator/
archetype-generator/src/main/java/org/apache/maven/archetype/generator/
Author: rafale
Date: Mon Sep 17 14:31:53 2007
New Revision: 576593
URL: http://svn.apache.org/viewvc?rev=576593&view=rev
Log:
fixed dir vs id in new modules
Modified:
maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
Modified: maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=576593&r1=576592&r2=576593&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java Mon Sep 17 14:31:53 2007
@@ -306,6 +306,7 @@
);
createPoms (pom, archetypeConfiguration.getProperty ( Constants.ARTIFACT_ID ),
+ archetypeConfiguration.getProperty ( Constants.ARTIFACT_ID ),
archetypeFilesDirectory, basedir,
pomReversedProperties, preserveCData, keepParent);
@@ -374,6 +375,7 @@
private void createModulePoms (
Properties pomReversedProperties,
+ String rootArtifactId,
String packageName,
File basedir,
File archetypeFilesDirectory,
@@ -395,6 +397,7 @@
createModulePoms (
pomReversedProperties,
+ rootArtifactId,
packageName,
FileUtils.resolveFile ( basedir, subModuleId ),
FileUtils.resolveFile ( archetypeFilesDirectory, subModuleId ),
@@ -404,6 +407,7 @@
}
createModulePom (
pom,
+ rootArtifactId,
archetypeFilesDirectory,
pomReversedProperties,
FileUtils.resolveFile ( basedir, Constants.ARCHETYPE_POM ),
@@ -414,7 +418,8 @@
restoreArtifactId ( pomReversedProperties, artifactId );
}
- private void createPoms ( Model pom, String artifactId, File archetypeFilesDirectory,
+ private void createPoms ( Model pom, String rootArtifactId,
+String artifactId, File archetypeFilesDirectory,
File basedir, Properties pomReversedProperties, boolean preserveCData,
boolean keepParent ) throws IOException, FileNotFoundException, XmlPullParserException
{
@@ -427,6 +432,7 @@
createModulePoms (
pomReversedProperties,
+ rootArtifactId,
moduleId,
FileUtils.resolveFile ( basedir, moduleId ),
FileUtils.resolveFile ( archetypeFilesDirectory, moduleId ),
@@ -689,6 +695,9 @@
pom.setArtifactId ( "${" + Constants.ARTIFACT_ID + "}" );
pom.setVersion ( "${" + Constants.VERSION + "}" );
//TODO: other behaviour should be enforced -> usage of submodules references in deps and depMan or maybe plugins
+
+// rewriteReferences(pom);
+
pomManager.writePom ( pom, outputFile, initialPomFile );
}
@@ -934,6 +943,7 @@
private void createModulePom (
Model pom,
+ String rootArtifactId,
File archetypeFilesDirectory,
Properties pomReversedProperties,
File initialPomFile,
@@ -964,10 +974,7 @@
}
else
{
- if (pom.getParent() != null &&
- pom.getParent().getArtifactId().equals(
- pomReversedProperties.getProperty (Constants.PARENT_ARTIFACT_ID))
- )
+ if (pom.getParent() != null )
{
pom.getParent().setGroupId (
StringUtils.replace(
@@ -975,7 +982,11 @@
pomReversedProperties.getProperty (Constants.GROUP_ID),
"${" + Constants.GROUP_ID + "}")
);
- pom.getParent().setArtifactId ( "${" + Constants.PARENT_ARTIFACT_ID + "}" );
+ if ( pom.getParent().getArtifactId () != null &&
+ pom.getParent().getArtifactId ().indexOf(rootArtifactId) >= 0 )
+ {
+ pom.getParent().setArtifactId ( StringUtils.replace( pom.getParent().getArtifactId (), rootArtifactId, "${rootArtifactId}" ) );
+ }
pom.getParent().setVersion ( "${" + Constants.VERSION + "}" );
}
pom.setModules ( null );
@@ -994,6 +1005,8 @@
{
pom.setVersion ( "${" + Constants.VERSION + "}" );
}
+
+// rewriteReferences(pom);
pomManager.writePom ( pom, outputFile, initialPomFile );
}
Modified: maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java?rev=576593&r1=576592&r2=576593&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java Mon Sep 17 14:31:53 2007
@@ -211,6 +211,8 @@
}
else
{
+ context.put("rootArtifactId", artifactId);
+
processFilesetModule (
artifactId,
artifactId,
@@ -501,7 +503,7 @@
context.put ( Constants.ARTIFACT_ID, StringUtils.replace( project.getId(), "${rootArtifactId}", rootArtifactId ) );
processFilesetModule (
rootArtifactId,
- artifactId,
+ StringUtils.replace( project.getDir(), "${rootArtifactId}", rootArtifactId),
archetypeResources,
new File ( moduleOutputDirectoryFile, Constants.ARCHETYPE_POM ),
archetypeZipFile,
@@ -519,7 +521,7 @@
private void processFilesetProject (
final AbstractArchetypeDescriptor archetypeDescriptor,
- final String artifactId,
+ final String moduleId,
final List archetypeResources,
final File pom,
final ZipFile archetypeZipFile,
@@ -544,7 +546,7 @@
pom,
moduleOffset,
basedirPom,
- artifactId
+ moduleId
);
}
else
@@ -612,7 +614,7 @@
File pom,
String moduleOffset,
File basedirPom,
- String artifactId
+ String moduleId
)
throws OutputFileExists,
FileNotFoundException,
@@ -634,9 +636,9 @@
/*if ( StringUtils.isEmpty ( moduleOffset ) )
{*/
- getLogger ().debug ( "Adding module " + artifactId );
-System.err.println ( "Adding module " + artifactId );
- pomManager.addModule ( basedirPom, artifactId );
+ getLogger ().debug ( "Adding module " + moduleId );
+System.err.println ( "Adding module " + moduleId );
+ pomManager.addModule ( basedirPom, moduleId );
pomManager.addParent ( pom, basedirPom );
//}
}