FORGE-1162: META-INF/beans.xml for CDI 1.1 is now created correctly

forge · Sep 5, 2013 · f4f0fec · f4f0fec
1 parent 13f5d4f
commit f4f0fec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/AbstractCDIFacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/AbstractCDIFacetImpl.java
@@ -65,6 +65,12 @@ public boolean install()
       return super.install();
    }
 
+   @Override
+   public boolean isInstalled()
+   {
+      return getConfigFile().exists() && super.isInstalled();
+   }
+
    protected abstract String getInitialBeansXMLContent();
 
    @Override

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_0.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_0.java
@@ -51,12 +51,6 @@ public Version getSpecVersion()
       return new SingleVersion("1.0");
    }
 
-   @Override
-   public boolean isInstalled()
-   {
-      return getConfigFile().exists() && super.isInstalled();
-   }
-
    @Override
    protected String getInitialBeansXMLContent()
    {

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_1.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_1.java
@@ -48,12 +48,6 @@ public Version getSpecVersion()
       return new SingleVersion("1.1");
    }
 
-   @Override
-   public boolean isInstalled()
-   {
-      return super.isInstalled();
-   }
-
    @Override
    protected String getInitialBeansXMLContent()
    {