Looks fine. Thanks.
On 8/11/11 2:08 PM, Peter Bower wrote:
>
> amx-config is being removed as part of the removal of AMX client
> proxies. Jane, can you review the following changes to pom.xml files?
>
> Index: appserver/tests/quicklook/adminconsole/pom.xml
> ===================================================================
> --- appserver/tests/quicklook/adminconsole/pom.xml (revision 48702)
> +++ appserver/tests/quicklook/adminconsole/pom.xml (working copy)
> @@ -127,10 +127,5 @@
> <artifactId>amx-core</artifactId>
> <version>3.2-SNAPSHOT</version>
> </dependency>
> - <dependency>
> - <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-config</artifactId>
> - <version>3.2-SNAPSHOT</version>
> - </dependency>
> </dependencies>
> </project>
> Index: appserver/tests/amx/pom.xml
> ===================================================================
> --- appserver/tests/amx/pom.xml (revision 48702)
> +++ appserver/tests/amx/pom.xml (working copy)
> @@ -134,13 +134,6 @@
>
> <dependency>
> <groupId>org.glassfish.common</groupId>
> - <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>
> Index: appserver/javadoc.xml
> ===================================================================
> --- appserver/javadoc.xml (revision 48702)
> +++ appserver/javadoc.xml (working copy)
> @@ -103,7 +103,6 @@
> <include name="external/org.osgi.core/**"/>
> <include name="common/glassfish-api/src/main/java/**"/>
> <include name="common/amx-core/src/main/java/**"/>
> - <include name="common/amx-config/src/main/java/**"/>
> <include name="common/amx-j2ee/src/main/java/**"/>
> <include name="web/web-embed/api/src/main/java/**"/>
> <include name="flashlight/framework/src/main/java/**"/>
> Index: appserver/packager/pom.xml
> ===================================================================
> --- appserver/packager/pom.xml (revision 48702)
> +++ 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,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,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>
> </properties>
>
> <modules>
> Index: appserver/packager/glassfish-common-tmp/build.xml
> ===================================================================
> --- appserver/packager/glassfish-common-tmp/build.xml (revision 48702)
> +++ appserver/packager/glassfish-common-tmp/build.xml (working copy)
> @@ -62,8 +62,6 @@
>
> <delete
> file="target/stage/${install.dir.name}/glassfish/modules/amx-core-impl.jar"
> failonerror="false" />
>
> - <delete
> file="target/stage/${install.dir.name}/glassfish/modules/amx-config.jar"
> failonerror="false" />
> -
> <delete
> file="target/stage/${install.dir.name}/glassfish/modules/amx-config-impl.jar"
> failonerror="false" />
>
> <delete
> file="target/stage/${install.dir.name}/glassfish/modules/amx-j2ee.jar"
> failonerror="false" />
> Index: appserver/common/amx-ext-impl/pom.xml
> ===================================================================
> --- appserver/common/amx-ext-impl/pom.xml (revision 48702)
> +++ appserver/common/amx-ext-impl/pom.xml (working copy)
> @@ -87,12 +87,6 @@
> </dependency>
>
> <dependency>
> - <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-config</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> -
> - <dependency>
> <groupId>org.glassfish.security</groupId>
> <artifactId>security</artifactId>
> <version>${project.version}</version>
> Index: appserver/common/amx-config-impl/pom.xml
> ===================================================================
> --- appserver/common/amx-config-impl/pom.xml (revision 48702)
> +++ appserver/common/amx-config-impl/pom.xml (working copy)
> @@ -70,12 +70,6 @@
> <dependencies>
> <dependency>
> <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-config</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.glassfish.common</groupId>
> <artifactId>amx-core-impl</artifactId>
> <version>${project.version}</version>
> </dependency>
>