ejtools-cvs — Mailing list for CVS

[Ejtools-cvs] applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form SearchForm.java,NONE,1.1 DetailForm.java,1.3,1.4 FilterForm.java,1.3,NONE

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form
In directory usw-pr-cvs1:/tmp/cvs-serv14005/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form

Modified Files:
	DetailForm.java 
Added Files:
	SearchForm.java 
Removed Files:
	FilterForm.java 
Log Message:
In progress

--- NEW FILE: SearchForm.java ---
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at www.gnu.org.
 */
package net.sourceforge.ejtools.jmxbrowser.web.form;

import javax.servlet.http.HttpServletRequest;

import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;

/**
 * Description of the Class
 *
 * @author    letiemble
 * @created   13 février 2002
 * @version   $Revision: 1.5 $
 * @todo      Javadoc to complete
 */
public class SearchForm extends ActionForm
{
   /** Description of the Field */
   protected String attribute = "";
   /** Description of the Field */
   protected String filter = "*:*";
   /** Description of the Field */
   protected String query = "";
   /** Description of the Field */
   protected String type = "java.lang.String";
   /** Description of the Field */
   protected String value = "";


   /** Constructor for the ConnectForm object */
   public SearchForm() { }


   /**
    * Gets the attribute attribute of the SearchForm object
    *
    * @return   The attribute value
    */
   public String getAttribute()
   {
      return attribute;
   }


   /**
    * Getter for the factory attribute
    *
    * @return   The value of factory attribute
    */
   public String getFilter()
   {
      return filter;
   }


   /**
    * Gets the query attribute of the SearchForm object
    *
    * @return   The query value
    */
   public String getQuery()
   {
      return query;
   }


   /**
    * Gets the type attribute of the SearchForm object
    *
    * @return   The type value
    */
   public String getType()
   {
      return type;
   }


   /**
    * Gets the value attribute of the SearchForm object
    *
    * @return   The value value
    */
   public String getValue()
   {
      return value;
   }


   /**
    * Description of the Method
    *
    * @param mapping  Description of Parameter
    * @param request  Description of Parameter
    */
   public void reset(ActionMapping mapping, HttpServletRequest request)
   {
      filter = "*:*";
   }


   /**
    * Sets the attribute attribute of the SearchForm object
    *
    * @param attribute  The new attribute value
    */
   public void setAttribute(String attribute)
   {
      this.attribute = attribute;
   }


   /**
    * Setter for the factory attribute
    *
    * @param filter  The new filter value
    */
   public void setFilter(String filter)
   {
      this.filter = filter;
   }


   /**
    * Sets the query attribute of the SearchForm object
    *
    * @param query  The new query value
    */
   public void setQuery(String query)
   {
      this.query = query;
   }


   /**
    * Sets the type attribute of the SearchForm object
    *
    * @param type  The new type value
    */
   public void setType(String type)
   {
      this.type = type;
   }


   /**
    * Sets the value attribute of the SearchForm object
    *
    * @param value  The new value value
    */
   public void setValue(String value)
   {
      this.value = value;
   }


   /**
    * Description of the Method
    *
    * @param mapping  Description of Parameter
    * @param request  Description of Parameter
    * @return         Description of the Returned Value
    */
   public ActionErrors validate(ActionMapping mapping, HttpServletRequest request)
   {
      ActionErrors errors = new ActionErrors();

      /*
       * if ((filter == null) || (filter.length() < 1))
       * {
       * errors.add("filter", new ActionError("web.error.filter.required"));
       * }
       */
      return errors;
   }
}

Index: DetailForm.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form/DetailForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DetailForm.java	15 May 2002 20:56:20 -0000	1.3
--- DetailForm.java	10 Jun 2002 07:49:56 -0000	1.4
***************
*** 19,25 ****
   * @author    letiemble
   * @created   13 février 2002
   * @todo      Javadoc to complete
   */
! public final class DetailForm extends ActionForm
  {
     /** Description of the Field */
--- 19,26 ----
   * @author    letiemble
   * @created   13 février 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
! public class DetailForm extends ActionForm
  {
     /** Description of the Field */

--- FilterForm.java DELETED ---

[Ejtools-cvs] applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib MBeanNameTag.java,NONE,1.1 MBeanParameterEditorTag.java,NONE,1.1 ConnectTag.java,1.5,1.6 MBeanAttributeAccessTag.java,1.3,1.4 MBeanAttributeClassTag.java,1.2,1.3 MBeanAttributeEditorTag.java,1.3,1.4 MBeanParameterClassTag.java,1.2,1.3 TreeRendererImpl.java,1.1,1.2 BeanContextTreeTag.java,1.1,NONE IndentedObject.java,1.2,NONE MBeanAttributeValueTag.java,1.2,NONE TreeLeafTag.java,1.2,NONE TreeRenderer.java,1.1,NONE TreeRendererTag.java,1.2,NONE TreeSpacerTag.java,1.2,NONE

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv14005/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib

Modified Files:
	ConnectTag.java MBeanAttributeAccessTag.java 
	MBeanAttributeClassTag.java MBeanAttributeEditorTag.java 
	MBeanParameterClassTag.java TreeRendererImpl.java 
Added Files:
	MBeanNameTag.java MBeanParameterEditorTag.java 
Removed Files:
	BeanContextTreeTag.java IndentedObject.java 
	MBeanAttributeValueTag.java TreeLeafTag.java TreeRenderer.java 
	TreeRendererTag.java TreeSpacerTag.java 
Log Message:
In progress

--- NEW FILE: MBeanNameTag.java ---
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at www.gnu.org.
 */
package net.sourceforge.ejtools.jmxbrowser.web.taglib;

import javax.management.MBeanParameterInfo;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
import net.sourceforge.ejtools.jmxbrowser.model.Domain;
import net.sourceforge.ejtools.jmxbrowser.model.Node;
import net.sourceforge.ejtools.jmxbrowser.model.Resource;

import net.sourceforge.ejtools.util.ClassTools;

import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;

/**
 * Description of the Class
 *
 * @author    letiemble
 * @created   25 avril 2002
 * @version   $Revision: 1.5 $
 * @todo      Javadoc to complete
 */
public class MBeanNameTag extends TagSupport
{
   /** Filter the rendered output for characters that are sensitive in HTML? */
   protected boolean filter = true;
   /** Should we ignore missing beans and simply output nothing? */
   protected boolean full = true;
   /** Should we ignore missing beans and simply output nothing? */
   protected boolean ignore = false;
   /** Name of the bean that contains the data we will be rendering. */
   protected String name = null;
   /** The scope to be searched to retrieve the specified bean. */
   protected String scope = null;


   /**
    * Description of the Method
    *
    * @return                  Description of the Returned Value
    * @exception JspException  Description of Exception
    */
   public int doStartTag() throws JspException
   {
      String output = "";

      // Look up the requested bean (if necessary)
      Node node = (Node) RequestUtils.lookup(pageContext, name, scope);

      if (ignore)
      {
         if (node == null)
         {
            return (SKIP_BODY);
         }
         // Nothing to output
      }

      if (node instanceof Resource)
      {
         Resource res = (Resource) node;
         output = res.getCanonicalName();

         if (!full)
         {
            output = output.substring(res.getDomain().length() + 1);
         }
      }
      else
      {
         output = node.toString();
      }

      if (filter)
      {
         ResponseUtils.write(pageContext, ResponseUtils.filter(output));
      }
      else
      {
         ResponseUtils.write(pageContext, output);
      }

      // Continue processing this page
      return (SKIP_BODY);
   }


   /**
    * Getter for the filter attribute
    *
    * @return   The value of filter attribute
    */
   public boolean getFilter()
   {
      return (this.filter);
   }


   /**
    * Gets the full attribute of the MBeanNameTag object
    *
    * @return   The full value
    */
   public boolean getFull()
   {
      return (this.full);
   }


   /**
    * Getter for the ignore attribute
    *
    * @return   The value of ignore attribute
    */
   public boolean getIgnore()
   {
      return (this.ignore);
   }


   /**
    * Getter for the name attribute
    *
    * @return   The value of name attribute
    */
   public String getName()
   {
      return (this.name);
   }


   /**
    * Getter for the scope attribute
    *
    * @return   The value of scope attribute
    */
   public String getScope()
   {
      return (this.scope);
   }


   /** Release all allocated resources. */
   public void release()
   {
      super.release();
      filter = true;
      ignore = false;
      full = false;
      name = null;
      scope = null;
   }


   /**
    * Setter for the filter attribute
    *
    * @param filter  The new value for filter attribute
    */
   public void setFilter(boolean filter)
   {
      this.filter = filter;
   }


   /**
    * Sets the full attribute of the MBeanNameTag object
    *
    * @param full  The new full value
    */
   public void setFull(boolean full)
   {
      this.full = full;
   }


   /**
    * Setter for the ignore attribute
    *
    * @param ignore  The new value for ignore attribute
    */
   public void setIgnore(boolean ignore)
   {
      this.ignore = ignore;
   }


   /**
    * Setter for the name attribute
    *
    * @param name  The new value for name attribute
    */
   public void setName(String name)
   {
      this.name = name;
   }


   /**
    * Setter for the scope attribute
    *
    * @param scope  The new value for scope attribute
    */
   public void setScope(String scope)
   {
      this.scope = scope;
   }
}


--- NEW FILE: MBeanParameterEditorTag.java ---
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at www.gnu.org.
 */
package net.sourceforge.ejtools.jmxbrowser.web.taglib;

import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;

import javax.management.MBeanParameterInfo;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;

import net.sourceforge.ejtools.util.ClassTools;

import org.apache.log4j.Category;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;

/**
 * Description of the Class
 *
 * @author    letiemble
 * @created   25 avril 2002
 * @version   $Revision: 1.5 $
 * @todo      Javadoc to complete
 */
public class MBeanParameterEditorTag extends TagSupport
{
   /** Filter the rendered output for characters that are sensitive in HTML? */
   protected boolean filter = true;
   /** Description of the Field */
   protected String id = null;
   /** Should we ignore missing beans and simply output nothing? */
   protected boolean ignore = false;
   /** Name of the bean that contains the data we will be rendering. */
   protected String name = null;
   /** The scope to be searched to retrieve the specified bean. */
   protected String scope = null;
   /** Description of the Field */
   private static Category logger = Category.getInstance(MBeanAttributeEditorTag.class);
   /** Description of the Field */
   private static MessageResources messages = MessageResources.getMessageResources("net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanAttributeInfoEditor");


   /**
    * Description of the Method
    *
    * @return                  Description of the Returned Value
    * @exception JspException  Description of Exception
    */
   public int doStartTag() throws JspException
   {
      // Look up the requested bean (if necessary)
      MBeanParameterInfo info = (MBeanParameterInfo) RequestUtils.lookup(pageContext, name, scope);
      
      if (ignore)
      {
         if (info == null)
         {
            return (SKIP_BODY);
         }
         // Nothing to output
      }

      PropertyEditor propertyeditor = null;
      Class c = ClassTools.getClass(info.getType());

      if (c == null)
      {
         addUnsupportedParameter(info);
      }
      else
      {
         if (c.isArray())
         {
            addUnsupportedArrayParameter(info);
         }
         else
         {
            propertyeditor = PropertyEditorManager.findEditor(c);

            if (propertyeditor == null)
            {
               addUnsupportedParameter(info);
            }
            else
            {
               addParameter(propertyeditor , info);
            }
         }
      }

      // Continue processing this page
      return (SKIP_BODY);
   }


   /**
    * Getter for the filter attribute
    *
    * @return   The value of filter attribute
    */
   public boolean getFilter()
   {
      return (this.filter);
   }


   /**
    * Gets the id attribute of the MBeanAttributeEditorTag object
    *
    * @return   The id value
    */
   public String getId()
   {
      return (this.id);
   }


   /**
    * Getter for the ignore attribute
    *
    * @return   The value of ignore attribute
    */
   public boolean getIgnore()
   {
      return (this.ignore);
   }


   /**
    * Getter for the name attribute
    *
    * @return   The value of name attribute
    */
   public String getName()
   {
      return (this.name);
   }


   /**
    * Getter for the scope attribute
    *
    * @return   The value of scope attribute
    */
   public String getScope()
   {
      return (this.scope);
   }


   /** Release all allocated resources. */
   public void release()
   {
      super.release();
      filter = true;
      ignore = false;
      name = null;
      scope = null;
      id = null;
   }


   /**
    * Setter for the filter attribute
    *
    * @param filter  The new value for filter attribute
    */
   public void setFilter(boolean filter)
   {
      this.filter = filter;
   }


   /**
    * Sets the id attribute of the MBeanAttributeEditorTag object
    *
    * @param id  The new id value
    */
   public void setId(String id)
   {
      this.id = id;
   }


   /**
    * Setter for the ignore attribute
    *
    * @param ignore  The new value for ignore attribute
    */
   public void setIgnore(boolean ignore)
   {
      this.ignore = ignore;
   }


   /**
    * Setter for the name attribute
    *
    * @param name  The new value for name attribute
    */
   public void setName(String name)
   {
      this.name = name;
   }


   /**
    * Setter for the scope attribute
    *
    * @param scope  The new value for scope attribute
    */
   public void setScope(String scope)
   {
      this.scope = scope;
   }

   /**
    * Adds a feature to the UnsupportedProperty attribute of the MBeanAttributeEditorTag object
    *
    * @param propertyeditor    The feature to be added to the Property attribute
    * @param attributeInfo     The feature to be added to the Property attribute
    * @param object            The feature to be added to the Property attribute
    * @exception JspException  Description of Exception
    */
   protected void addParameter(PropertyEditor propertyeditor, MBeanParameterInfo info) throws JspException
   {
      logger.debug("addParameter " + propertyeditor + " " + info.getName());

      String output = "";
      int id = -1;
      
      try
      {         
         Integer value = (Integer) pageContext.getAttribute(getId());
         id = value.intValue();
      }
      catch (Exception e)
      {
         logger.error("Exception during numbering reading " + e.getMessage());
         throw new JspException(e.getMessage());
      }

         output = output + "<input type=\"hidden\" name=\":param:"  + id + "\" value=\"" + propertyeditor.getClass().getName() + "\"/>";

         // Boolean types
         if (("java.lang.Boolean".equals(info.getType())) || ("boolean".equals(info.getType())))
         {
            output = output + "<select name=\":value:" + id + "\">";
            output = output + "<option value=\"true\">" + messages.getMessage("boolean.true") + "</option>";
            output = output + "<option value=\"false\">" + messages.getMessage("boolean.false") + "</option>";
            output = output + "</select>";
         }
         // Others types
         else
         {
            output = output + "<input type=\"text\" name=\":value:" + id + "\"/>";
         }

      ResponseUtils.write(pageContext, output);
   }


   /**
    * Adds a feature to the UnsupportedProperty attribute of the MBeanAttributeEditorTag object
    *
    * @param info              The feature to be added to the UnsupportedArrayParameter attribute
    * @exception JspException  Description of the Exception
    * @todo                    I18N
    */
   protected void addUnsupportedArrayParameter(MBeanParameterInfo info) throws JspException
   {
      Class c = ClassTools.getClass(info.getType());

      String output = "Unsupported Array Paramater : " + c.getComponentType().getName();

      if (filter)
      {
         output = "<i>" + ResponseUtils.filter(output) + "</i>";
      }
      else
      {
         output = "<i>" + output + "</i>";
      }

      ResponseUtils.write(pageContext, output);
   }


   /**
    * Adds a feature to the UnsupportedProperty attribute of the MBeanAttributeEditorTag object
    *
    * @param info              The feature to be added to the UnsupportedParameter attribute
    * @exception JspException  Description of Exception
    * @todo                    I18N
    */
   protected void addUnsupportedParameter(MBeanParameterInfo info) throws JspException
   {
      String output = "Unsupported Paramater : " + info.getType();

      if (filter)
      {
         output = "<i>" + ResponseUtils.filter(output) + "</i>";
      }
      else
      {
         output = "<i>" + output + "</i>";
      }

      ResponseUtils.write(pageContext, output);
   }

   static
   {
      PropertyEditorManager.setEditorSearchPath(new String[]{"sun.beans.editors", "net.sourceforge.ejtools.awt.editors"});
   }
}

Index: ConnectTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/ConnectTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConnectTag.java	17 May 2002 17:18:24 -0000	1.5
--- ConnectTag.java	10 Jun 2002 07:49:56 -0000	1.6
***************
*** 18,21 ****
--- 18,22 ----
   * @author    letiemble
   * @created   1 mars 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */

Index: MBeanAttributeAccessTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanAttributeAccessTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MBeanAttributeAccessTag.java	17 May 2002 17:18:24 -0000	1.3
--- MBeanAttributeAccessTag.java	10 Jun 2002 07:49:56 -0000	1.4
***************
*** 20,23 ****
--- 20,24 ----
   * @author    letiemble
   * @created   25 avril 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 33,37 ****
     protected String scope = null;
     /** Description of the Field */
!    private static MessageResources messages = MessageResources.getMessageResources("MBeanAttributeInfoAccess");
  
  
--- 34,38 ----
     protected String scope = null;
     /** Description of the Field */
!    private static MessageResources messages = MessageResources.getMessageResources("net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanAttributeInfoAccess");
  
  

Index: MBeanAttributeClassTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanAttributeClassTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MBeanAttributeClassTag.java	15 May 2002 20:56:11 -0000	1.2
--- MBeanAttributeClassTag.java	10 Jun 2002 07:49:56 -0000	1.3
***************
*** 21,24 ****
--- 21,25 ----
   * @author    letiemble
   * @created   25 avril 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 27,30 ****
--- 28,33 ----
     /** Filter the rendered output for characters that are sensitive in HTML? */
     protected boolean filter = true;
+    /** Description of the Field */
+    protected String id = null;
     /** Should we ignore missing beans and simply output nothing? */
     protected boolean ignore = false;
***************
*** 81,84 ****
--- 84,98 ----
  
     /**
+     * Gets the id attribute of the MBeanAttributeClassTag object
+     *
+     * @return   The id value
+     */
+    public String getId()
+    {
+       return (this.id);
+    }
+ 
+ 
+    /**
      * Getter for the ignore attribute
      *
***************
*** 121,124 ****
--- 135,139 ----
        name = null;
        scope = null;
+       id = null;
     }
  
***************
*** 132,135 ****
--- 147,161 ----
     {
        this.filter = filter;
+    }
+ 
+ 
+    /**
+     * Sets the id attribute of the MBeanAttributeClassTag object
+     *
+     * @param id  The new id value
+     */
+    public void setId(String id)
+    {
+       this.id = id;
     }
  

Index: MBeanAttributeEditorTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanAttributeEditorTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MBeanAttributeEditorTag.java	25 May 2002 20:36:22 -0000	1.3
--- MBeanAttributeEditorTag.java	10 Jun 2002 07:49:56 -0000	1.4
***************
*** 9,12 ****
--- 9,13 ----
  import java.beans.PropertyEditor;
  import java.beans.PropertyEditorManager;
+ import java.util.Hashtable;
  
  import javax.management.MBeanAttributeInfo;
***************
*** 17,20 ****
--- 18,23 ----
  import net.sourceforge.ejtools.util.ClassTools;
  
+ import org.apache.log4j.Category;
+ import org.apache.struts.util.MessageResources;
  import org.apache.struts.util.RequestUtils;
  import org.apache.struts.util.ResponseUtils;
***************
*** 25,28 ****
--- 28,32 ----
   * @author    letiemble
   * @created   25 avril 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 35,42 ****
--- 39,53 ----
     /** Name of the bean that contains the data we will be rendering. */
     protected String name = null;
+    /** Description of the Field */
+    protected String page = "/detail.do";
     /** Name of the property to be accessed on the specified bean. */
     protected String property = null;
     /** The scope to be searched to retrieve the specified bean. */
     protected String scope = null;
+    /** Description of the Field */
+    private static Category logger = Category.getInstance(MBeanAttributeEditorTag.class);
+    /** Description of the Field */
+    private static MessageResources messages = MessageResources.getMessageResources("net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanAttributeInfoEditor");
+ 
  
  
***************
*** 80,84 ****
                 propertyeditor = PropertyEditorManager.findEditor(String.class);
              }
!             addArrayProperty(bean, propertyeditor, info);
           }
           else
--- 91,95 ----
                 propertyeditor = PropertyEditorManager.findEditor(String.class);
              }
!             addArrayProperty(bean, propertyeditor, info, componentType);
           }
           else
***************
*** 226,234 ****
      * @param attributeInfo     The feature to be added to the ArrayProperty attribute
      * @param object            The feature to be added to the ArrayProperty attribute
      * @exception JspException  Description of Exception
      */
!    protected void addArrayProperty(MBeanAccessor object, PropertyEditor propertyeditor, MBeanAttributeInfo attributeInfo) throws JspException
     {
!       System.out.println("addProperty " + propertyeditor + " " + attributeInfo.getName());
        String output = "";
        Object obj = null;
--- 237,247 ----
      * @param attributeInfo     The feature to be added to the ArrayProperty attribute
      * @param object            The feature to be added to the ArrayProperty attribute
+     * @param componentType     The feature to be added to the ArrayProperty attribute
      * @exception JspException  Description of Exception
      */
!    protected void addArrayProperty(MBeanAccessor object, PropertyEditor propertyeditor, MBeanAttributeInfo attributeInfo, Class componentType) throws JspException
     {
!       logger.debug("addProperty " + propertyeditor + " " + attributeInfo.getName());
! 
        String output = "";
        Object obj = null;
***************
*** 239,243 ****
           if (attributeInfo.isReadable())
           {
!             obj = object.getAttribute(object.getObjectName(), attributeInfo.getName());
           }
           if (obj != null)
--- 252,256 ----
           if (attributeInfo.isReadable())
           {
!             obj = object.getAttribute(attributeInfo.getName());
           }
           if (obj != null)
***************
*** 246,275 ****
           }
        }
!       catch (Throwable _ex)
        {
        }
  
!       for (int i = 0; i < array.length; i++)
        {
!          try
           {
!             PropertyEditor propertyeditor1 = (PropertyEditor) propertyeditor.getClass().newInstance();
!             propertyeditor1.setValue(array[i]);
  
!             output = propertyeditor1.getAsText();
!             output = output + "<br/>";
  
!             if (filter)
!             {
!                ResponseUtils.write(pageContext, ResponseUtils.filter(output));
              }
!             else
              {
!                ResponseUtils.write(pageContext, output);
              }
           }
-          catch (Exception _ex)
-          {
-          }
        }
     }
--- 259,292 ----
           }
        }
!       catch (Throwable t)
        {
+          logger.warn("Exception during array reading " + t.getMessage());
        }
  
