Please review the pom.xml changes for splitting the amx-all module
into 2 parts, one in nucleus and one in appserver. This required the
following changes
- removed amx-all combiner module
- moved amx-core, amx-core-impl, amx-config-impl from appserver
to nucleus amx-core module
- removed amx-ext-impl module and moved into amx-core
- moved amx-j2ee module to amx-javaee module
- moved amx-j2ee-impl to amx-javaee module
- updates as required to reflect name changes
Thanks,
Peter
Index: appserver/tests/amx/pom.xml
===================================================================
--- appserver/tests/amx/pom.xml (revision 48850)
+++ appserver/tests/amx/pom.xml (working copy)
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-j2ee</artifactId>
+ <artifactId>amx-javaee</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Index: appserver/packager/pom.xml
===================================================================
--- appserver/packager/pom.xml (revision 48850)
+++ appserver/packager/pom.xml (working copy)
@@ -75,7 +75,7 @@
<properties>
<install.dir.name>glassfish3</install.dir.name>
<findbugs.skip>true</findbugs.skip>
-
<packager.artifact.excludes>stax-api,stax,junit,jtype,tiger-types,servlet-api,jstl-api,el-api,jsp-api,org.osgi.core,org.osgi.compendium,concurrent,amx-core,amx-core-impl,amx-config-impl,amx-j2ee,amx-j2ee-impl,amx-ext-impl,grizzly-utils,grizzly-lzma,gmbal-api-only,javax.servlet</packager.artifact.excludes>
+
<packager.artifact.excludes>stax-api,stax,junit,jtype,tiger-types,servlet-api,jstl-api,el-api,jsp-api,org.osgi.core,org.osgi.compendium,concurrent,grizzly-utils,grizzly-lzma,gmbal-api-only,javax.servlet</packager.artifact.excludes>
</properties>
<modules>
Index: appserver/packager/glassfish-common-tmp/pom.xml
===================================================================
--- appserver/packager/glassfish-common-tmp/pom.xml (revision
48850)
+++ appserver/packager/glassfish-common-tmp/pom.xml (working
copy)
@@ -121,10 +121,10 @@
<artifactId>monitoring-core</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- moving from glassfish-amx package -->
+ <!-- moving from glassfish-amx package -->
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-all</artifactId>
+ <artifactId>amx-javaee</artifactId>
<version>${project.version}</version>
</dependency>
Index: appserver/packager/glassfish-common-full/pom.xml
===================================================================
--- appserver/packager/glassfish-common-full/pom.xml (revision
48850)
+++ appserver/packager/glassfish-common-full/pom.xml (working
copy)
@@ -111,11 +111,16 @@
</dependency>
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-all</artifactId>
+ <artifactId>amx-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.common</groupId>
+ <artifactId>amx-javaee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.common</groupId>
<artifactId>mejb-frag</artifactId>
<version>${project.version}</version>
<type>distribution-fragment</type>
Index: appserver/web/admin/pom.xml
===================================================================
--- appserver/web/admin/pom.xml (revision 48850)
+++ appserver/web/admin/pom.xml (working copy)
@@ -197,7 +197,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-j2ee</artifactId>
+ <artifactId>amx-javaee</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
Index: appserver/common/amx-ext-impl/pom.xml (deleted)
===================================================================
Index: appserver/common/amx-config-impl/pom.xml (deleted)
===================================================================
Index: appserver/common/pom.xml
===================================================================
--- appserver/common/pom.xml (revision 48850)
+++ appserver/common/pom.xml (working copy)
@@ -56,13 +56,7 @@
<name>GlassFish Common modules</name>
<modules>
<module>stats77</module>
- <module>amx-core</module>
- <module>amx-core-impl</module>
- <module>amx-config-impl</module>
- <module>amx-j2ee</module>
- <module>amx-j2ee-impl</module>
- <module>amx-ext-impl</module>
- <module>amx-all</module>
+ <module>amx-javaee</module>
<module>mejb</module>
<module>mejb-frag</module>
<module>glassfish-ee-api</module>
Index: appserver/common/amx-all/pom.xml (deleted)
===================================================================
Index: appserver/common/amx-j2ee-impl/pom.xml (deleted)
===================================================================
Index: appserver/common/amx-j2ee/pom.xml (deleted)
===================================================================
Index: appserver/common/amx-core-impl/pom.xml (deleted)
===================================================================
Index: appserver/common/amx-core/pom.xml (deleted)
===================================================================
Index: appserver/common/amx-javaee/pom.xml
===================================================================
--- appserver/common/amx-javaee/pom.xml (revision 48849)
+++ appserver/common/amx-javaee/pom.xml (working copy)
@@ -50,9 +50,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>amx-j2ee</artifactId>
+ <artifactId>amx-javaee</artifactId>
<packaging>hk2-jar</packaging>
- <name>AMX V3 Java EE Management (JSR 77) API
</name>
+ <name>AMX V3 Java EE Management (JSR 77) API and
Implementation</name>
<developers>
<developer>
@@ -68,15 +68,22 @@
<dependencies>
<dependency>
+ <groupId>org.glassfish</groupId>
+
<artifactId>javax.management.j2ee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish.common</groupId>
<artifactId>amx-core</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
- <groupId>org.glassfish</groupId>
-
<artifactId>javax.management.j2ee</artifactId>
+ <groupId>org.glassfish.deployment</groupId>
+ <artifactId>dol</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Index: nucleus/common/pom.xml
===================================================================
--- nucleus/common/pom.xml (revision 48850)
+++ nucleus/common/pom.xml (working copy)
@@ -61,6 +61,7 @@
<module>glassfish-api</module>
<module>glassfish-naming</module>
<module>mbeanserver</module>
- <module>scattered-archive-api</module>
+ <module>scattered-archive-api</module>
+ <module>amx-core</module>
</modules>
</project>
Index: nucleus/common/amx-core/pom.xml
===================================================================
--- nucleus/common/amx-core/pom.xml (revision 48776)
+++ nucleus/common/amx-core/pom.xml (working copy)
@@ -45,7 +45,7 @@
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.glassfish.common</groupId>
- <artifactId>common</artifactId>
+ <artifactId>nucleus-common</artifactId>
<version>3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -72,5 +72,30 @@
<groupId>org.glassfish.external</groupId>
<artifactId>management-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.glassfish.common</groupId>
+ <artifactId>internal-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.common</groupId>
+
<artifactId>glassfish-mbeanserver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.core</groupId>
+ <artifactId>kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.security</groupId>
+ <artifactId>security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</project>
Index: nucleus/packager/pom.xml
===================================================================
--- nucleus/packager/pom.xml (revision 48850)
+++ nucleus/packager/pom.xml (working copy)
@@ -75,7 +75,7 @@
<properties>
<install.dir.name>nucleus</install.dir.name>
<findbugs.skip>true</findbugs.skip>
-
<packager.artifact.excludes>stax-api,stax,junit,jtype,tiger-types,servlet-api,jstl-api,el-api,jsp-api,org.osgi.core,org.osgi.compendium,concurrent,amx-core,amx-core-impl,amx-config-impl,amx-j2ee,amx-j2ee-impl,amx-ext-impl,grizzly-utils,grizzly-lzma,gmbal-api-only,javax.servlet</packager.artifact.excludes>
+
<packager.artifact.excludes>stax-api,stax,junit,jtype,tiger-types,servlet-api,jstl-api,el-api,jsp-api,org.osgi.core,org.osgi.compendium,concurrent,grizzly-utils,grizzly-lzma,gmbal-api-only,javax.servlet</packager.artifact.excludes>
</properties>
<modules>