I am removing the defunct amx-api and amx-impl modules in their
entirety.
The following pom.xml changes are required:
llcMP:code llc$ svn diff tests/quicklook/adminconsole/pom.xml tests/
amx/pom.xml distributions packager/glassfish-amx/pom.xml admin/cli/
pom.xml common/pom.xml common/mbeanserver/pom.xml
Index: tests/quicklook/adminconsole/pom.xml
===================================================================
--- tests/quicklook/adminconsole/pom.xml (revision 28402)
+++ tests/quicklook/adminconsole/pom.xml (working copy)
@@ -117,8 +117,13 @@
</dependency>
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-api</artifactId>
+ <artifactId>amx-core</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.common</groupId>
+ <artifactId>amx-config</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Index: tests/amx/pom.xml
===================================================================
--- tests/amx/pom.xml (revision 28402)
+++ tests/amx/pom.xml (working copy)
@@ -122,17 +122,24 @@
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-api</artifactId>
+ <artifactId>amx-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-impl</artifactId>
+ <artifactId>amx-config</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.glassfish.common</groupId>
+ <artifactId>amx-j2ee</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!--
<dependency>
Index: distributions/distributions.xml
===================================================================
--- distributions/distributions.xml (revision 28402)
+++ distributions/distributions.xml (working copy)
@@ -303,19 +303,16 @@
<resolveArtifact artifactId="server-mgmt"
groupId="org.glassfish.admin" property="server-mgmt.jar"/>
<resolveArtifact artifactId="admin-util"
groupId="org.glassfish.admin" property="admin-util.jar"/>
<resolveArtifact artifactId="security"
groupId="org.glassfish.security" property="security.jar"/>
- <resolveArtifact artifactId="amx-api"
groupId="org.glassfish.common" property="amx-api.jar"/>
<echo message="cli-optional jar: ${cli-optional.jar}"/>
<echo message="server-mgmt jar: ${server-mgmt.jar}"/>
<echo message="admin-util jar: ${admin-util.jar}"/>
<echo message="security jar: ${security.jar}"/>
- <echo message="amx-api jar: ${amx-api.jar}"/>
<copy file="${cli-optional.jar}" tofile="${modules.dir}/cli-
optional.jar"/>
<copy file="${server-mgmt.jar}" tofile="${modules.dir}/server-
mgmt.jar"/>
<copy file="${admin-util.jar}" tofile="${modules.dir}/admin-
util.jar"/>
<copy file="${security.jar}" tofile="${modules.dir}/
security.jar"/>
- <copy file="${amx-api.jar}" tofile="${modules.dir}/amx-api.jar"/>
</target>
<!-- delete artifacts required to create default domain; these are
not bundled as part of nucleus -->
@@ -327,7 +324,6 @@
<include name="admin-util.jar"/>
<include name="security.jar"/>
<include name="backup.jar"/>
- <include name="amx-api.jar"/>
</fileset>
</delete>
</target>
Index: distributions/nucleus/pom.xml
===================================================================
--- distributions/nucleus/pom.xml (revision 28402)
+++ distributions/nucleus/pom.xml (working copy)
@@ -200,12 +200,6 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.glassfish.common</groupId>
- <artifactId>amx-api</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
<!-- additional servicetag registry dependency -->
<dependency>
<groupId>org.glassfish.registration</groupId>
Index: packager/glassfish-amx/pom.xml
===================================================================
--- packager/glassfish-amx/pom.xml (revision 28402)
+++ packager/glassfish-amx/pom.xml (working copy)
@@ -72,11 +72,6 @@
-->
<dependency>
<groupId>org.glassfish.common</groupId>
- <artifactId>amx-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.common</groupId>
<artifactId>amx-core-impl</artifactId>
<version>${project.version}</version>
</dependency>
Index: admin/cli/pom.xml
===================================================================
--- admin/cli/pom.xml (revision 28402)
+++ admin/cli/pom.xml (working copy)
@@ -135,7 +135,7 @@
<mainClass>com.sun.enterprise.admin.cli.AsadminMain</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>cli-framework.jar cli-optional.jar glassfish.jar
server-mgmt.jar common-util.jar admin-util.jar launcher.jar backup.jar
amx-api.jar stax-osgi.jar admin-cli-l10n.jar security.jar glassfish-
api.jar</Class-Path>
+ <Class-Path>cli-framework.jar cli-optional.jar glassfish.jar
server-mgmt.jar common-util.jar admin-util.jar launcher.jar backup.jar
stax-osgi.jar admin-cli-l10n.jar security.jar glassfish-api.jar</Class-
Path>
<!-- 5776: we do not need backup jar entry,
but I retain it, Kedar -->
</manifestEntries>
</archive>
Index: common/pom.xml
===================================================================
--- common/pom.xml (revision 28402)
+++ common/pom.xml (working copy)
@@ -62,8 +62,6 @@
<module>amx-ext-impl</module>
<module>mejb</module>
- <module>amx-api</module>
- <module>amx-impl</module>
<module>glassfish-ee-api</module>
<module>internal-api</module>
<module>annotation-framework</module>
Index: common/mbeanserver/pom.xml
===================================================================
--- common/mbeanserver/pom.xml (revision 28402)
+++ common/mbeanserver/pom.xml (working copy)
@@ -84,12 +84,5 @@
<artifactId>jmxremote_optional-repackaged</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.jvnet</groupId>
- <artifactId>tiger-types</artifactId>
- <version>RELEASE</version>
- </dependency>
- -->
</dependencies>
</project>
llcMP:code llc$
Lloyd Chambers
lloyd.chambers_at_sun.com
GlassFish Team