!       if (array != null)
        {
!          for (int i = 0; i < array.length; i++)
           {
!             try
!             {
!                PropertyEditor propertyeditor1 = (PropertyEditor) propertyeditor.getClass().newInstance();
!                propertyeditor1.setValue(array[i]);
  
!                output = propertyeditor1.getAsText();
  
!                if (filter)
!                {
!                   output = ResponseUtils.filter(output);
!                }
! 
!                output = computeReadableEditor(componentType.getName(), output);
! 
!                ResponseUtils.write(pageContext, output + "<br/>");
              }
!             catch (Exception e)
              {
!                logger.warn("Exception during array output " + e.getMessage());
              }
           }
        }
     }
***************
*** 286,290 ****
     protected void addProperty(MBeanAccessor object, PropertyEditor propertyeditor, MBeanAttributeInfo attributeInfo) throws JspException
     {
!       System.out.println("addProperty " + propertyeditor + " " + attributeInfo.getName());
        String output = "";
  
--- 303,309 ----
     protected void addProperty(MBeanAccessor object, PropertyEditor propertyeditor, MBeanAttributeInfo attributeInfo) throws JspException
     {
!       logger.debug("addProperty " + propertyeditor + " " + attributeInfo.getName());
! 
!       Object value = null;
        String output = "";
  
***************
*** 293,320 ****
           if (attributeInfo.isReadable())
           {
!             propertyeditor.setValue(object.getAttribute(object.getObjectName(), attributeInfo.getName()));
           }
        }
!       catch (Throwable _ex)
        {
        }
  
        if (attributeInfo.isWritable())
        {
!          output = propertyeditor.getAsText();
        }
        else
        {
           output = propertyeditor.getAsText();
-       }
  
!       if (filter)
!       {
!          ResponseUtils.write(pageContext, ResponseUtils.filter(output));
!       }
!       else
!       {
!          ResponseUtils.write(pageContext, output);
        }
     }
  
--- 312,394 ----
           if (attributeInfo.isReadable())
           {
!             value = object.getAttribute(attributeInfo.getName());
!             propertyeditor.setValue(value);
           }
        }
!       catch (Throwable t)
        {
+          logger.warn("Exception during property reading " + t.getMessage());
        }
  
        if (attributeInfo.isWritable())
        {
!          output = output + "<input type=\"hidden\" name=\":attribute:" + attributeInfo.getName() + "\" value=\"" + propertyeditor.getClass().getName() + "\"/>";
!          output = output + "<input type=\"hidden\" name=\":previous:" + attributeInfo.getName() + "\" value=\"";
! 
!          if (value != null)
!          {
!             output = output + value;
!          }
!          output = output + "\"/>";
! 
!          // Boolean types
!          if (("java.lang.Boolean".equals(attributeInfo.getType())) || ("boolean".equals(attributeInfo.getType())))
!          {
!             output = output + "<select name=\":value:" + attributeInfo.getName() + "\">";
! 
!             output = output + "<option value=\"true\" ";
!             if (Boolean.TRUE.equals(value))
!             {
!                output = output + "selected";
!             }
!             output = output + ">" + messages.getMessage("boolean.true") + "</option>";
! 
!             output = output + "<option value=\"false\" ";
!             if (Boolean.FALSE.equals(value))
!             {
!                output = output + "selected";
!             }
!             output = output + ">" + messages.getMessage("boolean.false") + "</option>";
! 
!             output = output + "</select>";
!          }
!          // Others types
!          else
!          {
!             String content = "";
!             String link = "";
! 
!             output = output + "<input type=\"text\" name=\":value:" + attributeInfo.getName() + "\" value=\"";
! 
!             if (value != null)
!             {
!                content = propertyeditor.getAsText();
! 
!                if (filter)
!                {
!                   content = ResponseUtils.filter(content);
!                }
!             }
! 
!             output = output + content + "\"/>";
! 
!             link = computeWritableEditor(attributeInfo.getType(), content);
! 
!             output = output + link;
!          }
        }
        else
        {
           output = propertyeditor.getAsText();
  
!          if (filter)
!          {
!             output = ResponseUtils.filter(output);
!          }
! 
!          output = computeReadableEditor(attributeInfo.getType(), output);
        }
+ 
+       ResponseUtils.write(pageContext, output);
     }
  
***************
*** 325,342 ****
      * @param attributeInfo     The feature to be added to the UnsupportedProperty attribute
      * @exception JspException  Description of Exception
      */
     protected void addUnsupportedProperty(MBeanAttributeInfo attributeInfo) throws JspException
     {
!       System.out.println("Getting value for attribute " + attributeInfo.getName());
!       String output = "<i>Unsupported Class : " + attributeInfo.getType() + "</i>";
  
        if (filter)
        {
!          ResponseUtils.write(pageContext, ResponseUtils.filter(output));
        }
        else
        {
!          ResponseUtils.write(pageContext, output);
        }
     }
  
--- 399,490 ----
      * @param attributeInfo     The feature to be added to the UnsupportedProperty attribute
      * @exception JspException  Description of Exception
+     * @todo I18N
      */
     protected void addUnsupportedProperty(MBeanAttributeInfo attributeInfo) throws JspException
     {
!       logger.debug("Getting value for attribute " + attributeInfo.getName());
! 
!       String output = "Unsupported Class : " + attributeInfo.getType();
  
        if (filter)
        {
!          output = "<i>" + ResponseUtils.filter(output) + "</i>";
        }
        else
        {
!          output = "<i>" + output + "</i>";
        }
+ 
+       ResponseUtils.write(pageContext, output);
+    }
+ 
+ 
+    /**
+     * Description of the Method
+     *
+     * @param type   Description of the Parameter
+     * @param value  Description of the Parameter
+     * @return       Description of the Return Value
+     */
+    protected String computeReadableEditor(String type, String value)
+    {
+       if ((value == null) || ("".equals(value)) || ("null".equals(value)))
+       {
+          return value;
+       }
+ 
+       if ("javax.management.ObjectName".equals(type))
+       {
+          try
+          {
+             Hashtable params = new Hashtable();
+             params.put("reference", value);
+ 
+             String url = RequestUtils.computeURL(pageContext, null, null, page, params, null, false);
+ 
+             return ("<a href=\"" + url + "\">" + value + "</a>");
+          }
+          catch (Exception e)
+          {
+             logger.warn("Exception during computation of readable editor " + e.getMessage());
+          }
+       }
+ 
+       return value;
+    }
+ 
+ 
+    /**
+     * Description of the Method
+     *
+     * @param type   Description of the Parameter
+     * @param value  Description of the Parameter
+     * @return       Description of the Return Value
+     */
+    protected String computeWritableEditor(String type, String value)
+    {
+       if ((value == null) || ("".equals(value)) || ("null".equals(value)))
+       {
+          return "";
+       }
+ 
+       if ("javax.management.ObjectName".equals(type))
+       {
+          try
+          {
+             Hashtable params = new Hashtable();
+             params.put("reference", value);
+ 
+             String url = RequestUtils.computeURL(pageContext, null, null, page, params, null, false);
+ 
+             return (" <a href=\"" + url + "\">" + messages.getMessage("hyperlink.go") + "</a>");
+          }
+          catch (Exception e)
+          {
+             logger.warn("Exception during computation of writable editor " + e.getMessage());
+          }
+       }
+ 
+       return "";
     }
  
***************
*** 346,348 ****
     }
  }
- 
--- 494,495 ----

Index: MBeanParameterClassTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanParameterClassTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MBeanParameterClassTag.java	15 May 2002 20:56:11 -0000	1.2
--- MBeanParameterClassTag.java	10 Jun 2002 07:49:56 -0000	1.3
***************
*** 21,24 ****
--- 21,25 ----
   * @author    letiemble
   * @created   25 avril 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */

Index: TreeRendererImpl.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/TreeRendererImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeRendererImpl.java	25 May 2002 20:36:22 -0000	1.1
--- TreeRendererImpl.java	10 Jun 2002 07:49:56 -0000	1.2
***************
*** 7,12 ****
--- 7,15 ----
  package net.sourceforge.ejtools.jmxbrowser.web.taglib;
  
+ import java.util.Hashtable;
+ 
  import net.sourceforge.ejtools.jmxbrowser.model.Domain;
  import net.sourceforge.ejtools.jmxbrowser.model.Resource;
+ import net.sourceforge.ejtools.servlet.http.jsp.tagext.TreeRenderer;
  
  /**
***************
*** 15,22 ****
--- 18,30 ----
   * @author    letiemble
   * @created   25 avril 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
  public class TreeRendererImpl implements TreeRenderer
  {
+    /** Description of the Field */
+    protected static Hashtable icons = new Hashtable();
+ 
+ 
     /**
      * Gets the icon attribute of the TreeRendererImpl object
***************
*** 27,39 ****
     public String getIcon(Object o)
     {
!       if (net.sourceforge.ejtools.jmxbrowser.model.Domain.class.equals(o.getClass()))
!       {
!          return "images/icons/J2EEDomain16.gif";
!       }
!       if (net.sourceforge.ejtools.jmxbrowser.model.Resource.class.equals(o.getClass()))
        {
!          return "images/icons/EJBModule16.gif";
        }
!       return null;
     }
  }
--- 35,52 ----
     public String getIcon(Object o)
     {
!       String icon = (String) icons.get(o.getClass());
! 
!       if (icon == null)
        {
!          icon = "images/toolbarButtonGraphics/general/Bean16.gif";
        }
!       return icon;
!    }
! 
!    /** Map of the class/icons */
!    static
!    {
!       icons.put(net.sourceforge.ejtools.jmxbrowser.model.Domain.class, "images/toolbarButtonGraphics/development/J2EEDomain16.gif");
!       icons.put(net.sourceforge.ejtools.jmxbrowser.model.Resource.class, "images/toolbarButtonGraphics/development/Bean16.gif");
     }
  }

--- BeanContextTreeTag.java DELETED ---

--- IndentedObject.java DELETED ---

--- MBeanAttributeValueTag.java DELETED ---

--- TreeLeafTag.java DELETED ---

--- TreeRenderer.java DELETED ---

--- TreeRendererTag.java DELETED ---

--- TreeSpacerTag.java DELETED ---

[Ejtools-cvs] applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action ClearSearchAction.java,NONE,1.1 SearchAction.java,NONE,1.1 UpdateAction.java,NONE,1.1 ConnectAction.java,1.3,1.4 DetailAction.java,1.5,1.6 CreateAction.java,1.2,NONE InvokeAction.java,1.2,NONE UnregisterAction.java,1.2,NONE

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action
In directory usw-pr-cvs1:/tmp/cvs-serv14005/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action

Modified Files:
	ConnectAction.java DetailAction.java 
Added Files:
	ClearSearchAction.java SearchAction.java UpdateAction.java 
Removed Files:
	CreateAction.java InvokeAction.java UnregisterAction.java 
Log Message:
In progress

--- NEW FILE: ClearSearchAction.java ---
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at www.gnu.org.
 */
package net.sourceforge.ejtools.jmxbrowser.web.action;

import java.io.IOException;
import java.util.Locale;
import java.util.Vector;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import net.sourceforge.ejtools.jmxbrowser.web.Constants;
import net.sourceforge.ejtools.jmxbrowser.web.JMXContainer;

import org.apache.log4j.Category;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;

/**
 * Description of the Class
 *
 * @author    letiemble
 * @created   12 novembre 2001
 * @version   $Revision: 1.5 $
 * @todo      Javadoc to complete
 */
public class ClearSearchAction extends Action
{
   /** Description of the Field */
   private static Category logger = Category.getInstance(ClearSearchAction.class);


   /** Constructor for the FilterAction object */
   public ClearSearchAction() { }


   /**
    * Description of the Method
    *
    * @param mapping               Description of Parameter
    * @param form                  Description of Parameter
    * @param request               Description of Parameter
    * @param response              Description of Parameter
    * @return                      Description of the Returned Value
    * @exception IOException       Description of Exception
    * @exception ServletException  Description of Exception
    */
   public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
   {
      // Extract attributes we will need
      Locale locale = getLocale(request);
      MessageResources messages = getResources();

      // Validate the request parameters specified by the user
      ActionErrors errors = new ActionErrors();

      ServletContext context = this.getServlet().getServletContext();
      JMXContainer tree = (JMXContainer) context.getAttribute(Constants.TREE);

      if (tree != null)
      {
         Vector result = new Vector();
         context.setAttribute(Constants.SEARCH_RESULT, result);
      }
      else
      {
         errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.cannot.connect"));
      }

      // Report any errors we have discovered back to the original form
      if (!errors.empty())
      {
         saveErrors(request, errors);
         return (mapping.findForward("error"));
      }

      return (mapping.findForward("view"));
   }
}

--- NEW FILE: SearchAction.java ---
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at www.gnu.org.
 */
package net.sourceforge.ejtools.jmxbrowser.web.action;

import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Locale;
import java.util.Set;
import java.util.Vector;

import javax.management.AttributeValueExp;
import javax.management.ObjectName;
import javax.management.Query;
import javax.management.QueryExp;
import javax.management.ValueExp;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import net.sourceforge.ejtools.jmxbrowser.web.Constants;
import net.sourceforge.ejtools.jmxbrowser.web.JMXContainer;
import net.sourceforge.ejtools.jmxbrowser.web.form.SearchForm;

import org.apache.log4j.Category;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;

/**
 * Description of the Class
 *
 * @author    letiemble
 * @created   12 novembre 2001
 * @version   $Revision: 1.5 $
 * @todo      Javadoc to complete
 */
public class SearchAction extends Action
{
   /** Description of the Field */
   private static Category logger = Category.getInstance(SearchAction.class);


   /** Constructor for the FilterAction object */
   public SearchAction() { }


   /**
    * Description of the Method
    *
    * @param mapping               Description of Parameter
    * @param form                  Description of Parameter
    * @param request               Description of Parameter
    * @param response              Description of Parameter
    * @return                      Description of the Returned Value
    * @exception IOException       Description of Exception
    * @exception ServletException  Description of Exception
    */
   public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
   {
      JMXContainer tree = null;
      SearchForm searchForm = null;

      // Extract attributes we will need
      Locale locale = getLocale(request);
      MessageResources messages = getResources();

      // Validate the request parameters specified by the user
      ActionErrors errors = new ActionErrors();

      if (form instanceof SearchForm)
      {
         searchForm = (SearchForm) form;
      }
      else
      {
         errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.no.form"));
      }

      logger.debug("Connecting to JMX Server");

      ServletContext context = this.getServlet().getServletContext();
      tree = (JMXContainer) context.getAttribute(Constants.TREE);
      
         context.setAttribute(Constants.SEARCH_RESULT, new Vector());

      if (tree != null)
      {
         String filter = searchForm.getFilter();
         String attribute = searchForm.getAttribute();
         String query = searchForm.getQuery();
         String value = searchForm.getValue();
         String type = searchForm.getType();

         try
         {
            ObjectName name = null;
            QueryExp qExp = null;

            if (!("".equals(filter)))
            {
               name = new ObjectName(filter);
            }

            logger.debug("ObjectName " + name);

            if (!("".equals(attribute)))
            {
               AttributeValueExp attrExp = Query.attr(attribute);
               ValueExp valExp = computeValue(type, value);

               qExp = computeQuery(query, attrExp, valExp);
            }

            logger.debug("QueryExp " + qExp);

            Set result = tree.query(name, qExp);

            if (result != null)
            {
               logger.debug("Result " + result);

               context.setAttribute(Constants.SEARCH_RESULT, result);
            }

         }
         catch (Exception e)
         {
            errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.query.filter", filter));
            errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.exception.message", e.getMessage()));

            StringWriter w = new StringWriter();
            PrintWriter pw = new PrintWriter(w);
            e.printStackTrace(pw);
            pw.close();

            errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.exception.stack", w.toString()));
         }
      }
      else
      {
         errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.cannot.connect"));
      }

      // Report any errors we have discovered back to the original form
      if (!errors.empty())
      {
         saveErrors(request, errors);
         return (new ActionForward(mapping.getInput()));
      }

      return (mapping.findForward("view"));
   }


   /**
    * Description of the Method
    *
    * @param op      Description of the Parameter
    * @param value1  Description of the Parameter
    * @param value2  Description of the Parameter
    * @return        Description of the Return Value
    */
   protected QueryExp computeQuery(String op, ValueExp value1, ValueExp value2)
   {
      if ("=".equals(op))
      {
         return Query.eq(value1, value2);
      }
      if (">".equals(op))
      {
         return Query.gt(value1, value2);
      }
      if (">=".equals(op))
      {
         return Query.geq(value1, value2);
      }
      if ("<".equals(op))
      {
         return Query.lt(value1, value2);
      }
      if ("<=".equals(op))
      {
         return Query.leq(value1, value2);
      }
      return null;
   }


   /**
    * Description of the Method
    *
    * @param type           Description of the Parameter
    * @param value          Description of the Parameter
    * @return               Description of the Return Value
    * @exception Exception  Description of the Exception
    */
   protected ValueExp computeValue(String type, String value) throws Exception
   {
      logger.debug("Converting " + value + " of type " + type);

      if ("java.lang.String".equals(type))
      {
         return Query.value(value);
      }

      if ("java.lang.Integer".equals(type))
      {
         return Query.value(new Integer(value));
      }
      if ("java.lang.Long".equals(type))
      {
         return Query.value(new Long(value));
      }
      if ("java.lang.Float".equals(type))
      {
         return Query.value(new Float(value));
      }
      if ("java.lang.Double".equals(type))
      {
         return Query.value(new Double(value));
      }
      if ("java.lang.Boolean".equals(type))
      {
         return Query.value((new Boolean(value)).booleanValue());
      }

      if ("byte".equals(type))
      {
         return Query.value(Byte.parseByte(value));
      }
      if ("short".equals(type))
      {
         return Query.value(Short.parseShort(value));
      }
      if ("int".equals(type))
      {
         return Query.value(Integer.parseInt(value));
      }
      if ("long".equals(type))
      {
         return Query.value(Long.parseLong(value));
      }
      if ("float".equals(type))
      {
         return Query.value(Float.parseFloat(value));
      }
      if ("double".equals(type))
      {
         return Query.value(Double.parseDouble(value));
      }
      if ("boolean".equals(type))
      {
         return Query.value((new Boolean(value)).booleanValue());
      }
      return null;
   }
}

--- NEW FILE: UpdateAction.java ---
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at www.gnu.org.
 */
package net.sourceforge.ejtools.jmxbrowser.web.action;

import java.beans.PropertyEditor;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
import java.util.Vector;

import javax.management.Attribute;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import net.sourceforge.ejtools.jmxbrowser.model.Resource;
import net.sourceforge.ejtools.jmxbrowser.web.Constants;
import net.sourceforge.ejtools.jmxbrowser.web.JMXContainer;
import net.sourceforge.ejtools.jmxbrowser.web.form.DetailForm;

import org.apache.log4j.Category;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;

/**
 * Description of the Class
 *
 * @author    letiemble
 * @created   12 novembre 2001
 * @version   $Revision: 1.5 $
 * @todo      Javadoc to complete
 */
public class UpdateAction extends Action
{
   /** Description of the Field */
   private static Category logger = Category.getInstance(UpdateAction.class);


   /** Constructor for the SearchLoginAction object */
   public UpdateAction() { }


   /**
    * Description of the Method
    *
    * @param mapping               Description of Parameter
    * @param form                  Description of Parameter
    * @param request               Description of Parameter
    * @param response              Description of Parameter
    * @return                      Description of the Returned Value
    * @exception IOException       Description of Exception
    * @exception ServletException  Description of Exception
    */
   public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
   {
      String reference = null;
      Vector names = new Vector();

      // Extract attributes we will need
      Locale locale = getLocale(request);
      MessageResources messages = getResources();

      // Validate the request parameters specified by the user
      ActionErrors errors = new ActionErrors();

      if (form instanceof DetailForm)
      {
         reference = ((DetailForm) form).getReference();
         logger.debug("ObjectName requested " + reference);
      }
      else
      {
         errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.no.form"));
      }

      ServletContext context = this.getServlet().getServletContext();
      JMXContainer tree = (JMXContainer) context.getAttribute(Constants.TREE);

      if (tree != null)
      {
         logger.debug("Tree root found => " + tree);
         Resource res = (Resource) tree.searchObjectName(reference);

         if (res != null)
         {
            Enumeration enum = request.getParameterNames();
            while (enum.hasMoreElements())
            {
               String name = (String) enum.nextElement();
               if (name.startsWith(":attribute:"))
               {
                  name = name.substring(":attribute:".length());
                  names.add(name);
               }
            }

            String name = null;
            String editor = null;
            String previous = null;
            String value = null;

            try
            {
               // names contains the list of attribute to set
               Iterator it = names.iterator();
               while (it.hasNext())
               {
                  name = (String) it.next();
                  
                  logger.debug("Processing attribute " + name);
                  
                  editor = request.getParameter(":attribute:" + name);
                  previous = request.getParameter(":previous:" + name);
                  value = request.getParameter(":value:" + name);

                  if (!value.equals(previous))
                  {
                  logger.debug("Attribute " + name + " has changed");
                  
                     PropertyEditor pe = (PropertyEditor) Class.forName(editor).newInstance();

                     pe.setAsText(value);
                     Object o = pe.getValue();

                     logger.debug("Setting attribute " + name);

                     res.setAttribute(new Attribute(name, o));
                  }
               }
            }
            catch (Exception e)
            {
               logger.error("Exception occured " + e.getMessage());

               errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.mbean.attribute", name));
               errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.exception.message", e.getMessage()));

               StringWriter w = new StringWriter();
               PrintWriter pw = new PrintWriter(w);
               e.printStackTrace(pw);
               pw.close();

               errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.exception.stack", w.toString()));
            }
         }
         else
         {
            errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.no.mbean"));
         }
      }
      else
      {
         errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.cannot.connect"));
      }

      // Report any errors we have discovered back to the original form
      if (!errors.empty())
      {
         saveErrors(request, errors);
         return (mapping.findForward("error"));
      }

      return (mapping.findForward("detail"));
   }
}


