Rename Project.getProjectRoot() to Project.getRootDirectory()

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonBuildAndInstallCommand.java

@@ -67,7 +67,7 @@ public void initializeUI(UIBuilder builder) throws Exception
       project = getSelectedProject(builder.getUIContext());
       if (project != null)
       {
-         projectRoot.setDefaultValue(project.getProjectRoot());
+         projectRoot.setDefaultValue(project.getRootDirectory());
       }
       builder.add(projectRoot);
    }

addons/impl/src/main/java/org/jboss/forge/addon/addons/AddonProjectConfigurator.java

@@ -107,10 +107,10 @@ public void setupComplexAddonProject(Project project, Version forgeVersion, Iter
       MetadataFacet metadata = project.getFacet(MetadataFacet.class);
       String projectName = metadata.getProjectName();
       metadata.setProjectName(projectName + "-parent");
-      DirectoryResource newRoot = project.getProjectRoot().getParent().getChildDirectory(metadata.getProjectName());
+      DirectoryResource newRoot = project.getRootDirectory().getParent().getChildDirectory(metadata.getProjectName());
       // FORGE-877: there's an eclipse (not m2e) limitation that says if a project is located directly in the workspace
       // folder, then the imported project's name is always the same as the folder it is contained in.
-      if (newRoot.exists() || !project.getProjectRoot().renameTo(newRoot))
+      if (newRoot.exists() || !project.getRootDirectory().renameTo(newRoot))
       {
          log.warning("Could not rename project root");
       }
@@ -176,7 +176,7 @@ public void setupComplexAddonProject(Project project, Version forgeVersion, Iter
    private void generateReadme(Project project)
    {
       String readmeTemplate = Streams.toString(getClass().getResourceAsStream("README.asciidoc"));
-      FileResource<?> child = project.getProjectRoot().getChildOfType(FileResource.class, "README.asciidoc");
+      FileResource<?> child = project.getRootDirectory().getChildOfType(FileResource.class, "README.asciidoc");
 
       // TODO: Replace with template addon
       MetadataFacet metadata = project.getFacet(MetadataFacet.class);
@@ -209,7 +209,7 @@ private void installSelectedAddons(final Project project, Iterable<AddonId> addo
    private Project createSubmoduleProject(final Project parent, String moduleName, String artifactId,
             Class<? extends ProjectFacet>... requiredProjectFacets)
    {
-      DirectoryResource location = parent.getProjectRoot().getOrCreateChildDirectory(moduleName);
+      DirectoryResource location = parent.getRootDirectory().getOrCreateChildDirectory(moduleName);
 
       List<Class<? extends ProjectFacet>> facets = new ArrayList<Class<? extends ProjectFacet>>();
       facets.add(ResourcesFacet.class);

addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java

@@ -81,7 +81,7 @@ public static ForgeArchive getDeployment()
    public void testComplexAddonProject() throws FileNotFoundException, FacetNotFoundException
    {
       Project project = projectFactory.createTempProject();
-      project.getProjectRoot().deleteOnExit();
+      project.getRootDirectory().deleteOnExit();
 
       MetadataFacet metadataFacet = project.getFacet(MetadataFacet.class);
       metadataFacet.setProjectName("testproject");
@@ -95,7 +95,7 @@ public void testComplexAddonProject() throws FileNotFoundException, FacetNotFoun
       Assert.assertFalse(project.hasFacet(JavaSourceFacet.class));
       Assert.assertFalse(project.hasFacet(CDIFacet.class));
       Assert.assertFalse(project.hasFacet(ResourcesFacet.class));
-      DirectoryResource projectRoot = project.getProjectRoot();
+      DirectoryResource projectRoot = project.getRootDirectory();
 
       Assert.assertTrue("ADDON module is missing", projectRoot.getChild("addon").exists());
       Assert.assertTrue("API module is missing", projectRoot.getChild("api").exists());
@@ -149,7 +149,7 @@ public void testComplexAddonProject() throws FileNotFoundException, FacetNotFoun
        */
       Assert.assertNull(project.getFacet(MavenFacet.class).getModel().getParent());
 
-      Assert.assertFalse(project.getProjectRoot().getChild("src").exists());
+      Assert.assertFalse(project.getRootDirectory().getChild("src").exists());
       Assert.assertTrue(project.getFacet(DependencyFacet.class).hasDirectManagedDependency(
                DefaultFurnaceContainerAPIFacet.FURNACE_CONTAINER_API_DEPENDENCY));
       Assert.assertFalse(project.getFacet(DependencyFacet.class).hasDirectDependency(
@@ -316,16 +316,16 @@ public void testComplexAddonProject() throws FileNotFoundException, FacetNotFoun
       Assert.assertFalse(testsProject.getFacet(DependencyFacet.class).hasDirectDependency(
                DependencyBuilder.create("javax.annotation:jsr250-api:1.0")));
 
-      Assert.assertTrue(project.getProjectRoot().getChild("README.asciidoc").exists());
-      project.getProjectRoot().delete(true);
-      project.getProjectRoot().deleteOnExit();
+      Assert.assertTrue(project.getRootDirectory().getChild("README.asciidoc").exists());
+      project.getRootDirectory().delete(true);
+      project.getRootDirectory().deleteOnExit();
    }
 
    @Test
    public void testSimpleAddonProject() throws FileNotFoundException, FacetNotFoundException
    {
       Project project = projectFactory.createTempProject();
-      project.getProjectRoot().deleteOnExit();
+      project.getRootDirectory().deleteOnExit();
 
       MetadataFacet metadataFacet = project.getFacet(MetadataFacet.class);
       metadataFacet.setProjectName("testproject");
@@ -383,17 +383,17 @@ public void testSimpleAddonProject() throws FileNotFoundException, FacetNotFound
       Assert.assertFalse(project.getFacet(DependencyFacet.class).hasDirectDependency(
                DependencyBuilder.create("javax.annotation:jsr250-api:1.0")));
 
-      Assert.assertTrue(project.getProjectRoot().getChild("README.asciidoc").exists());
-      project.getProjectRoot().delete(true);
-      project.getProjectRoot().deleteOnExit();
+      Assert.assertTrue(project.getRootDirectory().getChild("README.asciidoc").exists());
+      project.getRootDirectory().delete(true);
+      project.getRootDirectory().deleteOnExit();
    }
 
    @Test
    @Ignore("FORGE-894")
    public void testDependencyResolution() throws FileNotFoundException, FacetNotFoundException
    {
       Project project = projectFactory.createTempProject();
-      project.getProjectRoot().deleteOnExit();
+      project.getRootDirectory().deleteOnExit();
 
       MetadataFacet metadataFacet = project.getFacet(MetadataFacet.class);
       metadataFacet.setProjectName("testproject");
@@ -403,7 +403,7 @@ public void testDependencyResolution() throws FileNotFoundException, FacetNotFou
       SingleVersion forgeVersion = new SingleVersion("2.0.0.Alpha3");
       configurator.setupComplexAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
 
-      DirectoryResource projectRoot = project.getProjectRoot();
+      DirectoryResource projectRoot = project.getRootDirectory();
 
       Assert.assertTrue("SPI module is missing", projectRoot.getChild("spi").exists());
       Assert.assertTrue("TESTS module is missing", projectRoot.getChild("tests").exists());

addons/tests/src/test/java/org/jboss/forge/addon/addons/FurnaceTestSetupCommandTest.java

@@ -72,7 +72,7 @@ public void testCreateTestClass() throws Exception
       Project project = projectFactory.createTempProject();
 
       CommandController controller = testHarness.createCommandController(NewFurnaceTestSetupCommand.class,
-               project.getProjectRoot());
+               project.getRootDirectory());
       controller.initialize();
       UISelectMany<AddonId> component = (UISelectMany<AddonId>) controller.getInputs().get("addonDependencies");
       controller.setValueFor("addonDependencies", component.getValueChoices());

addons/tests/src/test/java/org/jboss/forge/addon/addons/NewAddonProjectAeshTest.java

@@ -93,7 +93,7 @@ public void testContainerInjection() throws Exception
 
       Assert.assertNotNull(project);
 
-      Assert.assertTrue(project.getProjectRoot().exists());
+      Assert.assertTrue(project.getRootDirectory().exists());
 
       // TODO Wizard steps are not implemented by Aesh, so we can't actually invoke the entire wizard.
 

addons/tests/src/test/java/org/jboss/forge/addon/addons/NewFurnaceTestCommandTest.java

@@ -84,7 +84,7 @@ public void testCreateTestClass() throws Exception
       facetFactory.install(project, AddonTestFacet.class);
 
       CommandController controller = testHarness.createCommandController(NewFurnaceTestCommand.class,
-               project.getProjectRoot());
+               project.getRootDirectory());
       controller.initialize();
       controller.setValueFor("named", "MyTestCase");
       controller.setValueFor("packageName", "org.jboss.forge.test");

configuration/impl/src/main/java/org/jboss/forge/addon/configuration/ConfigurationFacetImpl.java

@@ -53,7 +53,7 @@ public boolean uninstall()
    @Override
    public FileResource<?> getConfigLocation()
    {
-      return getFaceted().getProjectRoot().getChild(CONFIGURATION_FILE).reify(FileResource.class);
+      return getFaceted().getRootDirectory().getChild(CONFIGURATION_FILE).reify(FileResource.class);
    }
 
    @Override

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/CDIFacetTest.java

@@ -93,7 +93,7 @@ public void testCDIFacet1_1OnlyInProject() throws Exception
       Project project = projectFactory.createTempProject();
       facetFactory.install(project, CDIFacet_1_1.class);
       projectFactory.invalidateCaches();      
-      project = projectFactory.findProject(project.getProjectRoot());
+      project = projectFactory.findProject(project.getRootDirectory());
       Assert.assertTrue(project.hasFacet(CDIFacet_1_1.class));
       Assert.assertFalse(project.hasFacet(CDIFacet_1_0.class));
    }
@@ -104,7 +104,7 @@ public void testCDIFacet1_0OnlyInProject() throws Exception
       Project project = projectFactory.createTempProject();
       facetFactory.install(project, CDIFacet_1_0.class);
       projectFactory.invalidateCaches();      
-      project = projectFactory.findProject(project.getProjectRoot());
+      project = projectFactory.findProject(project.getRootDirectory());
       Assert.assertTrue(project.hasFacet(CDIFacet_1_0.class));
       Assert.assertFalse(project.hasFacet(CDIFacet_1_1.class));
    }

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/BeansCommandsTest.java

@@ -74,7 +74,7 @@ public void testListAlternatives_1_1() throws Exception
       config.getOrCreateAlternatives().clazz("org.myclazz.MyAlternative");
       cdiFacet.saveConfig(config);
 
-      shellTest.execute("cd " + project.getProjectRoot().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
+      shellTest.execute("cd " + project.getRootDirectory().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
       shellTest.execute("cdi-list-alternatives", 5, TimeUnit.SECONDS);
       Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString("org.myclazz.MyAlternative"));
    }
@@ -88,7 +88,7 @@ public void testListAlternatives_1_0() throws Exception
       config.getOrCreateAlternatives().clazz("org.myclazz.MyAlternative");
       cdiFacet.saveConfig(config);
 
-      shellTest.execute("cd " + project.getProjectRoot().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
+      shellTest.execute("cd " + project.getRootDirectory().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
       shellTest.execute("cdi-list-alternatives", 5, TimeUnit.SECONDS);
       Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString("org.myclazz.MyAlternative"));
    }
@@ -102,7 +102,7 @@ public void testListDecorators_1_1() throws Exception
       config.getOrCreateDecorators().clazz("org.myclazz.MyDecorator");
       cdiFacet.saveConfig(config);
 
-      shellTest.execute("cd " + project.getProjectRoot().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
+      shellTest.execute("cd " + project.getRootDirectory().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
       shellTest.execute("cdi-list-decorators", 5, TimeUnit.SECONDS);
       Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString("org.myclazz.MyDecorator"));
    }
@@ -116,7 +116,7 @@ public void testListDecorators_1_0() throws Exception
       config.getOrCreateDecorators().clazz("org.myclazz.MyDecorator");
       cdiFacet.saveConfig(config);
 
-      shellTest.execute("cd " + project.getProjectRoot().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
+      shellTest.execute("cd " + project.getRootDirectory().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
       shellTest.execute("cdi-list-decorators", 5, TimeUnit.SECONDS);
       Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString("org.myclazz.MyDecorator"));
    }
@@ -130,7 +130,7 @@ public void testListInterceptors_1_1() throws Exception
       config.getOrCreateInterceptors().clazz("org.myclazz.MyInterceptor");
       cdiFacet.saveConfig(config);
 
-      shellTest.execute("cd " + project.getProjectRoot().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
+      shellTest.execute("cd " + project.getRootDirectory().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
       shellTest.execute("cdi-list-interceptors", 5, TimeUnit.SECONDS);
       Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString("org.myclazz.MyInterceptor"));
    }
@@ -144,7 +144,7 @@ public void testListInterceptors_1_0() throws Exception
       config.getOrCreateInterceptors().clazz("org.myclazz.MyInterceptor");
       cdiFacet.saveConfig(config);
 
-      shellTest.execute("cd " + project.getProjectRoot().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
+      shellTest.execute("cd " + project.getRootDirectory().getFullyQualifiedName(), 5, TimeUnit.SECONDS);
       shellTest.execute("cdi-list-interceptors", 5, TimeUnit.SECONDS);
       Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString("org.myclazz.MyInterceptor"));
    }

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/ejb/NewEJBCommandTest.java

@@ -87,7 +87,7 @@ public void testCreateEJB() throws Exception
       Project project = projectHelper.createJavaLibraryProject();
       facetFactory.install(project, JavaSourceFacet.class);
       WizardCommandController controller = testHarness.createWizardController(NewEJBCommand.class,
-               project.getProjectRoot());
+               project.getRootDirectory());
       controller.initialize();
       controller.setValueFor("named", "TestEJB");
       controller.setValueFor("targetPackage", "org.jboss.forge.test");
@@ -112,7 +112,7 @@ public void testCreateMDB() throws Exception
       Project project = projectHelper.createJavaLibraryProject();
       facetFactory.install(project, JavaSourceFacet.class);
       WizardCommandController controller = testHarness.createWizardController(NewEJBCommand.class,
-               project.getProjectRoot());
+               project.getRootDirectory());
       controller.initialize();
       controller.setValueFor("named", "TestEJB");
       controller.setValueFor("type", EJBType.MESSAGEDRIVEN);
@@ -148,7 +148,7 @@ public void testSetTransactionAttributeOnEJB() throws Exception
       Project project = projectHelper.createJavaLibraryProject();
       facetFactory.install(project, JavaSourceFacet.class);
       WizardCommandController controller = testHarness.createWizardController(NewEJBCommand.class,
-               project.getProjectRoot());
+               project.getRootDirectory());
       controller.initialize();
       controller.setValueFor("named", "TestEJB");
       controller.setValueFor("type", EJBType.MESSAGEDRIVEN);
