Merge branch '2.0' of github.com:forge/core into 2.0

forge · Apr 26, 2013 · e6d1047 · e6d1047
2 parents 7e69726 + b6d7a04
commit e6d1047
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/addons/src/main/java/org/jboss/forge/addons/AddonProjectFactory.java b/addons/src/main/java/org/jboss/forge/addons/AddonProjectFactory.java
@@ -70,20 +70,21 @@ public Project createAddonProject(Project project, Version forgeVersion, Iterabl
       project.getFacet(PackagingFacet.class).setPackagingType("pom");
       MetadataFacet metadata = project.getFacet(MetadataFacet.class);
       // TODO: Verify nomenclature
-      metadata.setProjectName(metadata.getProjectName() + "-parent");
+      String projectName = metadata.getProjectName();
+      metadata.setProjectName(projectName + "-parent");
       project.getProjectRoot().getChild("src").delete(true);
       installSelectedAddons(project, dependencyAddons, true);
 
       // Create ADDON Project
-      createSubmoduleProject(project, "addon", ForgeAddonFacet.class);
+      createSubmoduleProject(project, "addon", projectName, ForgeAddonFacet.class);
       // Create API Project
-      createSubmoduleProject(project, "api", ForgeAddonAPIFacet.class);
+      createSubmoduleProject(project, "api", projectName + "-api", ForgeAddonAPIFacet.class);
       // Create IMPL Project
-      createSubmoduleProject(project, "impl", ForgeAddonImplFacet.class);
+      createSubmoduleProject(project, "impl", projectName + "-impl", ForgeAddonImplFacet.class);
       // Create SPI Project
-      createSubmoduleProject(project, "spi", ForgeAddonSPIFacet.class);
+      createSubmoduleProject(project, "spi", projectName + "-spi", ForgeAddonSPIFacet.class);
       // Create TESTS Project
-      createSubmoduleProject(project, "tests", ForgeAddonTestFacet.class);
+      createSubmoduleProject(project, "tests", projectName + "-tests", ForgeAddonTestFacet.class);
       return project;
    }
 
@@ -117,7 +118,7 @@ private void installSelectedAddons(final Project project, Iterable<AddonId> addo
       }
    }
 
-   private Project createSubmoduleProject(final Project parent, String moduleName,
+   private Project createSubmoduleProject(final Project parent, String moduleName, String artifactId,
             Class<? extends ProjectFacet>... requiredProjectFacets)
    {
       DirectoryResource location = parent.getProjectRoot().getOrCreateChildDirectory(moduleName);
@@ -129,8 +130,7 @@ private Project createSubmoduleProject(final Project parent, String moduleName,
       Project project = projectFactory.createProject(location, facets);
 
       MetadataFacet metadata = project.getFacet(MetadataFacet.class);
-      MetadataFacet metadataParent = parent.getFacet(MetadataFacet.class);
-      metadata.setProjectName(metadataParent.getProjectName().replace("-parent", "") + "-" + moduleName);
+      metadata.setProjectName(artifactId);
       return project;
    }
 }