Index: ConnectAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/ConnectAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConnectAction.java	17 May 2002 20:41:31 -0000	1.3
--- ConnectAction.java	10 Jun 2002 07:49:56 -0000	1.4
***************
*** 31,34 ****
--- 31,35 ----
   * @author    letiemble
   * @created   12 novembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 36,40 ****
  {
     /** Description of the Field */
!    private static Category cat = Category.getInstance(ConnectAction.class.getName());
  
  
--- 37,41 ----
  {
     /** Description of the Field */
!    private static Category logger = Category.getInstance(ConnectAction.class);
  
  
***************
*** 65,76 ****
        ActionErrors errors = new ActionErrors();
  
!       System.out.println("Connecting");
! 
!       // Report any errors we have discovered back to the original form
!       if (!errors.empty())
!       {
!          saveErrors(request, errors);
!          return (new ActionForward(mapping.getInput()));
!       }
  
        ServletContext context = this.getServlet().getServletContext();
--- 66,70 ----
        ActionErrors errors = new ActionErrors();
  
!       logger.debug("Connecting to JMX Server");
  
        ServletContext context = this.getServlet().getServletContext();
***************
*** 84,87 ****
--- 78,88 ----
  
        tree.connect();
+ 
+       // Report any errors we have discovered back to the original form
+       if (!errors.empty())
+       {
+          saveErrors(request, errors);
+          return (new ActionForward(mapping.getInput()));
+       }
  
        return (mapping.findForward("view"));

Index: DetailAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/DetailAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DetailAction.java	17 May 2002 20:41:31 -0000	1.5
--- DetailAction.java	10 Jun 2002 07:49:56 -0000	1.6
***************
*** 14,18 ****
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpSession;
  
  import net.sourceforge.ejtools.jmxbrowser.model.Resource;
--- 14,17 ----
***************
*** 34,37 ****
--- 33,37 ----
   * @author    letiemble
   * @created   12 novembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 39,43 ****
  {
     /** Description of the Field */
!    private static Category cat = Category.getInstance(DetailAction.class.getName());
  
  
--- 39,43 ----
  {
     /** Description of the Field */
!    private static Category logger = Category.getInstance(DetailAction.class);
  
  
***************
*** 59,62 ****
--- 59,64 ----
     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
     {
+       String reference = null;
+ 
        // Extract attributes we will need
        Locale locale = getLocale(request);
***************
*** 66,91 ****
        ActionErrors errors = new ActionErrors();
  
!       // TODO : put in Constants
!       String ref = request.getParameter("reference");
! 
!       System.out.println("REF " + ref);
  
        ServletContext context = this.getServlet().getServletContext();
        JMXContainer tree = (JMXContainer) context.getAttribute(Constants.TREE);
  
!       System.out.println("Root " + tree);
!       Resource o = (Resource) tree.searchObjectName(ref);
! 
!       if (o != null)
        {
!          context.setAttribute(Constants.DETAIL, o);
!          System.out.println("Object " + o);
!          context.setAttribute(Constants.DETAIL_INFO, o.getMBeanInfo());
!          System.out.println("Object " + o.getMBeanInfo());
  
        }
        else
        {
!          errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("error.cannot.connect"));
        }
  
--- 68,108 ----
        ActionErrors errors = new ActionErrors();
  
!       reference = request.getParameter("reference");
!       logger.debug("ObjectName requested " + reference);
  
+       /*
+        * if (form instanceof DetailForm)
+        * {
+        * reference = ((DetailForm) form).getReference();
+        * logger.debug("ObjectName requested " + reference);
+        * }
+        * else
+        * {
+        * errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.no.form"));
+        * }
+        */
        ServletContext context = this.getServlet().getServletContext();
        JMXContainer tree = (JMXContainer) context.getAttribute(Constants.TREE);
  
!       if (tree != null)
        {
!          logger.debug("Tree root found => " + tree);
!          Resource res = (Resource) tree.searchObjectName(reference);
  
+          if (res != null)
+          {
+             context.setAttribute(Constants.DETAIL, res);
+             logger.debug("MBean found => " + res);
+             context.setAttribute(Constants.DETAIL_INFO, res.getMBeanInfo());
+             logger.debug("MBeanInfo found => " + res.getMBeanInfo());
+          }
+          else
+          {
+             errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.no.mbean"));
+          }
        }
        else
        {
!          errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("web.error.cannot.connect"));
        }
  

--- CreateAction.java DELETED ---

--- InvokeAction.java DELETED ---

--- UnregisterAction.java DELETED ---

[Ejtools-cvs] applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web QueryConstants.java,NONE,1.1 Constants.java,1.4,1.5 JMXContainer.java,1.1,1.2

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web
In directory usw-pr-cvs1:/tmp/cvs-serv14005/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web

Modified Files:
	Constants.java JMXContainer.java 
Added Files:
	QueryConstants.java 
Log Message:
In progress

--- NEW FILE: QueryConstants.java ---
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at www.gnu.org.
 */
package net.sourceforge.ejtools.jmxbrowser.web;

import java.io.Serializable;
import java.util.Collection;
import java.util.ResourceBundle;
import java.util.Vector;

import net.sourceforge.ejtools.jmxbrowser.model.Server;

/**
 * @author    letiemble
 * @created   2 janvier 2002
 * @version   $Revision: 1.3 $
 */
public class QueryConstants implements Serializable
{
   /** Description of the Field */
   protected Vector queries;
   /** Description of the Field */
   protected Vector types;


   /** Constructor for the SearchTypeEditor object */
   public QueryConstants()
   {
      types = new Vector();
      types.add("java.lang.String");
      types.add("java.lang.Integer");
      types.add("java.lang.Long");
      types.add("java.lang.Float");
      types.add("java.lang.Double");
      types.add("java.lang.Boolean");

      types.add("byte");
      types.add("short");
      types.add("int");
      types.add("long");
      types.add("float");
      types.add("double");
      types.add("boolean");

      queries = new Vector();
      queries.add("=");
      queries.add(">");
      queries.add(">=");
      queries.add("<");
      queries.add("<=");
   }


   /**
    * Gets the values attribute of the SearchTypeConstants object
    *
    * @return   The values value
    */
   public Collection getQueries()
   {
      return queries;
   }


   /**
    * Gets the labels attribute of the SearchTypeConstants object
    *
    * @return   The labels value
    */
   public Collection getTypes()
   {
      return types;
   }
}


Index: Constants.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Constants.java	25 May 2002 20:42:34 -0000	1.4
--- Constants.java	10 Jun 2002 07:49:55 -0000	1.5
***************
*** 13,16 ****
--- 13,17 ----
   * @author    letiemble
   * @created   28 février 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 28,32 ****
     public final static String NUMBER = "number";
     /** Description of the Field */
     public final static String TREE = "tree";
  }
- 
--- 29,34 ----
     public final static String NUMBER = "number";
     /** Description of the Field */
+    public final static String SEARCH_RESULT = "search.result";
+    /** Description of the Field */
     public final static String TREE = "tree";
  }

Index: JMXContainer.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/JMXContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JMXContainer.java	17 May 2002 20:41:31 -0000	1.1
--- JMXContainer.java	10 Jun 2002 07:49:55 -0000	1.2
***************
*** 8,12 ****
  
  import java.beans.beancontext.BeanContextServicesSupport;
! import java.util.Collection;
  
  import net.sourceforge.ejtools.jmxbrowser.model.ConnectionServiceProvider;
--- 8,14 ----
  
  import java.beans.beancontext.BeanContextServicesSupport;
! import java.util.*;
! 
! import javax.management.*;
  
  import net.sourceforge.ejtools.jmxbrowser.model.ConnectionServiceProvider;
***************
*** 18,21 ****
--- 20,24 ----
   * @author    letiemble
   * @created   25 avril 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 83,86 ****
--- 86,102 ----
     {
        return server;
+    }
+ 
+ 
+    /**
+     * Description of the Method
+     *
+     * @param name  Description of the Parameter
+     * @param exp   Description of the Parameter
+     * @return      Description of the Return Value
+     */
+    public Set query(ObjectName name, QueryExp exp)
+    {
+       return server.query(name, exp);
     }
  

[Ejtools-cvs] applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model ConnectionService.java,1.3,1.4 ConnectionServiceProvider.java,1.2,1.3 Domain.java,1.3,1.4 EJBConnectionService.java,1.3,1.4 LocalConnectionService.java,1.3,1.4 Node.java,1.3,1.4 RMIConnectionService.java,1.3,1.4 Resource.java,1.4,1.5 Server.java,1.5,1.6

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model
In directory usw-pr-cvs1:/tmp/cvs-serv14005/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model

Modified Files:
	ConnectionService.java ConnectionServiceProvider.java 
	Domain.java EJBConnectionService.java 
	LocalConnectionService.java Node.java 
	RMIConnectionService.java Resource.java Server.java 
Log Message:
In progress

Index: ConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/ConnectionService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConnectionService.java	15 May 2002 20:56:51 -0000	1.3
--- ConnectionService.java	10 Jun 2002 07:49:55 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  
  import javax.management.Attribute;
+ import javax.management.AttributeList;
  import javax.management.MBeanInfo;
  import javax.management.ObjectInstance;
***************
*** 21,24 ****
--- 22,26 ----
   * @author    letiemble
   * @created   13 décembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 89,92 ****
--- 91,105 ----
  
     /**
+     * Description of the Method
+     *
+     * @param name           Description of the Parameter
+     * @param exp            Description of the Parameter
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public Set queryNames(ObjectName name, QueryExp exp) throws Exception;
+ 
+ 
+    /**
      * Sets the attribute attribute of the ConnectionService object
      *
***************
*** 96,99 ****
--- 109,123 ----
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception;
+ 
+ 
+    /**
+     * Sets the attributes attribute of the ConnectionService object
+     *
+     * @param name           The new attributes value
+     * @param list           The new attributes value
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public AttributeList setAttributes(ObjectName name, AttributeList list) throws Exception;
  
  

Index: ConnectionServiceProvider.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/ConnectionServiceProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConnectionServiceProvider.java	15 May 2002 20:56:51 -0000	1.2
--- ConnectionServiceProvider.java	10 Jun 2002 07:49:55 -0000	1.3
***************
*** 18,21 ****
--- 18,22 ----
   * @author    letiemble
   * @created   13 décembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */

Index: Domain.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Domain.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Domain.java	15 May 2002 20:56:51 -0000	1.3
--- Domain.java	10 Jun 2002 07:49:55 -0000	1.4
***************
*** 12,18 ****
   * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class Domain extends Node
--- 12,22 ----
   * Description of the Class
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @javabean:class      displayName="JMX Domain" shortDescription="JMX Domain"
!  * @javabean:icons      color16="/toolbarButtonGraphics/development/Jar16.gif"
!  * @javabean:property   name="name" class="java.lang.String" displayname="Name" shortDescription="Domain name"
   */
  public class Domain extends Node

Index: EJBConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/EJBConnectionService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EJBConnectionService.java	15 May 2002 20:56:51 -0000	1.3
--- EJBConnectionService.java	10 Jun 2002 07:49:55 -0000	1.4
***************
*** 10,13 ****
--- 10,14 ----
  
  import javax.management.Attribute;
+ import javax.management.AttributeList;
  import javax.management.MBeanInfo;
  import javax.management.ObjectInstance;
***************
*** 25,28 ****
--- 26,30 ----
   * @author    letiemble
   * @created   13 décembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 144,147 ****
--- 146,163 ----
  
     /**
+     * Description of the Method
+     *
+     * @param name           Description of the Parameter
+     * @param exp            Description of the Parameter
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public Set queryNames(ObjectName name, QueryExp exp) throws Exception
+    {
+       return getConnector().queryNames(name, exp);
+    }
+ 
+ 
+    /**
      * Setter for the attribute attribute
      *
***************
*** 154,157 ****
--- 170,188 ----
        getConnector().setAttribute(name, attribute);
     }
+ 
+ 
+    /**
+     * Sets the attributes attribute of the EJBConnectionService object
+     *
+     * @param name           The new attributes value
+     * @param list           The new attributes value
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public AttributeList setAttributes(ObjectName name, AttributeList list) throws Exception
+    {
+       return getConnector().setAttributes(name, list);
+    }
+ 
  
  

Index: LocalConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/LocalConnectionService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LocalConnectionService.java	15 May 2002 20:56:51 -0000	1.3
--- LocalConnectionService.java	10 Jun 2002 07:49:55 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  
  import javax.management.Attribute;
+ import javax.management.AttributeList;
  import javax.management.MBeanInfo;
  import javax.management.MBeanServer;
***************
*** 23,26 ****
--- 24,28 ----
   * @author    letiemble
   * @created   13 décembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 142,145 ****
--- 144,161 ----
  
     /**
+     * Description of the Method
+     *
+     * @param name           Description of the Parameter
+     * @param exp            Description of the Parameter
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public Set queryNames(ObjectName name, QueryExp exp) throws Exception
+    {
+       return getConnector().queryNames(name, exp);
+    }
+ 
+ 
+    /**
      * Setter for the attribute attribute
      *
***************
*** 152,155 ****
--- 168,186 ----
        getConnector().setAttribute(name, attribute);
     }
+ 
+ 
+    /**
+     * Sets the attributes attribute of the LocalConnectionService object
+     *
+     * @param name           The new attributes value
+     * @param list           The new attributes value
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public AttributeList setAttributes(ObjectName name, AttributeList list) throws Exception
+    {
+       return getConnector().setAttributes(name, list);
+    }
+ 
  
  

Index: Node.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Node.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Node.java	15 May 2002 20:56:51 -0000	1.3
--- Node.java	10 Jun 2002 07:49:55 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
   * @author    letiemble
   * @created   13 décembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */

Index: RMIConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/RMIConnectionService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RMIConnectionService.java	15 May 2002 20:56:51 -0000	1.3
--- RMIConnectionService.java	10 Jun 2002 07:49:55 -0000	1.4
***************
*** 10,13 ****
--- 10,14 ----
  
  import javax.management.Attribute;
+ import javax.management.AttributeList;
  import javax.management.MBeanInfo;
  import javax.management.ObjectInstance;
***************
*** 24,27 ****
--- 25,29 ----
   * @author    letiemble
   * @created   13 décembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */
***************
*** 143,146 ****
--- 145,162 ----
  
     /**
+     * Description of the Method
+     *
+     * @param name           Description of the Parameter
+     * @param exp            Description of the Parameter
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public Set queryNames(ObjectName name, QueryExp exp) throws Exception
+    {
+       return getConnector().queryNames(name, exp);
+    }
+ 
+ 
+    /**
      * Setter for the attribute attribute
      *
***************
*** 153,156 ****
--- 169,187 ----
        getConnector().setAttribute(name, attribute);
     }
+ 
+ 
+    /**
+     * Sets the attributes attribute of the RMIConnectionService object
+     *
+     * @param name           The new attributes value
+     * @param list           The new attributes value
+     * @return               Description of the Return Value
+     * @exception Exception  Description of the Exception
+     */
+    public AttributeList setAttributes(ObjectName name, AttributeList list) throws Exception
+    {
+       return getConnector().setAttributes(name, list);
+    }
+ 
  
  

Index: Resource.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Resource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Resource.java	15 May 2002 20:56:51 -0000	1.4
--- Resource.java	10 Jun 2002 07:49:55 -0000	1.5
***************
*** 13,16 ****
--- 13,17 ----
  import javax.management.AttributeChangeNotification;
  import javax.management.AttributeChangeNotificationFilter;
+ import javax.management.AttributeList;
  import javax.management.MBeanInfo;
  import javax.management.Notification;
***************
*** 22,31 ****
  import net.sourceforge.ejtools.jmx.MBeanAccessor;
  
  /**
   * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class Resource extends Node implements MBeanAccessor
--- 23,41 ----
  import net.sourceforge.ejtools.jmx.MBeanAccessor;
  
+ import org.apache.log4j.Category;
+ 
  /**
   * Description of the Class
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @javabean:class      displayName="JMX Resource" shortDescription="JMX Resource"
!  * @javabean:icons      color16="/toolbarButtonGraphics/development/Bean16.gif"
!  * @javabean:property   name="name" class="java.lang.String" displayname="Name" shortDescription="Resource name"
!  * @javabean:property   name="className" class="java.lang.String" displayname="Class Name" shortDescription="Class Name"
!  * @javabean:property   name="domain" class="java.lang.String" displayname="Domain" shortDescription="Domain name"
!  * @javabean:property   name="description" class="java.lang.String" displayname="Description" shortDescription="Description"
   */
  public class Resource extends Node implements MBeanAccessor
***************
*** 43,46 ****
--- 53,58 ----
     /** Description of the Field */
     protected transient ResourceUpdater updater;
+    /** Description of the Field */
+    private static Category logger = Category.getInstance(Resource.class);
  
  
***************
*** 50,94 ****
  
     /**
-     * Description of the Method
-     *
-     * @param className   Description of the Parameter
-     * @param name        Description of the Parameter
-     * @param loaderName  Description of the Parameter
-     * @param params      Description of the Parameter
-     * @param signature   Description of the Parameter
-     * @return            Description of the Return Value
-     */
-    public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature)
-    {
-       BeanContextServices context = (BeanContextServices) getBeanContext();
-       ObjectInstance result = null;
- 
-       if (context.hasService(ConnectionService.class))
-       {
-          try
-          {
-             ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
- 
-             result = service.createMBean(className, name, loaderName, params, signature);
- 
-             context.releaseService(this, this, ConnectionService.class);
-          }
-          catch (Exception e)
-          {
-             e.printStackTrace();
-          }
-       }
-       return result;
-    }
- 
- 
-    /**
      * Getter for the attribute attribute
      *
!     * @param name       Description of Parameter
!     * @param attribute  Description of Parameter
!     * @return           The value
      */
!    public Object getAttribute(ObjectName name, String attribute)
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
--- 62,72 ----
  
     /**
      * Getter for the attribute attribute
      *
!     * @param attribute      Description of Parameter
!     * @return               The value
!     * @exception Exception  Description of the Exception
      */
!    public Object getAttribute(String attribute) throws Exception
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
***************
*** 101,105 ****
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             result = service.getAttribute(name, attribute);
  
              context.releaseService(this, this, ConnectionService.class);
--- 79,83 ----
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             result = service.getAttribute(objectName, attribute);
  
              context.releaseService(this, this, ConnectionService.class);
***************
*** 107,111 ****
           catch (Exception e)
           {
!             e.printStackTrace();
           }
        }
--- 85,90 ----
           catch (Exception e)
           {
!             logger.error("Error while getting attribute " + e.getMessage());
!             throw e;
           }
        }
***************
*** 162,167 ****
              catch (Exception e)
              {
!                System.out.println("Error during utilisation of service ConnectionService (" + e.getMessage() + ")");
!                e.printStackTrace();
              }
           }
--- 141,145 ----
              catch (Exception e)
              {
!                logger.error("Error during utilisation of service ConnectionService " + e.getMessage());
              }
           }
***************
*** 225,230 ****
              catch (Exception e)
              {
!                System.out.println("Error during utilisation of service ConnectionService (" + e.getMessage() + ")");
!                e.printStackTrace();
              }
           }
--- 203,207 ----
              catch (Exception e)
              {
!                logger.error("Error during utilisation of service ConnectionService " + e.getMessage());
              }
           }
***************
*** 259,269 ****
      * Description of the Method
      *
!     * @param name        Description of Parameter
!     * @param action      Description of Parameter
!     * @param params      Description of Parameter
!     * @param signatures  Description of Parameter
!     * @return            Description of the Returned Value
      */
!    public Object invoke(ObjectName name, String action, Object[] params, String[] signatures)
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
--- 236,246 ----
      * Description of the Method
      *
!     * @param action         Description of Parameter
!     * @param params         Description of Parameter
!     * @param signatures     Description of Parameter
!     * @return               Description of the Returned Value
!     * @exception Exception  Description of the Exception
      */
!    public Object invoke(String action, Object[] params, String[] signatures) throws Exception
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
***************
*** 276,280 ****
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             result = service.invoke(name, action, params, signatures);
  
              context.releaseService(this, this, ConnectionService.class);
--- 253,257 ----
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             result = service.invoke(objectName, action, params, signatures);
  
              context.releaseService(this, this, ConnectionService.class);
***************
*** 282,286 ****
           catch (Exception e)
           {
!             e.printStackTrace();
           }
        }
--- 259,264 ----
           catch (Exception e)
           {
!             logger.error("Error while invoking method " + e.getMessage());
!             throw e;
           }
        }
***************
*** 292,299 ****
      * Getter for the attribute attribute
      *
!     * @param name       Description of Parameter
!     * @param attribute  Description of Parameter
      */
!    public void setAttribute(ObjectName name, Attribute attribute)
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
--- 270,277 ----
      * Getter for the attribute attribute
      *
!     * @param attribute      Description of Parameter
!     * @exception Exception  Description of the Exception
      */
!    public void setAttribute(Attribute attribute) throws Exception
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
***************
*** 305,309 ****
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             service.setAttribute(name, attribute);
  
              context.releaseService(this, this, ConnectionService.class);
--- 283,287 ----
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             service.setAttribute(objectName, attribute);
  
              context.releaseService(this, this, ConnectionService.class);
***************
*** 311,320 ****
           catch (Exception e)
           {
!             e.printStackTrace();
           }
        }
     }
  
  
     /**
      * Sets the reference attribute of the Resource object
--- 289,332 ----
           catch (Exception e)
           {
!             logger.error("Error while setting attribute " + e.getMessage());
!             throw e;
!          }
!       }
!    }
! 
! 
!    /**
!     * Sets the attributes attribute of the Resource object
!     *
!     * @param list           The new attributes value
!     * @return               Description of the Return Value
!     * @exception Exception  Description of the Exception
!     */
!    public AttributeList setAttributes(AttributeList list) throws Exception
!    {
!       BeanContextServices context = (BeanContextServices) getBeanContext();
!       AttributeList result = null;
! 
!       if (context.hasService(ConnectionService.class))
!       {
!          try
!          {
!             ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
! 
!             result = service.setAttributes(objectName, list);
! 
!             context.releaseService(this, this, ConnectionService.class);
!          }
!          catch (Exception e)
!          {
!             logger.error("Error while setting attributes " + e.getMessage());
!             throw e;
           }
        }
+       return result;
     }
  
  
+ 
     /**
      * Sets the reference attribute of the Resource object
***************
*** 336,342 ****
      * Description of the Method
      *
!     * @param name  Description of the Parameter
      */
!    public void unregisterMBean(ObjectName name)
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
--- 348,354 ----
      * Description of the Method
      *
!     * @exception Exception  Description of the Exception
      */
!    public void unregisterMBean() throws Exception
     {
        BeanContextServices context = (BeanContextServices) getBeanContext();
***************
*** 348,352 ****
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             service.unregisterMBean(name);
  
              context.releaseService(this, this, ConnectionService.class);
--- 360,364 ----
              ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
  
!             service.unregisterMBean(objectName);
  
              context.releaseService(this, this, ConnectionService.class);
***************
*** 354,358 ****
           catch (Exception e)
           {
!             e.printStackTrace();
           }
        }
--- 366,371 ----
           catch (Exception e)
           {
!             logger.error("Error while unregistering " + e.getMessage());
!             throw e;
           }
        }

Index: Server.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Server.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Server.java	17 May 2002 07:21:30 -0000	1.5
--- Server.java	10 Jun 2002 07:49:55 -0000	1.6
***************
*** 8,26 ****
  
  import java.beans.beancontext.BeanContextServices;
  import java.util.Collection;
- import java.util.Hashtable;
  import java.util.Iterator;
  import java.util.Vector;
  
  import javax.management.ObjectInstance;