@@ -178,7 +178,7 @@ public void testSetTransactionAttributeOnEJB() throws Exception
       Assert.assertNotNull(((JavaClass) javaResource.getJavaSource()).getMethod("onMessage", Message.class));
 
       CommandController controller2 = testHarness.createCommandController(EJBSetClassTransactionAttributeCommand.class,
-               project.getProjectRoot());
+               project.getRootDirectory());
 
       controller2.initialize();
       Assert.assertFalse(controller2.canExecute());
@@ -195,7 +195,7 @@ public void testSetTransactionAttributeOnEJB() throws Exception
 
       CommandController controller3 = testHarness.createCommandController(
                EJBSetMethodTransactionAttributeCommand.class,
-               project.getProjectRoot());
+               project.getRootDirectory());
 
       controller3.initialize();
       Assert.assertFalse(controller3.canExecute());

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/faces/FacesOperationsTest.java

@@ -94,7 +94,7 @@ public void testCreateConverterInProject() throws Exception
       Assert.assertTrue(converter.exists());
 
       Assert.assertEquals("SampleConverter.java", converter.getName());
-      Resource<?> child = project.getProjectRoot().getChild("src/main/java/org/example/SampleConverter.java");
+      Resource<?> child = project.getRootDirectory().getChild("src/main/java/org/example/SampleConverter.java");
       Assert.assertTrue(child.exists());
       Assert.assertTrue(child instanceof JavaResource);
       Assert.assertEquals("SampleConverter", ((JavaResource) child).getJavaSource().getName());
