svn commit: r123512 - in incubator/beehive/trunk/netui: ant external/xdoclet src/bootstrap/org/apache/beehive/netui/tools

[ek...@apache.org]

Author: ekoneil
Date: Tue Dec 28 06:21:28 2004
New Revision: 123512

URL: http://svn.apache.org/viewcvs?view=rev&rev=123512
Log:
Upgrade the xjavadoc classes so that they handle some J2SE 5.0 features.

This xjavadoc-1.1-j5-v3.jar is a patch that came out of an XDoclet bug.  The BVTs seem t pass, so hopefully this will handle the new syntax well until a longer term solution can be completed.

BB: self
DRT: NetUI pass
BVT: NetUI pass (11 failures)


Added:
   incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.1-j5-v3.jar   (contents, props changed)
Removed:
   incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.0.jar
Modified:
   incubator/beehive/trunk/netui/ant/netui.properties
   incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java

Modified: incubator/beehive/trunk/netui/ant/netui.properties
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?view=diff&rev=123512&p1=incubator/beehive/trunk/netui/ant/netui.properties&r1=123511&p2=incubator/beehive/trunk/netui/ant/netui.properties&r2=123512
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties	(original)
+++ incubator/beehive/trunk/netui/ant/netui.properties	Tue Dec 28 06:21:28 2004
@@ -68,6 +68,7 @@
 jakarta-oro.jar=${struts.dir}/jakarta-oro.jar
 
 commons-el.jar=${build.external.dir}/commons-el/commons-el.jar
+apache-xml-resolver.jar=${external.dir}/apache-xml-resolver.jar
 
 #
 # JSF
@@ -92,7 +93,7 @@
 #
 xdoclet.jar=${xdoclet.dir}/xdoclet-1.2b4.jar
 xdoclet.web.module.jar=${xdoclet.dir}/xdoclet-web-module-1.2b4.jar
-xjavadoc.jar=${xdoclet.dir}/xjavadoc-1.0.jar
+xjavadoc.jar=${xdoclet.dir}/xjavadoc-1.1-j5-v3.jar
 
 #
 # Tomcat properties.  These JARs are used to compile the Tomcat 5x ServerAdapter.

Deleted: /incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.0.jar
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.0.jar?view=auto&rev=123511
==============================================================================

Added: incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.1-j5-v3.jar
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.1-j5-v3.jar?view=auto&rev=123512
==============================================================================
Binary file. No diff available.

Modified: incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java?view=diff&rev=123512&p1=incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java&r1=123511&p2=incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java&r2=123512
==============================================================================
--- incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java	(original)
+++ incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java	Tue Dec 28 06:21:28 2004
@@ -1,4 +1,4 @@
-/*
+    /*
  * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,6 @@
  */
 package org.apache.beehive.netui.tools;
 
-// java imports
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -27,22 +26,23 @@
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-// internal imports
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-// external imports
 import xdoclet.DocletSupport;
 import xdoclet.XDocletException;
 import xdoclet.XDocletMessages;
-import xdoclet.XDocletTagSupport;
 import xdoclet.tagshandler.AbstractProgramElementTagsHandler;
-import xdoclet.tagshandler.ConfigTagsHandler;
 import xdoclet.tagshandler.TypeTagsHandler;
 import xdoclet.util.Translator;
 import xdoclet.util.TypeConversionUtil;
 
-import xjavadoc.*;
+import xjavadoc.XTag;
+import xjavadoc.XProgramElement;
+import xjavadoc.XMethod;
+import xjavadoc.XClass;
+import xjavadoc.XMember;
+
 
 /**
  *
@@ -54,8 +54,6 @@
     private static final Log logger = LogFactory.getLog(NetUITldTagsHandler.class);
     private static final boolean DEBUG = true; //logger.isDebugEnabled();
 
-    private static final String NETUI_TAG = "netui:tag";
-    private static final String NETUI_TLDX_TAG = "netui.tldx:tag";
     private static final String NETUI_ATTRIBUTE = "netui:attribute";
     private static final String NETUI_TLDX_ATTRIBUTE = "netui.tldx:attribute";
 
@@ -190,10 +188,9 @@
         //System.out.println("packageName: " + packageName);
 
         Collection classes = getAllClasses();
-        ClassIterator ci = XCollections.classIterator(classes);
-        
+
         // sort alphabetically
-        Iterator i = sort(ci);
+        Iterator i = sort(classes.iterator());
         while(i.hasNext())
         {
             XClass currentClass = (XClass)i.next();
@@ -481,7 +478,7 @@
             }
         };
 
-    private Iterator sort(ClassIterator iterator)
+    private Iterator sort(Iterator iterator)
     {
         List sorted = new ArrayList();