- import javax.management.ObjectName;
  import javax.naming.Context;
  
  /**
   * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class Server extends Node
--- 8,39 ----
  
  import java.beans.beancontext.BeanContextServices;
+ import java.util.*;
  import java.util.Collection;
  import java.util.Iterator;
  import java.util.Vector;
+ import javax.management.*;
  
  import javax.management.ObjectInstance;
  import javax.naming.Context;
  
+ import org.apache.log4j.Category;
+ 
  /**
   * Description of the Class
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @todo                Add log4j logs
!  * @javabean:class      displayName="JMX Server" shortDescription="JMX Server"
!  * @javabean:icons      color16="/toolbarButtonGraphics/development/Server16.gif"
!  * @javabean:property   name="defaultDomain" class="java.lang.String" displayname="Default Domain" shortDescription="Default Domain"
!  * @javabean:property   name="count" class="int" displayname="MBean number" shortDescription="Number of MBean registered"
!  * @javabean:property   name="factory" class="java.lang.String" displayName="Factory" shortDescription="JNDI context factory"
!  * @javabean:property   name="packages" class="java.lang.String" displayName="Packages" shortDescription="Packages for context"
!  * @javabean:property   name="url" class="java.lang.String" displayName="URL" shortDescription="JNDI Server URL"
!  * @javabean:property   name="context" class="java.lang.String" displayName="Context" shortDescription="Initial JNDI context"
!  * @javabean:property   name="eJBName" class="java.lang.String" displayname="EJB Adaptor" shortDescription="JMX EJB Adaptor"
   */
  public class Server extends Node
***************
*** 42,45 ****
--- 55,60 ----
     /** Description of the Field */
     protected String url = "localhost:1099";
