Commit 05c05f35 authored by Loïc Albertin's avatar Loïc Albertin
Browse files

#1032: Refactor Services APIs

  - refactor deployment plan dependencies
parent 5f5c4fa4
......@@ -466,17 +466,17 @@
</deploymentPlan>
<!-- jaxb-2.2 is loaded using a custom behavior (lib/bootstrap/bundles directory) -->
<!--<deploymentPlan>-->
<!--<name>spec-ee-jaxb-2.2</name>-->
<!--<includes>-->
<!--<include>spec-ee-stax</include>-->
<!--<include>spec-ee-activation</include>-->
<!--</includes>-->
<!--<artifactItems>-->
<!--<artifactItem>-->
<!--<groupId>org.ow2.spec.ee</groupId>-->
<!--<artifactId>ow2-jaxb-2.2-spec</artifactId>-->
<!--</artifactItem>-->
<!--</artifactItems>-->
<!--<name>spec-ee-jaxb-2.2</name>-->
<!--<includes>-->
<!--<include>spec-ee-stax</include>-->
<!--<include>spec-ee-activation</include>-->
<!--</includes>-->
<!--<artifactItems>-->
<!--<artifactItem>-->
<!--<groupId>org.ow2.spec.ee</groupId>-->
<!--<artifactId>ow2-jaxb-2.2-spec</artifactId>-->
<!--</artifactItem>-->
<!--</artifactItems>-->
<!--</deploymentPlan>-->
<deploymentPlan>
<name>spec-ee-jaxrpc</name>
......@@ -768,9 +768,22 @@
</artifactItems>
</deploymentPlan>
<deploymentPlan>
<name>jonas-services-api</name>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
<artifactId>jonas-services-api</artifactId>
</artifactItem>
</artifactItems>
</deploymentPlan>
<!-- Definition of the bundles for the 'audit system' deployment plan -->
<deploymentPlan>
<name>audit</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -808,6 +821,9 @@
<!-- Definition of the bundles for the 'jndi-interceptors' deployment plan -->
<deploymentPlan>
<name>jndi-interceptors</name>
<includes>
<include>jonas-services-api</include>
</includes>
<!--it needs following bundles (currently all in auto-deploy):
* util archive
* util deployment system
......@@ -838,6 +854,9 @@
<!-- Definition of the bundles for the 'resourcemonitor' deployment plan -->
<deploymentPlan>
<name>resourcemonitor</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -874,6 +893,9 @@
<!-- Definition of the bundles for the 'ejb21-container' deployment plan -->
<deploymentPlan>
<name>ejb21-container</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -908,6 +930,7 @@
<name>jotm</name>
<includes>
<include>spec-ee-jta</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -923,6 +946,7 @@
<name>trans-interceptors-iiop</name>
<includes>
<include>jotm</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -956,6 +980,9 @@
<!-- Definition of the bundles for the 'db' deployment plan -->
<deploymentPlan>
<name>db-base</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -968,6 +995,9 @@
<deploymentPlan>
<name>db-hsqldb</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -979,6 +1009,9 @@
<deploymentPlan>
<name>db-h2</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -992,6 +1025,9 @@
<!-- Definition of the bundles for the 'dbm' deployment plan -->
<deploymentPlan>
<name>dbm</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1006,6 +1042,7 @@
<name>mail</name>
<includes>
<include>spec-ee-javamail</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1019,6 +1056,9 @@
<!-- Definition of the bundles for the 'wm' deployment plan -->
<deploymentPlan>
<name>wm</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1031,6 +1071,9 @@
<!-- Definition of the bundles for the 'resource' deployment plan -->
<deploymentPlan>
<name>resource</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1043,6 +1086,9 @@
<!-- Definition of the bundles for the 'resource-adapters' deployment plan -->
<deploymentPlan>
<name>jdbc-resource-adapters</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1152,6 +1198,7 @@
<include>jgroups</include>
<include>ow2-util-common-impl</include>
<include>ow2-util-event-common-ejb</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1180,6 +1227,9 @@
<!-- Definition of the bundles for the 'versioning' deployment plan -->
<deploymentPlan>
<name>versioning</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1192,6 +1242,9 @@
<!-- Definition of the bundles for the 'multitenant' deployment plan -->
<deploymentPlan>
<name>multitenant</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1209,6 +1262,9 @@
<!-- Definition of the bundles for the 'generators-base' deployment plan -->
<deploymentPlan>
<name>generators-base</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1233,6 +1289,7 @@
<include>ow2-util-event-common-ejb</include>
<include>spec-ee-javamail</include>
<include>jndi-interceptors</include>
<include>jndi-interceptors</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1255,6 +1312,7 @@
<include>spec-ee-ejb</include>
<include>spec-ee-javamail</include>
<include>jndi-interceptors</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1418,6 +1476,7 @@
<name>jsf-mojarra20</name>
<includes>
<include>spec-ee-jsf</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1434,6 +1493,7 @@
<name>jsf-myfaces20</name>
<includes>
<include>spec-ee-jsf</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1450,6 +1510,7 @@
<name>web-base</name>
<includes>
<include>spec-ee-jsp</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1616,6 +1677,7 @@
<!-- mail is needed by neethi -->
<include>spec-ee-javamail</include>
<include>spec-ee-jws</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1660,6 +1722,7 @@
<!-- javamail needed by cxf-bundle -->
<include>spec-ee-javamail</include>
<include>spec-ee-stax</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1748,6 +1811,9 @@
<!-- Definition of the bundles for the 'jaxws-axis2' deployment plan -->
<deploymentPlan>
<name>jaxws-axis2</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1764,6 +1830,7 @@
<includes>
<include>saaj-ri</include>
<include>generators-base</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1808,6 +1875,7 @@
<name>jaxrpc-axis</name>
<includes>
<include>xmlbeans</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1829,6 +1897,7 @@
<name>ear</name>
<includes>
<include>generators-base</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1848,6 +1917,9 @@
<!-- Definition of the bundles for the 'discovery-base' deployment plan -->
<deploymentPlan>
<name>discovery-base</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1860,6 +1932,9 @@
<!-- Definition of the bundles for the 'discovery-internal' deployment plan -->
<deploymentPlan>
<name>discovery-multicast</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1874,6 +1949,7 @@
<name>discovery-jgroups</name>
<includes>
<include>jgroups</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1887,6 +1963,9 @@
<!-- Definition of the bundles for the 'smartclient' deployment plan -->
<deploymentPlan>
<name>smartclient</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......@@ -1913,6 +1992,7 @@
<name>wsdl-publisher</name>
<includes>
<include>spec-ee-jaxr</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -1929,7 +2009,7 @@
<name>joram-server</name>
<artifactItems>
<!-- ow2-util-substitution V1 still needed for joram a3-services -->
<artifactItem>
<artifactItem>
<groupId>org.ow2.bundles</groupId>
<artifactId>ow2-util-substitution</artifactId>
<version>${ow2-bundles-substitution.version}</version>
......@@ -1981,6 +2061,7 @@
<directory>deploy</directory>
<includes>
<include>joram-server</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -2024,6 +2105,7 @@
<name>cdi</name>
<includes>
<include>javassist</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -2044,6 +2126,7 @@
<name>jaxrs</name>
<includes>
<include>spec-ee-jaxrs</include>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
......@@ -2088,6 +2171,9 @@
<deploymentPlan>
<name>datasource</name>
<includes>
<include>jonas-services-api</include>
</includes>
<artifactItems>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
......
......@@ -49,6 +49,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.jonas</groupId>
<artifactId>jonas-services-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.util.log</groupId>
<artifactId>log-api</artifactId>
......
......@@ -2008,9 +2008,19 @@
<artifactId>jonas-deployment-api</artifactId>
<version>${project.version}</version>
</artifactItem>
<!--<artifactItem>-->
<!--<groupId>org.ow2.jonas</groupId>-->
<!--<artifactId>jonas-services-api</artifactId>-->
<!--<version>${project.version}</version>-->
<!--</artifactItem>-->
<artifactItem>
<groupId>org.ow2.jonas</groupId>
<artifactId>jonas-services-api</artifactId>
<artifactId>jonas-apis-services-core</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.jonas</groupId>
<artifactId>jonas-apis-services-versioning</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment