Skip to content

Commit

Permalink
Merge branch 'master' of github.com:forge/core
Browse files Browse the repository at this point in the history
  • Loading branch information
@agoncal
agoncal committed Mar 6, 2015
2 parents d2f15b5 + 4a46e93 commit 9255e45
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 24 deletions.
10 changes: 4 additions & 6 deletions .../main/java/org/jboss/forge/addon/maven/archetype/ArchetypeCatalogFactoryRegistryImpl.java
View file
Expand Up @@ -11,9 +11,7 @@
import java.net.URL;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -100,13 +98,13 @@ public void addArchetypeCatalogFactory(ArchetypeCatalogFactory factory)
@Override
public Iterable<ArchetypeCatalogFactory> getArchetypeCatalogFactories()
{
Set<ArchetypeCatalogFactory> result = new LinkedHashSet<>();
Map<String, ArchetypeCatalogFactory> result = new TreeMap<>();
for (ArchetypeCatalogFactory factory : services)
{
result.add(factory);
result.put(factory.getName(), factory);
}
result.addAll(factories.values());
return Collections.unmodifiableCollection(result);
result.putAll(factories);
return Collections.unmodifiableCollection(result.values());
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java
View file
Expand Up @@ -71,7 +71,7 @@ public void setUp()
public void tearDown()
{
if (project != null)
project.getRootDirectory().delete(true);
project.getRoot().reify(DirectoryResource.class).delete(true);
}

@Test
Expand All @@ -86,7 +86,7 @@ public void testWebResourceFacet()
public void testDefaultWebappFolder() throws Exception
{
WebResourcesFacet facet = facetFactory.install(project, WebResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"src" + File.separator + "main" + File.separator + "webapp");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
}
Expand All @@ -95,9 +95,9 @@ public void testDefaultWebappFolder() throws Exception
public void testCustomWebappFolder() throws Exception
{
WebResourcesFacet facet = facetFactory.install(project, WebResourcesFacet.class);
MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);
pom.setContents("<project><modelVersion>4.0.0.</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><plugins><plugin><artifactId>maven-war-plugin</artifactId><version>2.4</version><configuration><warSourceDirectory>WebContent</warSourceDirectory><failOnMissingWebXml>false</failOnMissingWebXml></configuration></plugin></plugins></build></project>");
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"WebContent");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
}
Expand Down
16 changes: 16 additions & 0 deletions maven/tests/src/test/java/org/jboss/forge/addon/maven/archetype/ArchetypeRegistryTest.java
View file
Expand Up @@ -7,6 +7,9 @@

package org.jboss.forge.addon.maven.archetype;

import java.util.Iterator;
import java.util.List;

import javax.inject.Inject;

import org.apache.maven.archetype.catalog.Archetype;
Expand All @@ -17,6 +20,7 @@
import org.jboss.forge.arquillian.AddonDeployments;
import org.jboss.forge.arquillian.archive.AddonArchive;
import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
import org.jboss.forge.furnace.util.Lists;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.junit.Assert;
import org.junit.Test;
Expand Down Expand Up @@ -76,4 +80,16 @@ public void testHasArchetypeCatalogFactory()
{
Assert.assertTrue(archetypeRegistry.hasArchetypeCatalogFactories());
}

@Test
public void testDuplicateArchetypeCatalogs()
{
TestArchetypeCatalogFactory factory = new TestArchetypeCatalogFactory();
archetypeRegistry.addArchetypeCatalogFactory(factory);
Iterator<ArchetypeCatalogFactory> archetypeCatalogFactories = archetypeRegistry.getArchetypeCatalogFactories()
.iterator();
Assert.assertTrue(archetypeCatalogFactories.hasNext());
Assert.assertSame(factory, archetypeCatalogFactories.next());
Assert.assertFalse(archetypeCatalogFactories.hasNext());
}
}
20 changes: 10 additions & 10 deletions ...sts/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java
View file
Expand Up @@ -86,7 +86,7 @@ public void testResourceDirectoryNotNull() throws Exception
public void testDefaultResourceDirectory() throws Exception
{
ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"src" + File.separator + "main" + File.separator + "resources");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
}
Expand All @@ -95,20 +95,20 @@ public void testDefaultResourceDirectory() throws Exception
public void testDefaultTestResourceDirectory() throws Exception
{
ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"src" + File.separator + "test" + File.separator + "resources");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
}

@Test
public void testCustomResourceDirectory() throws Exception
{
MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);

pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><resources><resource><directory>foo</directory></resource></resources></build></project>");

ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"foo");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
}
Expand All @@ -117,26 +117,26 @@ public void testCustomResourceDirectory() throws Exception
@Ignore("https://issues.jboss.org/browse/FORGE-1218")
public void testCustomResourceDirectoryWithProperty() throws Exception
{
MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);

pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><resources><resource><directory>${project.basedir}"
+ File.separator + "foo</directory></resource></resources></build></project>");

ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"foo");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
}

@Test
public void testCustomTestSourceDirectory() throws Exception
{
MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);

pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><testResources><testResource><directory>foo</directory></testResource></testResources></build></project>");

ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"foo");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
}
Expand All @@ -145,13 +145,13 @@ public void testCustomTestSourceDirectory() throws Exception
@Ignore("https://issues.jboss.org/browse/FORGE-1218")
public void testCustomTestSourceDirectoryWithProperty() throws Exception
{
MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);

pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><testResources><testResource><directory>${project.basedir}"
+ File.separator + "foo</directory></testResource></testResources></build></project>");

ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"foo");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
}
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenWebResourceFacetTest.java
View file
Expand Up @@ -91,22 +91,22 @@ public void testWebResourceFolderNotNull() throws Exception
public void testDefaultWebResourceFolder() throws Exception
{
WebResourcesFacet facet = project.getFacet(WebResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory(
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
"src" + File.separator + "main" + File.separator + "webapp");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
}

@Test
public void testCustomWebResourceFolder() throws Exception
{
MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);

pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><plugins><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-war-plugin</artifactId><version>2.1-beta-1</version><configuration>"
+ "<warSourceDirectory>foo</warSourceDirectory>"
+ "</configuration></plugin></plugins></build></project>");

WebResourcesFacet facet = project.getFacet(WebResourcesFacet.class);
DirectoryResource expected = project.getRootDirectory().getChildDirectory("foo");
DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory("foo");
Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
}
}
1 change: 0 additions & 1 deletion ...mpl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java
View file
Expand Up @@ -114,7 +114,6 @@ public NavigationResult next(UINavigationContext context) throws Exception
attributeMap.put(ScaffoldGenerationContext.class, generationContext);

NavigationResult setupFlow = null;
Project project = getSelectedProject(uiContext);

// Verify if the selected provider is installed
// If not, add the setup flow and inform the generation step to setup the scaffold.
Expand Down

0 comments on commit 9255e45

Please sign in to comment.