+    /** Description of the Field */
+    private static Category logger = Category.getInstance(Server.class);
  
  
***************
*** 64,72 ****
  
  
!    /** Description of the Method */
     public void connect()
     {
-       System.out.println("In connect");
- 
        this.clear();
        this.domains.clear();
--- 79,89 ----
  
  
!    /**
!     * Description of the Method
!     *
!     * @javabean:method   name="connect" displayName="Connect" shortDescription="Connect to JMX Server"
!     */
     public void connect()
     {
        this.clear();
        this.domains.clear();
***************
*** 200,203 ****
--- 217,254 ----
     {
        return this.url;
+    }
+ 
+ 
+    /**
+     * Description of the Method
+     *
+     * @param name  Description of the Parameter
+     * @param exp   Description of the Parameter
+     * @return      Description of the Return Value
+     */
+    public Set query(ObjectName name, QueryExp exp)
+    {
+       Set result = null;
+ 
+       BeanContextServices context = (BeanContextServices) getBeanContext();
+ 
+       if (context.hasService(ConnectionService.class))
+       {
+          try
+          {
+             ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
+ 
+             result = service.queryNames(name, exp);
+ 
+             context.releaseService(this, this, ConnectionService.class);
+          }
+          catch (Exception e)
+          {
+             System.out.println("Error during utilisation of service ConnectionService (" + e.getMessage() + ")");
+             e.printStackTrace();
+          }
+       }
+ 
+       return result;
     }
  

[Ejtools-cvs] applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser AboutDialog.java,1.4,1.5 JMXBrowser.java,1.4,1.5 Main.java,1.3,1.4

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser
In directory usw-pr-cvs1:/tmp/cvs-serv14005/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser

Modified Files:
	AboutDialog.java JMXBrowser.java Main.java 
Log Message:
In progress

Index: AboutDialog.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/AboutDialog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AboutDialog.java	15 May 2002 20:57:01 -0000	1.4
--- AboutDialog.java	10 Jun 2002 07:49:55 -0000	1.5
***************
*** 24,27 ****
--- 24,28 ----
   * @author    letiemble
   * @created   2 novembre 2001
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */

Index: JMXBrowser.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/JMXBrowser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JMXBrowser.java	15 May 2002 20:57:01 -0000	1.4
--- JMXBrowser.java	10 Jun 2002 07:49:55 -0000	1.5
***************
*** 29,32 ****
--- 29,33 ----
   * @author    letiemble
   * @created   21 mars 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */

Index: Main.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Main.java	15 May 2002 20:57:01 -0000	1.3
--- Main.java	10 Jun 2002 07:49:55 -0000	1.4
***************
*** 21,24 ****
--- 21,25 ----
   * @author    letiemble
   * @created   21 mars 2002
+  * @version   $Revision$
   * @todo      Javadoc to complete
   */

[Ejtools-cvs] applications/jmx.browser/src/etc jmx.browser.mf,1.2,1.3 run.mf,1.2,1.3 logo.svg,1.2,NONE

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/etc
In directory usw-pr-cvs1:/tmp/cvs-serv13934/jmx.browser/src/etc

Modified Files:
	jmx.browser.mf run.mf 
Removed Files:
	logo.svg 
Log Message:
In progress

Index: jmx.browser.mf
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/jmx.browser.mf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jmx.browser.mf	15 May 2002 20:55:34 -0000	1.2
--- jmx.browser.mf	10 Jun 2002 07:49:25 -0000	1.3
***************
*** 1,2 ****
--- 1,9 ----
  Class-Path: .
  
+ Name: net/sourceforge/ejtools/jmxbrowser/
+ Specification-Title: @module.display.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
+ Specification-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
+ Specification-Vendor: EJTools Project
+ Implementation-Title: @module.display.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
+ Implementation-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
+ Implementation-Vendor: EJTools Project

Index: run.mf
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/run.mf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** run.mf	15 May 2002 20:55:34 -0000	1.2
--- run.mf	10 Jun 2002 07:49:25 -0000	1.3
***************
*** 3,10 ****
  
  Name: net/sourceforge/ejtools/jmxbrowser/
! Specification-Title: @module.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
  Specification-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
  Specification-Vendor: EJTools Project
! Implementation-Title: @module.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
  Implementation-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
  Implementation-Vendor: EJTools Project
--- 3,10 ----
  
  Name: net/sourceforge/ejtools/jmxbrowser/
! Specification-Title: @module.display.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
  Specification-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
  Specification-Vendor: EJTools Project
! Implementation-Title: @module.display.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
  Implementation-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
  Implementation-Vendor: EJTools Project

--- logo.svg DELETED ---

[Ejtools-cvs] applications/jmx.browser/src/etc/beaninfo Domain.xml,1.2,NONE Resource.xml,1.2,NONE Server.xml,1.2,NONE

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/etc/beaninfo
In directory usw-pr-cvs1:/tmp/cvs-serv13913/jmx.browser/src/etc/beaninfo

Removed Files:
	Domain.xml Resource.xml Server.xml 
Log Message:
In progress

--- Domain.xml DELETED ---

--- Resource.xml DELETED ---

--- Server.xml DELETED ---

[Ejtools-cvs] applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/general - New directory

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/general
In directory usw-pr-cvs1:/tmp/cvs-serv13526/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/general

Log Message:
Directory /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/general added to the repository

[Ejtools-cvs] applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development/jms - New directory

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development/jms
In directory usw-pr-cvs1:/tmp/cvs-serv13526/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development/jms

Log Message:
Directory /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development/jms added to the repository

[Ejtools-cvs] applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics - New directory

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics
In directory usw-pr-cvs1:/tmp/cvs-serv13526/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics

Log Message:
Directory /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics added to the repository

[Ejtools-cvs] applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development - New directory

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development
In directory usw-pr-cvs1:/tmp/cvs-serv13526/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development

Log Message:
Directory /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/images/toolbarButtonGraphics/development added to the repository

[Ejtools-cvs] applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web - New directory

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web
In directory usw-pr-cvs1:/tmp/cvs-serv13526/applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web

Log Message:
Directory /cvsroot/ejtools/applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web added to the repository

[Ejtools-cvs] applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web/taglib - New directory

[<let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv13526/applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web/taglib

Log Message:
Directory /cvsroot/ejtools/applications/jmx.browser/src/resources/net/sourceforge/ejtools/jmxbrowser/web/taglib added to the repository

[Ejtools-cvs] build/dtd application-client_1_2.dtd,NONE,1.1 application-client_1_3.dtd,NONE,1.1 application_1_2.dtd,NONE,1.1 application_1_3.dtd,NONE,1.1 connector_1_0.dtd,NONE,1.1 ejb-jar_1_1.dtd,NONE,1.1 ejb-jar_2_0.dtd,NONE,1.1 struts-config_1_0.dtd,NONE,1.1 web-app_2_2.dtd,NONE,1.1 web-app_2_3.dtd,NONE,1.1 web-jsptaglibrary_1_1.dtd,NONE,1.1 web-jsptaglibrary_1_2.dtd,NONE,1.1

[<let...@us...>]

Update of /cvsroot/ejtools/build/dtd
In directory usw-pr-cvs1:/tmp/cvs-serv12939/dtd

Added Files:
	application-client_1_2.dtd application-client_1_3.dtd 
	application_1_2.dtd application_1_3.dtd connector_1_0.dtd 
	ejb-jar_1_1.dtd ejb-jar_2_0.dtd struts-config_1_0.dtd 
	web-app_2_2.dtd web-app_2_3.dtd web-jsptaglibrary_1_1.dtd 
	web-jsptaglibrary_1_2.dtd 
Log Message:
Switch to Ant 1.5 beta 2

--- NEW FILE: application-client_1_2.dtd ---
<!--
Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road,
Palo Alto, CA  94303, U.S.A.  All rights reserved.
 
This product or document is protected by copyright and distributed
under licenses restricting its use, copying, distribution, and
decompilation.  No part of this product or documentation may be
reproduced in any form by any means without prior written authorization
of Sun and its licensors, if any.  

Third party software, including font technology, is copyrighted and 
licensed from Sun suppliers. 

Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java 
Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, 
are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. 
and other countries.

All SPARC trademarks are used under license and are trademarks
or registered trademarks of SPARC International, Inc.
in the U.S. and other countries. Products bearing SPARC
trademarks are based upon an architecture developed by Sun Microsystems, Inc. 

PostScript is a registered trademark of Adobe Systems, Inc. 

 
Federal Acquisitions: Commercial Software - Government Users Subject to 
Standard License Terms and Conditions.


 
DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
INVALID.

_________________________________________________________________________
Copyright 1999 Sun Microsystems, Inc., 
901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis. 
Tous droits re'serve's.
 

Ce produit ou document est prote'ge' par un copyright et distribue' avec 
des licences qui en restreignent l'utilisation, la copie, la distribution,
et la de'compilation.  Aucune partie de ce produit ou de sa documentation
associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen 
que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses 
bailleurs de licence, s'il y en a.  

Le logiciel de'tenu par des tiers, et qui comprend la technologie 
relative aux polices de caracte`res, est prote'ge' par un copyright 
et licencie' par des fournisseurs de Sun.
 
Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java 
Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,  
sont des marques de fabrique ou des marques de'pose'es de Sun 
Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
 
Toutes les marques SPARC sont utilise'es sous licence et sont
des marques de fabrique ou des marques de'pose'es de SPARC
International, Inc. aux Etats-Unis et  dans
d'autres pays. Les produits portant les marques SPARC sont
base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.  

Postcript est une marque enregistre'e d'Adobe Systems Inc. 
 
LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
-->

<!--
The application-client element is the root element of an application client
deployment descriptor.
The application client deployment descriptor describes the EJB components and
external resources referenced by the application client.
-->
<!ELEMENT application-client (icon?, display-name, description?, env-entry*,
ejb-ref*, resource-ref*)>

<!--
The description element is used to provide text describing the parent element.
The description element should include any information that the
application-client file producer wants to provide to the consumer of the
application-client file (i.e., to the Deployer). Typically, the tools used by
the application-client file consumer will display the description when
processing the parent element that contains the description.
-->
<!ELEMENT description (#PCDATA)>

<!--
The display-name element contains a short name that is intended to be displayed
by tools.
-->
<!ELEMENT display-name (#PCDATA)>

<!--
The ejb-link element is used in the ejb-ref element to specify that an EJB
reference is linked to an enterprise bean in the encompassing J2EE Application
package. The value of the ejb-link element must be the ejb-name of an enterprise
bean in the same J2EE Application package. Used in: ejb-ref
Example: <ejb-link>EmployeeRecord</ejb-link>
-->
<!ELEMENT ejb-link (#PCDATA)>

<!--
The ejb-ref element is used for the declaration of a reference to an enterprise
bean's home. The declaration consists of an optional description; the EJB
reference name used in the code of the referencing application client; the
expected type of the referenced enterprise bean; the expected home and remote
interfaces of the referenced enterprise bean; and an optional ejb-link
information. The optional ejb-link element is used to specify the referenced
enterprise bean.
-->
<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type, home, remote,
ejb-link?)>

<!--
The ejb-ref-name element contains the name of an EJB reference. The EJB
reference is an entry in the application client's environment. It is recommended
that name is prefixed with "ejb/". Used in: ejb-ref
Example: <ejb-ref-name>ejb/Payroll</ejb-ref-name>
-->
<!ELEMENT ejb-ref-name (#PCDATA)>

<!--
The ejb-ref-type element contains the expected type of the referenced enterprise
bean. The ejb-ref-type element must be one of the following:
<ejb-ref-type>Entity</ejb-ref-type>
<ejb-ref-type>Session</ejb-ref-type>
Used in: ejb-ref
-->
<!ELEMENT ejb-ref-type (#PCDATA)>

<!--
The env-entry element contains the declaration of an application client's
environment entries. The declaration consists of an optional description, the
name of the environment entry, and an optional value.
-->
<!ELEMENT env-entry (description?, env-entry-name, env-entry-type,
env-entry-value?)>

<!--
The env-entry-name element contains the name of an application client's
environment entry. Used in: env-entry
Example: <env-entry-name>EmployeeAppDB</env-entry-name>
-->
<!ELEMENT env-entry-name (#PCDATA)>

<!--
The env-entry-type element contains the fully-qualified Java type of the
environment entry value that is expected by the application client's code. The
following are the legal values of env-entry-type: java.lang.Boolean,
java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte,
java.lang.Short, java.lang.Long, and java.lang.Float.

Used in: env-entry

Example:
<env-entry-type>java.lang.Boolean</env-entry-type>
-->
<!ELEMENT env-entry-type (#PCDATA)>

<!--
The env-entry-value element contains the value of an application client's
environment entry. The value must be a String that is valid for the constructor
of the specified type that takes a single String parameter.

Used in: env-entry

Example:
<env-entry-value>/datasources/MyDatabase</env-entry-value>
-->
<!ELEMENT env-entry-value (#PCDATA)>

<!--
The home element contains the fully-qualified name of the enterprise bean's home
interface.
Used in: ejb-ref
Example: <home>com.aardvark.payroll.PayrollHome</home>
-->
<!ELEMENT home (#PCDATA)>

<!--
The icon element contains a small-icon and large-icon element which specify the
URIs for a small and a large GIF or JPEG icon image used to represent the
application client in a GUI tool.
-->
<!ELEMENT icon (small-icon?, large-icon?)>

<!--
The large-icon element contains the name of a file containing a large (32 x 32)
icon image. The file name is a relative path within the application-client jar
file. The image must be either in the JPEG or GIF format, and the file name must
end with the suffix ".jpg" or ".gif" respectively. The icon can be used by
tools.
Example:
<large-icon>lib/images/employee-service-icon32x32.jpg</large-icon>
-->
<!ELEMENT large-icon (#PCDATA)>

<!--
The remote element contains the fully-qualified name of the enterprise bean's
remote interface.
Used in: ejb-ref
Example:
<remote>com.wombat.empl.EmployeeService</remote>
-->
<!ELEMENT remote (#PCDATA)>

<!--
The res-auth element specifies whether the enterprise bean code signs on
programmatically to the resource manager, or whether the Container will sign on
to the resource manager on behalf of the bean. In the latter case, the Container
uses information that is supplied by the Deployer.
The value of this element must be one of the two following:
<res-auth>Application</res-auth>
<res-auth>Container</res-auth>
-->
<!ELEMENT res-auth (#PCDATA)>

<!--
The res-ref-name element specifies the name of the resource factory reference
name. The resource factory reference name is the name of the application
client's environment entry whose value contains the JNDI name of the data
source.
Used in: resource-ref
-->
<!ELEMENT res-ref-name (#PCDATA)>

<!--
The res-type element specifies the type of the data source. The type is
specified by the Java interface (or class) expected to be implemented by the
data source.
Used in: resource-ref
-->
<!ELEMENT res-type (#PCDATA)>

<!--
The resource-ref element contains a declaration of application clients's
reference to an external resource. It consists of an optional description, the
resource factory reference name, the indication of the resource factory type
expected by the application client's code, and the type of authentication (bean
or container).

Example:
<resource-ref>
<res-ref-name>EmployeeAppDB</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
-->
<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth)>
<!--
The small-icon element contains the name of a file containing a small (16 x 16)
icon image. The file name is a relative path within the application-client jar
file. The image must be either in the JPEG or GIF format, and the file name must
end with the suffix ".jpg" or ".gif" respectively. The icon can be used by
tools.
Example:
<small-icon>lib/images/employee-service-icon16x16.jpg</small-icon>
-->
<!ELEMENT small-icon (#PCDATA)>

<!--
The ID mechanism is to allow tools to easily make tool-specific references to
the elements of the deployment descriptor.
 -->
<!ATTLIST application-client id ID #IMPLIED>
<!ATTLIST description id ID #IMPLIED>
<!ATTLIST display-name id ID #IMPLIED>
<!ATTLIST ejb-link id ID #IMPLIED>
<!ATTLIST ejb-ref id ID #IMPLIED>
<!ATTLIST ejb-ref-name id ID #IMPLIED>
<!ATTLIST ejb-ref-type id ID #IMPLIED>
<!ATTLIST env-entry id ID #IMPLIED>
<!ATTLIST env-entry-name id ID #IMPLIED>
<!ATTLIST env-entry-type id ID #IMPLIED>
<!ATTLIST env-entry-value id ID #IMPLIED>
<!ATTLIST home id ID #IMPLIED>
<!ATTLIST icon id ID #IMPLIED>
<!ATTLIST large-icon id ID #IMPLIED>
<!ATTLIST remote id ID #IMPLIED>
<!ATTLIST res-auth id ID #IMPLIED>
<!ATTLIST res-ref-name id ID #IMPLIED>
<!ATTLIST res-type id ID #IMPLIED>
<!ATTLIST resource-ref id ID #IMPLIED>
<!ATTLIST small-icon id ID #IMPLIED>

--- NEW FILE: application-client_1_3.dtd ---
<!--
Copyright (c) 2000 Sun Microsystems, Inc.,
901 San Antonio Road,
Palo Alto, California 94303, U.S.A.
All rights reserved.

Sun Microsystems, Inc. has intellectual property rights relating to
technology embodied in the product that is described in this document.
In particular, and without limitation, these intellectual property
rights may include one or more of the U.S. patents listed at
http://www.sun.com/patents and one or more additional patents or
pending patent applications in the U.S. and in other countries.

This document and the product to which it pertains are distributed
under licenses restricting their use, copying, distribution, and
decompilation.  This document may be reproduced and distributed but may
not be changed without prior written authorization of Sun and its
licensors, if any.

Third-party software, including font technology, is copyrighted and
licensed from Sun suppliers.

Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
Enterprise JavaBeans are trademarks or registered trademarks of Sun
Microsystems, Inc. in the U.S. and other countries.

Federal Acquisitions: Commercial Software - Government Users Subject to
Standard License Terms and Conditions.

DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.


_________________________________________________________________________

Copyright (c) 2000 Sun Microsystems, Inc.,
901 San Antonio Road,
Palo Alto, California 94303, E'tats-Unis.
Tous droits re'serve's.

Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
relatants a` la technologie incorpore'e dans le produit qui est de'crit
dans ce document. En particulier, et sans la limitation, ces droits de
proprie'te' intellectuels peuvent inclure un ou plus des brevets
ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
brevets plus supple'mentaires ou les applications de brevet en attente
dans les E'tats-Unis et dans les autres pays.

Ce produit ou document est prote'ge' par un copyright et distribue'
avec des licences qui en restreignent l'utilisation, la copie, la
distribution, et la de'compilation.  Ce documention associe n peut
e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
licence, le cas e'che'ant.

Le logiciel de'tenu par des tiers, et qui comprend la technologie
relative aux polices de caracte`res, est prote'ge' par un copyright et
licencie' par des fournisseurs de Sun.

Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
Enterprise JavaBeans sont des marques de fabrique ou des marques
de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
pays.

LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
CONTREFAC,ON.
-->

<!--
This is the XML DTD for the J2EE 1.3 application client deployment
descriptor.  All J2EE 1.3 application client deployment descriptors
must include a DOCTYPE of the following form:

  <!DOCTYPE application-client PUBLIC
	"-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"
	"http://java.sun.com/dtd/application-client_1_3.dtd">

-->

<!--
The following conventions apply to all J2EE deployment descriptor
elements unless indicated otherwise.

- In elements that contain PCDATA, leading and trailing whitespace
  in the data may be ignored.

- In elements whose value is an "enumerated type", the value is
  case sensitive.

- In elements that specify a pathname to a file within the same
  JAR file, relative filenames (i.e., those not starting with "/")
  are considered relative to the root of the JAR file's namespace.
  Absolute filenames (i.e., those starting with "/") also specify
  names in the root of the JAR file's namespace.  In general, relative
  names are preferred.  The exception is .war files where absolute
  names are preferred for consistency with the servlet API.
-->


<!--
The application-client element is the root element of an application
client deployment descriptor.  The application client deployment
descriptor describes the EJB components and external resources
referenced by the application client.
-->
<!ELEMENT application-client (icon?, display-name, description?,
		env-entry*, ejb-ref*, resource-ref*, resource-env-ref*,
		callback-handler?)>

<!--
The callback-handler element names a class provided by the
application.  The class must have a no args constructor and must
implement the javax.security.auth.callback.CallbackHandler interface.
The class will be instantiated by the application client container and
used by the container to collect authentication information from the
user.

Used in: application-client
-->
<!ELEMENT callback-handler (#PCDATA)>

<!--
The description element is used to provide text describing the parent
element.  The description element should include any information that
the application client jar file producer wants to provide to the consumer of
the application client jar file (i.e., to the Deployer). Typically, the tools
used by the application client jar file consumer will display the description
when processing the parent element that contains the description.

Used in: application-client, ejb-ref, env-entry, resource-env-ref,
resource-ref
-->
<!ELEMENT description (#PCDATA)>

<!--
The display-name element contains a short name that is intended to be
displayed by tools.  The display name need not be unique.

Used in: application-client

Example:

<display-name>Employee Self Service</display-name>
-->
<!ELEMENT display-name (#PCDATA)>

<!--
The ejb-link element is used in the ejb-ref element
to specify that an EJB reference is linked to an
enterprise bean.

The name in the ejb-link element is composed of a
path name specifying the ejb-jar containing the referenced enterprise
bean with the ejb-name of the target bean appended and separated from
the path name by "#".  The path name is relative to the jar file
containing the application client that is referencing the enterprise bean.
This allows multiple enterprise beans with the same ejb-name to be
uniquely identified.

Used in: ejb-ref

Examples:

	<ejb-link>EmployeeRecord</ejb-link>

	<ejb-link>../products/product.jar#ProductEJB</ejb-link>

-->
<!ELEMENT ejb-link (#PCDATA)>

<!--
The ejb-ref element is used for the declaration of a reference to
an enterprise bean's home. The declaration consists of:

	- an optional description
	- the EJB reference name used in the code of
	  the application client that's referencing the enterprise bean
	- the expected type of the referenced enterprise bean
	- the expected home and remote interfaces of the referenced
	  enterprise bean
	- optional ejb-link information, used to specify the referenced
	  enterprise bean

Used in: application-client
-->
<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type,
		home, remote, ejb-link?)>

<!--
The ejb-ref-name element contains the name of an EJB reference. The
EJB reference is an entry in the application client's environment and is
relative to the java:comp/env context.  The name must be unique
within the application client.

It is recommended that name is prefixed with "ejb/".

Used in: ejb-ref

Example:

<ejb-ref-name>ejb/Payroll</ejb-ref-name>
-->
<!ELEMENT ejb-ref-name (#PCDATA)>

<!--
The ejb-ref-type element contains the expected type of the
referenced enterprise bean.

The ejb-ref-type element must be one of the following:

	<ejb-ref-type>Entity</ejb-ref-type>
	<ejb-ref-type>Session</ejb-ref-type>

Used in: ejb-ref
-->
<!ELEMENT ejb-ref-type (#PCDATA)>

<!--
The env-entry element contains the declaration of an application client's
environment entry. The declaration consists of an optional
description, the name of the environment entry, and an optional
value.  If a value is not specified, one must be supplied
during deployment.

Used in: application-client
-->
<!ELEMENT env-entry (description?, env-entry-name, env-entry-type,
		env-entry-value?)>

<!--
The env-entry-name element contains the name of an application client's
environment entry.  The name is a JNDI name relative to the
java:comp/env context.  The name must be unique within an application client.

Used in: env-entry

Example:

<env-entry-name>minAmount</env-entry-name>
-->
<!ELEMENT env-entry-name (#PCDATA)>

<!--
The env-entry-type element contains the fully-qualified Java type of
the environment entry value that is expected by the application client's
code.

The following are the legal values of env-entry-type:

	java.lang.Boolean
	java.lang.Byte
	java.lang.Character
	java.lang.String
	java.lang.Short
	java.lang.Integer
	java.lang.Long
	java.lang.Float
	java.lang.Double


Used in: env-entry

Example:

<env-entry-type>java.lang.Boolean</env-entry-type>
-->
<!ELEMENT env-entry-type (#PCDATA)>

<!--
The env-entry-value element contains the value of an application client's
environment entry. The value must be a String that is valid for the
constructor of the specified type that takes a single String
parameter, or for java.lang.Character, a single character.

Used in: env-entry

Example:

<env-entry-value>100.00</env-entry-value>
-->
<!ELEMENT env-entry-value (#PCDATA)>

<!--
The home element contains the fully-qualified name of the enterprise
bean's home interface.

Used in: ejb-ref

Example:

<home>com.aardvark.payroll.PayrollHome</home>
-->
<!ELEMENT home (#PCDATA)>

<!--
The icon element contains small-icon and large-icon elements that
specify the file names for small and a large GIF or JPEG icon images
used to represent the parent element in a GUI tool.

Used in: application-client
-->
<!ELEMENT icon (small-icon?, large-icon?)>

<!--
The large-icon element contains the name of a file
containing a large (32 x 32) icon image. The file
name is a relative path within the application client's
jar file.

The image may be either in the JPEG or GIF format.
The icon can be used by tools.

Used in: icon

Example:

<large-icon>employee-service-icon32x32.jpg</large-icon>
-->
<!ELEMENT large-icon (#PCDATA)>

<!--
The remote element contains the fully-qualified name of the enterprise
bean's remote interface.

Used in: ejb-ref

Example:

<remote>com.wombat.empl.EmployeeService</remote>
-->
<!ELEMENT remote (#PCDATA)>

<!--
The res-auth element specifies whether the application client code signs
on programmatically to the resource manager, or whether the Container
will sign on to the resource manager on behalf of the application client. In the
latter case, the Container uses information that is supplied by the
Deployer.

The value of this element must be one of the two following:

	<res-auth>Application</res-auth>
	<res-auth>Container</res-auth>

Used in: resource-ref
-->
<!ELEMENT res-auth (#PCDATA)>

<!--
The res-ref-name element specifies the name of a resource manager
connection factory reference.  The name is a JNDI name relative to the
java:comp/env context.  The name must be unique within an application client.

Used in: resource-ref
-->
<!ELEMENT res-ref-name (#PCDATA)>

<!--
The res-sharing-scope element specifies whether connections obtained
through the given resource manager connection factory reference can be
shared. The value of this element, if specified, must be one of the
two following:

	<res-sharing-scope>Shareable</res-sharing-scope>
	<res-sharing-scope>Unshareable</res-sharing-scope>

The default value is Shareable.

Used in: resource-ref
-->
<!ELEMENT res-sharing-scope (#PCDATA)>

<!--
The res-type element specifies the type of the data source. The type
is specified by the fully qualified Java language class or interface
expected to be implemented by the data source.

Used in: resource-ref
-->
<!ELEMENT res-type (#PCDATA)>

<!--
The resource-env-ref element contains a declaration of an application client's
reference to an administered object associated with a resource
in the application client's environment.  It consists of an optional
description, the resource environment reference name, and an
indication of the resource environment reference type expected by
the application client code.

Used in: application-client

Example:

<resource-env-ref>
    <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
</resource-env-ref>
-->
<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
		resource-env-ref-type)>

<!--
The resource-env-ref-name element specifies the name of a resource
environment reference; its value is the environment entry name used in
the application client code.  The name is a JNDI name relative to the
java:comp/env context and must be unique within an application client.

Used in: resource-env-ref
-->
<!ELEMENT resource-env-ref-name (#PCDATA)>

<!--
The resource-env-ref-type element specifies the type of a resource
environment reference.  It is the fully qualified name of a Java
language class or interface.

Used in: resource-env-ref
-->
<!ELEMENT resource-env-ref-type (#PCDATA)>

<!--
The resource-ref element contains a declaration of an application client's
reference to an external resource. It consists of an optional
description, the resource manager connection factory reference name,
the indication of the resource manager connection factory type
expected by the application client code, the type of authentication
(Application or Container), and an optional specification of the
shareability of connections obtained from the resource (Shareable or
Unshareable).

Used in: application-client

Example:

    <resource-ref>
	<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
	<res-type>javax.sql.DataSource</res-type>
	<res-auth>Container</res-auth>
	<res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
-->
<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
		res-sharing-scope?)>

<!--
The small-icon element contains the name of a file
containing a small (16 x 16) icon image. The file
name is a relative path within the application client's
jar file.

The image may be either in the JPEG or GIF format.
The icon can be used by tools.

Used in: icon

Example:

<small-icon>employee-service-icon16x16.jpg</small-icon>
-->
<!ELEMENT small-icon (#PCDATA)>

<!--
The ID mechanism is to allow tools that produce additional deployment
information (i.e., information beyond the standard deployment
descriptor information) to store the non-standard information in a
separate file, and easily refer from these tool-specific files to the
information in the standard deployment descriptor.

Tools are not allowed to add the non-standard information into the
standard deployment descriptor.
-->

<!ATTLIST application-client id ID #IMPLIED>
<!ATTLIST callback-handler id ID #IMPLIED>
<!ATTLIST description id ID #IMPLIED>
<!ATTLIST display-name id ID #IMPLIED>
<!ATTLIST ejb-link id ID #IMPLIED>
<!ATTLIST ejb-ref id ID #IMPLIED>
<!ATTLIST ejb-ref-name id ID #IMPLIED>
<!ATTLIST ejb-ref-type id ID #IMPLIED>
<!ATTLIST env-entry id ID #IMPLIED>
<!ATTLIST env-entry-name id ID #IMPLIED>
<!ATTLIST env-entry-type id ID #IMPLIED>
<!ATTLIST env-entry-value id ID #IMPLIED>
<!ATTLIST home id ID #IMPLIED>
<!ATTLIST icon id ID #IMPLIED>
<!ATTLIST large-icon id ID #IMPLIED>
<!ATTLIST remote id ID #IMPLIED>
<!ATTLIST res-auth id ID #IMPLIED>
<!ATTLIST res-ref-name id ID #IMPLIED>
<!ATTLIST res-sharing-scope id ID #IMPLIED>
<!ATTLIST res-type id ID #IMPLIED>
<!ATTLIST resource-env-ref id ID #IMPLIED>
<!ATTLIST resource-env-ref-name id ID #IMPLIED>
<!ATTLIST resource-env-ref-type id ID #IMPLIED>
<!ATTLIST resource-ref id ID #IMPLIED>
<!ATTLIST small-icon id ID #IMPLIED>

--- NEW FILE: application_1_2.dtd ---
<!--
Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road,
Palo Alto, CA  94303, U.S.A.  All rights reserved.
 
This product or document is protected by copyright and distributed
under licenses restricting its use, copying, distribution, and
decompilation.  No part of this product or documentation may be
reproduced in any form by any means without prior written authorization
of Sun and its licensors, if any.  

Third party software, including font technology, is copyrighted and 
licensed from Sun suppliers. 

Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java 
Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, 
are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. 
and other countries.

All SPARC trademarks are used under license and are trademarks
or registered trademarks of SPARC International, Inc.
in the U.S. and other countries. Products bearing SPARC
trademarks are based upon an architecture developed by Sun Microsystems, Inc. 

PostScript is a registered trademark of Adobe Systems, Inc. 

 
Federal Acquisitions: Commercial Software - Government Users Subject to 
Standard License Terms and Conditions.


 
DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
INVALID.

_________________________________________________________________________
Copyright 1999 Sun Microsystems, Inc., 
901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis. 
Tous droits re'serve's.
 

Ce produit ou document est prote'ge' par un copyright et distribue' avec 
des licences qui en restreignent l'utilisation, la copie, la distribution,
et la de'compilation.  Aucune partie de ce produit ou de sa documentation
associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen 
que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses 
bailleurs de licence, s'il y en a.  

Le logiciel de'tenu par des tiers, et qui comprend la technologie 
relative aux polices de caracte`res, est prote'ge' par un copyright 
et licencie' par des fournisseurs de Sun.
 
Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java 
Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,  
sont des marques de fabrique ou des marques de'pose'es de Sun 
Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
 
Toutes les marques SPARC sont utilise'es sous licence et sont
des marques de fabrique ou des marques de'pose'es de SPARC
International, Inc. aux Etats-Unis et  dans
d'autres pays. Les produits portant les marques SPARC sont
base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.  

Postcript est une marque enregistre'e d'Adobe Systems Inc. 
 
LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
-->

<!--
The alt-dd element specifies an optional URI to the post-assembly version of the
deployment descriptor file for a particular J2EE module. The URI must specify
the full pathname of the deployment descriptor file relative to the
application's root directory. If alt-dd is not specified, the deployer must read
the deployment descriptor from the default location and file name required by
the respective component specification.
-->
<!ELEMENT alt-dd (#PCDATA)>

<!--
The application element is the root element of a J2EE application deployment
descriptor.
-->
<!ELEMENT application (icon?, display-name, description?, module+,
security-role*)>

<!--
The context-root element specifies the context root of a web application
-->
<!ELEMENT context-root (#PCDATA)>

<!--
The description element provides a human readable description of the
application. The description element should include any information that the
application assembler wants to provide the deployer.
-->
<!ELEMENT description (#PCDATA)>

<!--
The display-name element specifies an application name.
The application name is assigned to the application by the application assembler
and is used to identify the application to the deployer at deployment time.
-->
<!ELEMENT display-name (#PCDATA)>

<!--
The ejb element specifies the URI of a ejb-jar, relative to the top level of the
application package.
-->
<!ELEMENT ejb (#PCDATA)>

<!--
The icon element contains a small-icon and large-icon element which specify the
URIs for a small and a large GIF or JPEG icon image to represent the application
in a GUI.
-->
<!ELEMENT icon (small-icon?, large-icon?)>

<!--
The java element specifies the URI of a java application client module, relative
to the top level of the application package.
-->
<!ELEMENT java (#PCDATA)>

<!--
The large-icon element specifies the URI for a large GIF or JPEG icon image to
represent the application in a GUI.
-->
<!ELEMENT large-icon (#PCDATA)>

<!--
The module element represents a single J2EE module and contains an ejb, java, or
web element, which indicates the module type and contains a path to the module
file, and an optional alt-dd element, which specifies an optional URI to the
post-assembly version of the deployment descriptor.
The application deployment descriptor must have one module element for each J2EE
module in the application package.
-->
<!ELEMENT module ((ejb | java | web), alt-dd?)>

<!--
The role-name element contains the name of a security role.
-->
<!ELEMENT role-name (#PCDATA)>

<!--
The security-role element contains the definition of a security role which is
global to the application. The definition consists of a description of the
security role, and the security role name. The descriptions at this level
override those in the component level security-role definitions and must be the
descriptions tool display to the deployer.
-->
<!ELEMENT security-role (description?, role-name)>

<!--
The small-icon element specifies the URI for a small GIF or JPEG icon image to
represent the application in a GUI.
-->
<!ELEMENT small-icon (#PCDATA)>

<!--
The web element contains the web-uri and context-root of a web application
module.
-->
<!ELEMENT web (web-uri, context-root)>

<!--
The web-uri element specifies the URI of a web application file, relative to the
top level of the application package.
-->
<!ELEMENT web-uri (#PCDATA)>

<!--
The ID mechanism is to allow tools to easily make tool-specific references to
the elements of the deployment descriptor.
 -->
<!ATTLIST alt-dd id ID #IMPLIED>
<!ATTLIST application id ID #IMPLIED>
<!ATTLIST context-root id ID #IMPLIED>
<!ATTLIST description id ID #IMPLIED>
<!ATTLIST display-name id ID #IMPLIED>
<!ATTLIST ejb id ID #IMPLIED>
<!ATTLIST icon id ID #IMPLIED>
<!ATTLIST java id ID #IMPLIED>
<!ATTLIST large-icon id ID #IMPLIED>
<!ATTLIST module id ID #IMPLIED>
<!ATTLIST role-name id ID #IMPLIED>
<!ATTLIST security-role id ID #IMPLIED>
<!ATTLIST small-icon id ID #IMPLIED>
<!ATTLIST web id ID #IMPLIED>
<!ATTLIST web-uri id ID #IMPLIED>

--- NEW FILE: application_1_3.dtd ---
<!--
Copyright (c) 2000 Sun Microsystems, Inc.,
901 San Antonio Road,
Palo Alto, California 94303, U.S.A.
All rights reserved.

Sun Microsystems, Inc. has intellectual property rights relating to
technology embodied in the product that is described in this document.
In particular, and without limitation, these intellectual property
rights may include one or more of the U.S. patents listed at
http://www.sun.com/patents and one or more additional patents or
pending patent applications in the U.S. and in other countries.

This document and the product to which it pertains are distributed
under licenses restricting their use, copying, distribution, and
decompilation.  This document may be reproduced and distributed but may
not be changed without prior written authorization of Sun and its
licensors, if any.

Third-party software, including font technology, is copyrighted and
licensed from Sun suppliers.

Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
Enterprise JavaBeans are trademarks or registered trademarks of Sun
Microsystems, Inc. in the U.S. and other countries.

Federal Acquisitions: Commercial Software - Government Users Subject to
Standard License Terms and Conditions.

DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.


_________________________________________________________________________

Copyright (c) 2000 Sun Microsystems, Inc.,
901 San Antonio Road,
Palo Alto, California 94303, E'tats-Unis.
Tous droits re'serve's.

Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
relatants a` la technologie incorpore'e dans le produit qui est de'crit
dans ce document. En particulier, et sans la limitation, ces droits de
proprie'te' intellectuels peuvent inclure un ou plus des brevets
ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
brevets plus supple'mentaires ou les applications de brevet en attente
dans les E'tats-Unis et dans les autres pays.

Ce produit ou document est prote'ge' par un copyright et distribue'
avec des licences qui en restreignent l'utilisation, la copie, la
distribution, et la de'compilation.  Ce documention associe n peut
e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
licence, le cas e'che'ant.

Le logiciel de'tenu par des tiers, et qui comprend la technologie
relative aux polices de caracte`res, est prote'ge' par un copyright et
licencie' par des fournisseurs de Sun.

Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
Enterprise JavaBeans sont des marques de fabrique ou des marques
de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
pays.

LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
CONTREFAC,ON.
-->

<!--
This is the XML DTD for the J2EE 1.3 application deployment
descriptor.  All J2EE 1.3 application deployment descriptors
must include a DOCTYPE of the following form:

  <!DOCTYPE application PUBLIC
	"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
	"http://java.sun.com/dtd/application_1_3.dtd">

-->

<!--
The following conventions apply to all J2EE deployment descriptor
elements unless indicated otherwise.

- In elements that contain PCDATA, leading and trailing whitespace
  in the data may be ignored.

- In elements whose value is an "enumerated type", the value is
  case sensitive.

- In elements that specify a pathname to a file within the same
  JAR file, relative filenames (i.e., those not starting with "/")
  are considered relative to the root of the JAR file's namespace.
  Absolute filenames (i.e., those starting with "/") also specify
  names in the root of the JAR file's namespace.  In general, relative
  names are preferred.  The exception is .war files where absolute
  names are preferred for consistency with the servlet API.
-->


<!--
The application element is the root element of a J2EE application
deployment descriptor.
-->
<!ELEMENT application (icon?, display-name, description?, module+,
		security-role*)>

<!--
The alt-dd element specifies an optional URI to the post-assembly
version of the deployment descriptor file for a particular J2EE module.
The URI must specify the full pathname of the deployment descriptor
file relative to the application's root directory. If alt-dd is not
specified, the deployer must read the deployment descriptor from the
default location and file name required by the respective component
specification.

Used in: module
-->
<!ELEMENT alt-dd (#PCDATA)>

<!--
The connector element specifies the URI of a resource adapter archive
file, relative to the top level of the application package.

Used in: module
-->
<!ELEMENT connector (#PCDATA)>

<!--
The context-root element specifies the context root of a web
application.

Used in: web
-->
<!ELEMENT context-root (#PCDATA)>

<!--
The description element is used to provide text describing the parent
element.  The description element should include any information that
the application ear file producer wants to provide to the consumer of
the application ear file (i.e., to the Deployer). Typically, the tools
used by the application ear file consumer will display the description
when processing the parent element that contains the description.

Used in: application, security-role
-->
<!ELEMENT description (#PCDATA)>

<!--
The display-name element contains a short name that is intended to be
displayed by tools.  The display name need not be unique.

Used in: application

Example:

<display-name>Employee Self Service</display-name>
-->
<!ELEMENT display-name (#PCDATA)>

<!--
The ejb element specifies the URI of an ejb-jar, relative to the top
level of the application package.

Used in: module
-->
<!ELEMENT ejb (#PCDATA)>

<!--
The icon element contains small-icon and large-icon elements that
specify the file names for small and a large GIF or JPEG icon images
used to represent the parent element in a GUI tool.

Used in: application
-->
<!ELEMENT icon (small-icon?, large-icon?)>

<!--
The java element specifies the URI of a java application client module,
relative to the top level of the application package.

Used in: module
-->
<!ELEMENT java (#PCDATA)>

<!--
The large-icon element contains the name of a file
containing a large (32 x 32) icon image. The file
name is a relative path within the application's
ear file.

The image may be either in the JPEG or GIF format.
The icon can be used by tools.

Used in: icon

Example:

<large-icon>employee-service-icon32x32.jpg</large-icon>
-->
<!ELEMENT large-icon (#PCDATA)>

<!--
The module element represents a single J2EE module and contains a
connector, ejb, java, or web element, which indicates the module type
and contains a path to the module file, and an optional alt-dd element,
which specifies an optional URI to the post-assembly version of the
deployment descriptor.

The application deployment descriptor must have one module element for
each J2EE module in the application package.

Used in: application
-->
<!ELEMENT module ((connector | ejb | java | web), alt-dd?)>

<!--
The role-name element contains the name of a security role.

The name must conform to the lexical rules for an NMTOKEN.

Used in: security-role
-->
<!ELEMENT role-name (#PCDATA)>

<!--
The security-role element contains the definition of a security
role. The definition consists of an optional description of the
security role, and the security role name.

Used in: application

Example:

    <security-role>
	<description>
	    This role includes all employees who are authorized
	    to access the employee service application.
	</description>
	<role-name>employee</role-name>
    </security-role>
-->
<!ELEMENT security-role (description?, role-name)>

<!--
The small-icon element contains the name of a file
containing a small (16 x 16) icon image. The file
name is a relative path within the application's
ear file.

The image may be either in the JPEG or GIF format.
The icon can be used by tools.

Used in: icon

Example:

<small-icon>employee-service-icon16x16.jpg</small-icon>
-->
<!ELEMENT small-icon (#PCDATA)>

<!--
The web element contains the web-uri and context-root of a web
application module.

Used in: module
-->
<!ELEMENT web (web-uri, context-root)>

<!--
The web-uri element specifies the URI of a web application file,
relative to the top level of the application package.

Used in: web
-->
<!ELEMENT web-uri (#PCDATA)>

<!--
The ID mechanism is to allow tools that produce additional deployment
information (i.e., information beyond the standard deployment
descriptor information) to store the non-standard information in a
separate file, and easily refer from these tool-specific files to the
information in the standard deployment descriptor.

Tools are not allowed to add the non-standard information into the
standard deployment descriptor.
-->

<!ATTLIST alt-dd id ID #IMPLIED>
<!ATTLIST application id ID #IMPLIED>
<!ATTLIST connector id ID #IMPLIED>
<!ATTLIST context-root id ID #IMPLIED>
<!ATTLIST description id ID #IMPLIED>
<!ATTLIST display-name id ID #IMPLIED>
<!ATTLIST ejb id ID #IMPLIED>
<!ATTLIST icon id ID #IMPLIED>
<!ATTLIST java id ID #IMPLIED>
<!ATTLIST large-icon id ID #IMPLIED>
<!ATTLIST module id ID #IMPLIED>
<!ATTLIST role-name id ID #IMPLIED>
<!ATTLIST security-role id ID #IMPLIED>
<!ATTLIST small-icon id ID #IMPLIED>
<!ATTLIST web id ID #IMPLIED>
<!ATTLIST web-uri id ID #IMPLIED>

--- NEW FILE: connector_1_0.dtd ---
<!--
Copyright (c) 2000 Sun Microsystems, Inc.,
901 San Antonio Road,
Palo Alto, California 94303, U.S.A.
All rights reserved.

Sun Microsystems, Inc. has intellectual property rights relating to
technology embodied in the product that is described in this document.
In particular, and without limitation, these intellectual property
rights may include one or more of the U.S. patents listed at
http://www.sun.com/patents and one or more additional patents or
pending patent applications in the U.S. and in other countries.

This document and the product to which it pertains are distributed
under licenses restricting their use, copying, distribution, and
decompilation.  This document may be reproduced and distributed but may
not be changed without prior written authorization of Sun and its
licensors, if any.

Third-party software, including font technology, is copyrighted and
licensed from Sun suppliers.

Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
Enterprise JavaBeans are trademarks or registered trademarks of Sun
Microsystems, Inc. in the U.S. and other countries.

Federal Acquisitions: Commercial Software - Government Users Subject to
Standard License Terms and Conditions.

DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.


_________________________________________________________________________

Copyright (c) 2000 Sun Microsystems, Inc.,
901 San Antonio Road,
Palo Alto, California 94303, E'tats-Unis.
Tous droits re'serve's.

Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
relatants a` la technologie incorpore'e dans le produit qui est de'crit
dans ce document. En particulier, et sans la limitation, ces droits de
proprie'te' intellectuels peuvent inclure un ou plus des brevets
ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
brevets plus supple'mentaires ou les applications de brevet en attente
dans les E'tats-Unis et dans les autres pays.

Ce produit ou document est prote'ge' par un copyright et distribue'
avec des licences qui en restreignent l'utilisation, la copie, la
distribution, et la de'compilation.  Ce documention associe n peut
e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
licence, le cas e'che'ant.

Le logiciel de'tenu par des tiers, et qui comprend la technologie
relative aux polices de caracte`res, est prote'ge' par un copyright et
licencie' par des fournisseurs de Sun.

Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
Enterprise JavaBeans sont des marques de fabrique ou des marques
de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
pays.

LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
CONTREFAC,ON.
-->

<!--
This is the XML DTD for the Connector 1.0 deployment descriptor.
All Connector 1.0 deployment descriptors must include a DOCTYPE
of the following form:

  <!DOCTYPE connector PUBLIC
	"-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"
	"http://java.sun.com/dtd/connector_1_0.dtd">

-->

<!--
The following conventions apply to all J2EE deployment descriptor
elements unless indicated otherwise.

- In elements that contain PCDATA, leading and trailing whitespace
  in the data may be ignored.

- In elements whose value is an "enumerated type", the value is
  case sensitive.

- In elements that specify a pathname to a file within the same
  JAR file, relative filenames (i.e., those not starting with "/")
  are considered relative to the root of the JAR file's namespace.
  Absolute filenames (i.e., those starting with "/") also specify
  names in the root of the JAR file's namespace.  In general, relative
  names are preferred.  The exception is .war files where absolute
  names are preferred for consistency with the servlet API.
-->


<!--
The connector element is the root element of the deployment descriptor
for the resource adapter. This element includes general information - vendor
name, version, specification version supported, icon -  about the
resource adapter module. It also includes information specific to the
implementation of the resource adapter library as specified through
the element resourceadapter.
-->
<!ELEMENT connector (display-name?, description?, icon?, vendor-name,
spec-version, eis-type, version, license?, resourceadapter)>

<!--
The element authentication-mechanism specifies an authentication mechanism
supported by the resource adapter. Note that this support is for
the resource adapter and not for the underlying EIS instance. The
optional description specifies any resource adapter specific requirement
for the support of security contract and authentication mechanism.

Note that BasicPassword mechanism type should support the
javax.resource.spi.security.PasswordCredential interface.
The Kerbv5 mechanism type should support the
javax.resource.spi.security.GenericCredential interface.

Used in: resourceadapter
-->
<!ELEMENT authentication-mechanism (
description?, authentication-mechanism-type, credential-interface)>

<!--
The element authentication-mechanism-type specifies type of an authentication
mechanism.

The example values are:
   <authentication-mechanism-type>BasicPassword
                   </authentication-mechanism-type>
   <authentication-mechanism-type>Kerbv5
                   </authentication-mechanism-type>

Any additional security mechanisms are outside the scope of the
Connector architecture specification.

Used in: authentication-mechanism
-->
<!ELEMENT authentication-mechanism-type (#PCDATA)>

<!--
The element config-property contains a declaration of a single
configuration property for a ManagedConnectionFactory instance.

Each ManagedConnectionFactory instance creates connections to a
specific EIS instance based on the properties configured on the
ManagedConnectionFactory instance. The configurable properties are
specified only once in the deployment descriptor, even though a
resource adapter can be used to configure multiple ManagedConnnection-
Factory instances (that create connections to different instances of
the same EIS).

The declaration consists of an optional description, name, type
and an optional value of the configuration property. If the resource
adapter provider does not specify a value than the deployer is
responsible for providing a valid value for a configuration property.

Any bounds or well-defined values of properties should be described
in the description element.

Used in: resourceadapter
-->
<!ELEMENT config-property (description?, config-property-name,
config-property-type, config-property-value?)>

<!--
The element config-property-name contains the name of a configuration
property.

The connector architecture defines a set of well-defined properties
all of type java.lang.String. These are as follows:
     <config-property-name>ServerName</config-property-name>
     <config-property-name>PortNumber</config-property-name>
     <config-property-name>UserName</config-property-name>
     <config-property-name>Password</config-property-name>
     <config-property-name>ConnectionURL</config-property-name>

A resource adapter provider can extend this property set to include
properties specific to the resource adapter and its underlying EIS.

Used in: config-property

Example: <config-property-name>ServerName</config-property-name>
-->
<!ELEMENT config-property-name (#PCDATA)>

<!--
The element config-property-type contains the fully qualified Java
type of a configuration property as required by ManagedConnection-
Factory instance.

The following are the legal values of config-property-type:
   java.lang.Boolean, java.lang.String, java.lang.Integer,
   java.lang.Double, java.lang.Byte, java.lang.Short,
   java.lang.Long, java.lang.Float, java.lang.Character

Used in: config-property

Example: <config-property-type>java.lang.String</config-property-type>
-->
<!ELEMENT config-property-type (#PCDATA)>

<!--
The element config-property-value contains the value of a configuration
entry.

Used in: config-property

Example: <config-property-value>WombatServer</config-property-value>
-->
<!ELEMENT config-property-value (#PCDATA)>

<!--
The element connection-impl-class specifies the fully-qualified
name of the Connection class that implements resource adapter
specific Connection interface.

Used in: resourceadapter

Example: <connection-impl-class>com.wombat.ConnectionImpl
         </connection-impl-class>
-->
<!ELEMENT connection-impl-class (#PCDATA)>

<!--
The element connection-interface specifies the fully-qualified
name of the Connection interface supported by the resource
adapter.

Used in: resourceadapter

Example: <connection-interface>javax.resource.cci.Connection
         </connection-interface>
-->
<!ELEMENT connection-interface (#PCDATA)>

<!--
The element connectionfactory-impl-class specifies the fully-qualified
name of the ConnectionFactory class that implements resource adapter
specific ConnectionFactory interface.

Used in: resourceadapter

Example: <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
         </connectionfactory-impl-class>
-->
<!ELEMENT connectionfactory-impl-class (#PCDATA)>

<!--
The element connectionfactory-interface specifies the fully-qualified
name of the ConnectionFactory interface supported by the resource
adapter.

Used in: resourceadapter

Example: <connectionfactory-interface>com.wombat.ConnectionFactory
         </connectionfactory-interface>
OR
<connectionfactory-interface>javax.resource.cci.ConnectionFactory
         </connectionfactory-interface>
-->
<!ELEMENT connectionfactory-interface (#PCDATA)>

<!--
The element credential-interface specifies the interface that the
resource adapter implementation supports for the representation
of the credentials. This element should be used by application server
to find out the Credential interface it should use as part of the
security contract.

The possible values are:
   <credential-interface>javax.resource.spi.security.PasswordCredential
        </credential-interface>
   <credential-interface>javax.resource.spi.security.GenericCredential
        </credential-interface>

Used in: authentication-mechanism
-->
<!ELEMENT credential-interface (#PCDATA)>

<!--
The description element is used to provide text describing the parent
element.  The description element should include any information that
the resource adapter rar file producer wants to provide to the consumer of
the resource adapter rar file (i.e., to the Deployer). Typically, the tools
used by the resource adapter rar file consumer will display the description
when processing the parent element that contains the description.

Used in: authentication-mechanism, config-property, connector, license,
security-permission
-->
<!ELEMENT description (#PCDATA)>

<!--
The display-name element contains a short name that is intended to be
displayed by tools.  The display name need not be unique.

Used in: connector

Example:

<display-name>Employee Self Service</display-name>
-->
<!ELEMENT display-name (#PCDATA)>

<!--
The element eis-type contains information about the type of the
EIS. For example, the type of an EIS can be product name of EIS
independent of any version info.

This helps in identifying EIS instances that can be used with
this resource adapter.

Used in: connector
-->
<!ELEMENT eis-type (#PCDATA)>

<!--
The icon element contains small-icon and large-icon elements that
specify the file names for small and a large GIF or JPEG icon images
used to represent the parent element in a GUI tool.

Used in: connector
-->
<!ELEMENT icon (small-icon?, large-icon?)>

<!--
The large-icon element contains the name of a file
containing a large (32 x 32) icon image. The file
name is a relative path within the resource adapter's
rar file.

The image may be either in the JPEG or GIF format.
The icon can be used by tools.

Used in: icon

Example:

<large-icon>employee-service-icon32x32.jpg</large-icon>
-->
<!ELEMENT large-icon (#PCDATA)>

<!--
The element license specifies licensing requirements for the resource
adapter module. This element specifies whether a license is required
to deploy and use this resource adapter, and an optional description
of the licensing terms (examples: duration of license, number of
connection restrictions).

Used in: connector
-->
<!ELEMENT license (description?, license-required)>

<!--
The element license-required specifies whether a license is required
to deploy and use the resource adapter. This element must be one of
the following:

	<license-required>true</license-required>
	<license-required>false</license-required>

Used in: license
-->
<!ELEMENT license-required (#PCDATA)>

<!--
The element managedconnectionfactory-class specifies the fully qualified
name of the Java class that implements the javax.resource.spi.Managed-
ConnectionFactory interface. This Java class is provided as part of
resource adapter's implementation of connector architecture specified
contracts.

Used in: resourceadapter

Example:
  <managedconnectionfactory-class>com.wombat.ManagedConnectionFactoryImpl
  </managedconnectionfactory-class>
-->
<!ELEMENT managedconnectionfactory-class (#PCDATA)>

<!--
The element reauthentication-support specifies whether the resource
adapter implementation supports re-authentication of existing Managed-
Connection instance. Note that this information is for the resource
adapter implementation and not for the underlying EIS instance.

This element must be one of the following:
        <reauthentication-support>true</reauthentication-support>
        <reauthentication-support>false</reauthentication-support>
Used in: resourceadapter
-->
<!ELEMENT reauthentication-support (#PCDATA)>

<!--
The element resourceadapter specifies information about the resource
adapter. The information includes fully-qualified names of
class/interfaces required as part of the connector architecture
specified contracts, level of transaction support provided,
configurable properties for ManagedConnectionFactory instances,
one or more authentication mechanisms supported and additional
required security permissions.

If there is no authentication-mechanism specified as part of
resource adapter element then the resource adapter does not
support any standard security authentication mechanisms as part
of security contract. The application server ignores the security
part of the system contracts in this case.

Used in: connector
-->
<!ELEMENT resourceadapter (
managedconnectionfactory-class, connectionfactory-interface,
connectionfactory-impl-class, connection-interface,
connection-impl-class, transaction-support, config-property*,
authentication-mechanism*, reauthentication-support, security-permission*
)>

<!--
The element security permission specifies a security permission that
is required by the resource adapter code.

The security permission listed in the deployment descriptor are ones
that are d...
 
[truncated message content]

[Ejtools-cvs] build build.bat,1.6,1.7 build.sh,1.5,1.6 build.xml,1.8,1.9 build_application.xml,1.12,1.13 build_library.xml,1.5,1.6 build_thirdparty.xml,1.4,1.5 build_webapp.xml,1.4,1.5 build_website.xml,1.4,1.5 general.properties,1.6,1.7 switch.properties,1.9,1.10

[<let...@us...>]

Update of /cvsroot/ejtools/build
In directory usw-pr-cvs1:/tmp/cvs-serv12939

Modified Files:
	build.bat build.sh build.xml build_application.xml 
	build_library.xml build_thirdparty.xml build_webapp.xml 
	build_website.xml general.properties switch.properties 
Log Message:
Switch to Ant 1.5 beta 2

Index: build.bat
===================================================================
RCS file: /cvsroot/ejtools/build/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.bat	25 May 2002 20:30:36 -0000	1.6
--- build.bat	10 Jun 2002 07:45:27 -0000	1.7
***************
*** 20,24 ****
  
  set CP=%CP%;%THIRDPARTY%\apache\ant\ant.jar
! set CP=%CP%;%THIRDPARTY%\apache\ant\optional.jar.jar
  set CP=%CP%;%THIRDPARTY%\apache\crimson\crimson.jar
  set CP=%CP%;%THIRDPARTY%\apache\log4j\log4j.jar
--- 20,24 ----
  
  set CP=%CP%;%THIRDPARTY%\apache\ant\ant.jar
! set CP=%CP%;%THIRDPARTY%\apache\ant\optional.jar
  set CP=%CP%;%THIRDPARTY%\apache\crimson\crimson.jar
  set CP=%CP%;%THIRDPARTY%\apache\log4j\log4j.jar
***************
*** 28,36 ****
  set CP=%CP%;%THIRDPARTY%\sun\tools\tools.jar
  
! set CP=%CP%;%THIRDPARTY%\dreambean\codegen\
! set CP=%CP%;%THIRDPARTY%\dreambean\codegen\codegen.jar
! set CP=%CP%;%THIRDPARTY%\dreambean\xmlbeans\
! set CP=%CP%;%THIRDPARTY%\dreambean\xmlbeans\xmlbeans.jar
! 
  set CP=%CP%;%THIRDPARTY%\sourceforge\xdoclet\xdoclet.jar
  set CP=%CP%;%THIRDPARTY%\sourceforge\jrefactory\jrefactory.jar
--- 28,32 ----
  set CP=%CP%;%THIRDPARTY%\sun\tools\tools.jar
  
! set CP=%CP%;%THIRDPARTY%\sourceforge\xdoclet\
  set CP=%CP%;%THIRDPARTY%\sourceforge\xdoclet\xdoclet.jar
  set CP=%CP%;%THIRDPARTY%\sourceforge\jrefactory\jrefactory.jar

Index: build.sh
===================================================================
RCS file: /cvsroot/ejtools/build/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6

Index: build.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml	25 May 2002 20:29:45 -0000	1.8
--- build.xml	10 Jun 2002 07:45:27 -0000	1.9
***************
*** 14,26 ****
  	<!-- Global Definitions -->
  	<!-- ======================================== -->
  	<property file="build/general.properties"/>
  	<property file="build/location.properties"/>
  	<property file="build/switch.properties"/>
! 	<!-- ==================== Everything Target ===================================== -->
! 	<target name="everything" depends="clean, build, logo, dist, javadoc, todo, package, website" description=""/>
! 	<!-- ==================== Rebuild Target ===================================== -->
! 	<target name="rebuild" depends="clean, build" description=""/>
  	<!-- ======================================== -->
! 	<!-- Displayed on demand or on failure -->
  	<!-- ======================================== -->
  	<target name="help" description="">
--- 14,47 ----
  	<!-- Global Definitions -->
  	<!-- ======================================== -->
+ 	<!--
+ 	<xmlproperty file="switch.xml" keepRoot="false" />
+ 	<echoproperties file="output.properties"/>
+    -->
  	<property file="build/general.properties"/>
  	<property file="build/location.properties"/>
  	<property file="build/switch.properties"/>
! 	<property environment="env"/>
! 	<!-- ==================== Task Definitions ======================== -->
! 	<taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
! 	<taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
! 	<taskdef name="javabean" classname="xdoclet.beans.JavaBeanDocletTask"/>
  	<!-- ======================================== -->
! 	<!-- Catalog Definitions -->
! 	<!-- ======================================== -->
! 	<xmlcatalog id="sunDTDs">
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN" location="dtd/ejb-jar_1_1.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" location="dtd/ejb-jar_2_0.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN" location="dtd/application_1_2.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" location="dtd/application_1_3.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN" location="dtd/application-client_1_2.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN" location="dtd/application-client_1_3.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" location="dtd/connector_1_0.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" location="dtd/web-app_2_2.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" location="dtd/web-app_2_3.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" location="dtd/web-jsptaglibrary_1_1.dtd"/>
! 		<dtd publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" location="dtd/web-jsptaglibrary_1_2.dtd"/>
! 	</xmlcatalog>
! 	<!-- ======================================== -->
! 	<!-- Displayed on demand -->
  	<!-- ======================================== -->
  	<target name="help" description="">
***************
*** 45,51 ****
  	<target name="info" description="">
  		<echo message="------------------------------------------------------------"/>
! 		<echo/>
  		<echo message="EJTools Build System"/>
! 		<echo/>
  		<echo message="------------------------------------------------------------"/>
  	</target>
--- 66,72 ----
  	<target name="info" description="">
  		<echo message="------------------------------------------------------------"/>
! 		<echo message=" "/>
  		<echo message="EJTools Build System"/>
! 		<echo message=" "/>
  		<echo message="------------------------------------------------------------"/>
  	</target>
***************
*** 55,58 ****
--- 76,80 ----
  	<target name="prepare" depends="info" description="">
  		<mkdir dir="${output.root}"/>
+ 		<tstamp/>
  	</target>
  	<!-- ======================================== -->
***************
*** 145,149 ****
  	<!-- Build the Source TarBall -->
  	<!-- ======================================== -->
! 	<target name="tarball" depends="info,clean" description=""/>
  	<!-- **************************************** -->
  	<!-- Generic subtask which calls the subtask for thirdparty, libraries and applications -->
--- 167,186 ----
  	<!-- Build the Source TarBall -->
  	<!-- ======================================== -->
! 	<target name="tarball" depends="info,clean,prepare" description="">
! 		<zip destfile="${output.root}/EJTools-${DSTAMP}.zip" basedir="." excludes="${output.root}/**">
! 			<zipfileset dir="${applications.root}" prefix="${applications.root}"/>
! 			<zipfileset dir="${build.root}" prefix="${build.root}"/>
! 			<zipfileset dir="${libraries.root}" prefix="${libraries.root}"/>
! 			<zipfileset dir="${thirdparty.root}" prefix="${thirdparty.root}"/>
! 		</zip>
! 		<tar destfile="${output.root}/EJTools.tar" basedir="." excludes="${output.root}/**">
! 			<tarfileset dir="${applications.root}" prefix="${applications.root}"/>
! 			<tarfileset dir="${build.root}" prefix="${build.root}"/>
! 			<tarfileset dir="${libraries.root}" prefix="${libraries.root}"/>
! 			<tarfileset dir="${thirdparty.root}" prefix="${thirdparty.root}"/>
! 		</tar>
! 		<gzip src="${output.root}/EJTools.tar" destfile="${output.root}/EJTools-${DSTAMP}.tar.gz"/>
! 		<delete file="${output.root}/EJTools.tar"/>
! 	</target>
  	<!-- **************************************** -->
  	<!-- Generic subtask which calls the subtask for thirdparty, libraries and applications -->

Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build_application.xml	25 May 2002 20:29:28 -0000	1.12
--- build_application.xml	10 Jun 2002 07:45:27 -0000	1.13
***************
*** 11,25 ****
  -->
  <project name="Generic Build File for Applications" default="dist" basedir=".">
- 	<!-- ==================== Global Definitions ======================== -->
- 	<property file="build/general.properties"/>
- 	<property file="build/location.properties"/>
- 	<!-- ==================== Task Definitions ======================== -->
- 	<taskdef name="xmlbean" classname="com.dreambean.xmlbeans.ant.XMLBeans"/>
- 	<taskdef name="xdoclet" classname="xdoclet.DocletTask"/>
- 	<taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
- 	<taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
- 	<!--
- 	<taskdef name="javabean" classname="xdoclet.beans.JavaBeanDocletTask"/>
- 	-->
  	<!-- ==================== Module Definition ======================== -->
  	<property name="module.root" value="${applications.root}/${module.name}"/>
--- 11,14 ----
***************
*** 96,100 ****
  		<available file="${module.root}/lib.properties" property="has.lib.file"/>
  		<available file="${module.root}/lib.ext.properties" property="has.lib.ext.file"/>
- 		<available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/>
  		<copy todir="${build.etc}">
  			<fileset dir="${src.etc}">
--- 85,88 ----
***************
*** 102,110 ****
  			</fileset>
  			<filterset>
! 				<filter token="module.name" value="${module.display.name}"/>
! 				<filter token="version.major" value="${version.major}"/>
! 				<filter token="version.minor" value="${version.minor}"/>
! 				<filter token="version.revision" value="${version.revision}"/>
! 				<filter token="version.tag" value="${version.tag}"/>
  			</filterset>
  		</copy>
--- 90,94 ----
  			</fileset>
  			<filterset>
! 				<filtersfile file="${module.root}/module.properties"/>
  			</filterset>
  		</copy>
***************
*** 112,115 ****
--- 96,104 ----
  	<!-- ==================== Compile Target ================================== -->
  	<target name="compile" depends="prepare" description="Compile Java sources">
+ 		<!-- See if beaninfo generation is needed -->
+ 		<uptodate property="beaninfo.uptodate">
+ 			<srcfiles dir="${src.main}" includes="**/*.java"/>
+ 			<mapper type="glob" from="*.java" to="../../../../${build.classes}/*.class"/>
+ 		</uptodate>
  		<!-- Compile Java classes as necessary -->
  		<javac srcdir="${src.main}" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
***************
*** 117,135 ****
  		</javac>
  	</target>
! 	<!-- ==================== XMLBeans Target ================================== -->
! 	<target name="beaninfo" depends="compile" if="has.dir.etc.beaninfo">
  		<mkdir dir="${build.src}"/>
- 		<!--		
  		<javabean sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
  			<fileset dir="${src.main}">
! 				<include name="**/*.java"/>
  			</fileset>
! 			<beaninfo/>
  			<i18n destdir="${build.classes}"/>
- 			<i18n locale="fr_FR" destdir="${build.classes}"/>
- 			<i18n locale="de_DE" destdir="${build.classes}"/>
  		</javabean>
- 		-->
- 		<xmlbean destdir="${build.src}" srcdir="../${src.etc}/beaninfo" includes="**" excludes="**/CVS/**"/>
  		<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
  			<classpath refid="compile.classpath"/>
--- 106,119 ----
  		</javac>
  	</target>
! 	<!-- ==================== BeanInfo Target ================================== -->
! 	<target name="beaninfo" depends="compile" unless="beaninfo.uptodate">
  		<mkdir dir="${build.src}"/>
  		<javabean sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
  			<fileset dir="${src.main}">
! 				<include name="**/model/**/*.java"/>
  			</fileset>
! 			<beaninfo i18n="true"/>
  			<i18n destdir="${build.classes}"/>
  		</javabean>
  		<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
  			<classpath refid="compile.classpath"/>
***************
*** 158,162 ****
  		</copy>
  		<copy todir="${dist.conf}">
! 			<fileset dir="${src.conf}"/>
  		</copy>
  		<copy todir="${dist.bin}">
--- 142,148 ----
  		</copy>
  		<copy todir="${dist.conf}">
! 			<fileset dir="${src.conf}">
! 				<include name="**/*.properties"/>
! 			</fileset>
  		</copy>
  		<copy todir="${dist.bin}">
***************
*** 170,173 ****
--- 156,165 ----
  			</fileset>
  		</copy>
+ 		<copy todir="${dist.home}">
+ 			<fileset dir="${src.conf}">
+ 				<include name="**/README*"/>
+ 			</fileset>
+ 		</copy>
+ 		<touch file="${dist.lib.ext}/donotremove"/>
  	</target>
  	<!-- ==================== Dist Libraries Copy Target ===================================== -->
***************
*** 202,206 ****
  	</target>
  	<!-- ==================== Package Target =================================== -->
! 	<target name="package" depends="dist" description=""/>
  	<!-- ==================== SVG Logo Target =================================== -->
  	<target name="logo" depends="prepare">
--- 194,210 ----
  	</target>
  	<!-- ==================== Package Target =================================== -->
! 	<target name="package" depends="dist" description="">
! 		<zip destfile="${output.root}/${module.name}-${version.major}.${version.minor}.${version.revision}-${version.tag}.zip" basedir="${dist.home}"/>
! 		<tar destfile="${output.root}/${module.name}.tar">
! 			<tarfileset dir="${dist.home}" mode="755">
! 				<include name="${dist.bin}/run.sh"/>
! 			</tarfileset>
! 			<tarfileset dir="${dist.home}">
! 				<exclude name="${dist.bin}/run.sh"/>
! 			</tarfileset>
! 		</tar>
! 		<gzip src="${output.root}/${module.name}.tar" zipfile="${output.root}/${module.name}-${version.major}.${version.minor}.${version.revision}-${version.tag}.tar.gz"/>
! 		<delete file="${output.root}/${module.name}.tar"/>
! 	</target>
  	<!-- ==================== SVG Logo Target =================================== -->
  	<target name="logo" depends="prepare">

Index: build_library.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_library.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build_library.xml	25 May 2002 20:29:28 -0000	1.5
--- build_library.xml	10 Jun 2002 07:45:27 -0000	1.6
***************
*** 11,20 ****
  -->
  <project name="Generic Build File for Library" default="build" basedir="..">
- 	<!-- ==================== Global Definitions ======================== -->
- 	<property file="build/general.properties"/>
- 	<property file="build/location.properties"/>
- 	<!-- ==================== Task Definitions ======================== -->
- 	<taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
- 	<taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
  	<!-- ==================== Module Definition ======================== -->
  	<property name="module.root" value="${libraries.root}/${module.name}"/>
--- 11,14 ----
***************
*** 67,75 ****
  			</fileset>
  			<filterset>
! 				<filter token="module.name" value="${module.display.name}"/>
! 				<filter token="version.major" value="${version.major}"/>
! 				<filter token="version.minor" value="${version.minor}"/>
! 				<filter token="version.revision" value="${version.revision}"/>
! 				<filter token="version.tag" value="${version.tag}"/>
  			</filterset>
  		</copy>
--- 61,65 ----
  			</fileset>
  			<filterset>
! 				<filtersfile file="${module.root}/module.properties"/>
  			</filterset>
  		</copy>

Index: build_thirdparty.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_thirdparty.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_thirdparty.xml	24 May 2002 21:13:39 -0000	1.4
--- build_thirdparty.xml	10 Jun 2002 07:45:28 -0000	1.5
***************
*** 11,17 ****
  -->
  <project name="Generic Build File for 3rd Party Library" default="build" basedir=".">
- 	<!-- ==================== Global Definitions ======================== -->
- 	<property file="build/general.properties"/>
- 	<property file="build/location.properties"/>
  	<!-- ==================== Module Definition ======================== -->
  	<property name="module.root" value="${thirdparty.root}/${vendor.name}/${module.name}"/>
--- 11,14 ----
***************
*** 55,63 ****
  			</fileset>
  			<filterset>
! 				<filter token="module.name" value="${module.display.name}"/>
! 				<filter token="version.major" value="${version.major}"/>
! 				<filter token="version.minor" value="${version.minor}"/>
! 				<filter token="version.revision" value="${version.revision}"/>
! 				<filter token="version.tag" value="${version.tag}"/>
  			</filterset>
  		</copy>
--- 52,56 ----
  			</fileset>
  			<filterset>
! 				<filtersfile file="${module.root}/module.properties"/>
  			</filterset>
  		</copy>

Index: build_webapp.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_webapp.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_webapp.xml	25 May 2002 20:29:28 -0000	1.4
--- build_webapp.xml	10 Jun 2002 07:45:28 -0000	1.5
***************
*** 11,25 ****
  -->
  <project name="Generic Build File for Web Applications" default="dist" basedir=".">
- 	<!-- ==================== Global Definitions ======================== -->
- 	<property file="build/general.properties"/>
- 	<property file="build/location.properties"/>
- 	<!-- ==================== Task Definitions ======================== -->
- 	<taskdef name="xmlbean" classname="com.dreambean.xmlbeans.ant.XMLBeans"/>
- 	<taskdef name="xdoclet" classname="xdoclet.DocletTask"/>
- 	<taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/>
- 	<taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"/>
- 	<!--
- 	<taskdef name="javabean" classname="xdoclet.beans.JavaBeanDocletTask"/>
- 	-->
  	<!-- ==================== Module Definition ======================== -->
  	<property name="module.root" value="${applications.root}/${module.name}"/>
--- 11,14 ----
***************
*** 53,56 ****
--- 42,46 ----
  		<fileset dir="${ejtools.adwt.root}" includes="*.jar"/>
  		<fileset dir="${ejtools.taglib.root}" includes="*.jar"/>
+ 		<fileset dir="${ejtools.xdoclet.root}" includes="*.jar"/>
  		<fileset dir="${ejtools.xmlweb.root}" includes="*.jar"/>
  		<fileset dir="${apache.ant.root}" includes="*.jar"/>
***************
*** 94,98 ****
  		<mkdir dir="${webapp.tmp.webinf.classes}"/>
  		<mkdir dir="${webapp.tmp.webinf.lib}"/>
- 		<available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/>
  		<copy todir="${build.etc}">
  			<fileset dir="${src.etc}">
--- 84,87 ----
***************
*** 100,108 ****
  			</fileset>
  			<filterset>
! 				<filter token="module.name" value="${module.display.name}"/>
! 				<filter token="version.major" value="${version.major}"/>
! 				<filter token="version.minor" value="${version.minor}"/>
! 				<filter token="version.revision" value="${version.revision}"/>
! 				<filter token="version.tag" value="${version.tag}"/>
  			</filterset>
  		</copy>
--- 89,93 ----
  			</fileset>
  			<filterset>
! 				<filtersfile file="${module.root}/module.properties"/>
  			</filterset>
  		</copy>
***************
*** 110,113 ****
--- 95,103 ----
  	<!-- ==================== Compile Target ================================== -->
  	<target name="compile" depends="prepare" description="Compile Java sources">
+ 		<!-- See if beaninfo generation is needed -->
+ 		<uptodate property="beaninfo.uptodate">
+ 			<srcfiles dir="${src.main}" includes="**/model/**/*.java"/>
+ 			<mapper type="glob" from="*.java" to="../../../../${build.classes}/*.class"/>
+ 		</uptodate>
  		<!-- Compile Java classes as necessary -->
  		<javac srcdir="${src.main}" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
***************
*** 115,122 ****
  		</javac>
  	</target>
! 	<!-- ==================== XMLBeans Target ================================== -->
! 	<target name="beaninfo" depends="compile" if="has.dir.etc.beaninfo">
  		<mkdir dir="${build.src}"/>
! 		<xmlbean destdir="${build.src}" srcdir="../${src.etc}/beaninfo" includes="**" excludes="**/CVS/**"/>
  		<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
  			<classpath refid="compile.classpath"/>
--- 105,120 ----
  		</javac>
  	</target>
! 	<!-- ==================== BeanInfo Target ================================== -->
! 	<target name="beaninfo" depends="compile" unless="beaninfo.uptodate">
  		<mkdir dir="${build.src}"/>
! 		<!-- Bean Info generation + i18n properties files -->
! 		<javabean sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
! 			<fileset dir="${src.main}">
! 				<include name="**/model/**/*.java"/>
! 			</fileset>
! 			<beaninfo i18n="true"/>
! 			<i18n destdir="${build.classes}"/>
! 		</javabean>
! 		<!-- Compile BeanInfo -->
  		<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
  			<classpath refid="compile.classpath"/>
***************
*** 131,135 ****
  		</copy>
  		<copy todir="${webapp.tmp}">
! 			<fileset dir="${src.webapp.content}"/>
  		</copy>
  		<copy todir="${webapp.tmp.webinf}">
--- 129,136 ----
  		</copy>
  		<copy todir="${webapp.tmp}">
! 			<fileset dir="${src.webapp.content}">
! 				<exclude name="**/*.xml"/>
! 				<exclude name="**/*.xsl"/>
! 			</fileset>
  		</copy>
  		<copy todir="${webapp.tmp.webinf}">
***************
*** 147,161 ****
  	<!-- ==================== JSP Build Target ===================================== -->
  	<target name="build.jsp" depends="build" description="">
! 		<java classname="org.apache.jasper.JspC" fork="true">
! 			<classpath refid="compile.classpath"/>
! 			<arg value="-d"/>
! 			<arg value="${build.src}"/>
! 			<arg value="-uriroot"/>
! 			<arg value="${webapp.tmp}"/>
! 			<arg value="${webapp.tmp}/*.jsp"/>
! 		</java>
  		<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="*.java" excludes="**/CVS/**">
  			<classpath refid="compile.classpath"/>
  		</javac>
  		<copy todir="${webapp.tmp.webinf.classes}">
  			<fileset dir="${build.classes}"/>
--- 148,160 ----
  	<!-- ==================== JSP Build Target ===================================== -->
  	<target name="build.jsp" depends="build" description="">
! 		<!-- JSP pre-compilation -->
! 		<jspc destdir="${build.src}" srcdir="${webapp.tmp}" uriroot="${webapp.tmp}" classpathref="compile.classpath">
! 			<include name="**/*.jsp"/>
! 		</jspc>
! 		<!-- Compile JSP -->
  		<javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="*.java" excludes="**/CVS/**">
  			<classpath refid="compile.classpath"/>
  		</javac>
+ 		<!-- Add them to classes -->
  		<copy todir="${webapp.tmp.webinf.classes}">
  			<fileset dir="${build.classes}"/>

Index: build_website.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_website.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_website.xml	24 May 2002 21:13:39 -0000	1.4
--- build_website.xml	10 Jun 2002 07:45:28 -0000	1.5
***************
*** 11,18 ****
  -->
  <project name="EJTools Website Build File" default="all" basedir=".">
- 	<!-- ==================== Global Definitions ======================== -->
- 	<property file="build/general.properties"/>
- 	<property file="build/location.properties"/>
- 	<property environment="env"/>
  	<!-- ==================== File and Directory Names ======================== -->
  	<property name="images.root" value="${website.root}/images"/>
--- 11,14 ----
***************
*** 24,29 ****
  		<echo message="------------------------------------------------------------"/>
  	</target>
! 	<!-- ==================== All Target =================================== -->
! 	<target name="all" depends="info,xweb,javadoc.copy,todo.copy,compress"/>
  	<!-- ==================== Compress Target =================================== -->
  	<target name="compress" depends="">
--- 20,28 ----
  		<echo message="------------------------------------------------------------"/>
  	</target>
! 	<!-- ==================== All Target ===================================
! 	<target name="all" depends="info,xweb,style.copy,tarball.copy,javadoc.copy,todo.copy">
! 	-->
! 	<target name="all" depends="info,xweb,style.copy,tarball.copy">
! 	</target>
  	<!-- ==================== Compress Target =================================== -->
  	<target name="compress" depends="">
***************
*** 31,34 ****
--- 30,53 ----
  		<gzip zipfile="${output.root}/website.tar.gz" src="${output.root}/website.tar"/>
  		<delete file="${output.root}/website.tar"/>
+ 	</target>
+ 	<!-- ==================== Coding Style Copy Target =================================== -->
+ 	<target name="style.copy" depends="xweb">
+ 		<loadfile property="style.page" srcFile="${website.root}/content/developers/style.html"/>
+ 		<filter token="STYLEPAGE" value="${style.page}"/>
+ 		<move file="${website.root}/output/dev/style.html" tofile="${website.root}/output/dev/style.html.tmp" filtering="true"/>
+ 		<move file="${website.root}/output/dev/style.html.tmp" tofile="${website.root}/output/dev/style.html"/>
+ 	</target>
+ 	<!-- ==================== TarBall Copy Target =================================== -->
+ 	<target name="tarball.copy" depends="xweb">
+ 		<mkdir dir="${website.root}/output/downloads"/>
+ 		<copy todir="${website.root}/output/downloads">
+ 			<fileset dir="${output.root}">
+ 				<include name="EJTools*"/>
+ 			</fileset>
+ 		</copy>
+ 		<tstamp/>
+ 		<filter token="DATE" value="${DSTAMP}"/>
+ 		<move file="${website.root}/output/dev/source.html" tofile="${website.root}/output/dev/source.html.tmp" filtering="true"/>
+ 		<move file="${website.root}/output/dev/source.html.tmp" tofile="${website.root}/output/dev/source.html"/>
  	</target>
  	<!-- ==================== JavaDoc Copy Target =================================== -->

Index: general.properties
===================================================================
RCS file: /cvsroot/ejtools/build/general.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** general.properties	24 May 2002 21:12:15 -0000	1.6
--- general.properties	10 Jun 2002 07:45:28 -0000	1.7
***************
*** 28,34 ****
  # Folders options
  # --------------------------------------------------------------------------------
  applications.root=applications
  libraries.root=libraries
  thirdparty.root=thirdparty
  website.root=website
- output.root=output
--- 28,36 ----
  # Folders options
  # --------------------------------------------------------------------------------
+ build.root=build
+ output.root=output
+ 
  applications.root=applications
  libraries.root=libraries
  thirdparty.root=thirdparty
  website.root=website

Index: switch.properties
===================================================================
RCS file: /cvsroot/ejtools/build/switch.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** switch.properties	24 May 2002 21:12:15 -0000	1.9
--- switch.properties	10 Jun 2002 07:45:28 -0000	1.10
***************
*** 50,59 ****
  # Modules to dist
  # --------------------------------------------------------------------------------
! dist.application.deployment=true
! dist.application.jmx.browser=true
! dist.application.jndi.browser=true
! dist.application.management=true
  dist.webapp.jmx.browser=true
! dist.webapp.jndi.browser=true
  dist.library.adwt=true
  dist.library.common=true
--- 50,59 ----
  # Modules to dist
  # --------------------------------------------------------------------------------
! #dist.application.deployment=true
! #dist.application.jmx.browser=true
! #dist.application.jndi.browser=true
! #dist.application.management=true
  dist.webapp.jmx.browser=true
! #dist.webapp.jndi.browser=true
  dist.library.adwt=true
  dist.library.common=true
***************
*** 61,64 ****
--- 61,65 ----
  dist.library.jboss.provider=true
  dist.library.taglib=true
+ dist.library.xdoclet=true
  dist.library.xmlweb=true
  dist.thirdparty.jsr77=true
***************
*** 85,88 ****
--- 86,103 ----
  logo.application.jndi.browser=true
  logo.application.management=true
+ 
+ # Modules to beautify
+ # --------------------------------------------------------------------------------
+ pretty.print.application.deployment=true
+ pretty.print.application.jmx.browser=true
+ pretty.print.application.jndi.browser=true
+ pretty.print.application.management=true
+ pretty.print.webapp.jmx.browser=true
+ pretty.print.webapp.jndi.browser=true
+ pretty.print.library.adwt=true
+ pretty.print.library.common=true
+ pretty.print.library.jboss.provider=true
+ pretty.print.library.taglib=true
+ pretty.print.library.xmlweb=true
  
  # Modules to todo

[Ejtools-cvs] build/dtd - New directory

[<let...@us...>]

Update of /cvsroot/ejtools/build/dtd
In directory usw-pr-cvs1:/tmp/cvs-serv12856/build/dtd

Log Message:
Directory /cvsroot/ejtools/build/dtd added to the repository

[Ejtools-cvs] thirdparty/apache/ant VERSION,1.1,1.2 ant.jar,1.1,1.2 optional.jar,1.1,1.2

[<let...@us...>]

Update of /cvsroot/ejtools/thirdparty/apache/ant
In directory usw-pr-cvs1:/tmp/cvs-serv11354/apache/ant

Modified Files:
	VERSION ant.jar optional.jar 
Log Message:
Switch to Ant 1.5 beta 2

Index: VERSION
===================================================================
RCS file: /cvsroot/ejtools/thirdparty/apache/ant/VERSION,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VERSION	17 Apr 2002 20:46:21 -0000	1.1
--- VERSION	10 Jun 2002 07:39:45 -0000	1.2
***************
*** 1 ****
! 1.4.1
--- 1 ----
! 1.5b2

Index: ant.jar
===================================================================
RCS file: /cvsroot/ejtools/thirdparty/apache/ant/ant.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsilEJEh and /tmp/cvs7ef4Ui differ

Index: optional.jar
===================================================================
RCS file: /cvsroot/ejtools/thirdparty/apache/ant/optional.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsqDKEGd and /tmp/cvscxAUAm differ

[Ejtools-cvs] libraries/xdoclet/src/resources/xdoclet/beans beaninfo.j,1.2,1.3

[<let...@us...>]

Update of /cvsroot/ejtools/libraries/xdoclet/src/resources/xdoclet/beans
In directory usw-pr-cvs1:/tmp/cvs-serv10732/xdoclet/src/resources/xdoclet/beans

Modified Files:
	beaninfo.j 
Log Message:
Change Template

Index: beaninfo.j
===================================================================
RCS file: /cvsroot/ejtools/libraries/xdoclet/src/resources/xdoclet/beans/beaninfo.j,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** beaninfo.j	29 May 2002 20:29:24 -0000	1.2
--- beaninfo.j	10 Jun 2002 07:35:59 -0000	1.3
***************
*** 24,36 ****
  {
     /** Description of the Field */
!    protected BeanDescriptor bd = new BeanDescriptor(<XDtClass:fullClassName/>.class<XDtClass:ifHasClassTag tagName="javabean:class" paramName="customizer">, <XDtClass:classTagValue tagName="javabean:class" paramName="customizer"/>.class</XDtClass:ifHasClassTag>);
     /** Description of the Field */
!    protected Image iconMono16<XDtClass:ifHasClassTag tagName="javabean:iconss" paramName="mono16"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="mono16"/>")</XDtClass:ifHasClassTag>;
     /** Description of the Field */
!    protected Image iconColor16<XDtClass:ifHasClassTag tagName="javabean:icons" paramName="color16"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="color16"/>")</XDtClass:ifHasClassTag>;
     /** Description of the Field */
!    protected Image iconMono32<XDtClass:ifHasClassTag tagName="javabean:icons" paramName="mono32"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="mono32"/>")</XDtClass:ifHasClassTag>;
     /** Description of the Field */
!    protected Image iconColor32<XDtClass:ifHasClassTag tagName="javabean:icons" paramName="color32"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="color32"/>")</XDtClass:ifHasClassTag>;
     <XDtConfig:ifConfigParamEquals paramName="i18n" value="true">
     /** Description of the Field */
--- 24,36 ----
  {
     /** Description of the Field */
!    protected BeanDescriptor bd = new BeanDescriptor(<XDtClass:fullClassName/>.class<XDtClass:ifHasClassTag tagName="javabean:class" paramName="customizer" superclasses="false">, <XDtClass:classTagValue tagName="javabean:class" paramName="customizer"/>.class</XDtClass:ifHasClassTag>);
     /** Description of the Field */
!    protected Image iconMono16<XDtClass:ifHasClassTag tagName="javabean:iconss" paramName="mono16" superclasses="false"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="mono16"/>")</XDtClass:ifHasClassTag>;
     /** Description of the Field */
!    protected Image iconColor16<XDtClass:ifHasClassTag tagName="javabean:icons" paramName="color16" superclasses="false"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="color16"/>")</XDtClass:ifHasClassTag>;
     /** Description of the Field */
!    protected Image iconMono32<XDtClass:ifHasClassTag tagName="javabean:icons" paramName="mono32" superclasses="false"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="mono32"/>")</XDtClass:ifHasClassTag>;
     /** Description of the Field */
!    protected Image iconColor32<XDtClass:ifHasClassTag tagName="javabean:icons" paramName="color32" superclasses="false"> = loadImage("<XDtClass:classTagValue tagName="javabean:icons" paramName="color32"/>")</XDtClass:ifHasClassTag>;
     <XDtConfig:ifConfigParamEquals paramName="i18n" value="true">
     /** Description of the Field */
***************
*** 74,78 ****
        try
        {
!          <XDtClass:ifHasClassTag tagName="javabean:class" paramName="stopClass">
           for (Class cl = <XDtClass:fullClassName/>.class.getSuperclass(); !cl.equals(<XDtClass:classTagValue tagName="javabean:class" paramName="stopClass"/>.class.getSuperclass()); cl = cl.getSuperclass()) {
              bi.addElement(Introspector.getBeanInfo(cl));
--- 74,78 ----
        try
        {
!          <XDtClass:ifHasClassTag tagName="javabean:class" paramName="stopClass" superclasses="false">
           for (Class cl = <XDtClass:fullClassName/>.class.getSuperclass(); !cl.equals(<XDtClass:classTagValue tagName="javabean:class" paramName="stopClass"/>.class.getSuperclass()); cl = cl.getSuperclass()) {
              bi.addElement(Introspector.getBeanInfo(cl));
***************
*** 97,117 ****
     public BeanDescriptor getBeanDescriptor()
     {
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="name">bd.setName("<XDtClass:classTagValue tagName="javabean:class" paramName="name"/>");</XDtClass:ifHasClassTag>
  
        <XDtConfig:ifConfigParamEquals paramName="i18n" value="true">
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="displayName">bd.setDisplayName(res.getString("bean.displayName"));</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="shortDescription">bd.setShortDescription(res.getString("bean.shortDescription"));</XDtClass:ifHasClassTag>
        </XDtConfig:ifConfigParamEquals>
        
        <XDtConfig:ifConfigParamNotEquals paramName="i18n" value="true">
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="displayName">bd.setDisplayName("<XDtClass:classTagValue tagName="javabean:class" paramName="displayName"/>");</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="shortDescription">bd.setShortDescription("<XDtClass:classTagValue tagName="javabean:class" paramName="shortDescription"/>");</XDtClass:ifHasClassTag>
        </XDtConfig:ifConfigParamNotEquals>
  
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="expert">bd.setExpert(<XDtClass:classTagValue tagName="javabean:class" paramName="expert" values="true,false"/>);</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="hidden">bd.setHidden(<XDtClass:classTagValue tagName="javabean:class" paramName="hidden" values="true,false"/>);</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="preferred">bd.setPreferred(<XDtClass:classTagValue tagName="javabean:class" paramName="preferred" values="true,false"/>);</XDtClass:ifHasClassTag>
  
!       <XDtClass:forAllClassTags tagName="javabean:attribute">
        bd.setValue("<XDtClass:classTagValue tagName="javabean:attribute" paramName="name"/>","<XDtClass:classTagValue tagName="javabean:attribute" paramName="value"/>");
        </XDtClass:forAllClassTags>
--- 97,117 ----
     public BeanDescriptor getBeanDescriptor()
     {
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="name" superclasses="false">bd.setName("<XDtClass:classTagValue tagName="javabean:class" paramName="name"/>");</XDtClass:ifHasClassTag>
  
        <XDtConfig:ifConfigParamEquals paramName="i18n" value="true">
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="displayName" superclasses="false">bd.setDisplayName(res.getString("bean.displayName"));</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="shortDescription" superclasses="false">bd.setShortDescription(res.getString("bean.shortDescription"));</XDtClass:ifHasClassTag>
        </XDtConfig:ifConfigParamEquals>
        
        <XDtConfig:ifConfigParamNotEquals paramName="i18n" value="true">
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="displayName" superclasses="false">bd.setDisplayName("<XDtClass:classTagValue tagName="javabean:class" paramName="displayName"/>");</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="shortDescription" superclasses="false">bd.setShortDescription("<XDtClass:classTagValue tagName="javabean:class" paramName="shortDescription"/>");</XDtClass:ifHasClassTag>
        </XDtConfig:ifConfigParamNotEquals>
  
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="expert" superclasses="false">bd.setExpert(<XDtClass:classTagValue tagName="javabean:class" paramName="expert" values="true,false"/>);</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="hidden" superclasses="false">bd.setHidden(<XDtClass:classTagValue tagName="javabean:class" paramName="hidden" values="true,false"/>);</XDtClass:ifHasClassTag>
!       <XDtClass:ifHasClassTag tagName="javabean:class" paramName="preferred" superclasses="false">bd.setPreferred(<XDtClass:classTagValue tagName="javabean:class" paramName="preferred" values="true,false"/>);</XDtClass:ifHasClassTag>
  
!       <XDtClass:forAllClassTags tagName="javabean:attribute" superclasses="false">
        bd.setValue("<XDtClass:classTagValue tagName="javabean:attribute" paramName="name"/>","<XDtClass:classTagValue tagName="javabean:attribute" paramName="value"/>");
        </XDtClass:forAllClassTags>
***************
*** 128,132 ****
     public int getDefaultPropertyIndex()
     {
!       String defName = "<XDtClass:classTagValue tagName="javabean:class" paramName="defaultProperty" default=""/>";
        if (defName.equals(""))
        {
--- 128,132 ----
     public int getDefaultPropertyIndex()
     {
!       String defName = "<XDtClass:classTagValue tagName="javabean:class" paramName="defaultProperty" default="" superclasses="false"/>";
        if (defName.equals(""))
        {
***************
*** 189,197 ****
           try
           {
!             <XDtClass:ifDoesntHaveClassTag tagName="javabean:property" paramName="readOnly">
              descriptor = new PropertyDescriptor("<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>", <XDtClass:fullClassName/>.class);
              </XDtClass:ifDoesntHaveClassTag>
              
!             <XDtClass:ifHasClassTag tagName="javabean:property" paramName="readOnly" >
              descriptor = new PropertyDescriptor("<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>", <XDtClass:fullClassName/>.class, "<XDtJavaBean:getterPrefix tagName="javabean:property" paramName="class"/><XDtJavaBean:capitalizeClassTag tagName="javabean:property" paramName="name"/>", null);
              </XDtClass:ifHasClassTag>
--- 189,197 ----
           try
           {
!             <XDtClass:ifDoesntHaveClassTag tagName="javabean:property" paramName="readOnly" superclasses="false">
              descriptor = new PropertyDescriptor("<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>", <XDtClass:fullClassName/>.class);
              </XDtClass:ifDoesntHaveClassTag>
              
!             <XDtClass:ifHasClassTag tagName="javabean:property" paramName="readOnly" superclasses="false">
              descriptor = new PropertyDescriptor("<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>", <XDtClass:fullClassName/>.class, "<XDtJavaBean:getterPrefix tagName="javabean:property" paramName="class"/><XDtJavaBean:capitalizeClassTag tagName="javabean:property" paramName="name"/>", null);
              </XDtClass:ifHasClassTag>
***************
*** 203,222 ****
  
           <XDtConfig:ifConfigParamEquals paramName="i18n" value="true">
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="displayName">descriptor.setDisplayName(res.getString("property.<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>.displayName"));</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="shortDescription">descriptor.setShortDescription(res.getString("property.<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>.shortDescription"));</XDtClass:ifHasClassTag>
           </XDtConfig:ifConfigParamEquals>
           
           <XDtConfig:ifConfigParamNotEquals paramName="i18n" value="true">
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="displayName">descriptor.setDisplayName("<XDtClass:classTagValue tagName="javabean:property" paramName="displayName"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="shortDescription">descriptor.setShortDescription("<XDtClass:classTagValue tagName="javabean:property" paramName="shortDescription"/>");</XDtClass:ifHasClassTag>
           </XDtConfig:ifConfigParamNotEquals>
  
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="expert">descriptor.setExpert(<XDtClass:classTagValue tagName="javabean:property" paramName="expert" values="true,false"/>);</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="hidden">descriptor.setHidden(<XDtClass:classTagValue tagName="javabean:property" paramName="hidden" values="true,false"/>);</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="preferred">descriptor.setPreferred(<XDtClass:classTagValue tagName="javabean:property" paramName="preferred" values="true,false"/>);</XDtClass:ifHasClassTag>
  
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="bound">descriptor.setBound("<XDtClass:classTagValue tagName="javabean:property" paramName="bound" values="true,false"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="constrained">descriptor.setConstrained("<XDtClass:classTagValue tagName="javabean:property" paramName="constrained" values="true,false"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="propertyEditor">descriptor.setPropertyEditorClass(Class.forName("<XDtClass:classTagValue tagName="javabean:property" paramName="propertyEditor"/>"));</XDtClass:ifHasClassTag>
  
           descriptors.add(descriptor);
--- 203,222 ----
  
           <XDtConfig:ifConfigParamEquals paramName="i18n" value="true">
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="displayName" superclasses="false">descriptor.setDisplayName(res.getString("property.<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>.displayName"));</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="shortDescription" superclasses="false">descriptor.setShortDescription(res.getString("property.<XDtClass:classTagValue tagName="javabean:property" paramName="name"/>.shortDescription"));</XDtClass:ifHasClassTag>
           </XDtConfig:ifConfigParamEquals>
           
           <XDtConfig:ifConfigParamNotEquals paramName="i18n" value="true">
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="displayName" superclasses="false">descriptor.setDisplayName("<XDtClass:classTagValue tagName="javabean:property" paramName="displayName"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="shortDescription" superclasses="false">descriptor.setShortDescription("<XDtClass:classTagValue tagName="javabean:property" paramName="shortDescription"/>");</XDtClass:ifHasClassTag>
           </XDtConfig:ifConfigParamNotEquals>
  
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="expert" superclasses="false">descriptor.setExpert(<XDtClass:classTagValue tagName="javabean:property" paramName="expert" values="true,false"/>);</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="hidden" superclasses="false">descriptor.setHidden(<XDtClass:classTagValue tagName="javabean:property" paramName="hidden" values="true,false"/>);</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="preferred" superclasses="false">descriptor.setPreferred(<XDtClass:classTagValue tagName="javabean:property" paramName="preferred" values="true,false"/>);</XDtClass:ifHasClassTag>
  
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="bound" superclasses="false">descriptor.setBound("<XDtClass:classTagValue tagName="javabean:property" paramName="bound" values="true,false"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="constrained" superclasses="false">descriptor.setConstrained("<XDtClass:classTagValue tagName="javabean:property" paramName="constrained" values="true,false"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="javabean:property" paramName="propertyEditor" superclasses="false">descriptor.setPropertyEditorClass(Class.forName("<XDtClass:classTagValue tagName="javabean:property" paramName="propertyEditor"/>"));</XDtClass:ifHasClassTag>
  
           descriptors.add(descriptor);

[Ejtools-cvs] libraries/taglib/src/etc default.mf,1.1,1.2

[<let...@us...>]

Update of /cvsroot/ejtools/libraries/taglib/src/etc
In directory usw-pr-cvs1:/tmp/cvs-serv10455/taglib/src/etc

Modified Files:
	default.mf 
Log Message:
Change Manifest and properties

Index: default.mf
===================================================================
RCS file: /cvsroot/ejtools/libraries/taglib/src/etc/default.mf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.mf	23 May 2002 21:27:21 -0000	1.1
--- default.mf	10 Jun 2002 07:34:58 -0000	1.2
***************
*** 1,6 ****
! Specification-Title: @module.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
! Specification-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
! Specification-Vendor: EJTools Project
! Implementation-Title: @module.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
! Implementation-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
! Implementation-Vendor: EJTools Project
--- 1,6 ----
! Specification-Title: @module.display.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
! Specification-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
! Specification-Vendor: EJTools Project
! Implementation-Title: @module.display.name@ @version.major@.@version.minor@.@version.revision@-@version.tag@
! Implementation-Version: @version.major@.@version.minor@.@version.revision@-@version.tag@
! Implementation-Vendor: EJTools Project

[Ejtools-cvs] libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms BytesMessage16.gif,NONE,1.1 MapMessage16.gif,1.1,1.2 Message16.gif,1.1,1.2 ObjectMessage16.gif,1.1,1.2 StreamMessage16.gif,1.1,1.2 TextMessage16.gif,1.1,1.2

[<let...@us...>]

Update of /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms
In directory usw-pr-cvs1:/tmp/cvs-serv10221/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms

Modified Files:
	MapMessage16.gif Message16.gif ObjectMessage16.gif 
	StreamMessage16.gif TextMessage16.gif 
Added Files:
	BytesMessage16.gif 
Log Message:
Change Manifest and properties

--- NEW FILE: BytesMessage16.gif ---
(This appears to be a binary file; contents omitted.)

Index: MapMessage16.gif
===================================================================
RCS file: /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms/MapMessage16.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsxIvf3D and /tmp/cvsSJmJ07 differ

Index: Message16.gif
===================================================================
RCS file: /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms/Message16.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsw3CzHF and /tmp/cvsopK27a differ

Index: ObjectMessage16.gif
===================================================================
RCS file: /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms/ObjectMessage16.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsfSrAUE and /tmp/cvsi1VRE9 differ

Index: StreamMessage16.gif
===================================================================
RCS file: /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms/StreamMessage16.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsyJeYtG and /tmp/cvsIHfOPc differ

Index: TextMessage16.gif
===================================================================
RCS file: /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development/jms/TextMessage16.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsTtjf6H and /tmp/cvs4VJY1f differ

[Ejtools-cvs] libraries/j2ee.icons/src/resources/toolbarButtonGraphics/general File16.gif,1.1,1.2 Folder16.gif,1.1,1.2

[<let...@us...>]

Update of /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/general
In directory usw-pr-cvs1:/tmp/cvs-serv10221/j2ee.icons/src/resources/toolbarButtonGraphics/general

Modified Files:
	File16.gif Folder16.gif 
Log Message:
Change Manifest and properties

Index: File16.gif
===================================================================
RCS file: /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/general/File16.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs1UjBcK and /tmp/cvsEuhR7j differ

Index: Folder16.gif
===================================================================
RCS file: /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/general/Folder16.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsStyMlJ and /tmp/cvsAxOszi differ

[Ejtools-cvs] libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development Corba16.gif,NONE,1.1 Corba24.gif,NONE,1.1 ejb24.gif,NONE,1.1 EJB24.gif,1.1,NONE

[<let...@us...>]

Update of /cvsroot/ejtools/libraries/j2ee.icons/src/resources/toolbarButtonGraphics/development
In directory usw-pr-cvs1:/tmp/cvs-serv10221/j2ee.icons/src/resources/toolbarButtonGraphics/development

Added Files:
	Corba16.gif Corba24.gif ejb24.gif 
Removed Files:
	EJB24.gif 
Log Message:
Change Manifest and properties

--- NEW FILE: Corba16.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Corba24.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ejb24.gif ---
(This appears to be a binary file; contents omitted.)

--- EJB24.gif DELETED ---

[Ejtools-cvs] libraries/j2ee.icons/src/resources icons.html,NONE,1.1

[<let...@us...>]

Update of /cvsroot/ejtools/libraries/j2ee.icons/src/resources
In directory usw-pr-cvs1:/tmp/cvs-serv10221/j2ee.icons/src/resources

Added Files:
	icons.html 
Log Message:
Change Manifest and properties

--- NEW FILE: icons.html ---
<html>

<head>
<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
</head>

<body>

<h1>J2EE Icons</h1>
<p>To customize the display of the applications, EJTools provides a bunch of
icons. Some are copies of existing icons and some are new.</p>
<h3>JNDI Browser Icons</h3>
<p>Here are the icons used in the JNDI Browser and their location :</p>
<div align="center">
  <center>
  <table border="1" width="75%" cellspacing="0" cellpadding="2">
    <tr>
      <td width="40%" align="center"><i><b>Object</b></i></td>
      <td width="10%" align="center"><i><b>16 pixels</b></i></td>
      <td width="10%" align="center"><i><b>24 pixels</b></i></td>
      <td width="40%" align="center"><i><b>Location</b></i></td>
    </tr>
    <tr>
      <td>J2EEServer</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>J2EEApplication</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>AppClientModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>EJBModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>EntityBean</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EntityBean16.gif" width="16" height="16"></td>
      <td><img height="24" src="toolbarButtonGraphics/development/toolbarButtonGraphics/development/EnterpriseJavaBean24.gif" width="24"></td>
      <td>custom</td>
    </tr>
  </table>
  </center>
</div>
<h3>JMX Browser Icons</h3>
<p>Here are the icons used in the JMX&nbsp; Browser and their location :</p>
<div align="center">
  <center>
  <table border="1" width="75%" cellspacing="0" cellpadding="2">
    <tr>
      <td width="40%" align="center"><i><b>Object</b></i></td>
      <td width="10%" align="center"><i><b>16 pixels</b></i></td>
      <td width="10%" align="center"><i><b>24 pixels</b></i></td>
      <td width="40%" align="center"><i><b>Location</b></i></td>
    </tr>
    <tr>
      <td>J2EEServer</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>J2EEApplication</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>AppClientModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>EJBModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>EntityBean</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EntityBean16.gif" width="16" height="16"></td>
      <td><img height="24" src="toolbarButtonGraphics/development/toolbarButtonGraphics/development/EnterpriseJavaBean24.gif" width="24"></td>
      <td>custom</td>
    </tr>
  </table>
  </center>
</div>
<h3>Management Console Icons</h3>
<p>Here are the icons used in the Management Console and their location :</p>
<div align="center">
  <center>
  <table border="1" width="75%" cellspacing="0" cellpadding="2">
    <tr>
      <td width="40%" align="center"><i><b>Object</b></i></td>
      <td width="10%" align="center"><i><b>16 pixels</b></i></td>
      <td width="10%" align="center"><i><b>24 pixels</b></i></td>
      <td width="40%" align="center"><i><b>Location</b></i></td>
    </tr>
    <tr>
      <td>J2EEDomain</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEDomain16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEDomain24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>-- J2EEServer</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- J2EEApplication</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>------ AppClientModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>------ EJBModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>-------- EntityBean</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EntityBean16.gif" width="16" height="16"></td>
      <td><img height="24" src="toolbarButtonGraphics/development/toolbarButtonGraphics/development/EnterpriseJavaBean24.gif" width="24"></td>
      <td>custom</td>
    </tr>
    <tr>
      <td>-------- StatefulSessionBean</td>
      <td><img border="0" src="toolbarButtonGraphics/development/StatefulSessionBean16.gif" width="16" height="16"></td>
      <td><img height="24" src="toolbarButtonGraphics/development/EnterpriseJavaBean24.gif" width="24"></td>
      <td>custom</td>
    </tr>
    <tr>
      <td>-------- StatelessSessionBean</td>
      <td><img border="0" src="toolbarButtonGraphics/developmentStatelessSessionBean16.gif" width="16" height="16"></td>
      <td><img height="24" src="toolbarButtonGraphics/development/EnterpriseJavaBean24.gif" width="24"></td>
      <td>custom</td>
    </tr>
    <tr>
      <td>-------- MessageDrivenBean</td>
      <td><img border="0" src="toolbarButtonGraphics/developmentMessageDrivenBean16.gif" width="16" height="16"></td>
      <td><img height="24" src="toolbarButtonGraphics/development/EnterpriseJavaBean24.gif" width="24"></td>
      <td>custom</td>
    </tr>
    <tr>
      <td>------ WebModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/WebModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/WebModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>-------- Servlet</td>
      <td><img border="0" src="toolbarButtonGraphics/development/Servlet16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/Servlet24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>------ ResourceAdapterModule</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>custom</td>
    </tr>
    <tr>
      <td>-------- ResourceAdapter</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>custom</td>
    </tr>
    <tr>
      <td>---- JavaMailResource</td>
      <td><img border="0" src="toolbarButtonGraphics/development/JavaMailResource16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/JavaMailResource24.gif" width="24" height="24"></td>
      <td>custom</td>
    </tr>
    <tr>
      <td>---- JCAResource</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>------ JCAConnectionFactory</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- JCAManagedConnectionFactory</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- JDBCResource</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>------ JDBCDataSource</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- JDBCDriver</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- JMSResource</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- JNDIResource</td>
      <td><img border="0" src="toolbarButtonGraphics/development/JNDIResource16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/JNDIResource24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>---- JTAResource</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- RMI_IIOPResource</td>
      <td>&nbsp;</td>
      <td>&nbsp;</td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>---- URLResource</td>
      <td><img border="0" src="toolbarButtonGraphics/development/URLResource16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/URLResource24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>---- JVM</td>
      <td><img border="0" src="toolbarButtonGraphics/development/JVM16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/JVM24.gif" width="24" height="24"></td>
      <td>custom</td>
    </tr>
    <tr>
      <td>J2EEServer</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEServer24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>J2EEApplication</td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/J2EEApplication24.gif" width="24" height="24"></td>
      <td>jlfgr</td>
    </tr>
    <tr>
      <td>AppClientModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/AppClientModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>EJBModule</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule16.gif" width="16" height="16"></td>
      <td><img border="0" src="toolbarButtonGraphics/development/EJBModule24.gif" width="24" height="24"></td>
      <td>rename</td>
    </tr>
    <tr>
      <td>EntityBean</td>
      <td><img border="0" src="toolbarButtonGraphics/development/EntityBean16.gif" width="16" height="16"></td>
      <td><img height="24" src="toolbarButtonGraphics/development/toolbarButtonGraphics/development/EnterpriseJavaBean24.gif" width="24"></td>
      <td>custom</td>
    </tr>
  </table>
  </center>
</div>

</body>

</html>

[Ejtools-cvs] libraries/j2ee.icons/src/resources/images logo-version.xml,NONE,1.1

[<let...@us...>]

Update of /cvsroot/ejtools/libraries/j2ee.icons/src/resources/images
In directory usw-pr-cvs1:/tmp/cvs-serv10221/j2ee.icons/src/resources/images

Added Files:
	logo-version.xml 
Log Message:
Change Manifest and properties

--- NEW FILE: logo-version.xml ---
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
	"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg width="700" height="200" style="fill:rgb(255,255,255)">
	<defs>
		<filter id="Drop_Shadow" filterUnits="objectBoundingBox" x="-10%" y="-10%"
			width="150%" height="150%">
			<feGaussianBlur in="SourceAlpha" stdDeviation="3" result="blurredAlpha"/>
			<feOffset in="blurredAlpha" dx="-3" dy="3" result="offsetBlurredAlpha"/>
			<feFlood result="flooded" style="flood-color:rgb(0,0,0);flood-opacity:0.65"/>
			<feComposite in="flooded" operator="in" in2="offsetBlurredAlpha"
				result="coloredShadow"/>
			<feComposite in="SourceGraphic" in2="coloredShadow" operator="over"/>
		</filter>
		<g id="gear_teeth">
			<polygon points="80,40 120,40 110,10 90,10"
				 style="fill:rgb(144,0,0)"/>
		</g>
		<g id="gear_disc">
			<ellipse cx="100" cy="100" rx="55" ry="55"
				 style="stroke:rgb(144,0,0);stroke-width:30;fill:none"/>
		</g>
		<g id="gear">
			<use x="0" y="0" xlink:href="#gear_teeth"/>
			<use x="0" y="0" xlink:href="#gear_teeth" transform="rotate(45 100 100)"/>
			<use x="0" y="0" xlink:href="#gear_teeth" transform="rotate(90 100 100)"/>
			<use x="0" y="0" xlink:href="#gear_teeth" transform="rotate(135 100 100)"/>
			<use x="0" y="0" xlink:href="#gear_teeth" transform="rotate(180 100 100)"/>
			<use x="0" y="0" xlink:href="#gear_teeth" transform="rotate(225 100 100)"/>
			<use x="0" y="0" xlink:href="#gear_teeth" transform="rotate(270 100 100)"/>
			<use x="0" y="0" xlink:href="#gear_teeth" transform="rotate(315 100 100)"/>
			<use x="0" y="0" xlink:href="#gear_disc"/>
		</g>
		<g id="blue_text">
			<text x="0" y="0" style="fill:rgb(0,0,144);font-weight:bold;font-size:128;font-family:Tahoma">EJT</text>
		</g>
		<g id="black_text">
			<text x="0" y="0" style="fill:rgb(0,0,0);font-weight:bold;font-size:128;font-family:Tahoma">EJTools</text>
			<rect x="0" y="-100" width="210" height="110"
				 style="fill:rgb(255,255,255)"/>
			<rect x="0" y="-100" width="240" height="30"
				 style="fill:rgb(255,255,255)"/>
		</g>
	</defs>
	<rect x="-5" y="-5" width="710" height="210"
		 style="fill:rgb(255,255,255)"/>
	<g>
		<use x="180" y="150" xlink:href="#black_text"/>
		<use x="190" y="150" xlink:href="#blue_text"/>
	</g>
	<g transform="translate(100 100) skewX(190) translate(-100 -100)"
		 style="filter:url(#Drop_Shadow)">
		<use x="0" y="0" xlink:href="#gear"/>
	</g>
	<text x="690" y="190" style="fill:rgb(0,0,0);text-anchor:end;font-size:36;font-family:Arial Black">V1.0.0 alpha</text>
</svg>