From f4f0fecf2e0a236180cd70cbd303d99c3c3fc051 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Thu, 5 Sep 2013 01:41:56 -0300 Subject: [PATCH] FORGE-1162: META-INF/beans.xml for CDI 1.1 is now created correctly --- .../jboss/forge/addon/javaee/cdi/AbstractCDIFacetImpl.java | 6 ++++++ .../org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_0.java | 6 ------ .../org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_1.java | 6 ------ 3 files changed, 6 insertions(+), 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 index 6a50cf534a..515273c791 100644 --- 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 index 85bd542499..f46480a9d7 100644 --- 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 index c16766d9cd..78b8f7b038 100644 --- 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() {