I've moved the classes. Here's the build changes. I'll commit the
changes in the morning.
Index: jdbc/admin/pom.xml
===================================================================
--- jdbc/admin/pom.xml (revision 36466)
+++ jdbc/admin/pom.xml (working copy)
@@ -134,7 +134,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.admin</groupId>
- <artifactId>admin-cli</artifactId>
+ <artifactId>admin-util</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Index: admin/cli/osgi.bundle
===================================================================
--- admin/cli/osgi.bundle (revision 36467)
+++ admin/cli/osgi.bundle (working copy)
@@ -2,4 +2,4 @@
com.sun.enterprise.admin.cli; \
com.sun.enterprise.admin.cli.remote; \
com.sun.enterprise.admin.cli.schemadoc; \
- org.glassfish.admin.cli.resources;
version=${project.osgi.version}
+ version=${project.osgi.version}
Index: admin/cli/pom.xml
===================================================================
--- admin/cli/pom.xml (revision 36467)
+++ admin/cli/pom.xml (working copy)
@@ -234,11 +234,6 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.admin</groupId>
- <artifactId>config-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish.common</groupId>
<artifactId>glassfish-api</artifactId>
<version>${project.parent.version}</version>
Index: admin/util/osgi.bundle
===================================================================
--- admin/util/osgi.bundle (revision 36467)
+++ admin/util/osgi.bundle (working copy)
@@ -1,4 +1,5 @@
-exportcontents: \
+ org.glassfish.admin.cli.resources; \
com.sun.enterprise.admin.remote; \
com.sun.enterprise.admin.util; \
com.sun.enterprise.admin.util.jmx; \
Index: admin/util/pom.xml
===================================================================
--- admin/util/pom.xml (revision 36466)
+++ admin/util/pom.xml (working copy)
@@ -3,7 +3,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
-* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+* Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -84,5 +84,10 @@
<artifactId>common-util</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.admin</groupId>
+ <artifactId>config-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
</project>
Index: jms/admin/pom.xml
===================================================================
--- jms/admin/pom.xml (revision 36466)
+++ jms/admin/pom.xml (working copy)
@@ -135,7 +135,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.admin</groupId>
- <artifactId>admin-cli</artifactId>
+ <artifactId>admin-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Index: connectors/admin/pom.xml
===================================================================
--- connectors/admin/pom.xml (revision 36466)
+++ connectors/admin/pom.xml (working copy)
@@ -3,7 +3,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
-* Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+* Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.admin</groupId>
- <artifactId>admin-cli</artifactId>
+ <artifactId>admin-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>