From 670c8a591566f33470f79d66dfcf276dbf87713a Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@redhat.com>
Date: Mon, 23 Apr 2012 13:29:03 +0200
Subject: [PATCH 49/49] Added org.jboss.as.jaxrs module
---
build/build.xml | 82 ++++++++++++++++++++---------------------
build/pom.xml | 110 +++++++++++++++++++++++++++----------------------------
pom.xml | 2 +-
3 files changed, 97 insertions(+), 97 deletions(-)
diff --git a/build/build.xml b/build/build.xml
index df0a912..ea0e220 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -409,6 +409,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-embedded"/>
</module-def>
+ <module-def name="org.jboss.as.jaxrs">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jaxrs"/>
+ </module-def>
+
<module-def name="org.jboss.as.jmx">
<maven-resource group="org.jboss.as" artifact="jboss-as-jmx"/>
</module-def>
@@ -590,6 +594,43 @@
<maven-resource group="org.jboss.remotingjmx" artifact="remoting-jmx"/>
</module-def>
+ <module-def name="org.jboss.resteasy.resteasy-atom-provider">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-atom-provider" jandex="true"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-cdi">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-cdi"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-jackson-provider">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jackson-provider" jandex="true"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-jaxb-provider">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxb-provider" jandex="true"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-jettison-provider">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jettison-provider" jandex="true"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-jaxrs">
+ <maven-resource group="org.jboss.resteasy" artifact="async-http-servlet-3.0"/>
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxrs" jandex="true"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-jsapi">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jsapi" jandex="true"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-multipart-provider">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-multipart-provider" jandex="true"/>
+ </module-def>
+
+ <module-def name="org.jboss.resteasy.resteasy-yaml-provider">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-yaml-provider" jandex="true"/>
+ </module-def>
+
<module-def name="org.jboss.sasl">
<maven-resource group="org.jboss.sasl" artifact="jboss-sasl" />
</module-def>
@@ -952,10 +993,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-jaxr"/>
</module-def>
- <module-def name="org.jboss.as.jaxrs">
- <maven-resource group="org.jboss.as" artifact="jboss-as-jaxrs"/>
- </module-def>
-
<module-def name="org.jboss.as.jdr">
<maven-resource group="org.jboss.as" artifact="jboss-as-jdr"/>
<maven-resource group="org.jboss.as" artifact="jboss-as-sos"/>
@@ -1056,43 +1093,6 @@
<maven-resource group="org.jboss.osgi.vfs" artifact="jbosgi-vfs30"/>
</module-def>
- <module-def name="org.jboss.resteasy.resteasy-atom-provider">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-atom-provider" jandex="true"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-cdi">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-cdi"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-jackson-provider">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jackson-provider" jandex="true"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-jaxb-provider">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxb-provider" jandex="true"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-jettison-provider">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jettison-provider" jandex="true"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-jaxrs">
- <maven-resource group="org.jboss.resteasy" artifact="async-http-servlet-3.0"/>
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxrs" jandex="true"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-jsapi">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jsapi" jandex="true"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-multipart-provider">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-multipart-provider" jandex="true"/>
- </module-def>
-
- <module-def name="org.jboss.resteasy.resteasy-yaml-provider">
- <maven-resource group="org.jboss.resteasy" artifact="resteasy-yaml-provider" jandex="true"/>
- </module-def>
-
<module-def name="org.jboss.security.xacml">
<maven-resource group="org.jboss.security" artifact="jbossxacml"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
index 949bcf6..2acf0f9 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -309,6 +309,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-jaxrs</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
<artifactId>jboss-as-jmx</artifactId>
</dependency>
@@ -508,6 +513,56 @@
</dependency>
<dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>async-http-servlet-3.0</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-atom-provider</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-cdi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson-provider</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jettison-provider</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jsapi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-multipart-provider</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-yaml-provider</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-remote-naming</artifactId>
</dependency>
@@ -1197,11 +1252,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-jaxrs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.as</groupId>
<artifactId>jboss-as-jdr</artifactId>
</dependency>
@@ -1466,56 +1516,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>async-http-servlet-3.0</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-atom-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-cdi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jettison-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jsapi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-multipart-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-yaml-provider</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.sasl</groupId>
<artifactId>jboss-sasl</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index 05d2b5c..b540261 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,7 @@
<module>ee-deployment</module>
<module>ejb3</module>
<module>embedded</module>
+ <module>jaxrs</module>
<module>jmx</module>
<module>jpa</module>
<module>management-client-content</module>
@@ -5976,7 +5977,6 @@
<module>jacorb</module>
-->
<module>jaxr</module>
- <module>jaxrs</module>
<module>jdr</module>
<module>jsr77</module>
<module>messaging</module>
--
1.7.10