Added Errai CDI Client test-jar dependency to the integration-test profile generation and upgraded to Forge 2.12.3-SNAPSHOT.

Author: ddadlani

.gitignore

@@ -1,5 +1,6 @@
 *.iml
-/.idea/*
+.idea/*
+*/.idea/*
 .classpath
 .project
 .settings

errai-forge-addon/pom.xml

@@ -8,11 +8,11 @@
   <version>3.1.0-SNAPSHOT</version>
   <name>Errai::Forge Addon</name>
   <properties>
-    <forge.api.version>2.5.0.Final</forge.api.version>
+    <forge.api.version>2.12.3-SNAPSHOT</forge.api.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <url>https://github.com/errai/forge-errai</url>
+  <url>https://github.com/errai/errai/tree/master/errai-forge-addon</url>
 
   <licenses>
     <license>
@@ -30,12 +30,15 @@
     <developer>
       <name>Max Barkley</name>
     </developer>
+    <developer>
+      <name>Divya Dadlani</name>
+    </developer>
   </developers>
 
   <scm>
-    <connection>scm:git:[email protected]:errai/forge-errai.git</connection>
-    <developerConnection>scm:git:[email protected]:errai/forge-errai.git</developerConnection>
-    <url>scm:git:[email protected]:errai/forge-errai.git</url>
+    <connection>scm:git:[email protected]:errai/errai.git</connection>
+    <developerConnection>scm:git:[email protected]:errai/errai.git</developerConnection>
+    <url>scm:git:[email protected]:errai/errai.git</url>
   </scm>
 
   <organization>
@@ -61,12 +64,14 @@
   </dependencyManagement>
 
   <dependencies>
+    <!-- Furnace container -->
     <dependency>
       <groupId>org.jboss.forge.furnace.container</groupId>
       <artifactId>cdi</artifactId>
       <classifier>forge-addon</classifier>
       <scope>provided</scope>
     </dependency>
+    <!-- Forge -->
     <dependency>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>configuration</artifactId>
@@ -88,6 +93,7 @@
     <dependency>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven</artifactId>
+      <!--<version>2.5.0.Final</version>-->
       <classifier>forge-addon</classifier>
       <scope>provided</scope>
     </dependency>
@@ -103,6 +109,13 @@
       <classifier>forge-addon</classifier>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>resources</artifactId>
+      <classifier>forge-addon</classifier>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Forge tests -->
     <dependency>
       <groupId>org.jboss.forge.furnace.test</groupId>
       <artifactId>furnace-test-harness</artifactId>
@@ -115,11 +128,12 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.forge.addon</groupId>
-      <artifactId>resources</artifactId>
-      <classifier>forge-addon</classifier>
+      <artifactId>maven-impl-projects</artifactId>
+      <version>2.12.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
+
   <repositories>
     <repository>
       <id>JBOSS_NEXUS</id>
@@ -141,7 +155,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
         <executions>
           <execution>
             <id>create-forge-addon</id>

errai-forge-addon/src/main/java/org/jboss/errai/forge/config/ProjectConfig.java

@@ -16,10 +16,6 @@
  */
 package org.jboss.errai.forge.config;
 
-import java.util.Arrays;
-
-import javax.inject.Inject;
-
 import org.jboss.errai.forge.config.converter.ConfigTypeConverter;
 import org.jboss.errai.forge.config.converter.ConfigTypeConverterFactory;
 import org.jboss.forge.addon.configuration.Configuration;
@@ -29,6 +25,9 @@
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
 
+import javax.inject.Inject;
+import java.util.Arrays;
+
 /**
  * A singleton class for accessing project-wide plugin settings.
  * 

errai-forge-addon/src/main/java/org/jboss/errai/forge/config/converter/ConfigTypeConverterFactory.java

@@ -1,10 +1,9 @@
 package org.jboss.errai.forge.config.converter;
 
+import javax.inject.Singleton;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Singleton;
-
 @Singleton
 public class ConfigTypeConverterFactory {
 

errai-forge-addon/src/main/java/org/jboss/errai/forge/constant/ArtifactVault.java

@@ -16,16 +16,11 @@
  */
 package org.jboss.errai.forge.constant;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import org.jboss.errai.forge.facet.base.AbstractBaseFacet;
 import org.jboss.forge.addon.dependencies.Dependency;
 
+import java.util.*;
+
 /**
  * @author Max Barkley <[email protected]>
  */
