Hi, I was trying to "ant package" the console stuff from cvs and ran into some errors using java 1.6. It seems like using import with a wildcard in some cases pulls in two classes with the same name. Here is a patch that replaces some of these problematic wildcards with explicit imports. I'm not really a java hacker so I'm not sure this is the best approach but it seems to make sense to me. Thanks, Jon
? src/com/netscape/management/client/console/versioninfo.properties Index: src/com/netscape/management/client/preferences/FilePreferenceManager.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/preferences/FilePreferenceManager.java,v retrieving revision 1.2 diff -p -u -9 -r1.2 FilePreferenceManager.java --- src/com/netscape/management/client/preferences/FilePreferenceManager.java 29 Nov 2005 18:37:01 -0000 1.2 +++ src/com/netscape/management/client/preferences/FilePreferenceManager.java 28 Sep 2007 23:23:28 -0000 @@ -14,19 +14,20 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ package com.netscape.management.client.preferences; import java.util.*; -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; import netscape.ldap.*; import com.netscape.management.client.console.*; import com.netscape.management.client.util.*; /** * A PreferenceManager that reads and stores preference * data from the file system (disk). * * @author ahakim@xxxxxxxxxxxx Index: src/com/netscape/management/client/security/CertRequestWizard.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertRequestWizard.java,v retrieving revision 1.3 diff -p -u -9 -r1.3 CertRequestWizard.java --- src/com/netscape/management/client/security/CertRequestWizard.java 8 Feb 2006 22:13:18 -0000 1.3 +++ src/com/netscape/management/client/security/CertRequestWizard.java 28 Sep 2007 23:23:28 -0000 @@ -19,19 +19,21 @@ * END COPYRIGHT BLOCK **/ package com.netscape.management.client.security; import java.awt.*; import java.awt.event.*; import java.util.*; import java.util.zip.*; import java.util.jar.*; import java.net.*; -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; +import java.io.InputStream; import javax.swing.*; import javax.swing.event.*; import com.netscape.management.client.console.*; import com.netscape.management.client.components.*; import com.netscape.management.client.util.ModalDialogUtil; import com.netscape.management.client.util.ResourceSet; import com.netscape.management.client.util.MultilineLabel; import com.netscape.management.client.util.GridBagUtil; import com.netscape.management.client.util.LocalJarClassLoader; Index: src/com/netscape/management/client/topology/DomainNode.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/DomainNode.java,v retrieving revision 1.1.1.1 diff -p -u -9 -r1.1.1.1 DomainNode.java --- src/com/netscape/management/client/topology/DomainNode.java 18 Jul 2005 00:34:18 -0000 1.1.1.1 +++ src/com/netscape/management/client/topology/DomainNode.java 28 Sep 2007 23:23:28 -0000 @@ -15,20 +15,19 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ package com.netscape.management.client.topology; import java.util.*; import java.net.*; -import java.io.*; -import java.awt.*; +import java.awt.Component; import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; import javax.swing.tree.*; import java.text.MessageFormat; import com.netscape.management.client.*; import com.netscape.management.client.util.*; import com.netscape.management.client.console.*; import com.netscape.management.nmclf.*; Index: src/com/netscape/management/client/topology/TopTopologyNode.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/TopTopologyNode.java,v retrieving revision 1.1.1.1 diff -p -u -9 -r1.1.1.1 TopTopologyNode.java --- src/com/netscape/management/client/topology/TopTopologyNode.java 18 Jul 2005 00:34:19 -0000 1.1.1.1 +++ src/com/netscape/management/client/topology/TopTopologyNode.java 28 Sep 2007 23:23:28 -0000 @@ -14,21 +14,18 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ package com.netscape.management.client.topology; import java.util.*; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; import javax.swing.tree.*; import com.netscape.management.client.*; import com.netscape.management.client.console.*; import com.netscape.management.client.util.*; import netscape.ldap.*; /** * Top Topology Node class Index: src/com/netscape/management/client/util/IndexDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/IndexDialog.java,v retrieving revision 1.1.1.1 diff -p -u -9 -r1.1.1.1 IndexDialog.java --- src/com/netscape/management/client/util/IndexDialog.java 18 Jul 2005 00:34:26 -0000 1.1.1.1 +++ src/com/netscape/management/client/util/IndexDialog.java 28 Sep 2007 23:23:29 -0000 @@ -16,19 +16,22 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ package com.netscape.management.client.util; import java.awt.*; import java.awt.event.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.StringReader; +import java.io.IOException; import java.util.*; import java.net.*; import java.text.*; import java.beans.*; import javax.swing.*; import javax.swing.event.*; import javax.swing.border.*; import javax.swing.text.*; import javax.swing.text.html.*;
-- Fedora-directory-devel mailing list Fedora-directory-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-directory-devel