@@ -124,7 +124,7 @@ public void testCreateValidatorInProject() throws Exception
       Assert.assertTrue(validator.exists());
 
       Assert.assertEquals("SampleValidator.java", validator.getName());
-      Resource<?> child = project.getProjectRoot().getChild("src/main/java/org/example/SampleValidator.java");
+      Resource<?> child = project.getRootDirectory().getChild("src/main/java/org/example/SampleValidator.java");
       Assert.assertTrue(child.exists());
       Assert.assertTrue(child instanceof JavaResource);
       Assert.assertEquals("SampleValidator", ((JavaResource) child).getJavaSource().getName());

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/faces/ui/setup/FacesSetupWizardTest.java

@@ -71,7 +71,7 @@ public void testSetupCreatesFacesConfigXML() throws Exception
       final Project project = projectFactory.createTempProject();
       facetFactory.install(project, ServletFacet_3_1.class);
       try (CommandController tester = testHarness.createCommandController(FacesSetupWizard.class,
-               project.getProjectRoot()))
+               project.getRootDirectory()))
       {
          tester.initialize();
          Assert.assertTrue(tester.isValid());

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/faces/ui/setup/ProjectStageCommandTest.java

@@ -72,7 +72,7 @@ public void testSetProjectStage() throws Exception
       FacesFacet_2_2 facesFacet = projectHelper.installFaces_2_2(project);
       Assert.assertEquals(ProjectStage.Production, facesFacet.getProjectStage());
       try (CommandController controller = testHarness.createCommandController(ProjectStageCommand.class,
-               project.getProjectRoot()))
+               project.getRootDirectory()))
       {
          controller.initialize();
          Assert.assertTrue(controller.isEnabled());

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/NewMappedSuperclassCommandTest.java

@@ -81,7 +81,7 @@ public void testCreateMappedSuperclass() throws Exception
       Project project = projectHelper.createJavaLibraryProject();
       facetFactory.install(project, JavaSourceFacet.class);
       try (CommandController controller = testHarness.createCommandController(NewMappedSuperclassCommand.class,
-               project.getProjectRoot()))
+               project.getRootDirectory()))
       {
          controller.initialize();
          controller.setValueFor("named", "CreditCardType");
@@ -104,7 +104,7 @@ public void testCreateMappedSuperclassDefaultPackage() throws Exception
       Project project = projectHelper.createJavaLibraryProject();
       facetFactory.install(project, JavaSourceFacet.class);
       try (CommandController controller = testHarness.createCommandController(NewMappedSuperclassCommand.class,
-               project.getProjectRoot()))
+               project.getRootDirectory()))
       {
          controller.initialize();
          controller.setValueFor("named", "CreditCardType");