Anissa,
Great!
Let me know when this is in, and I'll remove amx-api and amx-impl from
the source tree.
Lloyd
On Jul 1, 2009, at 12:11 AM, Anissa Lam wrote:
>
> All the GUI code has been ported over to use AMX.v3. There is no
> longer dependency on amx-api. All the code changes has been
> committed, so the last thing is to remove the dependency in pom.xml.
>
> Here is the diff for all the pom file under v3/admingui.
> Please review.
>
> thanks
> Anissa.
>
> Index: updatecenter/pom.xml
> ===================================================================
> --- updatecenter/pom.xml (revision 28369)
> +++ updatecenter/pom.xml (working copy)
> @@ -89,11 +89,5 @@
> <version>${project.version}</version>
> <scope>provided</scope>
> </dependency>
> - <dependency>
> - <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-api</artifactId>
> - <version>${project.version}</version>
> - <scope>provided</scope>
> - </dependency>
> </dependencies>
> </project>
> Index: core/pom.xml
> ===================================================================
> --- core/pom.xml (revision 28369)
> +++ core/pom.xml (working copy)
> @@ -110,12 +110,6 @@
> <version>${project.version}</version>
> <scope>provided</scope>
> </dependency>
> - <dependency>
> - <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-api</artifactId>
> - <version>${project.version}</version>
> - <scope>provided</scope>
> - </dependency>
> <dependency>
> <groupId>org.glassfish.common</groupId>
> <artifactId>amx-core</artifactId>
> Index: common/pom.xml
> ===================================================================
> --- common/pom.xml (revision 28369)
> +++ common/pom.xml (working copy)
> @@ -112,12 +112,6 @@
> </dependency>
> <dependency>
> <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-api</artifactId>
> - <version>${project.version}</version>
> - <scope>provided</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.glassfish.common</groupId>
> <artifactId>amx-core</artifactId>
> <version>${project.version}</version>
> <scope>provided</scope>
> Index: war/pom.xml
> ===================================================================
> --- war/pom.xml (revision 28369)
> +++ war/pom.xml (working copy)
> @@ -58,7 +58,7 @@
> <archive>
> <manifestEntries>
> <Glassfish-require-
> services>org.glassfish.api.admingui.ConsoleProvider</Glassfish-
> require-services>
> - <HK2-Import-Bundles>org.glassfish.admingui.console-
> common,com.sun.enterprise.hk2,org.glassfish.admingui.console-plugin-
> service, org.glassfish.common.amx-api,
> org.glassfish.deployment.deployment-
> client,org.glassfish.registration.registration-
> api,org.glassfish.registration.registration-impl,
> org.glassfish.javax.servlet, org.glassfish.javax.servlet.jsp,
> com.sun.jsftemplating, org.glassfish.admingui.dataprovider,
> com.sun.pkg.client </HK2-Import-Bundles>
> + <HK2-Import-Bundles>org.glassfish.admingui.console-
> common,com.sun.enterprise.hk2,org.glassfish.admingui.console-plugin-
> service, org.glassfish.deployment.deployment-
> client,org.glassfish.registration.registration-
> api,org.glassfish.registration.registration-impl,
> org.glassfish.javax.servlet, org.glassfish.javax.servlet.jsp,
> com.sun.jsftemplating, org.glassfish.admingui.dataprovider,
> com.sun.pkg.client </HK2-Import-Bundles>
> </manifestEntries>
> </archive>
> </configuration>
> @@ -116,7 +116,7 @@
> <archive>
> <manifestEntries>
> <Glassfish-require-
> services>org.glassfish.api.admingui.ConsoleProvider</Glassfish-
> require-services>
> - <HK2-Import-Bundles>org.glassfish.admingui.console-
> common,com.sun.enterprise.hk2,org.glassfish.admingui.console-plugin-
> service, org.glassfish.common.amx-api,
> org.glassfish.deployment.deployment-
> client,org.glassfish.registration.registration-
> api,org.glassfish.registration.registration-impl,
> org.glassfish.javax.servlet, org.glassfish.javax.servlet.jsp,
> com.sun.jsftemplating,
> org.glassfish.admingui.dataprovider,com.sun.pkg.client</HK2-Import-
> Bundles>
> + <HK2-Import-Bundles>org.glassfish.admingui.console-
> common,com.sun.enterprise.hk2,org.glassfish.admingui.console-plugin-
> service, org.glassfish.deployment.deployment-
> client,org.glassfish.registration.registration-
> api,org.glassfish.registration.registration-impl,
> org.glassfish.javax.servlet, org.glassfish.javax.servlet.jsp,
> com.sun.jsftemplating,
> org.glassfish.admingui.dataprovider,com.sun.pkg.client</HK2-Import-
> Bundles>
> </manifestEntries>
> </archive>
> <webResources>
> Index: pom.xml
> ===================================================================
> --- pom.xml (revision 28369)
> +++ pom.xml (working copy)
> @@ -77,7 +77,7 @@
> </roles>
> </developer>
> </developers>
> -
> +
> <modules>
> <module>dataprovider</module>
> <module>plugin-service</module>
> @@ -216,11 +216,7 @@
> </dependencies>
>
> <properties>
> - <!--
> - We are defining these values here so we can support a range
> - of versions. Anything after these version numbers is supported.
> - -->
> - <amx-api.version>${project.version}</amx-api.version>
> +
> <!-- raih:During release first official release change the
> versions of the following to the current level and then release the
> comments
> <glassfish-api.version>10.0.0-rev8</glassfish-api.version>
> <hk2.version>0.3.8</hk2.version>
>
>
> Index: security/pom.xml
> ===================================================================
> --- security/pom.xml (revision 28369)
> +++ security/pom.xml (working copy)
> @@ -77,11 +77,20 @@
> </dependency>
> <dependency>
> <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-api</artifactId>
> + <artifactId>amx-core</artifactId>
> <version>${project.version}</version>
> <scope>provided</scope>
> </dependency>
> +
> <dependency>
> + <groupId>org.glassfish.common</groupId>
> + <artifactId>amx-config</artifactId>
> + <version>${project.version}</version>
> + <scope>provided</scope>
> + </dependency>
> +
> +
> + <dependency>
> <groupId>org.glassfish.admingui</groupId>
> <artifactId>console-plugin-service</artifactId>
> <version>${project.version}</version>
> Index: web/pom.xml
> ===================================================================
> --- web/pom.xml (revision 28369)
> +++ web/pom.xml (working copy)
> @@ -103,12 +103,6 @@
> </dependency>
> <dependency>
> <groupId>org.glassfish.common</groupId>
> - <artifactId>amx-api</artifactId>
> - <version>${project.version}</version>
> - <scope>provided</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.glassfish.common</groupId>
> <artifactId>amx-config</artifactId>
> <version>${project.version}</version>
> <scope>provided</scope>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
Lloyd Chambers
lloyd.chambers_at_sun.com
GlassFish Team