I'm removing all dependence on the old cli-framework package from
the admin CLI. Mostly that involved copying 8 classes from cli-framework
to the new admin cli package. The final piece is removing the dependency
from pom.xml; see below.
There's still a few other modules that seem to depend on cli-framework.
These should probably be cleaned up as well and we should stop building
the cli-framework module. I'll leave that to others to figure out.
Here's the other module pom.xml files that reference cli-framework
and should probably be cleaned up:
./connectors/admin/pom.xml: <artifactId>cli-framework</artifactId>
./extras/upgrade/upgrade-jar/pom.xml:
<Class-Path>kernel.jar admin-cli.jar cli-framework.jar stax-osgi.jar
admin-cli-l10n.jar javahelp-2.0.02.jar</Class-Path>
./extras/upgrade/upgrade-jar/pom.xml:
<artifactId>cli-framework</artifactId>
./jdbc/admin/pom.xml: <artifactId>cli-framework</artifactId>
./jms/admin/pom.xml: <artifactId>cli-framework</artifactId>
./web/admin/pom.xml: <artifactId>cli-framework</artifactId>
Anyway, let me know if you see any issues with the change below.
No, I don't know why the cli-optional pom.xml has a huge Class-Path
entry and the cli module doesn't.
Thanks.
Index: cli/pom.xml
===================================================================
--- cli/pom.xml (revision 30257)
+++ 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
stax-osgi.jar admin-cli-l10n.jar security.jar glassfish-api.jar</Class-Path>
+ <Class-Path>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>
@@ -192,11 +192,6 @@
</reporting>
<dependencies>
<dependency>
- <groupId>org.glassfish.admin</groupId>
- <artifactId>cli-framework</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish.core</groupId>
<artifactId>glassfish</artifactId>
<version>${project.parent.version}</version>
Index: cli-optional/pom.xml
===================================================================
--- cli-optional/pom.xml (revision 30257)
+++ cli-optional/pom.xml (working copy)
@@ -112,7 +112,7 @@
<archive>
<manifestEntries>
<!--<Class-Path>config-api.jar glassfish-api.jar
kernel.jar internal-api.jar hk2.jar hk2-core.jar config.jar auto-depends.jar
tiger-types-osgi.jar bean-validator.jar glassfish-api.jar grizzly-utils.jar
gmbal.jar glassfish.jar</Class-Path>-->
- <Class-Path>jsr311-api.jar jersey-gf-bundle.jar
amx-core-impl.jar amx-core.jar glassfish-api.jar hk2.jar hk2-corejar configjar
auto-dependsjar tiger-types-osgijar bean-validator.jar grizzly-utils.jar
gmbal.jar glassfish-mbeanserver.jar internal-api.jar config-api.jar
common-util.jar javax.servlet.jar grizzly-config.jar osgi-adapterjar
jmxremote_optional-repackaged.jar amx-config-impl.jar amx-config.jar
amx-ext-impl.jar kernel.jar grizzly-framework.jar grizzly-http.jar
grizzly-rcm.jar grizzly-portunif.jar deployment-common.jar
asm-all-repackaged.jar pkg-client.jar flashlight-framework.jar
flashlight-agent.jar management-api.jar security.jar dol.jar
javax.annotation.jar javax.transaction.jar javax.enterprise.deploy.jar
javax.persistence.jar javax.resource.jar annotation-framework.jar
javax.security.auth.message.jar javax.security.jacc.jar javax.ejb.jar
ejb-internal-api.jar connectors-internal-api.jar transaction-internal-api.jar
ldapbp-repackaged.jar grizzly-compat.jar grizzly-comet.jar grizzly-cometd.jar
grizzly-messagesbus.jar servlet-api-2.5.jar glassfish-extra-jre-packages.jar
api-exporter.jar glassfish.jar admin-cli.jar cli-framework.jar launcher.jar
branding.jar deployment-admin.jar deployment-autodeploy.jar glassfish-ee-api.jar
osgi-mainjar glassfish-corba-omgapi.jar container-common.jar
glassfish-naming.jar orb-connector.jar javax.mail.jar osgi-container.jar
grizzly-container.jar monitoring-core.jar stats77.jar deployment-client.jar
deployment-javaee-core.jar inmemory.jacc.provider.jar ant.jar jaxb-osgi.jar
jaxb-api-osgi.jar registration-api.jar registration-impl.jar
sysnet-registration-repackaged.jar commons-codec-repackaged.jar
glassfish-registration.jar cli-optional.jar server-mgmt.jar admin-util.jar
extra-jdk-packages.jar rest-service.jar gf-client.jar gf-client-module.jar
ejb-container.jar appclient.security.jar ejb.security.jar
glassfish-corba-csiv2-idl.jar glassfish-corba-orb.jar
glassfish-corba-orbgeneric.jar glassfish-corba-newtimer.jar
glassfish-corba-codegen.jar glassfish-corba-asm.jar orb-iiop.jar acc-config.jar
webservices.security.jar webservices-osgi.jar webservices-api-osgi.jar
websecurity.jar web-core.jar apache-commons.jar war-util.jar
javax.servlet.jsp.jar web-naming.jar jsr109-impl.jar web-glue.jar web-cli.jar
amx-j2ee.jar javax.management.j2ee.jar jsp-impl.jar jsp-api.jar el-api.jar
el-impl.jar admin-core.jar web-gui-plugin-common.jar grizzly-http-servlet.jar
work-management.jar connectors-inbound-runtime.jar connectors-runtime.jar
jts.jar jta.jar jms-core.jar javax.jms.jar org.eclipse.persistence.core.jar
org.eclipse.persistence.jpa.jar org.eclipse.persistence.oracle.jar
org.eclipse.persistence.antlr.jar org.eclipse.persistence.asm.jar
jpa-connector.jar persistence-common.jar appclient-connector.jar
appclient-server-core.jar cmp-utility.jar cmp-model.jar dbschema-repackaged.jar
cmp-generator-database.jar cmp-ejb-mapping.jar schema2beans-repackaged.jar
cmp-enhancer.jar cmp-support-sqlstore.jar antlr-repackaged.jar
cmp-support-ejb.jar gf-connectors-connector.jar connectors-admin.jar
glassfish-oracle-jdbc-driver-packages.jar jsf-api.jar jsf-impl.jar
jstl-connector.jar jstl-impl.jar jstl-api.jar javax.servlet.jsp.jstl.jar
jsf-connector.jar jspcaching-connector.jar gf-web-connector.jar web-ajp.jar
web-embed-api.jar web-embed-impl.jar jdbc-admin.jar console-plugin-service.jar
dataprovider.jar dataprovider.jar jsftemplating.jar console-common.jar
console-security-plugin.jar webui-jsf-suntheme.jar webui-jsf.jar
commons-fileupload.jar xml-apis.jar json.jar console-updatecenter-plugin.jar
console-community-branding-plugin.jar console-web-plugin.jar
console-jdbc-plugin.jar gf-ejb-connector.jar console-ejb-lite-plugin.jar
deployment-javaee-full.jar amx-j2ee-impl.jar mejb.jar console-jms-plugin.jar
jms-admin.jar console-ejb-plugin.jar console-corba-plugin.jar
webbeans-integration.jar webbeans-osgi-bundle.jar jsr299-api.jar
webbeans-api.jar webbeans-spi.jar jms.jar webbeans-core.jar webbeans-logging.jar
javassist.jar dom4j.jar gf-jruby-connector.jar grizzly-jruby-module.jar
grizzly-jruby.jar grizzly-scripting-common.jar</Class-Path>
+ <Class-Path>jsr311-api.jar jersey-gf-bundle.jar
amx-core-impl.jar amx-core.jar glassfish-api.jar hk2.jar hk2-corejar configjar
auto-dependsjar tiger-types-osgijar bean-validator.jar grizzly-utils.jar
gmbal.jar glassfish-mbeanserver.jar internal-api.jar config-api.jar
common-util.jar javax.servlet.jar grizzly-config.jar osgi-adapterjar
jmxremote_optional-repackaged.jar amx-config-impl.jar amx-config.jar
amx-ext-impl.jar kernel.jar grizzly-framework.jar grizzly-http.jar
grizzly-rcm.jar grizzly-portunif.jar deployment-common.jar
asm-all-repackaged.jar pkg-client.jar flashlight-framework.jar
flashlight-agent.jar management-api.jar security.jar dol.jar
javax.annotation.jar javax.transaction.jar javax.enterprise.deploy.jar
javax.persistence.jar javax.resource.jar annotation-framework.jar
javax.security.auth.message.jar javax.security.jacc.jar javax.ejb.jar
ejb-internal-api.jar connectors-internal-api.jar transaction-internal-api.jar
ldapbp-repackaged.jar grizzly-compat.jar grizzly-comet.jar grizzly-cometd.jar
grizzly-messagesbus.jar servlet-api-2.5.jar glassfish-extra-jre-packages.jar
api-exporter.jar glassfish.jar admin-cli.jar launcher.jar branding.jar
deployment-admin.jar deployment-autodeploy.jar glassfish-ee-api.jar osgi-mainjar
glassfish-corba-omgapi.jar container-common.jar glassfish-naming.jar
orb-connector.jar javax.mail.jar osgi-container.jar grizzly-container.jar
monitoring-core.jar stats77.jar deployment-client.jar deployment-javaee-core.jar
inmemory.jacc.provider.jar ant.jar jaxb-osgi.jar jaxb-api-osgi.jar
registration-api.jar registration-impl.jar sysnet-registration-repackaged.jar
commons-codec-repackaged.jar glassfish-registration.jar cli-optional.jar
server-mgmt.jar admin-util.jar extra-jdk-packages.jar rest-service.jar
gf-client.jar gf-client-module.jar ejb-container.jar appclient.security.jar
ejb.security.jar glassfish-corba-csiv2-idl.jar glassfish-corba-orb.jar
glassfish-corba-orbgeneric.jar glassfish-corba-newtimer.jar
glassfish-corba-codegen.jar glassfish-corba-asm.jar orb-iiop.jar acc-config.jar
webservices.security.jar webservices-osgi.jar webservices-api-osgi.jar
websecurity.jar web-core.jar apache-commons.jar war-util.jar
javax.servlet.jsp.jar web-naming.jar jsr109-impl.jar web-glue.jar web-cli.jar
amx-j2ee.jar javax.management.j2ee.jar jsp-impl.jar jsp-api.jar el-api.jar
el-impl.jar admin-core.jar web-gui-plugin-common.jar grizzly-http-servlet.jar
work-management.jar connectors-inbound-runtime.jar connectors-runtime.jar
jts.jar jta.jar jms-core.jar javax.jms.jar org.eclipse.persistence.core.jar
org.eclipse.persistence.jpa.jar org.eclipse.persistence.oracle.jar
org.eclipse.persistence.antlr.jar org.eclipse.persistence.asm.jar
jpa-connector.jar persistence-common.jar appclient-connector.jar
appclient-server-core.jar cmp-utility.jar cmp-model.jar dbschema-repackaged.jar
cmp-generator-database.jar cmp-ejb-mapping.jar schema2beans-repackaged.jar
cmp-enhancer.jar cmp-support-sqlstore.jar antlr-repackaged.jar
cmp-support-ejb.jar gf-connectors-connector.jar connectors-admin.jar
glassfish-oracle-jdbc-driver-packages.jar jsf-api.jar jsf-impl.jar
jstl-connector.jar jstl-impl.jar jstl-api.jar javax.servlet.jsp.jstl.jar
jsf-connector.jar jspcaching-connector.jar gf-web-connector.jar web-ajp.jar
web-embed-api.jar web-embed-impl.jar jdbc-admin.jar console-plugin-service.jar
dataprovider.jar dataprovider.jar jsftemplating.jar console-common.jar
console-security-plugin.jar webui-jsf-suntheme.jar webui-jsf.jar
commons-fileupload.jar xml-apis.jar json.jar console-updatecenter-plugin.jar
console-community-branding-plugin.jar console-web-plugin.jar
console-jdbc-plugin.jar gf-ejb-connector.jar console-ejb-lite-plugin.jar
deployment-javaee-full.jar amx-j2ee-impl.jar mejb.jar console-jms-plugin.jar
jms-admin.jar console-ejb-plugin.jar console-corba-plugin.jar
webbeans-integration.jar webbeans-osgi-bundle.jar jsr299-api.jar
webbeans-api.jar webbeans-spi.jar jms.jar webbeans-core.jar webbeans-logging.jar
javassist.jar dom4j.jar gf-jruby-connector.jar grizzly-jruby-module.jar
grizzly-jruby.jar grizzly-scripting-common.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
@@ -138,11 +138,6 @@
<dependencies>
<dependency>
<groupId>org.glassfish.admin</groupId>
- <artifactId>cli-framework</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.admin</groupId>
<artifactId>admin-cli</artifactId>
<version>${project.parent.version}</version>
</dependency> <dependency>