Replaced Shrinkwrap Descriptors for Forge Descriptors

forge · Sep 20, 2013 · fa620c4 · fa620c4
1 parent 94c641a
commit fa620c4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/javaee/api/pom.xml b/javaee/api/pom.xml
@@ -35,8 +35,8 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-         <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
+         <groupId>org.jboss.forge.descriptors</groupId>
+         <artifactId>javaee-descriptors-api</artifactId>
       </dependency>
 
       <!-- Spec JARs -->

diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacet.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacet.java
@@ -8,6 +8,8 @@
 
 import java.util.List;
 
+import javax.management.Descriptor;
+
 import org.jboss.forge.addon.facets.constraints.FacetConstraint;
 import org.jboss.forge.addon.facets.constraints.FacetConstraintType;
 import org.jboss.forge.addon.facets.constraints.FacetConstraints;
@@ -17,13 +19,15 @@
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.resource.ResourceFilter;
+import org.jboss.shrinkwrap.descriptor.api.webapp.WebAppCommonDescriptor;
 
 /**
  * If installed, this {@link Project} supports features from the Servlet specification.
  * 
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
  */
+@SuppressWarnings("rawtypes")
 @FacetConstraints({
          @FacetConstraint(value = WebResourcesFacet.class, type = FacetConstraintType.REQUIRED)
 })
@@ -44,4 +48,10 @@ public interface ServletFacet extends JavaEEFacet
     * Return a reference to this {@link Project}'s web.xml file.
     */
    public FileResource<?> getConfigFile();
+
+   /**
+    * Return the {@link Descriptor} of the specification for which this facet represents.
+    */
+   WebAppCommonDescriptor getConfig();
+
 }
diff --git a/javaee/impl/pom.xml b/javaee/impl/pom.xml
@@ -16,8 +16,8 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-         <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+         <groupId>org.jboss.forge.descriptors</groupId>
+         <artifactId>javaee-descriptors</artifactId>
       </dependency>
 
       <dependency>

diff --git a/javaee/pom.xml b/javaee/pom.xml
@@ -22,7 +22,7 @@
    </modules>
 
    <properties>
-      <shrinkwrap.descriptors.version>3.0.0-alpha-1-SNAPSHOT</shrinkwrap.descriptors.version>
+      <javaee.descriptors.version>0.0.1-SNAPSHOT</javaee.descriptors.version>
    </properties>
 
    <dependencyManagement>
@@ -75,11 +75,14 @@
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-            <artifactId>shrinkwrap-descriptors-bom</artifactId>
-            <version>${shrinkwrap.descriptors.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
+            <groupId>org.jboss.forge.descriptors</groupId>
+            <artifactId>javaee-descriptors-api</artifactId>
+            <version>${javaee.descriptors.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.forge.descriptors</groupId>
+            <artifactId>javaee-descriptors</artifactId>
+            <version>${javaee.descriptors.version}</version>
          </dependency>
       </dependencies>
    </dependencyManagement>