Merged from origin 2.0

forge · Jun 21, 2013 · f7cf18e · f7cf18e
2 parents 6c54445 + 2da9ea3
commit f7cf18e
Show file tree

Hide file tree

Showing 80 changed files with 3,018 additions and 496 deletions.
diff --git a/addon-manager/example/pom.xml b/addon-manager/example/pom.xml
@@ -1,5 +1,4 @@
-<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">
+<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>
    <parent>
       <groupId>org.jboss.forge</groupId>

diff --git a/addon-manager/example2/pom.xml b/addon-manager/example2/pom.xml
@@ -1,5 +1,4 @@
-<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">
+<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>
    <parent>
       <groupId>org.jboss.forge</groupId>

diff --git a/addon-manager/impl/pom.xml b/addon-manager/impl/pom.xml
@@ -1,5 +1,4 @@
-<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">
+<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>
    <parent>
       <groupId>org.jboss.forge.addon</groupId>

diff --git a/addon-manager/pom.xml b/addon-manager/pom.xml
@@ -1,5 +1,4 @@
-<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">
+<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>
    <parent>
       <groupId>org.jboss.forge</groupId>

diff --git a/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java b/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java
@@ -56,7 +56,7 @@ public static ForgeArchive getDeployment()
    }
 
    @Inject
-   private AddonProjectConfigurator addonProjectFactory;
+   private AddonProjectConfigurator configurator;
 
    @Inject
    private ProjectFactory projectFactory;
@@ -65,13 +65,15 @@ public static ForgeArchive getDeployment()
    public void testCreateAddonProject()
    {
       Project project = projectFactory.createTempProject();
+      project.getProjectRoot().deleteOnExit();
+
       MetadataFacet metadataFacet = project.getFacet(MetadataFacet.class);
       metadataFacet.setProjectName("testproject");
       metadataFacet.setProjectVersion("1.0.0-SNAPSHOT");
       metadataFacet.setTopLevelPackage("com.acme.testproject");
 
       SingleVersion forgeVersion = new SingleVersion("2.0.0-SNAPSHOT");
-      addonProjectFactory.setupAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
+      configurator.setupAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
 
       DirectoryResource projectRoot = project.getProjectRoot();
 
@@ -234,19 +236,24 @@ public void testCreateAddonProject()
                ForgeContainerAPIFacet.FORGE_API_DEPENDENCY));
       Assert.assertTrue(testsProject.getFacet(DependencyFacet.class).hasEffectiveManagedDependency(
                ForgeContainerAPIFacet.FORGE_API_DEPENDENCY));
+
+      project.getProjectRoot().delete(true);
+      project.getProjectRoot().deleteOnExit();
    }
 
    @Test
    public void testSimpleAddonProject()
    {
       Project project = projectFactory.createTempProject();
+      project.getProjectRoot().deleteOnExit();
+
       MetadataFacet metadataFacet = project.getFacet(MetadataFacet.class);
       metadataFacet.setProjectName("testproject");
       metadataFacet.setProjectVersion("1.0.0-SNAPSHOT");
       metadataFacet.setTopLevelPackage("com.acme.testproject");
 
       SingleVersion forgeVersion = new SingleVersion("2.0.0-SNAPSHOT");
-      addonProjectFactory.setupSimpleAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
+      configurator.setupSimpleAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
 
       Assert.assertTrue(project.hasFacet(CDIFacet.class));
       Assert.assertTrue(project.hasFacet(JavaSourceFacet.class));
@@ -258,20 +265,25 @@ public void testSimpleAddonProject()
                ForgeContainerAPIFacet.FORGE_API_DEPENDENCY));
       Assert.assertTrue(project.getFacet(DependencyFacet.class).hasEffectiveManagedDependency(
                ForgeContainerAPIFacet.FORGE_API_DEPENDENCY));
+
+      project.getProjectRoot().delete(true);
+      project.getProjectRoot().deleteOnExit();
    }
 
    @Test
    @Ignore("FORGE-894")
    public void testDependencyResolution()
    {
       Project project = projectFactory.createTempProject();
+      project.getProjectRoot().deleteOnExit();
+
       MetadataFacet metadataFacet = project.getFacet(MetadataFacet.class);
       metadataFacet.setProjectName("testproject");
       metadataFacet.setProjectVersion("1.0.0-SNAPSHOT");
       metadataFacet.setTopLevelPackage("com.acme.testproject");
 
       SingleVersion forgeVersion = new SingleVersion("2.0.0.Alpha3");
-      addonProjectFactory.setupAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
+      configurator.setupAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
 
       DirectoryResource projectRoot = project.getProjectRoot();
 

diff --git a/configuration/addon/pom.xml b/configuration/addon/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>configuration-parent</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+   </parent>
+   <name>Forge - Configuration Addon</name>
+   <artifactId>configuration</artifactId>
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>configuration-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>configuration-impl</artifactId>
+         <scope>runtime</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>projects</artifactId>
+         <classifier>forge-addon</classifier>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>environment</artifactId>
+         <classifier>forge-addon</classifier>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>environment</artifactId>
+         <classifier>forge-addon</classifier>
+      </dependency>
+
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>create-forge-addon</id>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <classifier>forge-addon</classifier>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+</project>
diff --git a/configuration/addon/src/main/resources/META-INF/beans.xml b/configuration/addon/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
diff --git a/configuration/api/pom.xml b/configuration/api/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>configuration-parent</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+   </parent>
+   <artifactId>configuration-api</artifactId>
+   <name>Forge - Configuration API</name>
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+   </dependencies>
+</project>