@@ -49,15 +44,18 @@ public static enum DependencyArtifact {
     GwtSlf4j("gwt-slf4j", "de.benediktmeurer.gwt-slf4j"),
     JavaxInject("javax.inject", "javax.inject"),
     CdiApi("cdi-api", "javax.enterprise"),
+    Jetty("jetty", "org.mortbay.jetty"),
+    JettyPlus("jetty-plus", "org.mortbay.jetty"),
+    JettyNaming("jetty-naming", "org.mortbay.jetty"),
     JsrApi("jsr250-api", "javax.annotation"),
     JavaxValidation("validation-api", "javax.validation"),
-    JavaxValidationSources("validation-api", "javax.validation", "sources"),
+    JavaxValidationSources("validation-api", "javax.validation", "sources", null),
     HibernateAnnotations("hibernate-commons-annotations", "org.hibernate.common"),
     HibernateJpa("hibernate-jpa-2.0-api", "org.hibernate.javax.persistence"),
     HibernateCore("hibernate-core", "org.hibernate"),
     HibernateEntityManager("hibernate-entitymanager", "org.hibernate"),
     HibernateValidator("hibernate-validator", "org.hibernate"),
-    HibernateValidatorSources("hibernate-validator", "org.hibernate", "sources"),
+    HibernateValidatorSources("hibernate-validator", "org.hibernate", "sources", null),
     JbossLogging("jboss-logging", "org.jboss.logging"),
     JaxrsApi("jaxrs-api", "org.jboss.resteasy"),
     JbossInterceptors("jboss-interceptors-api_1.1_spec", "org.jboss.spec.javax.interceptor"),
@@ -69,9 +67,8 @@ public static enum DependencyArtifact {
     WeldApi("weld-api", "org.jboss.weld"),
     WeldSpi("weld-spi", "org.jboss.weld"),
     XmlApis("xml-apis", "xml-apis"),
-    JettyNaming("jetty-naming", "org.mortbay.jetty"),
     RestEasyCdi("resteasy-cdi", "org.jboss.resteasy"),
-    
+
     // tests
     GwtMockito("gwtmockito", "com.google.gwt.gwtmockito"),
 
@@ -96,6 +93,7 @@ public static enum DependencyArtifact {
     ErraiTools("errai-tools"),
     ErraiBus("errai-bus"),
     ErraiCdiClient("errai-cdi-client"),
+    ErraiCdiClientTest("errai-cdi-client", "org.jboss.errai", null, "test-jar"),
     ErraiWeldIntegration("errai-weld-integration"),
     ErraiCdiJetty("errai-cdi-jetty"),
     ErraiCodegenGwt("errai-codegen-gwt"),
@@ -118,15 +116,17 @@ public static enum DependencyArtifact {
     private final String artifactId;
     private final String groupId;
     private final String classifier;
+    private final String type;
 
-    private DependencyArtifact(final String artifactId, final String groupId, final String classifier) {
+    private DependencyArtifact(final String artifactId, final String groupId, final String classifier, final String type) {
       this.artifactId = artifactId;
       this.groupId = groupId;
       this.classifier = classifier;
+      this.type = type;
     }
 
     private DependencyArtifact(final String artifactId, final String groupId) {
-      this(artifactId, groupId, null);
+      this(artifactId, groupId, null, null);
     }
 
     private DependencyArtifact(final String id) {
@@ -152,7 +152,18 @@ public String getGroupId() {
      */
     @Override
     public String toString() {
-      return String.format("%s:%s", groupId, artifactId);
+            return String.format("%s:%s", groupId, artifactId);
+//      StringBuilder artifactBuilder = new StringBuilder();
+//
+//      String plainArtifactString = new String(groupId + ":" + artifactId);
+//      artifactBuilder.append(plainArtifactString);
+//
+//      if (type != null) {
+//        artifactBuilder.append(":::");
+//        artifactBuilder.append(type);
+//      }
+//
+//      return artifactBuilder.toString();
     }
 
     private static Map<String, DependencyArtifact> artifacts = new HashMap<String, ArtifactVault.DependencyArtifact>();
@@ -174,6 +185,10 @@ public static DependencyArtifact valueOf(String groupId, String artifactId) {
     public String getClassifier() {
       return classifier;
     }
+
+    public String getType() {
+      return type;
+    }
   }
 
   /**

errai-forge-addon/src/main/java/org/jboss/errai/forge/facet/aggregate/AggregatorFacetReflections.java

@@ -16,14 +16,13 @@
  */
 package org.jboss.errai.forge.facet.aggregate;
 
+import org.jboss.forge.addon.configuration.Configuration;
+
+import javax.inject.Singleton;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.inject.Singleton;
-
-import org.jboss.forge.addon.configuration.Configuration;
-
 /**
  * A class for querying meta-data on of top-level aggregator facets.
  * 

errai-forge-addon/src/main/java/org/jboss/errai/forge/facet/aggregate/BaseAggregatorFacet.java

@@ -16,15 +16,6 @@
  */
 package org.jboss.errai.forge.facet.aggregate;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Set;
-
-import javax.inject.Inject;
-
 import org.jboss.errai.forge.config.ProjectConfig;
 import org.jboss.errai.forge.config.ProjectProperty;
 import org.jboss.errai.forge.config.SerializableSet;
@@ -36,6 +27,9 @@
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
 
+import javax.inject.Inject;
+import java.util.*;
+
 /**
  * Acts as top-level aggregator for pulling in other facet dependencies.
  * Concrete subclasses should be used to simplify the process of installing

errai-forge-addon/src/main/java/org/jboss/errai/forge/facet/aggregate/CoreFacet.java

@@ -16,24 +16,19 @@
  */
 package org.jboss.errai.forge.facet.aggregate;
 
-import javax.inject.Inject;
-
 import org.jboss.errai.forge.config.ProjectConfig;
 import org.jboss.errai.forge.config.ProjectProperty;
 import org.jboss.errai.forge.facet.base.CoreBuildFacet;
 import org.jboss.errai.forge.facet.dependency.ErraiBuildDependencyFacet;
 import org.jboss.errai.forge.facet.module.ModuleCoreFacet;
-import org.jboss.errai.forge.facet.plugin.CleanPluginFacet;
-import org.jboss.errai.forge.facet.plugin.CompilerPluginFacet;
-import org.jboss.errai.forge.facet.plugin.DependencyPluginFacet;
-import org.jboss.errai.forge.facet.plugin.GwtPluginFacet;
-import org.jboss.errai.forge.facet.plugin.WildflyPluginFacet;
-import org.jboss.errai.forge.facet.plugin.WarPluginFacet;
+import org.jboss.errai.forge.facet.plugin.*;
 import org.jboss.errai.forge.facet.resource.ErraiAppPropertiesFacet;
 import org.jboss.forge.addon.facets.FacetFactory;
 import org.jboss.forge.addon.facets.constraints.FacetConstraint;
 import org.jboss.forge.addon.projects.ProjectFacet;
 
+import javax.inject.Inject;
+
 /**
  * Aggregates core facets required by all other facet aggregators. Installing
  * this facet will add all the necessary dependencies, profile, and plugin

errai-forge-addon/src/main/java/org/jboss/errai/forge/facet/aggregate/ErraiUiFacet.java

@@ -17,7 +17,6 @@
 package org.jboss.errai.forge.facet.aggregate;
 
 import org.jboss.errai.forge.facet.dependency.ErraiDataBindingDependencyFacet;
-
 import org.jboss.errai.forge.facet.dependency.ErraiUiDependencyFacet;
 import org.jboss.errai.forge.facet.module.ErraiUiModuleFacet;
 import org.jboss.forge.addon.facets.constraints.FacetConstraint;

errai-forge-addon/src/main/java/org/jboss/errai/forge/facet/base/AbstractBaseFacet.java

@@ -16,8 +16,6 @@
  */
 package org.jboss.errai.forge.facet.base;
 
-import java.util.Collection;
-
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
@@ -33,6 +31,8 @@
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
 
+import java.util.Collection;
+
 /**
  * A base class for Errai-related facets providing some basic routines.
  * 

errai-forge-addon/src/main/java/org/jboss/errai/forge/facet/base/CoreBuildFacet.java

@@ -16,11 +16,6 @@
  */
 package org.jboss.errai.forge.facet.base;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Resource;
@@ -33,6 +28,11 @@
 import org.jboss.forge.addon.maven.projects.MavenFacet;
 import org.jboss.forge.addon.projects.Project;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
 /**
  * This facet configures the source folders, build output directory, and pom
  * properties for a project.

errai-forge-addon/src/main/java/org/jboss/errai/forge/facet/base/DependencyManagementFacet.java

@@ -16,11 +16,6 @@
  */
 package org.jboss.errai.forge.facet.base;
 
-import static org.jboss.errai.forge.config.ProjectProperty.ERRAI_VERSION;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.jboss.errai.forge.config.ProjectConfig;
 import org.jboss.errai.forge.constant.ArtifactVault.DependencyArtifact;
 import org.jboss.errai.forge.constant.PomPropertyVault.Property;
@@ -29,6 +24,11 @@
 import org.jboss.forge.addon.facets.constraints.FacetConstraint;
 import org.jboss.forge.addon.projects.facets.DependencyFacet;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import static org.jboss.errai.forge.config.ProjectProperty.ERRAI_VERSION;
+
 @FacetConstraint({ CoreBuildFacet.class, VersionFacet.class })
 public class DependencyManagementFacet extends AbstractBaseFacet {