ejtools-cvs — Mailing list for CVS

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

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

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

Modified Files:
	AboutDialog.java JMXBrowser.java Main.java 
Log Message:
Add some JavaDocs

Index: AboutDialog.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/AboutDialog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AboutDialog.java	30 Apr 2002 21:10:51 -0000	1.3
--- AboutDialog.java	15 May 2002 20:57:01 -0000	1.4
***************
*** 20,46 ****
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    2 novembre 2001
   */
  public class AboutDialog implements AboutService
  {
!    /**  Description of the Field */
!    private final static ResourceBundle res = ResourceBundle.getBundle("ApplicationResources");
!    /**  Description of the Field */
     private JPanel panel = null;
  
  
!    /**  Constructor for the AboutServiceProvider object */
!    public AboutDialog()
!    {
!    }
  
  
     /**
!     *  Gets the panel attribute of the AboutDialog object
      *
!     * @return    The panel value
      */
     public Container getPanel()
--- 20,45 ----
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   2 novembre 2001
!  * @todo      Javadoc to complete
   */
  public class AboutDialog implements AboutService
  {
!    /** Description of the Field */
     private JPanel panel = null;
+    /** Description of the Field */
+    private final static ResourceBundle res = ResourceBundle.getBundle("ApplicationResources");
  
  
!    /** Constructor for the AboutServiceProvider object */
!    public AboutDialog() { }
  
  
     /**
!     * Gets the panel attribute of the AboutDialog object
      *
!     * @return   The panel value
      */
     public Container getPanel()
***************
*** 54,58 ****
  
  
!    /**  Description of the Method */
     public String getTitle()
     {
--- 53,61 ----
  
  
!    /**
!     * Description of the Method
!     *
!     * @return   The title value
!     */
     public String getTitle()
     {
***************
*** 61,65 ****
  
  
!    /**  Description of the Method */
     private void createPanel()
     {
--- 64,68 ----
  
  
!    /** Description of the Method */
     private void createPanel()
     {
***************
*** 86,89 ****
     }
  }
- 
  
--- 89,91 ----

Index: JMXBrowser.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/JMXBrowser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JMXBrowser.java	28 Apr 2002 13:06:25 -0000	1.3
--- JMXBrowser.java	15 May 2002 20:57:01 -0000	1.4
***************
*** 9,63 ****
  import java.beans.beancontext.BeanContextServicesSupport;
  import java.util.Vector;
- import javax.swing.ImageIcon;
  
- //import com.dreambean.awt.BeanContextPanel;
  import net.sourceforge.ejtools.awt.BeanContextTreePanel;
  import net.sourceforge.ejtools.awt.action.Command;
- import net.sourceforge.ejtools.awt.action.CommandAction;
  import net.sourceforge.ejtools.awt.action.file.ExitAction;
- import net.sourceforge.ejtools.awt.action.file.NewAction;
- import net.sourceforge.ejtools.awt.action.file.OpenAction;
- import net.sourceforge.ejtools.awt.action.file.SaveAction;
- import net.sourceforge.ejtools.awt.action.file.SaveAsAction;
  import net.sourceforge.ejtools.awt.services.AboutServiceProvider;
  import net.sourceforge.ejtools.awt.services.FrameServiceProvider;
  import net.sourceforge.ejtools.awt.services.MenuBarServiceProvider;
- import net.sourceforge.ejtools.awt.services.StatusBarService;
  import net.sourceforge.ejtools.awt.services.StatusBarServiceProvider;
  import net.sourceforge.ejtools.awt.services.ToolBarServiceProvider;
  import net.sourceforge.ejtools.jmxbrowser.model.ConnectionServiceProvider;
  import net.sourceforge.ejtools.jmxbrowser.model.Server;
  
  import org.apache.log4j.Category;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    21 mars 2002
   */
  public class JMXBrowser extends BeanContextServicesSupport
  {
!    /**  Description of the Field */
!    private static Category cat = Category.getInstance(JMXBrowser.class.getName());
!    /**  Description of the Field */
!    private static Vector factories;
!    /**  Description of the Field */
     protected AboutServiceProvider aboutService;
!    /**  Description of the Field */
     protected ConnectionServiceProvider connectionProvider;
!    /**  Description of the Field */
     protected FrameServiceProvider frameService;
!    /**  Description of the Field */
     protected MenuBarServiceProvider menuBarService;
!    /**  Description of the Field */
     protected StatusBarServiceProvider statusBarService;
!    /**  Description of the Field */
     protected ToolBarServiceProvider toolBarService;
  
  
!    /**  Constructor for the EJX object */
     public JMXBrowser()
     {
        cat.debug("JMXBrowser starting...");
  
--- 9,60 ----
  import java.beans.beancontext.BeanContextServicesSupport;
  import java.util.Vector;
  
  import net.sourceforge.ejtools.awt.BeanContextTreePanel;
  import net.sourceforge.ejtools.awt.action.Command;
  import net.sourceforge.ejtools.awt.action.file.ExitAction;
  import net.sourceforge.ejtools.awt.services.AboutServiceProvider;
  import net.sourceforge.ejtools.awt.services.FrameServiceProvider;
  import net.sourceforge.ejtools.awt.services.MenuBarServiceProvider;
  import net.sourceforge.ejtools.awt.services.StatusBarServiceProvider;
  import net.sourceforge.ejtools.awt.services.ToolBarServiceProvider;
  import net.sourceforge.ejtools.jmxbrowser.model.ConnectionServiceProvider;
  import net.sourceforge.ejtools.jmxbrowser.model.Server;
+ import net.sourceforge.ejtools.util.JNDI;
  
  import org.apache.log4j.Category;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   21 mars 2002
!  * @todo      Javadoc to complete
   */
  public class JMXBrowser extends BeanContextServicesSupport
  {
!    /** Description of the Field */
     protected AboutServiceProvider aboutService;
!    /** Description of the Field */
     protected ConnectionServiceProvider connectionProvider;
!    /** Description of the Field */
     protected FrameServiceProvider frameService;
!    /** Description of the Field */
     protected MenuBarServiceProvider menuBarService;
!    /** Description of the Field */
     protected StatusBarServiceProvider statusBarService;
!    /** Description of the Field */
     protected ToolBarServiceProvider toolBarService;
+    /** Description of the Field */
+    private static Category cat = Category.getInstance(JMXBrowser.class.getName());
+    /** Description of the Field */
+    private static Vector factories;
  
  
!    /** Constructor for the EJX object */
     public JMXBrowser()
     {
+       // Get JNDI environment
+       JNDI.setJNDIProperties();
+ 
        cat.debug("JMXBrowser starting...");
  

Index: Main.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Main.java	25 Apr 2002 20:24:47 -0000	1.2
--- Main.java	15 May 2002 20:57:01 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.ejtools.jmxbrowser;
  
+ import java.beans.Beans;
  import java.io.File;
  import java.net.URL;
***************
*** 16,31 ****
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    21 mars 2002
   */
  public class Main
  {
     /**
!     *  The main program for the Main class
      *
!     * @param  args           The command line arguments
!     * @exception  Exception  Description of Exception
      */
     public static void main(String[] args) throws Exception
--- 17,33 ----
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   21 mars 2002
!  * @todo      Javadoc to complete
   */
  public class Main
  {
     /**
!     * The main program for the Main class
      *
!     * @param args           The command line arguments
!     * @exception Exception  Description of Exception
      */
     public static void main(String[] args) throws Exception
***************
*** 52,63 ****
           new SecurityManager()
           {
!             public void checkPermission(Permission p)
!             {
!             }
  
  
!             public void checkPermission(Permission perm, Object context)
!             {
!             }
           });
  
--- 54,61 ----
           new SecurityManager()
           {
!             public void checkPermission(Permission p) { }
  
  
!             public void checkPermission(Permission perm, Object context) { }
           });
  

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

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

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model
In directory usw-pr-cvs1:/tmp/cvs-serv10550/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:
Add some JavaDocs

Index: ConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/ConnectionService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConnectionService.java	28 Apr 2002 13:05:44 -0000	1.2
--- ConnectionService.java	15 May 2002 20:56:51 -0000	1.3
***************
*** 1,6 ****
--- 1,13 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
  import java.io.Serializable;
  import java.util.Set;
+ 
  import javax.management.Attribute;
  import javax.management.MBeanInfo;
***************
*** 8,29 ****
  import javax.management.ObjectName;
  import javax.management.QueryExp;
- import javax.naming.InitialContext;
- import javax.rmi.PortableRemoteObject;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public interface ConnectionService extends Serializable
  {
     /**
!     *  Gets the attribute attribute of the ConnectionService object
      *
!     * @param  name           Description of the Parameter
!     * @param  attribute      Description of the Parameter
!     * @return                The attribute value
!     * @exception  Exception  Description of the Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception;
--- 15,35 ----
  import javax.management.ObjectName;
  import javax.management.QueryExp;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public interface ConnectionService extends Serializable
  {
     /**
!     * Gets the attribute attribute of the ConnectionService object
      *
!     * @param name           Description of the Parameter
!     * @param attribute      Description of the Parameter
!     * @return               The attribute value
!     * @exception Exception  Description of the Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception;
***************
*** 31,38 ****
  
     /**
!     *  Gets the defaultDomain attribute of the ConnectionService object
      *
!     * @return                The defaultDomain value
!     * @exception  Exception  Description of the Exception
      */
     public String getDefaultDomain() throws Exception;
--- 37,44 ----
  
     /**
!     * Gets the defaultDomain attribute of the ConnectionService object
      *
!     * @return               The defaultDomain value
!     * @exception Exception  Description of the Exception
      */
     public String getDefaultDomain() throws Exception;
***************
*** 40,47 ****
  
     /**
!     *  Gets the mBeanCount attribute of the ConnectionService object
      *
!     * @return                The mBeanCount value
!     * @exception  Exception  Description of the Exception
      */
     public Integer getMBeanCount() throws Exception;
--- 46,53 ----
  
     /**
!     * Gets the mBeanCount attribute of the ConnectionService object
      *
!     * @return               The mBeanCount value
!     * @exception Exception  Description of the Exception
      */
     public Integer getMBeanCount() throws Exception;
***************
*** 49,57 ****
  
     /**
!     *  Gets the mBeanInfo attribute of the ConnectionService object
      *
!     * @param  name           Description of the Parameter
!     * @return                The mBeanInfo value
!     * @exception  Exception  Description of the Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception;
--- 55,63 ----
  
     /**
!     * Gets the mBeanInfo attribute of the ConnectionService object
      *
!     * @param name           Description of the Parameter
!     * @return               The mBeanInfo value
!     * @exception Exception  Description of the Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception;
***************
*** 59,70 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of the Parameter
!     * @param  action         Description of the Parameter
!     * @param  params         Description of the Parameter
!     * @param  signatures     Description of the Parameter
!     * @return                Description of the Return Value
!     * @exception  Exception  Description of the Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception;
--- 65,76 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of the Parameter
!     * @param action         Description of the Parameter
!     * @param params         Description of the Parameter
!     * @param signatures     Description of the Parameter
!     * @return               Description of the Return Value
!     * @exception Exception  Description of the Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception;
***************
*** 72,81 ****
  
     /**
!     *  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 queryMBeans(ObjectName name, QueryExp exp) throws Exception;
--- 78,87 ----
  
     /**
!     * 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 queryMBeans(ObjectName name, QueryExp exp) throws Exception;
***************
*** 83,91 ****
  
     /**
!     *  Sets the attribute attribute of the ConnectionService object
      *
!     * @param  name           The new attribute value
!     * @param  attribute      The new attribute value
!     * @exception  Exception  Description of the Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception;
--- 89,97 ----
  
     /**
!     * Sets the attribute attribute of the ConnectionService object
      *
!     * @param name           The new attribute value
!     * @param attribute      The new attribute value
!     * @exception Exception  Description of the Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception;
***************
*** 93,105 ****
  
     /**
!     *  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
!     * @exception  Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception;
--- 99,111 ----
  
     /**
!     * 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
!     * @exception Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception;
***************
*** 107,114 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of the Parameter
!     * @exception  Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception;
--- 113,120 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of the Parameter
!     * @exception Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception;
***************
*** 116,122 ****
  
     /**
!     *  Sets the eJBName attribute of the ConnectionService object
      *
!     * @param  ejbName  The new eJBName value
      */
     public void setEJBName(String ejbName);
--- 122,128 ----
  
     /**
!     * Sets the eJBName attribute of the ConnectionService object
      *
!     * @param ejbName  The new eJBName value
      */
     public void setEJBName(String ejbName);
***************
*** 124,130 ****
  
     /**
!     *  Sets the factory attribute of the ConnectionService object
      *
!     * @param  factory  The new factory value
      */
     public void setFactory(String factory);
--- 130,136 ----
  
     /**
!     * Sets the factory attribute of the ConnectionService object
      *
!     * @param factory  The new factory value
      */
     public void setFactory(String factory);
***************
*** 132,138 ****
  
     /**
!     *  Sets the packages attribute of the ConnectionService object
      *
!     * @param  pkgs  The new packages value
      */
     public void setPackages(String pkgs);
--- 138,144 ----
  
     /**
!     * Sets the packages attribute of the ConnectionService object
      *
!     * @param pkgs  The new packages value
      */
     public void setPackages(String pkgs);
***************
*** 140,146 ****
  
     /**
!     *  Sets the uRL attribute of the ConnectionService object
      *
!     * @param  url  The new uRL value
      */
     public void setURL(String url);
--- 146,152 ----
  
     /**
!     * Sets the uRL attribute of the ConnectionService object
      *
!     * @param url  The new uRL value
      */
     public void setURL(String url);

Index: ConnectionServiceProvider.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/ConnectionServiceProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConnectionServiceProvider.java	22 Apr 2002 17:38:42 -0000	1.1
--- ConnectionServiceProvider.java	15 May 2002 20:56:51 -0000	1.2
***************
*** 1,2 ****
--- 1,8 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
***************
*** 7,35 ****
  import java.util.Vector;
  
- import net.sourceforge.ejtools.util.JNDI;
- 
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public class ConnectionServiceProvider extends BeanContextServicesSupport implements BeanContextServiceProvider
  {
!    /**  Description of the Field */
     protected ConnectionService service = null;
! 	protected String type = null;
  
! 	public ConnectionServiceProvider(String type) {
! 		this.type= type;
! 	}
  
  
     /**
!     *  Getter for the currentServiceSelectors attribute
      *
!     * @param  bcs           Description of Parameter
!     * @param  serviceClass  Description of Parameter
!     * @return               The value
      */
     public Iterator getCurrentServiceSelectors(BeanContextServices bcs, java.lang.Class serviceClass)
--- 13,48 ----
  import java.util.Vector;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class ConnectionServiceProvider extends BeanContextServicesSupport implements BeanContextServiceProvider
  {
!    /** Description of the Field */
     protected ConnectionService service = null;
!    /** Description of the Field */
!    protected String type = null;
  
! 
!    /**
!     * Constructor for the ConnectionServiceProvider object
!     *
!     * @param type  Description of the Parameter
!     */
!    public ConnectionServiceProvider(String type)
!    {
!       this.type = type;
!    }
  
  
     /**
!     * Getter for the currentServiceSelectors attribute
      *
!     * @param bcs           Description of Parameter
!     * @param serviceClass  Description of Parameter
!     * @return              The value
      */
     public Iterator getCurrentServiceSelectors(BeanContextServices bcs, java.lang.Class serviceClass)
***************
*** 40,50 ****
  
     /**
!     *  Getter for the service attribute
      *
!     * @param  bcs              Description of Parameter
!     * @param  requestor        Description of Parameter
!     * @param  serviceClass     Description of Parameter
!     * @param  serviceSelector  Description of Parameter
!     * @return                  The value
      */
     public Object getService(BeanContextServices bcs, java.lang.Object requestor, java.lang.Class serviceClass, java.lang.Object serviceSelector)
--- 53,63 ----
  
     /**
!     * Getter for the service attribute
      *
!     * @param bcs              Description of Parameter
!     * @param requestor        Description of Parameter
!     * @param serviceClass     Description of Parameter
!     * @param serviceSelector  Description of Parameter
!     * @return                 The value
      */
     public Object getService(BeanContextServices bcs, java.lang.Object requestor, java.lang.Class serviceClass, java.lang.Object serviceSelector)
***************
*** 52,64 ****
        if (service == null)
        {
! 		if("EJB".equals(type)) {
! 			service = new EJBConnectionService();
! 		}
! 		if("RMI".equals(type)) {
! 			service = new RMIConnectionService();
! 		}
! 		if("LOCAL".equals(type)) {
! 			service = new LocalConnectionService();
! 		}
        }
        return service;
--- 65,80 ----
        if (service == null)
        {
!          if ("EJB".equals(type))
!          {
!             service = new EJBConnectionService();
!          }
!          if ("RMI".equals(type))
!          {
!             service = new RMIConnectionService();
!          }
!          if ("LOCAL".equals(type))
!          {
!             service = new LocalConnectionService();
!          }
        }
        return service;
***************
*** 67,80 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  bcs        Description of Parameter
!     * @param  requestor  Description of Parameter
!     * @param  service    Description of Parameter
      */
     public void releaseService(BeanContextServices bcs, java.lang.Object requestor, java.lang.Object service) { }
  
  
!    /**  Description of the Method */
     protected void initializeBeanContextResources()
     {
--- 83,96 ----
  
     /**
!     * Description of the Method
      *
!     * @param bcs        Description of Parameter
!     * @param requestor  Description of Parameter
!     * @param service    Description of Parameter
      */
     public void releaseService(BeanContextServices bcs, java.lang.Object requestor, java.lang.Object service) { }
  
  
!    /** Description of the Method */
     protected void initializeBeanContextResources()
     {

Index: Domain.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Domain.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Domain.java	24 Apr 2002 20:08:22 -0000	1.2
--- Domain.java	15 May 2002 20:56:51 -0000	1.3
***************
*** 1,30 ****
  package net.sourceforge.ejtools.jmxbrowser.model;
  
! import java.awt.*;
! import java.beans.*;
! import java.beans.beancontext.*;
! import java.util.*;
! import javax.management.*;
! import javax.naming.*;
! import javax.swing.*;
! import org.w3c.dom.*;
! 
! import com.dreambean.awt.*;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public class Domain extends Node
  {
!    /**  Constructor */
     public Domain() { }
  
     /**
!     *  Setter for the reference attribute
      *
!     * @param  resource  The new value
      */
     public void setReference(ObjectInstance resource)
--- 1,29 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
! import javax.management.ObjectInstance;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class Domain extends Node
  {
!    /** Constructor */
     public Domain() { }
  
+ 
     /**
!     * Setter for the reference attribute
      *
!     * @param resource  The new value
      */
     public void setReference(ObjectInstance resource)

Index: EJBConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/EJBConnectionService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EJBConnectionService.java	28 Apr 2002 13:05:44 -0000	1.2
--- EJBConnectionService.java	15 May 2002 20:56:51 -0000	1.3
***************
*** 1,5 ****
--- 1,12 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
  import java.util.Set;
+ 
  import javax.management.Attribute;
  import javax.management.MBeanInfo;
***************
*** 14,50 ****
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public class EJBConnectionService implements ConnectionService
  {
!    /**  Description of the Field */
     protected transient Adaptor connector = null;
!    /**  Description of the Field */
     protected String ejbName = null;
!    /**  Description of the Field */
     protected String factory = null;
!    /**  Description of the Field */
     protected String pkgs = null;
!    /**  Description of the Field */
     protected String url = null;
  
  
!    /**  Constructor */
     protected EJBConnectionService() { }
  
  
     /**
!     *  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
!     * @exception  Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception
--- 21,58 ----
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class EJBConnectionService implements ConnectionService
  {
!    /** Description of the Field */
     protected transient Adaptor connector = null;
!    /** Description of the Field */
     protected String ejbName = null;
!    /** Description of the Field */
     protected String factory = null;
!    /** Description of the Field */
     protected String pkgs = null;
!    /** Description of the Field */
     protected String url = null;
  
  
!    /** Constructor */
     protected EJBConnectionService() { }
  
  
     /**
!     * 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
!     * @exception Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception
***************
*** 55,64 ****
  
     /**
!     *  Getter for the attribute attribute
      *
!     * @param  name           Description of Parameter
!     * @param  attribute      Description of Parameter
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception
--- 63,72 ----
  
     /**
!     * Getter for the attribute attribute
      *
!     * @param name           Description of Parameter
!     * @param attribute      Description of Parameter
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception
***************
*** 69,76 ****
  
     /**
!     *  Getter for the defaultDomain attribute
      *
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public String getDefaultDomain() throws Exception
--- 77,84 ----
  
     /**
!     * Getter for the defaultDomain attribute
      *
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public String getDefaultDomain() throws Exception
***************
*** 81,88 ****
  
     /**
!     *  Getter for the mBeanCount attribute
      *
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public Integer getMBeanCount() throws Exception
--- 89,96 ----
  
     /**
!     * Getter for the mBeanCount attribute
      *
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public Integer getMBeanCount() throws Exception
***************
*** 93,101 ****
  
     /**
!     *  Getter for the mBeanInfo attribute
      *
!     * @param  name           Description of Parameter
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception
--- 101,109 ----
  
     /**
!     * Getter for the mBeanInfo attribute
      *
!     * @param name           Description of Parameter
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception
***************
*** 106,117 ****
  
     /**
!     *  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
!     * @exception  Exception  Description of Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception
--- 114,125 ----
  
     /**
!     * 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
!     * @exception Exception  Description of Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception
***************
*** 122,131 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of Parameter
!     * @param  exp            Description of Parameter
!     * @return                Description of the Returned Value
!     * @exception  Exception  Description of Exception
      */
     public Set queryMBeans(ObjectName name, QueryExp exp) throws Exception
--- 130,139 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of Parameter
!     * @param exp            Description of Parameter
!     * @return               Description of the Returned Value
!     * @exception Exception  Description of Exception
      */
     public Set queryMBeans(ObjectName name, QueryExp exp) throws Exception
***************
*** 136,144 ****
  
     /**
!     *  Setter for the attribute attribute
      *
!     * @param  name           The new value
!     * @param  attribute      The new value
!     * @exception  Exception  Description of Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception
--- 144,152 ----
  
     /**
!     * Setter for the attribute attribute
      *
!     * @param name           The new value
!     * @param attribute      The new value
!     * @exception Exception  Description of Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception
***************
*** 149,155 ****
  
     /**
!     *  Setter for the eJBName attribute
      *
!     * @param  ejbName  The new value
      */
     public void setEJBName(String ejbName)
--- 157,163 ----
  
     /**
!     * Setter for the eJBName attribute
      *
!     * @param ejbName  The new value
      */
     public void setEJBName(String ejbName)
***************
*** 161,167 ****
  
     /**
!     *  Setter for the factory attribute
      *
!     * @param  factory  The new value
      */
     public void setFactory(String factory)
--- 169,175 ----
  
     /**
!     * Setter for the factory attribute
      *
!     * @param factory  The new value
      */
     public void setFactory(String factory)
***************
*** 173,179 ****
  
     /**
!     *  Setter for the packages attribute
      *
!     * @param  pkgs  The new value
      */
     public void setPackages(String pkgs)
--- 181,187 ----
  
     /**
!     * Setter for the packages attribute
      *
!     * @param pkgs  The new value
      */
     public void setPackages(String pkgs)
***************
*** 185,191 ****
  
     /**
!     *  Setter for the url attribute
      *
!     * @param  url  The new value
      */
     public void setURL(String url)
--- 193,199 ----
  
     /**
!     * Setter for the url attribute
      *
!     * @param url  The new value
      */
     public void setURL(String url)
***************
*** 197,204 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of the Parameter
!     * @exception  Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception
--- 205,212 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of the Parameter
!     * @exception Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception
***************
*** 209,216 ****
  
     /**
!     *  Description of the Method
      *
!     * @return                Description of the Returned Value
!     * @exception  Exception  Description of Exception
      */
     protected Adaptor getConnector() throws Exception
--- 217,224 ----
  
     /**
!     * Description of the Method
      *
!     * @return               Description of the Returned Value
!     * @exception Exception  Description of Exception
      */
     protected Adaptor getConnector() throws Exception

Index: LocalConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/LocalConnectionService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LocalConnectionService.java	28 Apr 2002 13:05:44 -0000	1.2
--- LocalConnectionService.java	15 May 2002 20:56:51 -0000	1.3
***************
*** 1,6 ****
--- 1,13 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
  import java.util.ArrayList;
  import java.util.Set;
+ 
  import javax.management.Attribute;
  import javax.management.MBeanInfo;
***************
*** 10,52 ****
  import javax.management.ObjectName;
  import javax.management.QueryExp;
- import javax.naming.InitialContext;
- import javax.rmi.PortableRemoteObject;
- 
- import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public class LocalConnectionService implements ConnectionService
  {
!    /**  Description of the Field */
     protected transient MBeanServer connector = null;
!    /**  Description of the Field */
     protected String ejbName = null;
!    /**  Description of the Field */
     protected String factory = null;
!    /**  Description of the Field */
     protected String pkgs = null;
!    /**  Description of the Field */
     protected String url = null;
  
  
!    /**  Constructor */
     protected LocalConnectionService() { }
  
  
     /**
!     *  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
!     * @exception  Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception
--- 17,56 ----
  import javax.management.ObjectName;
  import javax.management.QueryExp;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class LocalConnectionService implements ConnectionService
  {
!    /** Description of the Field */
     protected transient MBeanServer connector = null;
!    /** Description of the Field */
     protected String ejbName = null;
!    /** Description of the Field */
     protected String factory = null;
!    /** Description of the Field */
     protected String pkgs = null;
!    /** Description of the Field */
     protected String url = null;
  
  
!    /** Constructor */
     protected LocalConnectionService() { }
  
  
     /**
!     * 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
!     * @exception Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception
***************
*** 57,66 ****
  
     /**
!     *  Getter for the attribute attribute
      *
!     * @param  name           Description of Parameter
!     * @param  attribute      Description of Parameter
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception
--- 61,70 ----
  
     /**
!     * Getter for the attribute attribute
      *
!     * @param name           Description of Parameter
!     * @param attribute      Description of Parameter
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception
***************
*** 71,78 ****
  
     /**
!     *  Getter for the defaultDomain attribute
      *
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public String getDefaultDomain() throws Exception
--- 75,82 ----
  
     /**
!     * Getter for the defaultDomain attribute
      *
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public String getDefaultDomain() throws Exception
***************
*** 83,90 ****
  
     /**
!     *  Getter for the mBeanCount attribute
      *
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public Integer getMBeanCount() throws Exception
--- 87,94 ----
  
     /**
!     * Getter for the mBeanCount attribute
      *
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public Integer getMBeanCount() throws Exception
***************
*** 95,103 ****
  
     /**
!     *  Getter for the mBeanInfo attribute
      *
!     * @param  name           Description of Parameter
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception
--- 99,107 ----
  
     /**
!     * Getter for the mBeanInfo attribute
      *
!     * @param name           Description of Parameter
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception
***************
*** 108,119 ****
  
     /**
!     *  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
!     * @exception  Exception  Description of Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception
--- 112,123 ----
  
     /**
!     * 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
!     * @exception Exception  Description of Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception
***************
*** 124,133 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of Parameter
!     * @param  exp            Description of Parameter
!     * @return                Description of the Returned Value
!     * @exception  Exception  Description of Exception
      */
     public Set queryMBeans(ObjectName name, QueryExp exp) throws Exception
--- 128,137 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of Parameter
!     * @param exp            Description of Parameter
!     * @return               Description of the Returned Value
!     * @exception Exception  Description of Exception
      */
     public Set queryMBeans(ObjectName name, QueryExp exp) throws Exception
***************
*** 138,146 ****
  
     /**
!     *  Setter for the attribute attribute
      *
!     * @param  name           The new value
!     * @param  attribute      The new value
!     * @exception  Exception  Description of Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception
--- 142,150 ----
  
     /**
!     * Setter for the attribute attribute
      *
!     * @param name           The new value
!     * @param attribute      The new value
!     * @exception Exception  Description of Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception
***************
*** 151,157 ****
  
     /**
!     *  Setter for the eJBName attribute
      *
!     * @param  ejbName  The new value
      */
     public void setEJBName(String ejbName)
--- 155,161 ----
  
     /**
!     * Setter for the eJBName attribute
      *
!     * @param ejbName  The new value
      */
     public void setEJBName(String ejbName)
***************
*** 163,169 ****
  
     /**
!     *  Setter for the factory attribute
      *
!     * @param  factory  The new value
      */
     public void setFactory(String factory)
--- 167,173 ----
  
     /**
!     * Setter for the factory attribute
      *
!     * @param factory  The new value
      */
     public void setFactory(String factory)
***************
*** 175,181 ****
  
     /**
!     *  Setter for the packages attribute
      *
!     * @param  pkgs  The new value
      */
     public void setPackages(String pkgs)
--- 179,185 ----
  
     /**
!     * Setter for the packages attribute
      *
!     * @param pkgs  The new value
      */
     public void setPackages(String pkgs)
***************
*** 187,193 ****
  
     /**
!     *  Setter for the url attribute
      *
!     * @param  url  The new value
      */
     public void setURL(String url)
--- 191,197 ----
  
     /**
!     * Setter for the url attribute
      *
!     * @param url  The new value
      */
     public void setURL(String url)
***************
*** 199,206 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of the Parameter
!     * @exception  Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception
--- 203,210 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of the Parameter
!     * @exception Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception
***************
*** 211,218 ****
  
     /**
!     *  Description of the Method
      *
!     * @return                Description of the Returned Value
!     * @exception  Exception  Description of Exception
      */
     protected MBeanServer getConnector() throws Exception
--- 215,222 ----
  
     /**
!     * Description of the Method
      *
!     * @return               Description of the Returned Value
!     * @exception Exception  Description of Exception
      */
     protected MBeanServer getConnector() throws Exception

Index: Node.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Node.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Node.java	24 Apr 2002 20:08:22 -0000	1.2
--- Node.java	15 May 2002 20:56:51 -0000	1.3
***************
*** 1,32 ****
  package net.sourceforge.ejtools.jmxbrowser.model;
  
! import java.awt.*;
! import java.beans.*;
! import java.beans.beancontext.*;
! import java.util.*;
! import javax.naming.*;
! import javax.swing.*;
  
! import net.sourceforge.ejtools.awt.*;
! import net.sourceforge.ejtools.xml.*;
! import net.sourceforge.ejtools.util.*;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public abstract class Node extends BeanContextServicesSupport implements BeanContextChildComponentProxy
  {
!    /**  Description of the Field */
     protected transient Customizer c = null;
!    /**  Description of the Field */
     protected String className = "<undefined>";
!    /**  Description of the Field */
     protected String name = "<undefined>";
  
  
!    /**  Constructor for the Node object */
     public Node()
     {
--- 1,42 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
! import java.awt.Component;
! import java.beans.Customizer;
! import java.beans.beancontext.BeanContext;
! import java.beans.beancontext.BeanContextChild;
! import java.beans.beancontext.BeanContextChildComponentProxy;
! import java.beans.beancontext.BeanContextServiceRevokedListener;
! import java.beans.beancontext.BeanContextServices;
! import java.beans.beancontext.BeanContextServicesSupport;
! import java.util.Iterator;
! import java.util.TooManyListenersException;
  
! import net.sourceforge.ejtools.awt.GenericCustomizer;
! import net.sourceforge.ejtools.util.Sort;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public abstract class Node extends BeanContextServicesSupport implements BeanContextChildComponentProxy
  {
!    /** Description of the Field */
     protected transient Customizer c = null;
!    /** Description of the Field */
     protected String className = "<undefined>";
!    /** Description of the Field */
     protected String name = "<undefined>";
  
  
!    /** Constructor for the Node object */
     public Node()
     {
***************
*** 35,42 ****
  
  
     /**
!     *  Getter for the className attribute
      *
!     * @return    The value
      */
     public String getClassName()
--- 45,68 ----
  
  
+    /** Description of the Method */
+    public void clear()
+    {
+       Iterator iterator = iterator();
+       while (iterator.hasNext())
+       {
+          Object o = iterator.next();
+          if (o instanceof BeanContext)
+          {
+             ((BeanContext) o).clear();
+          }
+          remove(o);
+       }
+    }
+ 
+ 
     /**
!     * Getter for the className attribute
      *
!     * @return   The value
      */
     public String getClassName()
***************
*** 47,53 ****
  
     /**
!     *  Gets the component attribute of the Node object
      *
!     * @return    The component value
      */
     public Component getComponent()
--- 73,79 ----
  
     /**
!     * Gets the component attribute of the Node object
      *
!     * @return   The component value
      */
     public Component getComponent()
***************
*** 62,68 ****
  
     /**
!     *  Gets the name attribute of the Node object
      *
!     * @return    The name value
      */
     public String getName()
--- 88,94 ----
  
     /**
!     * Gets the name attribute of the Node object
      *
!     * @return   The name value
      */
     public String getName()
***************
*** 73,85 ****
  
     /**
!     *  Getter for the service attribute
      *
!     * @param  child                          Description of Parameter
!     * @param  requestor                      Description of Parameter
!     * @param  serviceClass                   Description of Parameter
!     * @param  serviceSelector                Description of Parameter
!     * @param  bcsrl                          Description of Parameter
!     * @return                                The value
!     * @exception  TooManyListenersException  Description of Exception
      */
     public Object getService(BeanContextChild child,
--- 99,111 ----
  
     /**
!     * Getter for the service attribute
      *
!     * @param child                          Description of Parameter
!     * @param requestor                      Description of Parameter
!     * @param serviceClass                   Description of Parameter
!     * @param serviceSelector                Description of Parameter
!     * @param bcsrl                          Description of Parameter
!     * @return                               The value
!     * @exception TooManyListenersException  Description of Exception
      */
     public Object getService(BeanContextChild child,
***************
*** 113,119 ****
  
     /**
!     *  Description of the Method
      *
!     * @return    Description of the Returned Value
      */
     public Iterator iterator()
--- 139,145 ----
  
     /**
!     * Description of the Method
      *
!     * @return   Description of the Returned Value
      */
     public Iterator iterator()
***************
*** 124,130 ****
  
     /**
!     *  Description of the Method
      *
!     * @return    Description of the Returned Value
      */
     public String toString()
--- 150,156 ----
  
     /**
!     * Description of the Method
      *
!     * @return   Description of the Returned Value
      */
     public String toString()
***************
*** 135,157 ****
  
     /**
!     *  Setter for the name attribute
      *
!     * @param  name  The new value
      */
     protected void setName(String name)
     {
        this.name = name;
-    }
-    
-    public void clear() {
-          Iterator iterator = iterator();
-       while (iterator.hasNext())
-       {
-          Object o = iterator.next();
-          if (o instanceof BeanContext) {
-             ((BeanContext)o).clear();
-          }
-          remove(o);
-       }
     }
  }
--- 161,171 ----
  
     /**
!     * Setter for the name attribute
      *
!     * @param name  The new value
      */
     protected void setName(String name)
     {
        this.name = name;
     }
  }

Index: RMIConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/RMIConnectionService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RMIConnectionService.java	28 Apr 2002 13:05:44 -0000	1.2
--- RMIConnectionService.java	15 May 2002 20:56:51 -0000	1.3
***************
*** 1,5 ****
--- 1,12 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
  import java.util.Set;
+ 
  import javax.management.Attribute;
  import javax.management.MBeanInfo;
***************
*** 13,49 ****
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public class RMIConnectionService implements ConnectionService
  {
!    /**  Description of the Field */
     protected transient RMIAdaptor connector = null;
!    /**  Description of the Field */
     protected String ejbName = null;
!    /**  Description of the Field */
     protected String factory = null;
!    /**  Description of the Field */
     protected String pkgs = null;
!    /**  Description of the Field */
     protected String url = null;
  
  
!    /**  Constructor */
     protected RMIConnectionService() { }
  
  
     /**
!     *  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
!     * @exception  Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception
--- 20,57 ----
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @todo      Javadoc to complete
   */
  public class RMIConnectionService implements ConnectionService
  {
!    /** Description of the Field */
     protected transient RMIAdaptor connector = null;
!    /** Description of the Field */
     protected String ejbName = null;
!    /** Description of the Field */
     protected String factory = null;
!    /** Description of the Field */
     protected String pkgs = null;
!    /** Description of the Field */
     protected String url = null;
  
  
!    /** Constructor */
     protected RMIConnectionService() { }
  
  
     /**
!     * 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
!     * @exception Exception  Description of the Exception
      */
     public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws Exception
***************
*** 54,63 ****
  
     /**
!     *  Getter for the attribute attribute
      *
!     * @param  name           Description of Parameter
!     * @param  attribute      Description of Parameter
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception
--- 62,71 ----
  
     /**
!     * Getter for the attribute attribute
      *
!     * @param name           Description of Parameter
!     * @param attribute      Description of Parameter
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public Object getAttribute(ObjectName name, String attribute) throws Exception
***************
*** 68,75 ****
  
     /**
!     *  Getter for the defaultDomain attribute
      *
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public String getDefaultDomain() throws Exception
--- 76,83 ----
  
     /**
!     * Getter for the defaultDomain attribute
      *
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public String getDefaultDomain() throws Exception
***************
*** 80,87 ****
  
     /**
!     *  Getter for the mBeanCount attribute
      *
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public Integer getMBeanCount() throws Exception
--- 88,95 ----
  
     /**
!     * Getter for the mBeanCount attribute
      *
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public Integer getMBeanCount() throws Exception
***************
*** 92,100 ****
  
     /**
!     *  Getter for the mBeanInfo attribute
      *
!     * @param  name           Description of Parameter
!     * @return                The value
!     * @exception  Exception  Description of Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception
--- 100,108 ----
  
     /**
!     * Getter for the mBeanInfo attribute
      *
!     * @param name           Description of Parameter
!     * @return               The value
!     * @exception Exception  Description of Exception
      */
     public MBeanInfo getMBeanInfo(ObjectName name) throws Exception
***************
*** 105,116 ****
  
     /**
!     *  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
!     * @exception  Exception  Description of Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception
--- 113,124 ----
  
     /**
!     * 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
!     * @exception Exception  Description of Exception
      */
     public Object invoke(ObjectName name, String action, Object[] params, String[] signatures) throws Exception
***************
*** 121,130 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of Parameter
!     * @param  exp            Description of Parameter
!     * @return                Description of the Returned Value
!     * @exception  Exception  Description of Exception
      */
     public Set queryMBeans(ObjectName name, QueryExp exp) throws Exception
--- 129,138 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of Parameter
!     * @param exp            Description of Parameter
!     * @return               Description of the Returned Value
!     * @exception Exception  Description of Exception
      */
     public Set queryMBeans(ObjectName name, QueryExp exp) throws Exception
***************
*** 135,143 ****
  
     /**
!     *  Setter for the attribute attribute
      *
!     * @param  name           The new value
!     * @param  attribute      The new value
!     * @exception  Exception  Description of Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception
--- 143,151 ----
  
     /**
!     * Setter for the attribute attribute
      *
!     * @param name           The new value
!     * @param attribute      The new value
!     * @exception Exception  Description of Exception
      */
     public void setAttribute(ObjectName name, Attribute attribute) throws Exception
***************
*** 148,154 ****
  
     /**
!     *  Setter for the eJBName attribute
      *
!     * @param  ejbName  The new value
      */
     public void setEJBName(String ejbName)
--- 156,162 ----
  
     /**
!     * Setter for the eJBName attribute
      *
!     * @param ejbName  The new value
      */
     public void setEJBName(String ejbName)
***************
*** 160,166 ****
  
     /**
!     *  Setter for the factory attribute
      *
!     * @param  factory  The new value
      */
     public void setFactory(String factory)
--- 168,174 ----
  
     /**
!     * Setter for the factory attribute
      *
!     * @param factory  The new value
      */
     public void setFactory(String factory)
***************
*** 172,178 ****
  
     /**
!     *  Setter for the packages attribute
      *
!     * @param  pkgs  The new value
      */
     public void setPackages(String pkgs)
--- 180,186 ----
  
     /**
!     * Setter for the packages attribute
      *
!     * @param pkgs  The new value
      */
     public void setPackages(String pkgs)
***************
*** 184,190 ****
  
     /**
!     *  Setter for the url attribute
      *
!     * @param  url  The new value
      */
     public void setURL(String url)
--- 192,198 ----
  
     /**
!     * Setter for the url attribute
      *
!     * @param url  The new value
      */
     public void setURL(String url)
***************
*** 196,203 ****
  
     /**
!     *  Description of the Method
      *
!     * @param  name           Description of the Parameter
!     * @exception  Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception
--- 204,211 ----
  
     /**
!     * Description of the Method
      *
!     * @param name           Description of the Parameter
!     * @exception Exception  Description of the Exception
      */
     public void unregisterMBean(ObjectName name) throws Exception
***************
*** 208,215 ****
  
     /**
!     *  Description of the Method
      *
!     * @return                Description of the Returned Value
!     * @exception  Exception  Description of Exception
      */
     protected RMIAdaptor getConnector() throws Exception
--- 216,223 ----
  
     /**
!     * Description of the Method
      *
!     * @return               Description of the Returned Value
!     * @exception Exception  Description of Exception
      */
     protected RMIAdaptor getConnector() throws Exception

Index: Resource.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Resource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Resource.java	28 Apr 2002 13:05:44 -0000	1.3
--- Resource.java	15 May 2002 20:56:51 -0000	1.4
***************
*** 1,55 ****
  package net.sourceforge.ejtools.jmxbrowser.model;
  
! import java.awt.*;
! import java.beans.*;
! import java.beans.beancontext.*;
! import java.lang.reflect.*;
! import java.util.*;
! import javax.management.*;
! import javax.naming.*;
! import javax.swing.*;
! import org.w3c.dom.*;
  
! import com.dreambean.awt.*;
! import net.sourceforge.ejtools.awt.*;
  import net.sourceforge.ejtools.jmx.MBeanAccessor;
- import org.jboss.jmx.adaptor.interfaces.Adaptor;
- import org.jboss.jmx.adaptor.interfaces.AdaptorHome;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 décembre 2001
   */
  public class Resource extends Node implements MBeanAccessor
  {
!    /**  Description of the Field */
     protected String description;
!    /**  Description of the Field */
     protected String domain;
!    /**  Description of the Field */
     protected transient MBeanInfo info;
!    /**  Description of the Field */
     protected transient ObjectInstance objectInstance;
!    /**  Description of the Field */
     protected transient ObjectName objectName;
!    /**  Description of the Field */
     protected transient ResourceUpdater updater;
  
  
!    /**  Constructor for the Resource object */
     public Resource() { }
  
  
     /**
!     *  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)
--- 1,61 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.model;
  
! import java.awt.Component;
! import java.beans.beancontext.BeanContextServices;
  
! import javax.management.Attribute;
! import javax.management.AttributeChangeNotification;
! import javax.management.AttributeChangeNotificationFilter;
! import javax.management.MBeanInfo;
! import javax.management.Notification;
! import javax.management.NotificationListener;
! import javax.management.ObjectInstance;
! import javax.management.ObjectName;
! 
! import net.sourceforge.ejtools.awt.GenericMBeanCustomizer;
  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
  {
!    /** Description of the Field */
     protected String description;
!    /** Description of the Field */
     protected String domain;
!    /** Description of the Field */
     protected transient MBeanInfo info;
!    /** Description of the Field */
     protected transient ObjectInstance objectInstance;
!    /** Description of th...
 
[truncated message content]

[Ejtools-cvs] CVS: applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web Constants.java,1.2,1.3 JMXTree.java,1.3,1.4

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

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

Modified Files:
	Constants.java JMXTree.java 
Log Message:
Add some JavaDocs

Index: Constants.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/Constants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Constants.java	24 Apr 2002 20:07:36 -0000	1.2
--- Constants.java	15 May 2002 20:56:40 -0000	1.3
***************
*** 1,24 ****
  package net.sourceforge.ejtools.jmxbrowser.web;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    28 février 2002
   */
  public final class Constants
  {
!    /**  Description of the Field */
     public final static String CONNECTOR = "tree";
!    /**  Description of the Field */
!    public final static String TREE = "tree";
!    /**  Description of the Field */
     public final static String DETAIL = "detail";
!    /**  Description of the Field */
     public final static String DETAIL_INFO = "detail.info";
!    /**  Description of the Field */
     public final static String DOMAIN = "domain";
!    /**  Description of the Field */
     public final static String NUMBER = "number";
  }
  
--- 1,31 ----
+ /*
+  * EJTools, the Enterprise Java Tools
+  *
+  * Distributable under LGPL license.
+  * See terms of license at www.gnu.org.
+  */
  package net.sourceforge.ejtools.jmxbrowser.web;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   28 février 2002
!  * @todo      Javadoc to complete
   */
  public final class Constants
  {
!    /** Description of the Field */
     public final static String CONNECTOR = "tree";
!    /** Description of the Field */
     public final static String DETAIL = "detail";
!    /** Description of the Field */
     public final static String DETAIL_INFO = "detail.info";
!    /** Description of the Field */
     public final static String DOMAIN = "domain";
!    /** Description of the Field */
     public final static String NUMBER = "number";
+    /** Description of the Field */
+    public final static String TREE = "tree";
  }
  

Index: JMXTree.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/JMXTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JMXTree.java	25 Apr 2002 20:24:07 -0000	1.3
--- JMXTree.java	15 May 2002 20:56:40 -0000	1.4
***************
*** 1,25 ****
  package net.sourceforge.ejtools.jmxbrowser.web;
  
! import java.beans.beancontext.*;
! import java.util.*;
! import net.sourceforge.ejtools.jmxbrowser.model.*;
! import net.sourceforge.ejtools.xml.*;
! import net.sourceforge.ejtools.xml.beans.*;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    25 avril 2002
   */
  public class JMXTree extends BeanContextServicesSupport
  {
!    /**  Description of the Field */
!    protected Server server;
!    /**  Description of the Field */
     protected ConnectionServiceProvider connectionProvider;
  
  
!    /**Constructor for the JMXTree object */
     public JMXTree()
     {
--- 1,32 ----
+ /*
+  * 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.beans.beancontext.BeanContextServicesSupport;
! import java.util.Collection;
! 
! import net.sourceforge.ejtools.jmxbrowser.model.ConnectionServiceProvider;
! import net.sourceforge.ejtools.jmxbrowser.model.Server;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   25 avril 2002
!  * @todo      Javadoc to complete
   */
  public class JMXTree extends BeanContextServicesSupport
  {
!    /** Description of the Field */
     protected ConnectionServiceProvider connectionProvider;
+    /** Description of the Field */
+    protected Server server;
  
  
!    /** Constructor for the JMXTree object */
     public JMXTree()
     {
***************
*** 31,35 ****
           add(connectionProvider);
           add(server);
- 
        }
        catch (Exception e)
--- 38,41 ----
***************
*** 40,58 ****
  
  
!    /**
!     *  Getter for the defaultDomain attribute
!     *
!     * @return    The value of defaultDomain attribute
!     */
!    public String getDefaultDomain()
     {
!       return server.getDefaultDomain();
     }
  
  
     /**
!     *  Getter for the count attribute
      *
!     * @return    The value of count attribute
      */
     public int getCount()
--- 46,60 ----
  
  
!    /** Description of the Method */
!    public void connect()
     {
!       server.connect();
     }
  
  
     /**
!     * Getter for the count attribute
      *
!     * @return   The value of count attribute
      */
     public int getCount()
***************
*** 63,97 ****
  
     /**
!     *  Getter for the server attribute
      *
!     * @return    The value of server attribute
      */
!    public Collection getServer()
     {
!       return server;
     }
  
  
     /**
!     *  Description of the Method
      *
!     * @param  objectName  Description of Parameter
!     * @return             Description of the Returned Value
      */
!    public Object searchObjectName(String objectName)
     {
!       return server.searchObjectName(objectName);
     }
  
  
     /**
!     *  Description of the Method
      *
!     * @param  filter  Description of Parameter
      */
!    public void view(String filter)
     {
!       server.setFilter(filter);
!       server.connect();
     }
  
--- 65,98 ----
  
     /**
!     * Getter for the defaultDomain attribute
      *
!     * @return   The value of defaultDomain attribute
      */
!    public String getDefaultDomain()
     {
!       return server.getDefaultDomain();
     }
  
  
     /**
!     * Getter for the server attribute
      *
!     * @return   The value of server attribute
      */
!    public Collection getServer()
     {
!       return server;
     }
  
  
     /**
!     * Description of the Method
      *
!     * @param objectName  Description of Parameter
!     * @return            Description of the Returned Value
      */
!    public Object searchObjectName(String objectName)
     {
!       return server.searchObjectName(objectName);
     }
  

[Ejtools-cvs] CVS: applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action ConnectAction.java,NONE,1.1 CreateAction.java,NONE,1.1 InvokeAction.java,NONE,1.1 UnregisterAction.java,NONE,1.1 DetailAction.java,1.2,1.3 FilterAction.java,1.2,NONE

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

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

Modified Files:
	DetailAction.java 
Added Files:
	ConnectAction.java CreateAction.java InvokeAction.java 
	UnregisterAction.java 
Removed Files:
	FilterAction.java 
Log Message:
Add some JavaDocs

--- NEW FILE: ConnectAction.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 javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

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

import org.apache.log4j.Category;
import org.apache.struts.action.Action;
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
 * @todo      Javadoc to complete
 */
public class ConnectAction extends Action
{
   /** Description of the Field */
   private static Category cat = Category.getInstance(ConnectAction.class.getName());


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


   /**
    * 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
   {
      JMXTree tree = 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();

      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()));
      }

      HttpSession session = request.getSession();
      tree = (JMXTree) session.getAttribute(Constants.TREE);

      System.out.println("perform session " + session.getId());

      if (tree == null)
      {
         tree = new JMXTree();
         session.setAttribute(Constants.TREE, tree);
      }

      tree.connect();

      // Remove the obsolete form bean
      /*
       * if (mapping.getAttribute() != null)
       * {
       * if ("request".equals(mapping.getScope()))
       * {
       * request.removeAttribute(mapping.getAttribute());
       * }
       * else
       * {
       * session.removeAttribute(mapping.getAttribute());
       * }
       * }
       */
      return (mapping.findForward("view"));
   }
}


--- NEW FILE: CreateAction.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 javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

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

import org.apache.log4j.Category;
import org.apache.struts.action.Action;
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
 * @todo      Javadoc to complete
 */
public class CreateAction extends Action
{
   /** Description of the Field */
   private static Category cat = Category.getInstance(CreateAction.class.getName());


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


   /**
    * 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();

      // TODO : put in Constants
      String ref = request.getParameter("reference");

      System.out.println("REF " + ref);

      HttpSession session = request.getSession();
      System.out.println("perform session " + session.getId());
      System.out.println("Session " + session);

      JMXTree root = (JMXTree) session.getAttribute(Constants.TREE);
      System.out.println("Root " + root);
//      root.unregisterMBean(ref);

      // 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: InvokeAction.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 javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

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

import org.apache.log4j.Category;
import org.apache.struts.action.Action;
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
 * @todo      Javadoc to complete
 */
public class InvokeAction extends Action
{
   /** Description of the Field */
   private static Category cat = Category.getInstance(InvokeAction.class.getName());


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


   /**
    * 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();

      // TODO : put in Constants
      String ref = request.getParameter("reference");

      System.out.println("REF " + ref);

      HttpSession session = request.getSession();
      System.out.println("perform session " + session.getId());
      System.out.println("Session " + session);

      JMXTree root = (JMXTree) session.getAttribute(Constants.TREE);
      System.out.println("Root " + root);
//      root.unregisterMBean(ref);

      // 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: UnregisterAction.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 javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

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

import org.apache.log4j.Category;
import org.apache.struts.action.Action;
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
 * @todo      Javadoc to complete
 */
public class UnregisterAction extends Action
{
   /** Description of the Field */
   private static Category cat = Category.getInstance(UnregisterAction.class.getName());


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


   /**
    * 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();

      // TODO : put in Constants
      String ref = request.getParameter("reference");

      System.out.println("REF " + ref);

      HttpSession session = request.getSession();
      System.out.println("perform session " + session.getId());
      System.out.println("Session " + session);

      JMXTree root = (JMXTree) session.getAttribute(Constants.TREE);
      System.out.println("Root " + root);
//      root.unregisterMBean(ref);

      // 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"));
   }
}


Index: DetailAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/DetailAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DetailAction.java	25 Apr 2002 20:24:07 -0000	1.2
--- DetailAction.java	15 May 2002 20:56:32 -0000	1.3
***************
*** 1,50 ****
  package net.sourceforge.ejtools.jmxbrowser.web.action;
  
! import java.io.*;
! import java.sql.*;
! import java.util.*;
! import javax.ejb.*;
! import javax.management.*;
! import javax.management.j2ee.*;
! import javax.naming.*;
! import javax.rmi.*;
! import javax.servlet.*;
! import javax.servlet.http.*;
! import javax.sql.*;
  
! import net.sourceforge.ejtools.jmxbrowser.model.*;
! import net.sourceforge.ejtools.jmxbrowser.web.*;
! import org.apache.log4j.*;
! import org.apache.struts.action.*;
! import org.apache.struts.util.*;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    12 novembre 2001
   */
  public class DetailAction extends Action
  {
!    /**  Description of the Field */
     private static Category cat = Category.getInstance(DetailAction.class.getName());
  
  
!    /**  Constructor for the SearchLoginAction object */
!    public DetailAction()
!    {
!    }
  
  
     /**
!     *  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
--- 1,58 ----
+ /*
+  * 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 javax.servlet.ServletException;
! import javax.servlet.http.HttpServletRequest;
! import javax.servlet.http.HttpServletResponse;
! import javax.servlet.http.HttpSession;
! 
! import net.sourceforge.ejtools.jmxbrowser.model.Resource;
! import net.sourceforge.ejtools.jmxbrowser.web.Constants;
! import net.sourceforge.ejtools.jmxbrowser.web.JMXTree;
! 
! 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
!  * @todo      Javadoc to complete
   */
  public class DetailAction extends Action
  {
!    /** Description of the Field */
     private static Category cat = Category.getInstance(DetailAction.class.getName());
  
  
!    /** Constructor for the SearchLoginAction object */
!    public DetailAction() { }
  
  
     /**
!     * 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

--- FilterAction.java DELETED ---

[Ejtools-cvs] CVS: applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form DetailForm.java,1.2,1.3 FilterForm.java,1.2,1.3

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

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

Modified Files:
	DetailForm.java FilterForm.java 
Log Message:
Add some JavaDocs

Index: DetailForm.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form/DetailForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DetailForm.java	25 Apr 2002 20:24:07 -0000	1.2
--- DetailForm.java	15 May 2002 20:56:20 -0000	1.3
***************
*** 1,65 ****
  package net.sourceforge.ejtools.jmxbrowser.web.form;
  
! import javax.servlet.http.*;
  
! import org.apache.struts.action.*;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 février 2002
   */
  public final class DetailForm extends ActionForm
  {
!    /**  Description of the Field */
     protected String reference = null;
  
  
!    /**  Constructor for the ConnectForm object */
!    public DetailForm()
!    {
!    }
  
  
     /**
!     *  Setter for the factory attribute
      *
!     * @param  reference  The new value for reference attribute
      */
!    public void setReference(String reference)
     {
!       this.reference = reference;
     }
  
  
     /**
!     *  Getter for the factory attribute
      *
!     * @return    The value of factory attribute
      */
!    public String getReference()
!    {
!       return reference;
!    }
  
  
     /**
!     *  Description of the Method
      *
!     * @param  mapping  Description of Parameter
!     * @param  request  Description of Parameter
      */
!    public void reset(ActionMapping mapping, HttpServletRequest request)
     {
     }
  
  
     /**
!     *  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)
--- 1,71 ----
+ /*
+  * 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
!  * @todo      Javadoc to complete
   */
  public final class DetailForm extends ActionForm
  {
!    /** Description of the Field */
     protected String reference = null;
  
  
!    /** Constructor for the ConnectForm object */
!    public DetailForm() { }
  
  
     /**
!     * Getter for the factory attribute
      *
!     * @return   The value of factory attribute
      */
!    public String getReference()
     {
!       return reference;
     }
  
  
     /**
!     * Description of the Method
      *
!     * @param mapping  Description of Parameter
!     * @param request  Description of Parameter
      */
!    public void reset(ActionMapping mapping, HttpServletRequest request) { }
  
  
     /**
!     * Setter for the factory attribute
      *
!     * @param reference  The new value for reference attribute
      */
!    public void setReference(String reference)
     {
+       this.reference = reference;
     }
  
  
     /**
!     * 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)

Index: FilterForm.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form/FilterForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FilterForm.java	25 Apr 2002 20:24:07 -0000	1.2
--- FilterForm.java	15 May 2002 20:56:20 -0000	1.3
***************
*** 1,66 ****
  package net.sourceforge.ejtools.jmxbrowser.web.form;
  
! import javax.servlet.http.*;
  
! import org.apache.struts.action.*;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    13 février 2002
   */
  public final class FilterForm extends ActionForm
  {
!    /**  Description of the Field */
     protected String filter = "*:*";
  
  
!    /**  Constructor for the ConnectForm object */
!    public FilterForm()
!    {
!    }
  
  
     /**
!     *  Setter for the factory attribute
      *
!     * @param  filter  The new value for filter attribute
      */
!    public void setFilter(String filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     *  Getter for the factory attribute
      *
!     * @return    The value of factory attribute
      */
!    public String getFilter()
     {
!       return filter;
     }
  
  
     /**
!     *  Description of the Method
      *
!     * @param  mapping  Description of Parameter
!     * @param  request  Description of Parameter
      */
!    public void reset(ActionMapping mapping, HttpServletRequest request)
     {
!       this.filter = "*:*";
     }
  
  
     /**
!     *  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)
--- 1,73 ----
+ /*
+  * 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.ActionErrors;
! import org.apache.struts.action.ActionForm;
! import org.apache.struts.action.ActionMapping;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 février 2002
!  * @todo      Javadoc to complete
   */
  public final class FilterForm extends ActionForm
  {
!    /** Description of the Field */
     protected String filter = "*:*";
  
  
!    /** Constructor for the ConnectForm object */
!    public FilterForm() { }
  
  
     /**
!     * Getter for the factory attribute
      *
!     * @return   The value of factory attribute
      */
!    public String getFilter()
     {
!       return filter;
     }
  
  
     /**
!     * Description of the Method
      *
!     * @param mapping  Description of Parameter
!     * @param request  Description of Parameter
      */
!    public void reset(ActionMapping mapping, HttpServletRequest request)
     {
!       this.filter = "*:*";
     }
  
  
     /**
!     * Setter for the factory attribute
      *
!     * @param filter  The new value for filter attribute
      */
!    public void setFilter(String filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     * 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)

[Ejtools-cvs] CVS: applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib ConnectTag.java,1.2,1.3 MBeanAttributeAccessTag.java,1.1,1.2 MBeanAttributeClassTag.java,1.1,1.2 MBeanAttributeEditorTag.java,1.1,1.2 MBeanAttributeValueTag.java,1.1,1.2 MBeanParameterClassTag.java,1.1,1.2

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

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

Modified Files:
	ConnectTag.java MBeanAttributeAccessTag.java 
	MBeanAttributeClassTag.java MBeanAttributeEditorTag.java 
	MBeanAttributeValueTag.java MBeanParameterClassTag.java 
Log Message:
Add some JavaDocs

Index: ConnectTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/ConnectTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConnectTag.java	25 Apr 2002 20:23:34 -0000	1.2
--- ConnectTag.java	15 May 2002 20:56:11 -0000	1.3
***************
*** 1,51 ****
  package net.sourceforge.ejtools.jmxbrowser.web.taglib;
  
! import java.io.*;
! import javax.servlet.http.*;
! import javax.servlet.jsp.*;
! import javax.servlet.jsp.tagext.*;
  
! import net.sourceforge.ejtools.jmxbrowser.web.*;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    1 mars 2002
   */
  public class ConnectTag extends TagSupport
  {
!    /**  The key of the session-scope bean we look for. */
     private String name = Constants.TREE;
!    /**  The page to which we should forward for the user to log on. */
     private String page = "/connect.do";
  
  
     /**
!     *  Setter for the name attribute
      *
!     * @param  name  The new value for name attribute
      */
!    public void setName(String name)
     {
!       this.name = name;
     }
  
  
     /**
!     *  Setter for the page attribute
      *
!     * @param  page  The new value for page attribute
      */
!    public void setPage(String page)
     {
!       this.page = page;
     }
  
  
     /**
!     *  Getter for the name attribute
      *
!     * @return    The value of name attribute
      */
     public String getName()
--- 1,85 ----
+ /*
+  * 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.servlet.http.HttpSession;
! import javax.servlet.jsp.JspException;
! import javax.servlet.jsp.tagext.TagSupport;
  
! import net.sourceforge.ejtools.jmxbrowser.web.Constants;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   1 mars 2002
!  * @todo      Javadoc to complete
   */
  public class ConnectTag extends TagSupport
  {
!    /** The key of the application-scope bean we look for. */
     private String name = Constants.TREE;
!    /** The page to which we should forward for the user to log on. */
     private String page = "/connect.do";
  
  
     /**
!     * Description of the Method
      *
!     * @return                  Description of the Returned Value
!     * @exception JspException  Description of Exception
      */
!    public int doEndTag() throws JspException
     {
!       boolean valid = false;
! 
!       HttpSession session = pageContext.getSession();
!       System.out.println("ConnectTag session " + session.getId());
! 
!       if ((session != null) && (session.getAttribute(name) != null))
!       {
!          valid = true;
!       }
! 
!       // Forward control based on the results
!       if (valid)
!       {
!          return (EVAL_PAGE);
!       }
!       else
!       {
!          try
!          {
!             pageContext.forward(page);
!          }
!          catch (Exception e)
!          {
!             throw new JspException(e.toString());
!          }
!          return (SKIP_PAGE);
!       }
     }
  
  
     /**
!     * Description of the Method
      *
!     * @return                  Description of the Returned Value
!     * @exception JspException  Description of Exception
      */
!    public int doStartTag() throws JspException
     {
!       return (SKIP_BODY);
     }
  
  
     /**
!     * Getter for the name attribute
      *
!     * @return   The value of name attribute
      */
     public String getName()
***************
*** 56,62 ****
  
     /**
!     *  Getter for the page attribute
      *
!     * @return    The value of page attribute
      */
     public String getPage()
--- 90,96 ----
  
     /**
!     * Getter for the page attribute
      *
!     * @return   The value of page attribute
      */
     public String getPage()
***************
*** 66,121 ****
  
  
!    /**
!     *  Description of the Method
!     *
!     * @return                   Description of the Returned Value
!     * @exception  JspException  Description of Exception
!     */
!    public int doStartTag() throws JspException
     {
!       return (SKIP_BODY);
     }
  
  
     /**
!     *  Description of the Method
      *
!     * @return                   Description of the Returned Value
!     * @exception  JspException  Description of Exception
      */
!    public int doEndTag() throws JspException
     {
!       boolean valid = false;
! 
!       HttpSession session = pageContext.getSession();
!       System.out.println("ConnectTag session " + session.getId());
! 
!       if ((session != null) && (session.getAttribute(name) != null))
!          valid = true;
! 
!       // Forward control based on the results
!       if (valid)
!          return (EVAL_PAGE);
!       else
!       {
!          try
!          {
!             pageContext.forward(page);
!          }
!          catch (Exception e)
!          {
!             throw new JspException(e.toString());
!          }
!          return (SKIP_PAGE);
!       }
     }
  
  
!    /**  Description of the Method */
!    public void release()
     {
!       super.release();
!       this.name = Constants.TREE;
!       this.page = "/connect.do";
     }
  }
--- 100,131 ----
  
  
!    /** Description of the Method */
!    public void release()
     {
!       super.release();
!       this.name = Constants.TREE;
!       this.page = "/connect.do";
     }
  
  
     /**
!     * Setter for the name attribute
      *
!     * @param name  The new value for name attribute
      */
!    public void setName(String name)
     {
!       this.name = name;
     }
  
  
!    /**
!     * Setter for the page attribute
!     *
!     * @param page  The new value for page attribute
!     */
!    public void setPage(String page)
     {
!       this.page = page;
     }
  }

Index: MBeanAttributeAccessTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanAttributeAccessTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MBeanAttributeAccessTag.java	25 Apr 2002 20:20:44 -0000	1.1
--- MBeanAttributeAccessTag.java	15 May 2002 20:56:11 -0000	1.2
***************
*** 1,8 ****
  package net.sourceforge.ejtools.jmxbrowser.web.taglib;
  
! import javax.management.*;
  import javax.servlet.jsp.JspException;
- import javax.servlet.jsp.PageContext;
  import javax.servlet.jsp.tagext.TagSupport;
  import org.apache.struts.util.MessageResources;
  import org.apache.struts.util.RequestUtils;
--- 1,14 ----
+ /*
+  * 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.MBeanAttributeInfo;
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.tagext.TagSupport;
+ 
  import org.apache.struts.util.MessageResources;
  import org.apache.struts.util.RequestUtils;
***************
*** 10,80 ****
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    25 avril 2002
   */
  public class MBeanAttributeAccessTag extends TagSupport
  {
!    /**  Description of the Field */
!    private static MessageResources messages = MessageResources.getMessageResources("MBeanAttributeInfoAccess");
!    /** Name of the bean that contains the data we will be rendering. */
!    protected String name = null;
     /** Should we ignore missing beans and simply output nothing? */
     protected boolean ignore = false;
!    /**Filter the rendered output for characters that are sensitive in HTML? */
!    protected boolean filter = true;
     /** The scope to be searched to retrieve the specified bean. */
     protected String scope = null;
  
  
     /**
!     *  Setter for the name attribute
      *
!     * @param  name  The new value for name attribute
      */
!    public void setName(String name)
     {
-       this.name = name;
-    }
  
  
!    /**
!     *  Setter for the ignore attribute
!     *
!     * @param  ignore  The new value for ignore attribute
!     */
!    public void setIgnore(boolean ignore)
!    {
!       this.ignore = ignore;
     }
  
  
     /**
!     *  Setter for the filter attribute
      *
!     * @param  filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     *  Setter for the scope attribute
      *
!     * @param  scope  The new value for scope attribute
      */
!    public void setScope(String scope)
     {
!       this.scope = scope;
     }
  
  
     /**
!     *  Getter for the name attribute
      *
!     * @return    The value of name attribute
      */
     public String getName()
--- 16,100 ----
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   25 avril 2002
!  * @todo      Javadoc to complete
   */
  public class MBeanAttributeAccessTag 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 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 MessageResources messages = MessageResources.getMessageResources("MBeanAttributeInfoAccess");
  
  
     /**
!     * 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)
+       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, name, scope);
+       if (ignore)
+       {
+          if (info == null)
+          {
+             return (SKIP_BODY);
+          }
+          // Nothing to output
+       }
  
!       String output = computeAccess(info);
!       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);
     }
  
  
     /**
!     * 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()
***************
*** 85,167 ****
  
     /**
!     *  Getter for the ignore attribute
      *
!     * @return    The value of ignore attribute
      */
!    public boolean getIgnore()
     {
!       return (this.ignore);
     }
  
  
     /**
!     *  Getter for the filter attribute
      *
!     * @return    The value of filter attribute
      */
!    public boolean getFilter()
     {
!       return (this.filter);
     }
  
  
     /**
!     *  Getter for the scope attribute
      *
!     * @return    The value of scope attribute
      */
!    public String getScope()
     {
!       return (this.scope);
     }
  
  
     /**
!     *  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)
!       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, name, scope);
!       if (ignore)
!       {
!          if (info == null)
!             return (SKIP_BODY);
!          // Nothing to output
!       }
! 
!       String output = computeAccess(info);
!       if (filter)
!          ResponseUtils.write(pageContext, ResponseUtils.filter(output));
!       else
!          ResponseUtils.write(pageContext, output);
! 
!       // Continue processing this page
!       return (SKIP_BODY);
     }
  
  
!    /** Release all allocated resources. */
!    public void release()
     {
! 
!       super.release();
!       filter = true;
!       ignore = false;
!       name = null;
!       scope = null;
! 
     }
  
  
     /**
!     *  Description of the Method
      *
!     * @param  info  Description of Parameter
!     * @return       Description of the Returned Value
      */
     protected String computeAccess(MBeanAttributeInfo info)
--- 105,180 ----
  
     /**
!     * 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;
! 
     }
  
  
     /**
!     * Setter for the filter attribute
      *
!     * @param filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     * 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;
     }
  
  
     /**
!     * Description of the Method
      *
!     * @param info  Description of Parameter
!     * @return      Description of the Returned Value
      */
     protected String computeAccess(MBeanAttributeInfo info)

Index: MBeanAttributeClassTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanAttributeClassTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MBeanAttributeClassTag.java	25 Apr 2002 20:20:44 -0000	1.1
--- MBeanAttributeClassTag.java	15 May 2002 20:56:11 -0000	1.2
***************
*** 1,27 ****
  package net.sourceforge.ejtools.jmxbrowser.web.taglib;
  
! import javax.management.*;
  import javax.servlet.jsp.JspException;
- import javax.servlet.jsp.PageContext;
  import javax.servlet.jsp.tagext.TagSupport;
  import net.sourceforge.ejtools.util.ClassTools;
! import org.apache.struts.util.MessageResources;
  import org.apache.struts.util.RequestUtils;
  import org.apache.struts.util.ResponseUtils;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    25 avril 2002
   */
  public class MBeanAttributeClassTag extends TagSupport
  {
-    /** Name of the bean that contains the data we will be rendering. */
-    protected String name = null;
-    /** Should we ignore missing beans and simply output nothing? */
-    protected boolean ignore = false;
     /** Filter the rendered output for characters that are sensitive in HTML? */
     protected boolean filter = true;
     /** The scope to be searched to retrieve the specified bean. */
     protected String scope = null;
--- 1,34 ----
+ /*
+  * 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.MBeanAttributeInfo;
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.tagext.TagSupport;
+ 
  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
!  * @todo      Javadoc to complete
   */
  public class MBeanAttributeClassTag 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 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;
***************
*** 29,79 ****
  
     /**
!     *  Setter for the name attribute
      *
!     * @param  name  The new value for name attribute
      */
!    public void setName(String name)
     {
!       this.name = name;
!    }
  
  
!    /**
!     *  Setter for the ignore attribute
!     *
!     * @param  ignore  The new value for ignore attribute
!     */
!    public void setIgnore(boolean ignore)
!    {
!       this.ignore = ignore;
     }
  
  
     /**
!     *  Setter for the filter attribute
      *
!     * @param  filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     *  Setter for the scope attribute
      *
!     * @param  scope  The new value for scope attribute
      */
!    public void setScope(String scope)
     {
!       this.scope = scope;
     }
  
  
     /**
!     *  Getter for the name attribute
      *
!     * @return    The value of name attribute
      */
     public String getName()
--- 36,98 ----
  
     /**
!     * 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)
!       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, name, scope);
!       if (ignore)
!       {
!          if (info == null)
!          {
!             return (SKIP_BODY);
!          }
!          // Nothing to output
!       }
  
+       String output = ClassTools.classDisplay(info.getType());
+       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);
     }
  
  
     /**
!     * 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()
***************
*** 84,155 ****
  
     /**
!     *  Getter for the ignore attribute
      *
!     * @return    The value of ignore attribute
      */
!    public boolean getIgnore()
     {
!       return (this.ignore);
     }
  
  
     /**
!     *  Getter for the filter attribute
      *
!     * @return    The value of filter attribute
      */
!    public boolean getFilter()
     {
!       return (this.filter);
     }
  
  
     /**
!     *  Getter for the scope attribute
      *
!     * @return    The value of scope attribute
      */
!    public String getScope()
     {
!       return (this.scope);
     }
  
  
     /**
!     *  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)
!       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, name, scope);
!       if (ignore)
!       {
!          if (info == null)
!             return (SKIP_BODY);
!          // Nothing to output
!       }
! 
!       String output = ClassTools.classDisplay(info.getType());
!       if (filter)
!          ResponseUtils.write(pageContext, ResponseUtils.filter(output));
!       else
!          ResponseUtils.write(pageContext, output);
! 
!       // Continue processing this page
!       return (SKIP_BODY);
     }
  
  
!    /** Release all allocated resources. */
!    public void release()
     {
!       super.release();
!       filter = true;
!       ignore = false;
!       name = null;
!       scope = null;
     }
  }
--- 103,168 ----
  
     /**
!     * 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;
     }
  
  
     /**
!     * Setter for the filter attribute
      *
!     * @param filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     * 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;
     }
  }

Index: MBeanAttributeEditorTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanAttributeEditorTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MBeanAttributeEditorTag.java	25 Apr 2002 20:20:44 -0000	1.1
--- MBeanAttributeEditorTag.java	15 May 2002 20:56:11 -0000	1.2
***************
*** 1,94 ****
  package net.sourceforge.ejtools.jmxbrowser.web.taglib;
  
! import java.beans.*;
! import javax.management.*;
  import javax.servlet.jsp.JspException;
- import javax.servlet.jsp.PageContext;
  import javax.servlet.jsp.tagext.TagSupport;
! import net.sourceforge.ejtools.jmx.*;
  import net.sourceforge.ejtools.util.ClassTools;
! import org.apache.struts.util.MessageResources;
  import org.apache.struts.util.RequestUtils;
  import org.apache.struts.util.ResponseUtils;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    25 avril 2002
   */
  public class MBeanAttributeEditorTag extends TagSupport
  {
-    /** Name of the bean that contains the data we will be rendering. */
-    protected String name = null;
-    /** Should we ignore missing beans and simply output nothing? */
-    protected boolean ignore = false;
     /** Filter the rendered output for characters that are sensitive in HTML? */
     protected boolean filter = true;
!    /** The scope to be searched to retrieve the specified bean. */
!    protected String scope = null;
     /** Name of the property to be accessed on the specified bean. */
     protected String property = null;
  
  
     /**
!     *  Setter for the name attribute
      *
!     * @param  name  The new value for name attribute
      */
!    public void setName(String name)
     {
!       this.name = name;
!    }
  
  
!    /**
!     *  Setter for the property attribute
!     *
!     * @param  property  The new value for property attribute
!     */
!    public void setProperty(String property)
!    {
!       this.property = property;
     }
  
  
     /**
!     *  Setter for the ignore attribute
      *
!     * @param  ignore  The new value for ignore attribute
      */
!    public void setIgnore(boolean ignore)
     {
!       this.ignore = ignore;
     }
  
  
     /**
!     *  Setter for the filter attribute
      *
!     * @param  filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     *  Setter for the scope attribute
      *
!     * @param  scope  The new value for scope attribute
      */
!    public void setScope(String scope)
     {
!       this.scope = scope;
     }
  
  
     /**
!     *  Getter for the property attribute
      *
!     * @return    The value of property attribute
      */
     public String getProperty()
--- 1,139 ----
+ /*
+  * 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.MBeanAttributeInfo;
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.tagext.TagSupport;
! 
! import net.sourceforge.ejtools.jmx.MBeanAccessor;
  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
!  * @todo      Javadoc to complete
   */
  public class MBeanAttributeEditorTag 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 ignore = false;
!    /** Name of the bean that contains the data we will be rendering. */
!    protected String name = null;
     /** 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 Method
      *
!     * @return                  Description of the Returned Value
!     * @exception JspException  Description of Exception
      */
!    public int doStartTag() throws JspException
     {
!       // Look up the requested bean (if necessary)
!       MBeanAccessor bean = (MBeanAccessor) RequestUtils.lookup(pageContext, name, scope);
!       if (ignore)
!       {
!          if (bean == null)
!          {
!             return (SKIP_BODY);
!          }
!          // Nothing to output
!       }
  
+       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, property, scope);
  
!       PropertyEditor propertyeditor = null;
!       Class c = ClassTools.getClass(info.getType());
! 
!       if (c == null)
!       {
!          addUnsupportedProperty(info);
!       }
!       else
!       {
!          if (c.isArray())
!          {
!             Class componentType = c.getComponentType();
!             propertyeditor = PropertyEditorManager.findEditor(componentType);
! 
!             if (propertyeditor == null)
!             {
!                propertyeditor = PropertyEditorManager.findEditor(String.class);
!             }
!             addArrayProperty(bean, propertyeditor, info);
!          }
!          else
!          {
!             propertyeditor = PropertyEditorManager.findEditor(c);
! 
!             if (propertyeditor == null)
!             {
!                propertyeditor = PropertyEditorManager.findEditor(String.class);
!             }
!             addProperty(bean, 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);
     }
  
  
     /**
!     * 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 property attribute
      *
!     * @return   The value of property attribute
      */
     public String getProperty()
***************
*** 99,219 ****
  
     /**
!     *  Getter for the name attribute
      *
!     * @return    The value of name attribute
      */
!    public String getName()
     {
!       return (this.name);
     }
  
  
     /**
!     *  Getter for the ignore attribute
      *
!     * @return    The value of ignore attribute
      */
!    public boolean getIgnore()
     {
!       return (this.ignore);
     }
  
  
     /**
!     *  Getter for the filter attribute
      *
!     * @return    The value of filter attribute
      */
!    public boolean getFilter()
     {
!       return (this.filter);
     }
  
  
     /**
!     *  Getter for the scope attribute
      *
!     * @return    The value of scope attribute
      */
!    public String getScope()
     {
!       return (this.scope);
     }
  
  
     /**
!     *  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)
!       MBeanAccessor bean = (MBeanAccessor) RequestUtils.lookup(pageContext, name, scope);
!       if (ignore)
!       {
!          if (bean == null)
!             return (SKIP_BODY);
!          // Nothing to output
!       }
! 
!       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, property, scope);
! 
!       PropertyEditor propertyeditor = null;
!       Class c = ClassTools.getClass(info.getType());
! 
!       if (c == null)
!       {
!          addUnsupportedProperty(info);
!       }
!       else
!       {
!          if (c.isArray())
!          {
!             Class componentType = c.getComponentType();
!             propertyeditor = PropertyEditorManager.findEditor(componentType);
! 
!             if (propertyeditor == null)
!             {
!                propertyeditor = PropertyEditorManager.findEditor(String.class);
!             }
!             addArrayProperty(bean, propertyeditor, info);
!          }
!          else
!          {
!             propertyeditor = PropertyEditorManager.findEditor(c);
! 
!             if (propertyeditor == null)
!             {
!                propertyeditor = PropertyEditorManager.findEditor(String.class);
!             }
!             addProperty(bean, propertyeditor, info);
!          }
!       }
! 
!       // Continue processing this page
!       return (SKIP_BODY);
     }
  
  
!    /** Release all allocated resources. */
!    public void release()
     {
!       super.release();
!       filter = true;
!       ignore = false;
!       name = null;
!       scope = null;
     }
  
  
     /**
!     *  Adds a feature to the ArrayProperty attribute of the MBeanAttributeEditorTag object
      *
!     * @param  propertyeditor    The feature to be added to the ArrayProperty attribute
!     * @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
--- 144,234 ----
  
     /**
!     * 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;
     }
  
  
     /**
!     * Setter for the filter attribute
      *
!     * @param filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     * 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 property attribute
      *
!     * @param property  The new value for property attribute
      */
!    public void setProperty(String property)
     {
!       this.property = property;
     }
  
  
!    /**
!     * 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 ArrayProperty attribute of the
!     * MBeanAttributeEditorTag object
      *
!     * @param propertyeditor    The feature to be added to the ArrayProperty
!     *      attribute
!     * @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
***************
*** 250,256 ****
--- 265,275 ----
  
              if (filter)
+             {
                 ResponseUtils.write(pageContext, ResponseUtils.filter(output));
+             }
              else
+             {
                 ResponseUtils.write(pageContext, output);
+             }
           }
           catch (Exception _ex)
***************
*** 262,271 ****
  
     /**
!     *  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 addProperty(MBeanAccessor object, PropertyEditor propertyeditor, MBeanAttributeInfo attributeInfo) throws JspException
--- 281,291 ----
  
     /**
!     * 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 addProperty(MBeanAccessor object, PropertyEditor propertyeditor, MBeanAttributeInfo attributeInfo) throws JspException
***************
*** 295,309 ****
  
        if (filter)
           ResponseUtils.write(pageContext, ResponseUtils.filter(output));
        else
           ResponseUtils.write(pageContext, output);
     }
  
  
     /**
!     *  Adds a feature to the UnsupportedProperty attribute of the MBeanAttributeEditorTag object
      *
!     * @param  attributeInfo     The feature to be added to the UnsupportedProperty attribute
!     * @exception  JspException  Description of Exception
      */
     protected void addUnsupportedProperty(MBeanAttributeInfo attributeInfo) throws JspException
--- 315,335 ----
  
        if (filter)
+       {
           ResponseUtils.write(pageContext, ResponseUtils.filter(output));
+       }
        else
+       {
           ResponseUtils.write(pageContext, output);
+       }
     }
  
  
     /**
!     * Adds a feature to the UnsupportedProperty attribute of the
!     * MBeanAttributeEditorTag object
      *
!     * @param attributeInfo     The feature to be added to the
!     *      UnsupportedProperty attribute
!     * @exception JspException  Description of Exception
      */
     protected void addUnsupportedProperty(MBeanAttributeInfo attributeInfo) throws JspException
***************
*** 313,319 ****
--- 339,349 ----
  
        if (filter)
+       {
           ResponseUtils.write(pageContext, ResponseUtils.filter(output));
+       }
        else
+       {
           ResponseUtils.write(pageContext, output);
+       }
     }
  

Index: MBeanAttributeValueTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanAttributeValueTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MBeanAttributeValueTag.java	25 Apr 2002 20:20:44 -0000	1.1
--- MBeanAttributeValueTag.java	15 May 2002 20:56:11 -0000	1.2
***************
*** 1,188 ****
  package net.sourceforge.ejtools.jmxbrowser.web.taglib;
  
! import javax.management.*;
  import javax.servlet.jsp.JspException;
- import javax.servlet.jsp.PageContext;
  import javax.servlet.jsp.tagext.TagSupport;
! import net.sourceforge.ejtools.jmx.*;
  import org.apache.struts.util.RequestUtils;
  import org.apache.struts.util.ResponseUtils;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    25 avril 2002
   */
  public class MBeanAttributeValueTag extends TagSupport
  {
-    /** Name of the bean that contains the data we will be rendering. */
-    protected String name = null;
-    /** Should we ignore missing beans and simply output nothing? */
-    protected boolean ignore = false;
     /** Filter the rendered output for characters that are sensitive in HTML? */
     protected boolean filter = true;
!    /** The scope to be searched to retrieve the specified bean. */
!    protected String scope = null;
     /** Name of the property to be accessed on the specified bean. */
     protected String property = null;
  
  
     /**
!     *  Setter for the name attribute
      *
!     * @param  name  The new value for name attribute
      */
!    public void setName(String name)
     {
!       this.name = name;
     }
  
  
     /**
!     *  Setter for the ignore attribute
      *
!     * @param  ignore  The new value for ignore attribute
      */
!    public void setIgnore(boolean ignore)
     {
!       this.ignore = ignore;
     }
  
  
     /**
!     *  Setter for the filter attribute
      *
!     * @param  filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     *  Setter for the scope attribute
      *
!     * @param  scope  The new value for scope attribute
      */
!    public void setScope(String scope)
     {
!       this.scope = scope;
     }
  
  
     /**
!     *  Setter for the property attribute
      *
!     * @param  property  The new value for property attribute
      */
!    public void setProperty(String property)
     {
!       this.property = property;
     }
  
  
     /**
!     *  Getter for the name attribute
      *
!     * @return    The value of name attribute
      */
!    public String getName()
     {
!       return (this.name);
     }
  
  
!    /**
!     *  Getter for the ignore attribute
!     *
!     * @return    The value of ignore attribute
!     */
!    public boolean getIgnore()
     {
!       return (this.ignore);
     }
  
  
     /**
!     *  Getter for the filter attribute
      *
!     * @return    The value of filter attribute
      */
!    public boolean getFilter()
     {
!       return (this.filter);
     }
  
  
     /**
!     *  Getter for the scope attribute
      *
!     * @return    The value of scope attribute
      */
!    public String getScope()
     {
!       return (this.scope);
     }
  
  
     /**
!     *  Getter for the property attribute
      *
!     * @return    The value of property attribute
      */
!    public String getProperty()
     {
!       return (this.property);
     }
  
  
     /**
!     *  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)
!       MBeanAccessor bean = (MBeanAccessor) RequestUtils.lookup(pageContext, name, scope);
!       if (ignore)
!       {
!          if (bean == null)
!             return (SKIP_BODY);
!          // Nothing to output
!       }
! 
!       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, property, scope);
!       String output = "";
! 
!       if (info.isIs() || info.isReadable())
!       {
!          System.out.println("Getting value for attribute " + info.getName());
!          output = "" + bean.getAttribute(bean.getObjectName(), info.getName());
!       }
! 
!       if (filter)
!          ResponseUtils.write(pageContext, ResponseUtils.filter(output));
!       else
!          ResponseUtils.write(pageContext, output);
! 
!       // Continue processing this page
!       return (SKIP_BODY);
     }
  
  
!    /** Release all allocated resources. */
!    public void release()
     {
! 
!       super.release();
!       filter = true;
!       ignore = false;
!       name = null;
!       scope = null;
! 
     }
  
--- 1,202 ----
+ /*
+  * 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.MBeanAttributeInfo;
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.tagext.TagSupport;
! 
! import net.sourceforge.ejtools.jmx.MBeanAccessor;
! 
  import org.apache.struts.util.RequestUtils;
  import org.apache.struts.util.ResponseUtils;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   25 avril 2002
!  * @todo      Javadoc to complete
   */
  public class MBeanAttributeValueTag 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 ignore = false;
!    /** Name of the bean that contains the data we will be rendering. */
!    protected String name = null;
     /** 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 Method
      *
!     * @return                  Description of the Returned Value
!     * @exception JspException  Description of Exception
      */
!    public int doStartTag() throws JspException
     {
!       // Look up the requested bean (if necessary)
!       MBeanAccessor bean = (MBeanAccessor) RequestUtils.lookup(pageContext, name, scope);
!       if (ignore)
!       {
!          if (bean == null)
!          {
!             return (SKIP_BODY);
!          }
!          // Nothing to output
!       }
! 
!       MBeanAttributeInfo info = (MBeanAttributeInfo) RequestUtils.lookup(pageContext, property, scope);
!       String output = "";
! 
!       if (info.isIs() || info.isReadable())
!       {
!          System.out.println("Getting value for attribute " + info.getName());
!          output = "" + bean.getAttribute(bean.getObjectName(), info.getName());
!       }
! 
!       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);
     }
  
  
     /**
!     * 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 property attribute
      *
!     * @return   The value of property attribute
      */
!    public String getProperty()
     {
!       return (this.property);
     }
  
  
     /**
!     * 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;
! 
     }
  
  
     /**
!     * Setter for the filter attribute
      *
!     * @param filter  The new value for filter attribute
      */
!    public void setFilter(boolean filter)
     {
!       this.filter = filter;
     }
  
  
     /**
!     * 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 property attribute
      *
!     * @param property  The new value for property attribute
      */
!    public void setProperty(String property)
     {
!       this.property = property;
     }
  
  
!    /**
!     * Setter for the scope attribute
!     *
!     * @param scope  The new value for scope attribute
!     */
!    public void setScope(String scope)
     {
!       this.scope = scope;
     }
  

Index: MBeanParameterClassTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/MBeanParameterClassTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MBeanParameterClassTag.java	25 Apr 2002 20:20:44 -0000	1.1
--- MBeanParameterClassTag.java	15 May 2002 20:56:11 -0000	1.2
***************
*** 1,36 ****
  package net.sourceforge.ejtools.jmxbrowser.web.taglib;
  
! import javax.management.*;
  import javax.servlet.jsp.JspException;
- import javax.servlet.jsp.PageContext;
  import javax.servlet.jsp.tagext.TagSupport;
  import net.sourceforge.ejtools.util.ClassTools;
! import org.apache.struts.util.MessageResources;
  import org.apache.struts.util.RequestUtils;
  import org.apache.struts.util.ResponseUtils;
  
  /**
!  *  Description of the Class
   *
!  * @author     letiembl
!  * @created    25 avril 2002
   */
  public class MBeanParameterClassTag 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 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
--- 1,43 ----
+ /*
+  * 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.util.ClassTools;
! 
  import org.apache.struts.util.RequestUtils;
  import org.apache.struts.util.ResponseUtils;
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   25 avril 2002
!  * @todo      Javadoc to complete
   */
  public class MBeanParameterClassTag 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 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
***************
*** 63,69 ****
  
     /**
!     *  Getter for the filter attribute
      *
!     * @return    The value of filter attribute
      */
     public boolean getFilter()
--- 70,76 ----
  
     /**
!     * Getter for the filter attribute
      *
!     * @return   The value of filter attribute
      */
     public boolean getFilter()
***************
*** 74,80 ****
  
     /**
!     *  Getter for the ignore attribute
      *
!     * @return    The value of ignore attribute
      */
     public boolean getIgnore()
--- 81,87 ----
  
     /**
!     * Getter for the ignore attribute
      *
!     * @return   The value of ignore attribute
      */
     public boolean getIgnore()
***************
*** 85,91 ****
  
     /**
!     *  Getter for the name attribute
      *
!     * @return    The value of name attribute
      */
     public String getName()
--- 92,98 ----
  
     /**
!     * Getter for the name attribute
      *
!     * @return   The value of name attribute
      */
     public String getName()
***************
*** 96,102 ****
  
     /**
!     *  Getter for the scope attribute
      *
!     * @return    The value of scope attribute
      */
     public String getScope()
--- 103,109 ----
  
     /**
!     * Getter for the scope attribute
      *
!     * @return   The value of scope attribute
      */
     public String getScope()
***************
*** 106,110 ****
  
  
!    /**  Release all allocated resources. */
     public void release()
     {
--- 113,117 ----
  
  
!    /** Release all allocated resources. */
     public void release()
     {
***************
*** 118,124 ****
  
     /**
!     *  Setter for the filter attribute
      *
!     * @param  filter  The new value for filter attribute
      */
     public void setFilter(boolean filter)
--- 125,131 ----
  
     /**
!     * Setter for the filter attribute
      *
!     * @param filter  The new value for filter attribute
      */
     public void setFilter(boolean filter)
***************
*** 129,135 ****
  
     /**
!     *  Setter for the ignore attribute
      *
!     * @param  ignore  The new value for ignore attribute
      */
     public void setIgnore(boolean ignore)
--- 136,142 ----
  
     /**
!     * Setter for the ignore attribute
      *
!     * @param ignore  The new value for ignore attribute
      */
     public void setIgnore(boolean ignore)
***************
*** 140,146 ****
  
     /**
!     *  Setter for the name attribute
      *
!     * @param  name  The new value for name attribute
      */
     public void setName(String name)
--- 147,153 ----
  
     /**
!     * Setter for the name attribute
      *
!     * @param name  The new value for name attribute
      */
     public void setName(String name)
***************
*** 151,157 ****
  
     /**
!     *  Setter for the scope attribute
      *
!     * @param  scope  The new value for scope attribute
      */
     public void setScope(String scope)
--- 158,164 ----
  
     /**
!     * Setter for the scope attribute
      *
!     * @param scope  The new value for scope attribute
      */
     public void setScope(String scope)

[Ejtools-cvs] CVS: applications/jmx.browser/src/etc jmx.browser.mf,1.1,1.2 logo.svg,1.1,1.2 run.mf,1.1,1.2

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

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

Modified Files:
	jmx.browser.mf logo.svg run.mf 
Log Message:
Correct CR/LF

Index: jmx.browser.mf
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/jmx.browser.mf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jmx.browser.mf	22 Apr 2002 17:39:23 -0000	1.1
--- jmx.browser.mf	15 May 2002 20:55:34 -0000	1.2
***************
*** 1,2 ****
! Class-Path: .
! 
--- 1,2 ----
! Class-Path: .
! 

Index: logo.svg
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/logo.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** logo.svg	22 Apr 2002 17:40:16 -0000	1.1
--- logo.svg	15 May 2002 20:55:34 -0000	1.2
***************
*** 1,56 ****
! <?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:32;font-family:Tahoma">@module.name@ V...@ve...jor@.@version.minor@.@version.revision@-@version.tag@</text>
! </svg>
--- 1,56 ----
! <?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:32;font-family:Tahoma">@module.name@ V...@ve...jor@.@version.minor@.@version.revision@-@version.tag@</text>
! </svg>

Index: run.mf
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/run.mf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** run.mf	22 Apr 2002 17:41:21 -0000	1.1
--- run.mf	15 May 2002 20:55:34 -0000	1.2
***************
*** 1,10 ****
! Main-Class: net.sourceforge.ejtools.jmxbrowser.Main
! Class-Path: ../conf/
! 
! 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
--- 1,10 ----
! Main-Class: net.sourceforge.ejtools.jmxbrowser.Main
! Class-Path: ../conf/
! 
! 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

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

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

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

Modified Files:
	Domain.xml Resource.xml Server.xml 
Log Message:
Correct CR/LF

Index: Domain.xml
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/beaninfo/Domain.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Domain.xml	22 Apr 2002 17:38:59 -0000	1.1
--- Domain.xml	15 May 2002 20:55:20 -0000	1.2
***************
*** 1,9 ****
! <bean
!   class="net.sourceforge.ejtools.jmxbrowser.model.Domain"
!   displayname="JMX Domain"
!   iconcolor16="/toolbarButtonGraphics/development/Jar16.gif">
! 
!   <property
!     name="name" class="java.lang.String"
!     displayname="Name"/>
! </bean>
--- 1,9 ----
! <bean
!   class="net.sourceforge.ejtools.jmxbrowser.model.Domain"
!   displayname="JMX Domain"
!   iconcolor16="/toolbarButtonGraphics/development/Jar16.gif">
! 
!   <property
!     name="name" class="java.lang.String"
!     displayname="Name"/>
! </bean>

Index: Resource.xml
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/beaninfo/Resource.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Resource.xml	22 Apr 2002 17:41:20 -0000	1.1
--- Resource.xml	15 May 2002 20:55:20 -0000	1.2
***************
*** 1,21 ****
! <bean
!   class="net.sourceforge.ejtools.jmxbrowser.model.Resource"
!   displayname="JMX Resource"
!   iconcolor16="/toolbarButtonGraphics/development/Bean16.gif">
! 
!   <property
!     name="name" class="java.lang.String"
!     displayname="Name"/>
! 
!   <property
!     name="className" class="java.lang.String"
!     displayname="Class Name"/>
! 
!   <property
!     name="domain" class="java.lang.String"
!     displayname="Domain"/>
! 
!   <property
!     name="description" class="java.lang.String"
!     displayname="Description"/>
! </bean>
--- 1,21 ----
! <bean
!   class="net.sourceforge.ejtools.jmxbrowser.model.Resource"
!   displayname="JMX Resource"
!   iconcolor16="/toolbarButtonGraphics/development/Bean16.gif">
! 
!   <property
!     name="name" class="java.lang.String"
!     displayname="Name"/>
! 
!   <property
!     name="className" class="java.lang.String"
!     displayname="Class Name"/>
! 
!   <property
!     name="domain" class="java.lang.String"
!     displayname="Domain"/>
! 
!   <property
!     name="description" class="java.lang.String"
!     displayname="Description"/>
! </bean>

Index: Server.xml
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/etc/beaninfo/Server.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Server.xml	22 Apr 2002 17:41:53 -0000	1.1
--- Server.xml	15 May 2002 20:55:20 -0000	1.2
***************
*** 1,32 ****
! <bean
!   class="net.sourceforge.ejtools.jmxbrowser.model.Server"
!   displayname="JMX Server"
!   iconcolor16="/toolbarButtonGraphics/development/Server16.gif">
! 
!   <property
!     name="defaultDomain" class="java.lang.String"
!     displayname="Default Domain"/>
! 
!   <property
!     name="count" class="int"
!     displayname="MBean number"/>
! 
!   <property
!     name="factory" class="java.lang.String"
!     displayname="Factory"/>
! 
!   <property
!     name="packages" class="java.lang.String"
!     displayname="Packages"/>
! 
!   <property
!     name="uRL" class="java.lang.String"
!     displayname="URL"/>
! 
!   <property
!     name="eJBName" class="java.lang.String"
!     displayname="EJB Adaptor"/>
! 
!   <method name="connect" displayname="Connect">
!   </method>
! </bean>
--- 1,32 ----
! <bean
!   class="net.sourceforge.ejtools.jmxbrowser.model.Server"
!   displayname="JMX Server"
!   iconcolor16="/toolbarButtonGraphics/development/Server16.gif">
! 
!   <property
!     name="defaultDomain" class="java.lang.String"
!     displayname="Default Domain"/>
! 
!   <property
!     name="count" class="int"
!     displayname="MBean number"/>
! 
!   <property
!     name="factory" class="java.lang.String"
!     displayname="Factory"/>
! 
!   <property
!     name="packages" class="java.lang.String"
!     displayname="Packages"/>
! 
!   <property
!     name="uRL" class="java.lang.String"
!     displayname="URL"/>
! 
!   <property
!     name="eJBName" class="java.lang.String"
!     displayname="EJB Adaptor"/>
! 
!   <method name="connect" displayname="Connect">
!   </method>
! </bean>

[Ejtools-cvs] CVS: applications/jmx.browser/src/bin run.bat,1.1,1.2 run.sh,1.1,1.2

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

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

Modified Files:
	run.bat run.sh 
Log Message:
Correct CR/LF

Index: run.bat
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/bin/run.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** run.bat	22 Apr 2002 17:41:21 -0000	1.1
--- run.bat	15 May 2002 20:55:00 -0000	1.2
***************
*** 1,6 ****
! @echo off
! @if not "%ECHO%" == ""  echo %ECHO%
! @if "%OS%" == "Windows_NT"  setlocal
! 
! java -jar run.jar
! 
--- 1,6 ----
! @echo off
! @if not "%ECHO%" == ""  echo %ECHO%
! @if "%OS%" == "Windows_NT"  setlocal
! 
! java -jar run.jar
! 

Index: run.sh
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/bin/run.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** run.sh	22 Apr 2002 17:41:37 -0000	1.1
--- run.sh	15 May 2002 20:55:00 -0000	1.2
***************
*** 1,3 ****
! #!/bin/sh
! 
! java -jar run.jar
--- 1,3 ----
! #!/bin/sh
! 
! java -jar run.jar

[Ejtools-cvs] CVS: applications/jndi.browser/src/conf jndi.properties,NONE,1.1

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/conf
In directory usw-pr-cvs1:/tmp/cvs-serv8206/jndi.browser/src/conf

Added Files:
	jndi.properties 
Log Message:
Add JNDI properties

--- NEW FILE: jndi.properties ---
# JNDI Properties
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
java.naming.provider.url=localhost:1099

[Ejtools-cvs] CVS: applications/jndi.browser/src/resources/net/sourceforge/ejtools/jndibrowser/model/ejb EJBObjectProxyBeanInfo.properties,NONE,1.1

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/resources/net/sourceforge/ejtools/jndibrowser/model/ejb
In directory usw-pr-cvs1:/tmp/cvs-serv8054/jndi.browser/src/resources/net/sourceforge/ejtools/jndibrowser/model/ejb

Added Files:
	EJBObjectProxyBeanInfo.properties 
Log Message:
Add translations

--- NEW FILE: EJBObjectProxyBeanInfo.properties ---
bean.displayname=EJB
property.name.displayname=Name
property.className.displayname=Class

[Ejtools-cvs] CVS: applications/jndi.browser/src/resources/net/sourceforge/ejtools/jndibrowser/model/jms BytesMessageProxyBeanInfo.properties,NONE,1.1 ConnectionFactoryProxyBeanInfo.properties,NONE,1.1 MapMessageProxyBeanInfo.properties,NONE,1.1 ObjectMessageProxyBeanInfo.properties,NONE,1.1 StreamMessageProxyBeanInfo.properties,NONE,1.1 TextMessageProxyBeanInfo.properties,1.1,1.2

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/resources/net/sourceforge/ejtools/jndibrowser/model/jms
In directory usw-pr-cvs1:/tmp/cvs-serv7990/jndi.browser/src/resources/net/sourceforge/ejtools/jndibrowser/model/jms

Modified Files:
	TextMessageProxyBeanInfo.properties 
Added Files:
	BytesMessageProxyBeanInfo.properties 
	ConnectionFactoryProxyBeanInfo.properties 
	MapMessageProxyBeanInfo.properties 
	ObjectMessageProxyBeanInfo.properties 
	StreamMessageProxyBeanInfo.properties 
Log Message:
Add translations

--- NEW FILE: BytesMessageProxyBeanInfo.properties ---
bean.displayname=JMS Bytes Message
property.correlationId.displayname=Correlation Id
property.deliveryMode.displayname=Delivery Mode
property.expiration.displayname=Expiration
property.messageId.displayname=Message Id
property.priority.displayname=Priority
property.redelivered.displayname=Is redelivered
property.timestamp.displayname=Time Stamp
property.type.displayname=Type

--- NEW FILE: ConnectionFactoryProxyBeanInfo.properties ---
bean.displayname=JMS Queue
property.name.displayname=Name
property.className.displayname=Class
property.queueConnectionFactory.displayname=Can Create QueueConnection
property.topicConnectionFactory.displayname=Can Create TopicConnection

--- NEW FILE: MapMessageProxyBeanInfo.properties ---
bean.displayname=JMS Map Message
property.correlationId.displayname=Correlation Id
property.deliveryMode.displayname=Delivery Mode
property.expiration.displayname=Expiration
property.messageId.displayname=Message Id
property.priority.displayname=Priority
property.redelivered.displayname=Is redelivered
property.timestamp.displayname=Time Stamp
property.type.displayname=Type

--- NEW FILE: ObjectMessageProxyBeanInfo.properties ---
bean.displayname=JMS Object Message
property.correlationId.displayname=Correlation Id
property.deliveryMode.displayname=Delivery Mode
property.expiration.displayname=Expiration
property.messageId.displayname=Message Id
property.priority.displayname=Priority
property.redelivered.displayname=Is redelivered
property.timestamp.displayname=Time Stamp
property.type.displayname=Type

--- NEW FILE: StreamMessageProxyBeanInfo.properties ---
bean.displayname=JMS Stream Message
property.correlationId.displayname=Correlation Id
property.deliveryMode.displayname=Delivery Mode
property.expiration.displayname=Expiration
property.messageId.displayname=Message Id
property.priority.displayname=Priority
property.redelivered.displayname=Is redelivered
property.timestamp.displayname=Time Stamp
property.type.displayname=Type

Index: TextMessageProxyBeanInfo.properties
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/resources/net/sourceforge/ejtools/jndibrowser/model/jms/TextMessageProxyBeanInfo.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextMessageProxyBeanInfo.properties	2 May 2002 20:54:57 -0000	1.1
--- TextMessageProxyBeanInfo.properties	15 May 2002 20:50:20 -0000	1.2
***************
*** 1,10 ****
! bean.displayname=JMS Message
! property.correlationId.displayname=Correlation Id
! property.deliveryMode.displayname=Delivery Mode
! property.expiration.displayname=Expiration
! property.messageId.displayname=Message Id
! property.priority.displayname=Priority
! property.redelivered.displayname=Is redelivered
! property.timestamp.displayname=Time Stamp
! property.type.displayname=Type
! property.text.displayname=Texte
--- 1,10 ----
! bean.displayname=JMS Text Message
! property.correlationId.displayname=Correlation Id
! property.deliveryMode.displayname=Delivery Mode
! property.expiration.displayname=Expiration
! property.messageId.displayname=Message Id
! property.priority.displayname=Priority
! property.redelivered.displayname=Is redelivered
! property.timestamp.displayname=Time Stamp
! property.type.displayname=Type
! property.text.displayname=Texte

[Ejtools-cvs] CVS: applications/jndi.browser/src/resources ApplicationResources.properties,1.3,1.4 ApplicationResources_fr_FR.properties,1.3,1.4

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/resources
In directory usw-pr-cvs1:/tmp/cvs-serv7821/jndi.browser/src/resources

Modified Files:
	ApplicationResources.properties 
	ApplicationResources_fr_FR.properties 
Log Message:
Add translations

Index: ApplicationResources.properties
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/resources/ApplicationResources.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ApplicationResources.properties	2 May 2002 20:54:29 -0000	1.3
--- ApplicationResources.properties	15 May 2002 20:49:58 -0000	1.4
***************
*** 1,43 ****
! # Options Menu
! action.options=Options
! action.options.mnemonic=79
! 
! # Options Menu Items
! action.options.selectQueueFactory=Set Default QueueConnectionFactory
! action.options.selectTopicFactory=Set Default TopicConnectionFactory
! 
! # Title for Frame, Dialog, etc
! title.application=JNDI Browser
! title.about.dialog=About JNDI Browser
! title.information.defaultFactory.queue=Default QueueConnectionFactory Selection
! title.information.defaultFactory.topic=Default TopicConnectionFactory Selection
! title.question.defaultFactory.queue=Default QueueConnectionFactory Selection
! title.question.defaultFactory.topic=Default TopicConnectionFactory Selection
! 
! # Text for Frame, Dialog, etc
! text.about.application=The Enterprise Java Tools
! text.about.javaVersion=Java Version
! text.about.virtualMachine=Virtual Machine
! text.information.noDefaultFactory.queue=There is no registered QueueConnectionFactory
! text.information.noDefaultFactory.topic=There is no registered TopicConnectionFactory
! text.question.defaultFactory.queue=Choose the default QueueConnectionFactory
! text.question.defaultFactory.topic=Choose the default TopicConnectionFactory
! 
! # Text for splash widow
! text.progress.task.start=JNDIBrowser starting...
! text.progress.task.create.frame.service=Creating Frame service...
! text.progress.task.create.about.service=Creating About service...
! text.progress.task.create.menubar.service=Creating MenuBar service...
! text.progress.task.create.connection.service=Creating Connection service...
! text.progress.task.add.frame.service=Adding Frame service...
! text.progress.task.add.about.service=Adding About service...
! text.progress.task.add.menubar.service=Adding MenuBar service...
! text.progress.task.add.connection.service=Adding Connection service...
! text.progress.task.add.server=Adding Server entry point...
! text.progress.task.add.action.quit=Adding Exit action...
! text.progress.task.add.action.queue=Adding QueueConnectionFactory action...
! text.progress.task.add.action.topic=Adding TopicConnectionFactory action...
! 
! # Text for custom editors
! text.editor.SearchTypeEditor.shallow=Shallow
! text.editor.SearchTypeEditor.deep=Deep
--- 1,47 ----
! # Options Menu
! action.options=Options
! action.options.mnemonic=79
! 
! # Options Menu Items
! action.options.selectQueueFactory=Set Default QueueConnectionFactory
! action.options.selectTopicFactory=Set Default TopicConnectionFactory
! 
! # Title for Frame, Dialog, etc
! title.application=JNDI Browser
! title.about.dialog=About JNDI Browser
! title.information.defaultFactory.queue=Default QueueConnectionFactory Selection
! title.information.defaultFactory.topic=Default TopicConnectionFactory Selection
! title.question.defaultFactory.queue=Default QueueConnectionFactory Selection
! title.question.defaultFactory.topic=Default TopicConnectionFactory Selection
! 
! # Text for Tree element
! tree.server.name=JNDI Server
! tree.message.name=Msg.
! 
! # Text for Frame, Dialog, etc
! text.about.application=The Enterprise Java Tools
! text.about.javaVersion=Java Version
! text.about.virtualMachine=Virtual Machine
! text.information.noDefaultFactory.queue=There is no registered QueueConnectionFactory
! text.information.noDefaultFactory.topic=There is no registered TopicConnectionFactory
! text.question.defaultFactory.queue=Choose the default QueueConnectionFactory
! text.question.defaultFactory.topic=Choose the default TopicConnectionFactory
! 
! # Text for splash widow
! text.progress.task.start=JNDIBrowser starting...
! text.progress.task.create.frame.service=Creating Frame service...
! text.progress.task.create.about.service=Creating About service...
! text.progress.task.create.menubar.service=Creating MenuBar service...
! text.progress.task.create.connection.service=Creating Connection service...
! text.progress.task.add.frame.service=Adding Frame service...
! text.progress.task.add.about.service=Adding About service...
! text.progress.task.add.menubar.service=Adding MenuBar service...
! text.progress.task.add.connection.service=Adding Connection service...
! text.progress.task.add.server=Adding Server entry point...
! text.progress.task.add.action.quit=Adding Exit action...
! text.progress.task.add.action.queue=Adding QueueConnectionFactory action...
! text.progress.task.add.action.topic=Adding TopicConnectionFactory action...
! 
! # Text for custom editors
! text.editor.SearchTypeEditor.shallow=Shallow
! text.editor.SearchTypeEditor.deep=Deep

Index: ApplicationResources_fr_FR.properties
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/resources/ApplicationResources_fr_FR.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ApplicationResources_fr_FR.properties	2 May 2002 20:54:41 -0000	1.3
--- ApplicationResources_fr_FR.properties	15 May 2002 20:49:58 -0000	1.4
***************
*** 1,43 ****
! # Options Menu
! action.options=Options
! action.options.mnemonic=79
! 
! # Options Menu Items
! action.options.selectQueueFactory=QueueConnectionFactory par défaut
! action.options.selectTopicFactory=TopicConnectionFactory par défaut
! 
! # Title for Frame, Dialog, etc
! title.application=JNDI Browser
! title.about.dialog=A propos de JNDI Browser
! title.information.defaultFactory.queue=Sélection du QueueConnectionFactory par défaut
! title.information.defaultFactory.topic=Sélection du TopicConnectionFactory par défaut
! title.question.defaultFactory.queue=Sélection du QueueConnectionFactory par défaut
! title.question.defaultFactory.topic=Sélection du TopicConnectionFactory par défaut
! 
! # Text for Frame, Dialog, etc
! text.about.application=The Enterprise Java Tools
! text.about.javaVersion=Version de Java
! text.about.virtualMachine=Machine Virtuelle
! text.information.noDefaultFactory.queue=Pas de QueueConnectionFactory référencé
! text.information.noDefaultFactory.topic=Pas de TopicConnectionFactory référencé
! text.question.defaultFactory.queue=Choisissze le QueueConnectionFactory par défaut
! text.question.defaultFactory.topic=Choisissze le TopicConnectionFactory par défaut
! 
! # Text for splash widow
! text.progress.task.start=JNDIBrowser demarre...
! text.progress.task.create.menubar.service=Création de MenuBar service...
! text.progress.task.create.connection.service=Création de Connection service...
! text.progress.task.create.frame.service=Création de Frame service...
! text.progress.task.create.about.service=Création de About service...
! text.progress.task.add.menubar.service=Ajout de MenuBar service...
! text.progress.task.add.connection.service=Ajout de Connection service...
! text.progress.task.add.frame.service=Ajout de Frame service...
! text.progress.task.add.about.service=Ajout de About service...
! text.progress.task.add.server=Ajout du Serveur...
! text.progress.task.add.action.quit=Ajout de l'action Quitter...
! text.progress.task.add.action.queue=Ajout de l'action QueueConnectionFactory...
! text.progress.task.add.action.topic=Ajout de l'action TopicConnectionFactory...
! 
! # Text for custom editors
! text.editor.SearchTypeEditor.shallow=Légère
! text.editor.SearchTypeEditor.deep=Approfondie
--- 1,47 ----
! # Options Menu
! action.options=Options
! action.options.mnemonic=79
! 
! # Options Menu Items
! action.options.selectQueueFactory=QueueConnectionFactory par défaut
! action.options.selectTopicFactory=TopicConnectionFactory par défaut
! 
! # Title for Frame, Dialog, etc
! title.application=JNDI Browser
! title.about.dialog=A propos de JNDI Browser
! title.information.defaultFactory.queue=Sélection du QueueConnectionFactory par défaut
! title.information.defaultFactory.topic=Sélection du TopicConnectionFactory par défaut
! title.question.defaultFactory.queue=Sélection du QueueConnectionFactory par défaut
! title.question.defaultFactory.topic=Sélection du TopicConnectionFactory par défaut
! 
! # Text for Tree element
! tree.server.name=JNDI Serveur
! tree.message.name=Msg.
! 
! # Text for Frame, Dialog, etc
! text.about.application=The Enterprise Java Tools
! text.about.javaVersion=Version de Java
! text.about.virtualMachine=Machine Virtuelle
! text.information.noDefaultFactory.queue=Pas de QueueConnectionFactory référencé
! text.information.noDefaultFactory.topic=Pas de TopicConnectionFactory référencé
! text.question.defaultFactory.queue=Choisissze le QueueConnectionFactory par défaut
! text.question.defaultFactory.topic=Choisissze le TopicConnectionFactory par défaut
! 
! # Text for splash widow
! text.progress.task.start=JNDIBrowser demarre...
! text.progress.task.create.menubar.service=Création de MenuBar service...
! text.progress.task.create.connection.service=Création de Connection service...
! text.progress.task.create.frame.service=Création de Frame service...
! text.progress.task.create.about.service=Création de About service...
! text.progress.task.add.menubar.service=Ajout de MenuBar service...
! text.progress.task.add.connection.service=Ajout de Connection service...
! text.progress.task.add.frame.service=Ajout de Frame service...
! text.progress.task.add.about.service=Ajout de About service...
! text.progress.task.add.server=Ajout du Serveur...
! text.progress.task.add.action.quit=Ajout de l'action Quitter...
! text.progress.task.add.action.queue=Ajout de l'action QueueConnectionFactory...
! text.progress.task.add.action.topic=Ajout de l'action TopicConnectionFactory...
! 
! # Text for custom editors
! text.editor.SearchTypeEditor.shallow=Légère
! text.editor.SearchTypeEditor.deep=Approfondie

[Ejtools-cvs] CVS: applications/jndi.browser/src/conf log4j.properties,1.2,1.3

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/conf
In directory usw-pr-cvs1:/tmp/cvs-serv7568/jndi.browser/src/conf

Modified Files:
	log4j.properties 
Log Message:
Correct CR/LF

Index: log4j.properties
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/conf/log4j.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** log4j.properties	30 Apr 2002 21:11:48 -0000	1.2
--- log4j.properties	15 May 2002 20:49:05 -0000	1.3
***************
*** 1,15 ****
! # Set root category priority to DEBUG and its only appender to A1.
! log4j.rootCategory=DEBUG, STDOUT, R
! 
! # STDOUT is set to be a ConsoleAppender.
! log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
! log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
! log4j.appender.STDOUT.layout.ConversionPattern=[%-5p] (%c:%L) - %m%n
! 
! # R is set to be a RollingFileAppender
! log4j.appender.R=org.apache.log4j.RollingFileAppender
! log4j.appender.R.File=../logs/event.log
! log4j.appender.R.MaxFileSize=500KB
! log4j.appender.R.MaxBackupIndex=5
! log4j.appender.R.layout=org.apache.log4j.PatternLayout
! log4j.appender.R.layout.ConversionPattern=[%-5p] (%c:%L) - %m%n
--- 1,15 ----
! # Set root category priority to DEBUG and its only appender to A1.
! log4j.rootCategory=DEBUG, STDOUT, R
! 
! # STDOUT is set to be a ConsoleAppender.
! log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
! log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
! log4j.appender.STDOUT.layout.ConversionPattern=[%-5p] (%c:%L) - %m%n
! 
! # R is set to be a RollingFileAppender
! log4j.appender.R=org.apache.log4j.RollingFileAppender
! log4j.appender.R.File=../logs/event.log
! log4j.appender.R.MaxFileSize=500KB
! log4j.appender.R.MaxBackupIndex=5
! log4j.appender.R.layout=org.apache.log4j.PatternLayout
! log4j.appender.R.layout.ConversionPattern=[%-5p] (%c:%L) - %m%n

[Ejtools-cvs] CVS: applications/jndi.browser/src/bin run.bat,1.1,1.2

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/bin
In directory usw-pr-cvs1:/tmp/cvs-serv7491/jndi.browser/src/bin

Modified Files:
	run.bat 
Log Message:
Correct CR/LF

Index: run.bat
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/bin/run.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** run.bat	22 Apr 2002 17:41:21 -0000	1.1
--- run.bat	15 May 2002 20:48:51 -0000	1.2
***************
*** 1,6 ****
! @echo off
! @if not "%ECHO%" == ""  echo %ECHO%
! @if "%OS%" == "Windows_NT"  setlocal
! 
! java -jar run.jar
! 
--- 1,6 ----
! @echo off
! @if not "%ECHO%" == ""  echo %ECHO%
! @if "%OS%" == "Windows_NT"  setlocal
! 
! java -jar run.jar
! 

[Ejtools-cvs] CVS: applications/jndi.browser lib.ext.properties,1.2,1.3 lib.properties,1.2,1.3 module.properties,1.2,1.3

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

Update of /cvsroot/ejtools/applications/jndi.browser
In directory usw-pr-cvs1:/tmp/cvs-serv7223/jndi.browser

Modified Files:
	lib.ext.properties lib.properties module.properties 
Log Message:
Change the lib and lib/ext packages

Index: lib.ext.properties
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/lib.ext.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lib.ext.properties	30 Apr 2002 21:14:29 -0000	1.2
--- lib.ext.properties	15 May 2002 20:48:15 -0000	1.3
***************
*** 1,7 ****
! #
! # Librairies to be put into the lib/ext directory
! #
! # $Revision$
! #
! ${jboss.client.root}/*.jar
! 
--- 1,7 ----
! #
! # Librairies to be put into the lib/ext directory
! #
! # $Revision$
! #
! ${jboss.client.root}/*.jar
! ${jboss.jmx.root}/*.jar

Index: lib.properties
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/lib.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lib.properties	30 Apr 2002 21:14:29 -0000	1.2
--- lib.properties	15 May 2002 20:48:15 -0000	1.3
***************
*** 1,14 ****
! #
! # Librairies to be put into the lib directory
! #
! # $Revision$
! #
! ${apache.log4j.root}/*.jar
! ${dreambean.awt.root}/*.jar
! ${ejtools.adwt.root}/*.jar
! ${ejtools.common.root}/*.jar
! ${ejtools.icons.root}/*.jar
! ${sun.j2ee.root}/*.jar
! ${sun.jmx.root}/*.jar
! ${sun.jndi.root}/*.jar
! ${sun.swing.root}/*.jar
--- 1,13 ----
! #
! # Librairies to be put into the lib directory
! #
! # $Revision$
! #
! ${apache.log4j.root}/*.jar
! ${dreambean.awt.root}/*.jar
! ${ejtools.adwt.root}/*.jar
! ${ejtools.common.root}/*.jar
! ${ejtools.icons.root}/*.jar
! ${sun.j2ee.root}/*.jar
! ${sun.jndi.root}/*.jar
! ${sun.swing.root}/*.jar

Index: module.properties
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/module.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** module.properties	30 Apr 2002 21:14:29 -0000	1.2
--- module.properties	15 May 2002 20:48:15 -0000	1.3
***************
*** 1,18 ****
! #
! # Module Properties
! #
! # $Revision$
! #
! version.major=1
! version.minor=0
! version.revision=0
! version.tag=alpha
! 
! module.name=jndi.browser
! module.folder=jndi.browser
! module.display.name=JNDI Browser
! module.archive.name=ejtools.jndi.browser
! module.package=net.sourceforge.ejtools.jndibrowser.*
! module.starter=net/sourceforge/ejtools/jndibrowser/Main
! 
! module.javadoc.title=EJTools - JNDI Browser
--- 1,18 ----
! #
! # Module Properties
! #
! # $Revision$
! #
! version.major=1
! version.minor=0
! version.revision=0
! version.tag=alpha
! 
! module.name=jndi.browser
! module.folder=jndi.browser
! module.display.name=JNDI Browser
! module.archive.name=ejtools.jndi.browser
! module.package=net.sourceforge.ejtools.jndibrowser
! module.starter=net/sourceforge/ejtools/jndibrowser/Main
! 
! module.javadoc.title=EJTools - JNDI Browser

[Ejtools-cvs] CVS: applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser AboutDialog.java,1.3,1.4 JNDIBrowser.java,1.5,1.6 Main.java,1.3,1.4 SelectFactoryAction.java,1.3,1.4 SplashWindow.java,1.3,1.4

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser
In directory usw-pr-cvs1:/tmp/cvs-serv6651/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser

Modified Files:
	AboutDialog.java JNDIBrowser.java Main.java 
	SelectFactoryAction.java SplashWindow.java 
Log Message:
Add JavaDocs. Add logs.

Index: AboutDialog.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/AboutDialog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4

Index: JNDIBrowser.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/JNDIBrowser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JNDIBrowser.java	5 May 2002 20:20:42 -0000	1.5
--- JNDIBrowser.java	15 May 2002 20:46:29 -0000	1.6
***************
*** 25,38 ****
  import net.sourceforge.ejtools.jndibrowser.model.jms.ConnectionService;
  import net.sourceforge.ejtools.jndibrowser.model.jms.ConnectionServiceProvider;
  
  import org.apache.log4j.Category;
  
  /**
!  * Description of the Class
   *
!  * @author    letiembl
   * @created   21 mars 2002
   * @version   $Revision$
-  * @todo      Javadoc to complete
   */
  public class JNDIBrowser extends BeanContextServicesSupport
--- 25,39 ----
  import net.sourceforge.ejtools.jndibrowser.model.jms.ConnectionService;
  import net.sourceforge.ejtools.jndibrowser.model.jms.ConnectionServiceProvider;
+ import net.sourceforge.ejtools.util.JNDI;
  
  import org.apache.log4j.Category;
  
  /**
!  * Main JavaBean of the application. Contains all the JavaBean Services such as
!  * MenuBarService, FrameService and AboutService.
   *
!  * @author    letiemble
   * @created   21 mars 2002
   * @version   $Revision$
   */
  public class JNDIBrowser extends BeanContextServicesSupport
***************
*** 55,58 ****
--- 56,62 ----
     public JNDIBrowser()
     {
+       // Get JNDI environment
+       JNDI.setJNDIProperties();
+ 
        // Create a splash window
        SplashWindow splash = new SplashWindow(res.getString("text.progress.task.start"), 14);
***************
*** 84,88 ****
           this.frameService.setTitle(res.getString("title.application"));
  
!          // Has window hook
           this.frameService.addWindowListener(
              new WindowAdapter()
--- 88,92 ----
           this.frameService.setTitle(res.getString("title.application"));
  
!          // Add window hook
           this.frameService.addWindowListener(
              new WindowAdapter()

Index: Main.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Main.java	2 May 2002 19:39:14 -0000	1.3
--- Main.java	15 May 2002 20:46:29 -0000	1.4
***************
*** 76,87 ****
           new SecurityManager()
           {
!             public void checkPermission(Permission p)
!             {
!             }
  
  
!             public void checkPermission(Permission perm, Object context)
!             {
!             }
           });
  
--- 76,83 ----
           new SecurityManager()
           {
!             public void checkPermission(Permission p) { }
  
  
!             public void checkPermission(Permission perm, Object context) { }
           });
  

Index: SelectFactoryAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/SelectFactoryAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4

Index: SplashWindow.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/SplashWindow.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SplashWindow.java	2 May 2002 20:52:10 -0000	1.3
--- SplashWindow.java	15 May 2002 20:46:29 -0000	1.4
***************
*** 24,28 ****
   * @created   2 novembre 2001
   * @version   $Revision$
-  * @todo      Javadoc to complete
   */
  public class SplashWindow extends JWindow
--- 24,27 ----

[Ejtools-cvs] CVS: applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model JNDIContext.java,1.3,1.4 JNDIEntry.java,1.3,1.4 SearchTypeEditor.java,1.3,1.4 Server.java,1.4,1.5

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model
In directory usw-pr-cvs1:/tmp/cvs-serv6407/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model

Modified Files:
	JNDIContext.java JNDIEntry.java SearchTypeEditor.java 
	Server.java 
Log Message:
Add JavaDocs tags for BeanInfo generation by XDoclet

Index: JNDIContext.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/JNDIContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JNDIContext.java	2 May 2002 20:52:10 -0000	1.3
--- JNDIContext.java	15 May 2002 20:45:46 -0000	1.4
***************
*** 21,29 ****
  
  /**
!  * Ancestor of all element in the JNDI tree. Represents a JNDI Context and can contains other context.
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
   */
  public class JNDIContext extends BeanContextServicesSupport implements BeanContextChildComponentProxy
--- 21,32 ----
  
  /**
!  * Ancestor of all element in the JNDI tree. Represents a JNDI Context and can
!  * contains other context.
   *
!  * @author           letiemble
!  * @created          13 décembre 2001
!  * @version          $Revision$
!  * @beaninfo:class   displayName="JNDI Context" shortDescription="JNDI Context"
!  * @beaninfo:icons   color16="/toolbarButtonGraphics/general/Folder16.gif"
   */
  public class JNDIContext extends BeanContextServicesSupport implements BeanContextChildComponentProxy
***************
*** 31,35 ****
     /** Customizer of the JavaBean */
     protected transient Customizer c = null;
!    /** Class name of the context */
     protected String className = "";
     /** Name of the context */
--- 34,43 ----
     /** Customizer of the JavaBean */
     protected transient Customizer c = null;
!    /**
!     * Class name of the context
!     *
!     * @beaninfo:property   name="name" class="java.lang.String"
!     *      displayName="Name" shortDescription="Name of the context"
!     */
     protected String className = "";
     /** Name of the context */
***************
*** 62,66 ****
     public Component getComponent()
     {
!    	// Lazy creation
        if (c == null)
        {
--- 70,74 ----
     public Component getComponent()
     {
!       // Lazy creation
        if (c == null)
        {
***************
*** 83,87 ****
  
     /**
!     * Override of BeanContextServicesSupport to allow recursive access to BeanContext services
      *
      * @param child                          Child which requested the service
--- 91,96 ----
  
     /**
!     * Override of BeanContextServicesSupport to allow recursive access to
!     * BeanContext services
      *
      * @param child                          Child which requested the service
***************
*** 112,116 ****
           catch (ClassCastException cce)
           {
!          	// Ignore it
              return null;
           }
--- 121,125 ----
           catch (ClassCastException cce)
           {
!             // Ignore it
              return null;
           }
***************
*** 124,128 ****
  
     /**
!     * Return the children of this context as an iterator 
      *
      * @return   The sorted iterator by class and by name
--- 133,137 ----
  
     /**
!     * Return the children of this context as an iterator
      *
      * @return   The sorted iterator by class and by name

Index: JNDIEntry.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/JNDIEntry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JNDIEntry.java	2 May 2002 20:52:10 -0000	1.3
--- JNDIEntry.java	15 May 2002 20:45:46 -0000	1.4
***************
*** 10,19 ****
   * Describe a simple JNDI entry.
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
   */
  public class JNDIEntry extends JNDIContext
  {
  }
- 
--- 10,24 ----
   * Describe a simple JNDI entry.
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @beaninfo:class      displayName="JNDI Entry" shortDescription="JNDI Entry"
!  * @beaninfo:icons      color16="/toolbarButtonGraphics/general/File16.gif"
!  * @beaninfo:property   name="name" class="java.lang.String" displayName="Name"
!  *      shortDescription="Name of the entry"
!  * @beaninfo:property   name="className" class="java.lang.String"
!  *      displayName="Class" shortDescription="Class of the entry"
   */
  public class JNDIEntry extends JNDIContext
  {
  }

Index: SearchTypeEditor.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/SearchTypeEditor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4

Index: Server.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/Server.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Server.java	2 May 2002 20:52:10 -0000	1.4
--- Server.java	15 May 2002 20:45:46 -0000	1.5
***************
*** 10,13 ****
--- 10,14 ----
  import java.util.Iterator;
  import java.util.Properties;
+ import java.util.ResourceBundle;
  import java.util.Vector;
  
***************
*** 29,37 ****
   * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Javadoc to complete
!  * @todo      Add log4j logs
   */
  public class Server extends JNDIContext
--- 30,51 ----
   * Description of the Class
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @todo                Add log4j logs
!  * @beaninfo:class      displayName="JNDI Server" shortDescription="JNDI Server"
!  * @beaninfo:icons      color16="/toolbarButtonGraphics/development/Server16.gif"
!  * @beaninfo:property   name="factory" class="java.lang.String"
!  *      displayName="Factory" shortDescription="JNDI context factory"
!  * @beaninfo:property   name="context" class="java.lang.String"
!  *      displayName="Context" shortDescription="Initial JNDI context"
!  * @beaninfo:property   name="packages" class="java.lang.String"
!  *      displayName="Packages" shortDescription="Packages for context"
!  * @beaninfo:property   name="url" class="java.lang.String" displayName="URL"
!  *      shortDescription="JNDI Server URL"
!  * @beaninfo:property   name="searchType" class="int" displayName="Browsing"
!  *      shortDescription="JNDI context factory"
!  *      propertyeditor="net.sourceforge.ejtools.jndibrowser.model.SearchTypeEditor"
   */
  public class Server extends JNDIContext
***************
*** 53,63 ****
     /** Description of the Field */
     public final static int SHALLOW_SEARCH = 1;
  
  
!    /** Constructor for the JndiServer object */
     public Server()
     {
        super();
!       this.name = "JNDI Server";
     }
  
--- 67,96 ----
     /** Description of the Field */
     public final static int SHALLOW_SEARCH = 1;
+    /** Bundle for I18N */
+    private final static ResourceBundle res = ResourceBundle.getBundle("ApplicationResources");
  
  
!    /**
!     * Constructor for the JndiServer object
!     *
!     * @todo   I18N to complete
!     */
     public Server()
     {
        super();
!       this.name = res.getString("tree.server.name");
! 
!       if (System.getProperty(Context.INITIAL_CONTEXT_FACTORY) != null)
!       {
!          this.factory = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
!       }
!       if (System.getProperty(Context.URL_PKG_PREFIXES) != null)
!       {
!          this.pkgs = System.getProperty(Context.URL_PKG_PREFIXES);
!       }
!       if (System.getProperty(Context.PROVIDER_URL) != null)
!       {
!          this.url = System.getProperty(Context.PROVIDER_URL);
!       }
     }
  
***************
*** 118,124 ****
  
  
!    /** Description of the Method */
     public void refresh()
     {
        Iterator iterator = iterator();
        while (iterator.hasNext())
--- 151,163 ----
  
  
!    /**
!     * Description of the Method
!     *
!     * @beaninfo:method   name="refresh" displayName="Refresh"
!     *      shortDescription="Refresh the JNDI tree"
!     */
     public void refresh()
     {
+       logger.debug("Cleaning JNDI tree...");
        Iterator iterator = iterator();
        while (iterator.hasNext())
***************
*** 130,144 ****
        {
           Properties props = new Properties();
!          // To change
!          props.put("java.naming.factory.initial", this.getFactory());
!          // To change
!          props.put("java.naming.factory.url.pkgs", this.getPackages());
           props.put(Context.PROVIDER_URL, this.getUrl());
-          InitialContext context = new InitialContext(props);
  
!          Vector content = new Vector();
  
           this.iterateContext(context, this.getContext(), content);
  
           Iterator it = content.iterator();
           while (it.hasNext())
--- 169,186 ----
        {
           Properties props = new Properties();
!          props.put(Context.INITIAL_CONTEXT_FACTORY, this.getFactory());
!          props.put(Context.URL_PKG_PREFIXES, this.getPackages());
           props.put(Context.PROVIDER_URL, this.getUrl());
  
!          Context context = new InitialContext(props);
!          logger.debug("Initial context with " + props);
! 
! //	   context = (Context) context.lookup(this.getContext());
  
+          logger.debug("Parsing context " + props);
+          Vector content = new Vector();
           this.iterateContext(context, this.getContext(), content);
  
+          logger.debug("Populating JNDI tree...");
           Iterator it = content.iterator();
           while (it.hasNext())
***************
*** 315,329 ****
                                   {
                                   }
- 
                                }
                             }
- 
                          }
- 
                       }
                       catch (Exception e1)
                       {
                       }
- 
                    }
                    catch (Exception e1)
--- 357,367 ----
***************
*** 338,342 ****
        catch (Exception namingexception)
        {
!          System.err.println("iterateContext Exception " + namingexception.getMessage());
           return false;
        }
--- 376,380 ----
        catch (Exception namingexception)
        {
!          logger.warn("iterateContext Exception " + namingexception.getMessage());
           return false;
        }

[Ejtools-cvs] CVS: applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms BytesMessageProxy.java,1.1,1.2 ConnectionFactoryProxy.java,1.4,1.5 ConnectionService.java,1.4,1.5 MapMessageProxy.java,1.1,1.2 MessageProxy.java,1.5,1.6 ObjectMessageProxy.java,1.1,1.2 QueueProxy.java,1.4,1.5 StreamMessageProxy.java,1.1,1.2 TextMessageProxy.java,1.4,1.5 TopicProxy.java,1.4,1.5

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms
In directory usw-pr-cvs1:/tmp/cvs-serv6185/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms

Modified Files:
	BytesMessageProxy.java ConnectionFactoryProxy.java 
	ConnectionService.java MapMessageProxy.java MessageProxy.java 
	ObjectMessageProxy.java QueueProxy.java 
	StreamMessageProxy.java TextMessageProxy.java TopicProxy.java 
Log Message:
Add JavaDocs tags for BeanInfo generation by XDoclet

Index: BytesMessageProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/BytesMessageProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BytesMessageProxy.java	12 May 2002 19:55:27 -0000	1.1
--- BytesMessageProxy.java	15 May 2002 20:44:51 -0000	1.2
***************
*** 1,37 ****
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Javadoc to complete
!  */
! public class BytesMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param name     Description of Parameter
!     * @param message  Description of Parameter
!     */
!    public BytesMessageProxy(String name, Message message)
!    {
!       super(name, message);
!    }
! }
! 
--- 1,57 ----
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @beaninfo:class      displayName="JMS Bytes Message" shortDescription="JMS
!  *      Bytes Message"
!  * @beaninfo:icons      color16="toolbarButtonGraphics/development/jms/BytesMessage16.gif"
!  * @beaninfo:property   name="correlationId" class="java.lang.String"
!  *      displayName="Correlation Id" shortDescription="Correlation Id"
!  * @beaninfo:property   name="deliveryMode" class="int" displayName="Delivery
!  *      Mode" shortDescription="Delivery Mode"
!  *      propertyeditor="net.sourceforge.ejtools.jndibrowser.model.jms.DeliveryModeEditor"
!  * @beaninfo:property   name="expiration" class="long" displayName="Expiration"
!  *      shortDescription="Expiration" propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="messageId" class="java.lang.String"
!  *      displayName="Message Id" shortDescription="Message Id"
!  * @beaninfo:property   name="priority" class="int" displayName="Priority"
!  *      shortDescription="Priority"
!  * @beaninfo:property   name="redelivered" class="boolean" displayName="Is
!  *      redelivered" shortDescription="Is redelivered"
!  * @beaninfo:property   name="timestamp" class="java.util.Date"
!  *      displayName="TimeStamp" shortDescription="TimeStamp"
!  *      propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="type" class="java.lang.String" displayName="Type"
!  *      shortDescription="Type"
!  */
! public class BytesMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param message  Description of Parameter
!     */
!    public BytesMessageProxy(Message message)
!    {
!       super(message);
!    }
! }
! 

Index: ConnectionFactoryProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/ConnectionFactoryProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConnectionFactoryProxy.java	5 May 2002 20:20:25 -0000	1.4
--- ConnectionFactoryProxy.java	15 May 2002 20:44:51 -0000	1.5
***************
*** 18,21 ****
--- 18,22 ----
  
  import net.sourceforge.ejtools.jndibrowser.model.JNDIEntry;
+ 
  import org.apache.log4j.Category;
  
***************
*** 23,32 ****
   * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Javadoc to complete
!  * @todo      Add log4j logs
!  * @todo      Review the exception raised
   */
  public class ConnectionFactoryProxy extends JNDIEntry
--- 24,46 ----
   * Description of the Class
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @todo                Add log4j logs
!  * @todo                Review the exception raised
!  * @beaninfo:class      displayName="Connection Factory"
!  *      shortDescription="Connection Factory"
!  * @beaninfo:icons      color16="/toolbarButtonGraphics/development/Server16.gif"
!  * @beaninfo:property   name="name" class="java.lang.String" displayName="Name"
!  *      shortDescription="Name of the Connection Factory"
!  * @beaninfo:property   name="className" class="java.lang.String"
!  *      displayName="Class" shortDescription="Class of the Connection Factory"
!  * @beaninfo:property   name="queueConnectionFactory" class="boolean"
!  *      displayName="Can Create QueueConnection" shortDescription="JNDI context
!  *      factory"
!  * @beaninfo:property   name="topicConnectionFactory" class="boolean"
!  *      displayName="Can Create QueueConnection" shortDescription="JNDI context
!  *      factory"
   */
  public class ConnectionFactoryProxy extends JNDIEntry
***************
*** 42,45 ****
--- 56,61 ----
     /** Description of the Field */
     protected TopicConnectionFactory topicConnectionFactory = null;
+    /** Description of the Field */
+    private static Category logger = Category.getInstance(ConnectionFactoryProxy.class);
  
  
***************
*** 127,132 ****
        catch (Exception e)
        {
!          System.out.println("Error during release of service ConnectionService (" + e.getMessage() + ")");
!          e.printStackTrace();
        }
     }
--- 143,147 ----
        catch (Exception e)
        {
!          logger.error("Error during release of service ConnectionService (" + e.getMessage() + ")");
        }
     }
***************
*** 156,161 ****
           catch (Exception e)
           {
!             System.out.println("Error during utilisation of service ConnectionService (" + e.getMessage() + ")");
!             e.printStackTrace();
           }
        }
--- 171,175 ----
           catch (Exception e)
           {
!             logger.error("Error during utilisation of service ConnectionService (" + e.getMessage() + ")");
           }
        }

Index: ConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/ConnectionService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConnectionService.java	5 May 2002 20:20:25 -0000	1.4
--- ConnectionService.java	15 May 2002 20:44:51 -0000	1.5
***************
*** 40,43 ****
--- 40,51 ----
      */
     public TopicConnectionFactory getDefaultTopicConnectionFactory();
+ 
+ 
+    /**
+     * Description of the Method
+     *
+     * @param type  Description of the Parameter
+     */
+    public void selectFactory(String type);
  }
  

Index: MapMessageProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/MapMessageProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MapMessageProxy.java	12 May 2002 19:55:28 -0000	1.1
--- MapMessageProxy.java	15 May 2002 20:44:51 -0000	1.2
***************
*** 1,37 ****
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Javadoc to complete
!  */
! public class MapMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param name     Description of Parameter
!     * @param message  Description of Parameter
!     */
!    public MapMessageProxy(String name, Message message)
!    {
!       super(name, message);
!    }
! }
! 
--- 1,57 ----
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @beaninfo:class      displayName="JMS Map Message" shortDescription="JMS Map
!  *      Message"
!  * @beaninfo:icons      color16="toolbarButtonGraphics/development/jms/MapMessage16.gif"
!  * @beaninfo:property   name="correlationId" class="java.lang.String"
!  *      displayName="Correlation Id" shortDescription="Correlation Id"
!  * @beaninfo:property   name="deliveryMode" class="int" displayName="Delivery
!  *      Mode" shortDescription="Delivery Mode"
!  *      propertyeditor="net.sourceforge.ejtools.jndibrowser.model.jms.DeliveryModeEditor"
!  * @beaninfo:property   name="expiration" class="long" displayName="Expiration"
!  *      shortDescription="Expiration" propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="messageId" class="java.lang.String"
!  *      displayName="Message Id" shortDescription="Message Id"
!  * @beaninfo:property   name="priority" class="int" displayName="Priority"
!  *      shortDescription="Priority"
!  * @beaninfo:property   name="redelivered" class="boolean" displayName="Is
!  *      redelivered" shortDescription="Is redelivered"
!  * @beaninfo:property   name="timestamp" class="java.util.Date"
!  *      displayName="TimeStamp" shortDescription="TimeStamp"
!  *      propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="type" class="java.lang.String" displayName="Type"
!  *      shortDescription="Type"
!  */
! public class MapMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param message  Description of Parameter
!     */
!    public MapMessageProxy(Message message)
!    {
!       super(message);
!    }
! }
! 

Index: MessageProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/MessageProxy.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MessageProxy.java	12 May 2002 20:10:39 -0000	1.5
--- MessageProxy.java	15 May 2002 20:44:51 -0000	1.6
***************
*** 9,13 ****
--- 9,15 ----
  import java.lang.reflect.Constructor;
  import java.util.Date;
+ import java.util.Enumeration;
  import java.util.Hashtable;
+ import java.util.ResourceBundle;
  
  import javax.jms.BytesMessage;
***************
*** 22,34 ****
  import net.sourceforge.ejtools.jndibrowser.model.JNDIEntry;
  
  /**
   * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Exceptions to detail
!  * @todo      Javadoc to complete
!  * @todo      Add log4j logs
   */
  public class MessageProxy extends JNDIEntry
--- 24,58 ----
  import net.sourceforge.ejtools.jndibrowser.model.JNDIEntry;
  
+ import org.apache.log4j.Category;
+ 
  /**
   * Description of the Class
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Exceptions to detail
!  * @todo                Javadoc to complete
!  * @todo                Add log4j logs
!  * @beaninfo:class      displayName="JMS Message" shortDescription="JMS Message"
!  * @beaninfo:icons      color16="toolbarButtonGraphics/development/jms/Message16.gif"
!  * @beaninfo:property   name="correlationId" class="java.lang.String"
!  *      displayName="Correlation Id" shortDescription="Correlation Id"
!  * @beaninfo:property   name="deliveryMode" class="int" displayName="Delivery
!  *      Mode" shortDescription="Delivery Mode"
!  *      propertyeditor="net.sourceforge.ejtools.jndibrowser.model.jms.DeliveryModeEditor"
!  * @beaninfo:property   name="expiration" class="long" displayName="Expiration"
!  *      shortDescription="Expiration" propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="messageId" class="java.lang.String"
!  *      displayName="Message Id" shortDescription="Message Id"
!  * @beaninfo:property   name="priority" class="int" displayName="Priority"
!  *      shortDescription="Priority"
!  * @beaninfo:property   name="redelivered" class="boolean" displayName="Is
!  *      redelivered" shortDescription="Is redelivered"
!  * @beaninfo:property   name="timestamp" class="java.util.Date"
!  *      displayName="TimeStamp" shortDescription="TimeStamp"
!  *      propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="type" class="java.lang.String" displayName="Type"
!  *      shortDescription="Type"
   */
  public class MessageProxy extends JNDIEntry
***************
*** 37,41 ****
--- 61,69 ----
     protected Message message = null;
     /** Description of the Field */
+    private static Category logger = Category.getInstance(MessageProxy.class);
+    /** Description of the Field */
     private static Hashtable proxies = new Hashtable();
+    /** Bundle for I18N */
+    private final static ResourceBundle res = ResourceBundle.getBundle("ApplicationResources");
  
  
***************
*** 43,53 ****
      * Constructor for the MessageProxy object
      *
-     * @param name     Description of Parameter
      * @param message  Description of Parameter
      */
!    public MessageProxy(String name, Message message)
     {
-       this.name = name;
        this.message = message;
     }
  
--- 71,90 ----
      * Constructor for the MessageProxy object
      *
      * @param message  Description of Parameter
+     * @todo           I18N to complete
      */
!    public MessageProxy(Message message)
     {
        this.message = message;
+       this.name = res.getString("tree.message.name");
+ 
+       try
+       {
+          this.name = this.name + " " + getTimestamp().getTime();
+       }
+       catch (Exception e)
+       {
+          // Ignore it
+       }
     }
  
***************
*** 176,203 ****
      * Description of the Method
      *
-     * @param name     Description of Parameter
      * @param message  Description of Parameter
      * @return         Description of the Returned Value
      */
!    public static MessageProxy createMessageProxy(String name, Message message)
     {
!       Class clazz = (Class) proxies.get(message.getClass());
  
        try
        {
!          Constructor constructor = clazz.getConstructor(new Class[]{java.lang.String.class, javax.jms.Message.class});
!          MessageProxy proxy = (MessageProxy) constructor.newInstance(new Object[]{name, message});
           return proxy;
        }
        catch (Exception e)
        {
        }
!       return new MessageProxy(name, message);
     }
  
!    /** Load the list of proxies to create  */
     static
     {
-       proxies.put(javax.jms.Message.class, MessageProxy.class);
        proxies.put(javax.jms.BytesMessage.class, BytesMessageProxy.class);
        proxies.put(javax.jms.MapMessage.class, MapMessageProxy.class);
--- 213,256 ----
      * Description of the Method
      *
      * @param message  Description of Parameter
      * @return         Description of the Returned Value
      */
!    public static MessageProxy createMessageProxy(Message message)
     {
!       logger.debug("Message " + message);
! 
!       Class clazz = null;
!       Enumeration enum = proxies.keys();
!       while ((enum.hasMoreElements()) && (clazz == null))
!       {
!          Class i = (Class) enum.nextElement();
!          if (i.isAssignableFrom(message.getClass()))
!          {
!             clazz = (Class) proxies.get(i);
!          }
!       }
! 
!       if (clazz == null)
!       {
!          clazz = javax.jms.Message.class;
!       }
  
        try
        {
!          Constructor constructor = clazz.getConstructor(new Class[]{javax.jms.Message.class});
!          MessageProxy proxy = (MessageProxy) constructor.newInstance(new Object[]{message});
           return proxy;
        }
        catch (Exception e)
        {
+          // Ignore it
        }
! 
!       return new MessageProxy(message);
     }
  
!    /** Load the list of proxies to create */
     static
     {
        proxies.put(javax.jms.BytesMessage.class, BytesMessageProxy.class);
        proxies.put(javax.jms.MapMessage.class, MapMessageProxy.class);

Index: ObjectMessageProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/ObjectMessageProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ObjectMessageProxy.java	12 May 2002 19:55:28 -0000	1.1
--- ObjectMessageProxy.java	15 May 2002 20:44:51 -0000	1.2
***************
*** 1,37 ****
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Javadoc to complete
!  */
! public class ObjectMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param name     Description of Parameter
!     * @param message  Description of Parameter
!     */
!    public ObjectMessageProxy(String name, Message message)
!    {
!       super(name, message);
!    }
! }
! 
--- 1,57 ----
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @beaninfo:class      displayName="JMS Object Message" shortDescription="JMS
!  *      Object Message"
!  * @beaninfo:icons      color16="toolbarButtonGraphics/development/jms/ObjectMessage16.gif"
!  * @beaninfo:property   name="correlationId" class="java.lang.String"
!  *      displayName="Correlation Id" shortDescription="Correlation Id"
!  * @beaninfo:property   name="deliveryMode" class="int" displayName="Delivery
!  *      Mode" shortDescription="Delivery Mode"
!  *      propertyeditor="net.sourceforge.ejtools.jndibrowser.model.jms.DeliveryModeEditor"
!  * @beaninfo:property   name="expiration" class="long" displayName="Expiration"
!  *      shortDescription="Expiration" propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="messageId" class="java.lang.String"
!  *      displayName="Message Id" shortDescription="Message Id"
!  * @beaninfo:property   name="priority" class="int" displayName="Priority"
!  *      shortDescription="Priority"
!  * @beaninfo:property   name="redelivered" class="boolean" displayName="Is
!  *      redelivered" shortDescription="Is redelivered"
!  * @beaninfo:property   name="timestamp" class="java.util.Date"
!  *      displayName="TimeStamp" shortDescription="TimeStamp"
!  *      propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="type" class="java.lang.String" displayName="Type"
!  *      shortDescription="Type"
!  */
! public class ObjectMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param message  Description of Parameter
!     */
!    public ObjectMessageProxy(Message message)
!    {
!       super(message);
!    }
! }
! 

Index: QueueProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/QueueProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueueProxy.java	12 May 2002 19:55:28 -0000	1.4
--- QueueProxy.java	15 May 2002 20:44:51 -0000	1.5
***************
*** 26,29 ****
--- 26,31 ----
  
  import net.sourceforge.ejtools.jndibrowser.model.JNDIEntry;
+ import net.sourceforge.ejtools.util.Sort;
+ 
  import org.apache.log4j.Category;
  
***************
*** 46,49 ****
--- 48,53 ----
     /** Description of the Field */
     private Queue queue = null;
+    /** Description of the Field */
+    private static Category logger = Category.getInstance(QueueProxy.class);
  
  
***************
*** 67,71 ****
     public void browse()
     {
!       // Clean the Queue
        Iterator iterator = iterator();
        while (iterator.hasNext())
--- 71,75 ----
     public void browse()
     {
!       logger.debug("Cleaning the Queue...");
        Iterator iterator = iterator();
        while (iterator.hasNext())
***************
*** 87,100 ****
  
              count = 0;
- 
              Enumeration enum = queueBrowser.getEnumeration();
!             System.out.println("Enumeration " + enum);
              while (enum.hasMoreElements())
              {
                 message = (Message) enum.nextElement();
!                MessageProxy newMessage = MessageProxy.createMessageProxy("Message " + count, message);
  
                 count++;
-                System.out.println("Count is " + count);
  
                 add(newMessage);
--- 91,102 ----
  
              count = 0;
              Enumeration enum = queueBrowser.getEnumeration();
! 
              while (enum.hasMoreElements())
              {
                 message = (Message) enum.nextElement();
!                MessageProxy newMessage = MessageProxy.createMessageProxy(message);
  
                 count++;
  
                 add(newMessage);
***************
*** 108,112 ****
           catch (Exception e)
           {
!             System.out.println("Exception occurred: " + e.toString());
           }
           finally
--- 110,114 ----
           catch (Exception e)
           {
!             logger.warn("Exception occurred: " + e.toString());
           }
           finally
***************
*** 120,123 ****
--- 122,126 ----
                 catch (JMSException e)
                 {
+                   // Ignore it
                 }
              }
***************
*** 148,152 ****
           catch (JMSException e)
           {
!             System.out.println("Exception occurred: " + e.toString());
           }
           finally
--- 151,155 ----
           catch (JMSException e)
           {
!             logger.warn("Exception occurred: " + e.toString());
           }
           finally
***************
*** 163,166 ****
--- 166,170 ----
              }
           }
+ 
           // Browse the content
           this.browse();
***************
*** 195,199 ****
           catch (JMSException e)
           {
!             System.out.println("Exception occurred: " + e.toString());
           }
           finally
--- 199,203 ----
           catch (JMSException e)
           {
!             logger.warn("Exception occurred: " + e.toString());
           }
           finally
***************
*** 210,213 ****
--- 214,218 ----
              }
           }
+ 
           // Browse the content
           this.browse();
***************
*** 228,231 ****
--- 233,247 ----
  
     /**
+     * Return the message of this queue as an iterator
+     *
+     * @return   The sorted iterator by name
+     */
+    public Iterator iterator()
+    {
+       return Sort.sortByName(super.iterator());
+    }
+ 
+ 
+    /**
      * Description of the Method
      *
***************
*** 258,262 ****
           catch (JMSException e)
           {
!             System.out.println("No Connection: " + e.toString());
           }
        }
--- 274,278 ----
           catch (JMSException e)
           {
!             logger.warn("No Connection: " + e.toString());
           }
        }
***************
*** 284,288 ****
        catch (Exception e)
        {
!          System.out.println("No Factory: " + e.toString());
        }
  
--- 300,304 ----
        catch (Exception e)
        {
!          logger.warn("No Factory: " + e.toString());
        }
  

Index: StreamMessageProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/StreamMessageProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StreamMessageProxy.java	12 May 2002 19:55:28 -0000	1.1
--- StreamMessageProxy.java	15 May 2002 20:44:51 -0000	1.2
***************
*** 1,37 ****
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Javadoc to complete
!  */
! public class StreamMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param name     Description of Parameter
!     * @param message  Description of Parameter
!     */
!    public StreamMessageProxy(String name, Message message)
!    {
!       super(name, message);
!    }
! }
! 
--- 1,57 ----
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at www.gnu.org.
!  */
! package net.sourceforge.ejtools.jndibrowser.model.jms;
! 
! import java.awt.Component;
! import javax.jms.JMSException;
! import javax.jms.Message;
! import javax.jms.TextMessage;
! 
! import org.apache.log4j.Category;
! 
! /**
!  * Description of the Class
!  *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @beaninfo:class      displayName="JMS Stream Message" shortDescription="JMS
!  *      Stream Message"
!  * @beaninfo:icons      color16="toolbarButtonGraphics/development/jms/StreamMessage16.gif"
!  * @beaninfo:property   name="correlationId" class="java.lang.String"
!  *      displayName="Correlation Id" shortDescription="Correlation Id"
!  * @beaninfo:property   name="deliveryMode" class="int" displayName="Delivery
!  *      Mode" shortDescription="Delivery Mode"
!  *      propertyeditor="net.sourceforge.ejtools.jndibrowser.model.jms.DeliveryModeEditor"
!  * @beaninfo:property   name="expiration" class="long" displayName="Expiration"
!  *      shortDescription="Expiration" propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="messageId" class="java.lang.String"
!  *      displayName="Message Id" shortDescription="Message Id"
!  * @beaninfo:property   name="priority" class="int" displayName="Priority"
!  *      shortDescription="Priority"
!  * @beaninfo:property   name="redelivered" class="boolean" displayName="Is
!  *      redelivered" shortDescription="Is redelivered"
!  * @beaninfo:property   name="timestamp" class="java.util.Date"
!  *      displayName="TimeStamp" shortDescription="TimeStamp"
!  *      propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="type" class="java.lang.String" displayName="Type"
!  *      shortDescription="Type"
!  */
! public class StreamMessageProxy extends MessageProxy
! {
!    /**
!     * Constructor for the MessageProxy object
!     *
!     * @param message  Description of Parameter
!     */
!    public StreamMessageProxy(Message message)
!    {
!       super(message);
!    }
! }
! 

Index: TextMessageProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/TextMessageProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TextMessageProxy.java	12 May 2002 19:55:28 -0000	1.4
--- TextMessageProxy.java	15 May 2002 20:44:51 -0000	1.5
***************
*** 17,24 ****
   * Description of the Class
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
!  * @todo      Javadoc to complete
   */
  public class TextMessageProxy extends MessageProxy
--- 17,48 ----
   * Description of the Class
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Javadoc to complete
!  * @beaninfo:class      displayName="JMS Text Message" shortDescription="JMS
!  *      Text Message"
!  * @beaninfo:icons      color16="toolbarButtonGraphics/development/jms/TextMessage16.gif"
!  * @beaninfo:property   name="correlationId" class="java.lang.String"
!  *      displayName="Correlation Id" shortDescription="Correlation Id"
!  * @beaninfo:property   name="deliveryMode" class="int" displayName="Delivery
!  *      Mode" shortDescription="Delivery Mode"
!  *      propertyeditor="net.sourceforge.ejtools.jndibrowser.model.jms.DeliveryModeEditor"
!  * @beaninfo:property   name="expiration" class="long" displayName="Expiration"
!  *      shortDescription="Expiration" propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="messageId" class="java.lang.String"
!  *      displayName="Message Id" shortDescription="Message Id"
!  * @beaninfo:property   name="priority" class="int" displayName="Priority"
!  *      shortDescription="Priority"
!  * @beaninfo:property   name="redelivered" class="boolean" displayName="Is
!  *      redelivered" shortDescription="Is redelivered"
!  * @beaninfo:property   name="timestamp" class="java.util.Date"
!  *      displayName="TimeStamp" shortDescription="TimeStamp"
!  *      propertyeditor="net.sourceforge.ejtools.awt.editors.DateTimeEditor"
!  * @beaninfo:property   name="type" class="java.lang.String" displayName="Type"
!  *      shortDescription="Type"
!  * @beaninfo:property   name="text" class="java.lang.String" displayName="Text"
!  *      shortDescription="Text of the message"
!  *      propertyeditor="com.dreambean.awt.editors.TextEditor"
   */
  public class TextMessageProxy extends MessageProxy
***************
*** 27,36 ****
      * Constructor for the MessageProxy object
      *
-     * @param name     Description of Parameter
      * @param message  Description of Parameter
      */
!    public TextMessageProxy(String name, Message message)
     {
!       super(name, message);
     }
  
--- 51,59 ----
      * Constructor for the MessageProxy object
      *
      * @param message  Description of Parameter
      */
!    public TextMessageProxy(Message message)
     {
!       super(message);
     }
  

Index: TopicProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/jms/TopicProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TopicProxy.java	12 May 2002 19:55:28 -0000	1.4
--- TopicProxy.java	15 May 2002 20:44:51 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.ejtools.jndibrowser.model.jms;
  
+ import java.beans.beancontext.BeanContextServices;
  import javax.jms.JMSException;
  import javax.jms.Message;
***************
*** 22,25 ****
--- 23,27 ----
  
  import net.sourceforge.ejtools.jndibrowser.model.JNDIEntry;
+ 
  import org.apache.log4j.Category;
  
***************
*** 37,40 ****
--- 39,44 ----
     /** Description of the Field */
     private Topic topic = null;
+    /** Description of the Field */
+    private static Category logger = Category.getInstance(QueueProxy.class);
  
  
***************
*** 58,109 ****
     public void createTextMessage(String text)
     {
!       Context jndiContext = null;
!       TopicConnectionFactory topicConnectionFactory = null;
!       TopicConnection topicConnection = null;
!       TopicSession topicSession = null;
!       TopicPublisher topicPublisher = null;
!       TextMessage message = null;
! 
!       // TO MODIFY
!       try
        {
!          jndiContext = new InitialContext();
!          topicConnectionFactory = (TopicConnectionFactory) jndiContext.lookup("ConnectionFactory");
        }
!       catch (NamingException e)
        {
!          System.out.println("JNDI lookup failed: " + e.toString());
        }
-       // TO MODIFY
  
!       try
!       {
!          topicConnection = topicConnectionFactory.createTopicConnection();
!          topicSession = topicConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
!          topicPublisher = topicSession.createPublisher(topic);
  
-          message = topicSession.createTextMessage();
-          message.setText(text);
-          topicPublisher.publish(message);
  
!          topicSession.close();
!       }
!       catch (JMSException e)
        {
!          System.out.println("Exception occurred: " + e.toString());
        }
!       finally
        {
!          if (topicConnection != null)
!          {
!             try
!             {
!                topicConnection.close();
!             }
!             catch (JMSException e)
!             {
!             }
!          }
        }
     }
  }
--- 62,148 ----
     public void createTextMessage(String text)
     {
!       // Get a connection on the default factory
!       TopicConnection topicConnection = getTopicConnection();
!       if (topicConnection != null)
        {
!          try
!          {
!             TextMessage message = null;
! 
!             TopicSession topicSession = topicConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
!             TopicPublisher topicPublisher = topicSession.createPublisher(topic);
! 
!             message = topicSession.createTextMessage();
!             message.setText(text);
!             topicPublisher.publish(message);
! 
!             topicSession.close();
!          }
!          catch (JMSException e)
!          {
!             logger.warn("Exception occurred: " + e.toString());
!          }
!          finally
!          {
!             if (topicConnection != null)
!             {
!                try
!                {
!                   topicConnection.close();
!                }
!                catch (JMSException e)
!                {
!                }
!             }
!          }
        }
!    }
! 
! 
!    /**
!     * @return   The value
!     * @todo     Add Log4j log
!     */
!    protected TopicConnection getTopicConnection()
!    {
!       TopicConnection topicConnection = null;
!       TopicConnectionFactory topicConnectionFactory = getTopicConnectionFactory();
! 
!       if (topicConnectionFactory != null)
        {
!          try
!          {
!             topicConnection = topicConnectionFactory.createTopicConnection();
!          }
!          catch (JMSException e)
!          {
!             logger.warn("No Connection: " + e.toString());
!          }
        }
  
!       return topicConnection;
!    }
  
  
!    /**
!     * @return   The value
!     * @todo     Add Log4j log
!     */
!    protected TopicConnectionFactory getTopicConnectionFactory()
!    {
!       TopicConnectionFactory topicConnectionFactory = null;
! 
!       try
        {
!          BeanContextServices context = (BeanContextServices) getBeanContext();
!          ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
!          topicConnectionFactory = service.getDefaultTopicConnectionFactory();
        }
!       catch (Exception e)
        {
!          logger.warn("No Factory: " + e.toString());
        }
+ 
+       return topicConnectionFactory;
     }
  }

[Ejtools-cvs] CVS: applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/ejb EJBHomeProxy.java,1.4,1.5 EJBObjectProxy.java,1.4,1.5 PropertyChanger.java,1.4,1.5

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

Update of /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/ejb
In directory usw-pr-cvs1:/tmp/cvs-serv5963/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/ejb

Modified Files:
	EJBHomeProxy.java EJBObjectProxy.java PropertyChanger.java 
Log Message:
Add JavaDocs tags for BeanInfo generation by XDoclet

Index: EJBHomeProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/ejb/EJBHomeProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EJBHomeProxy.java	5 May 2002 20:20:33 -0000	1.4
--- EJBHomeProxy.java	15 May 2002 20:44:10 -0000	1.5
***************
*** 27,33 ****
   * EJBObjectProxy.
   *
!  * @author    letiemble
!  * @created   13 décembre 2001
!  * @version   $Revision$
   */
  public class EJBHomeProxy extends JNDIEntry implements InvocationHandler
--- 27,41 ----
   * EJBObjectProxy.
   *
!  * @author              letiemble
!  * @created             13 décembre 2001
!  * @version             $Revision$
!  * @todo                Reference to Rickard Öberg
!  * @beaninfo:class      displayName="Enterprise Java Bean" shortDescription="EJB
!  *      Home interface"
!  * @beaninfo:icons      color16="/toolbarButtonGraphics/development/EnterpriseJavaBeanJar16.gif"
!  * @beaninfo:property   name="name" class="java.lang.String" displayName="Name"
!  *      shortDescription="Name of the EJB Home"
!  * @beaninfo:property   name="className" class="java.lang.String"
!  *      displayName="Home interface" shortDescription="Class of EJB Home"
   */
  public class EJBHomeProxy extends JNDIEntry implements InvocationHandler

Index: EJBObjectProxy.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/ejb/EJBObjectProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EJBObjectProxy.java	5 May 2002 20:20:33 -0000	1.4
--- EJBObjectProxy.java	15 May 2002 20:44:10 -0000	1.5
***************
*** 23,33 ****
  
  /**
!  * Description of the Class
   *
!  * @author    letiemble
!  * @created   2 janvier 2002
!  * @see       <related>
!  * @version   $Revision$
!  * @todo      JavaDoc to complete
   */
  public class EJBObjectProxy extends JNDIEntry implements InvocationHandler
--- 23,36 ----
  
  /**
!  * Proxy that hide the remote aspect of the EJB remote interface. Allows the
!  * execution of remote methods on the specified EJB.
   *
!  * @author           letiemble
!  * @created          2 janvier 2002
!  * @version          $Revision$
!  * @todo             Reference to Rickard Öberg
!  * @beaninfo:class   displayName="Enterprise Java Bean" shortDescription="EJB
!  *      Remote interface"
!  * @beaninfo:icons   color16="/toolbarButtonGraphics/development/EnterpriseJavaBean16.gif"
   */
  public class EJBObjectProxy extends JNDIEntry implements InvocationHandler

Index: PropertyChanger.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/net/sourceforge/ejtools/jndibrowser/model/ejb/PropertyChanger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PropertyChanger.java	5 May 2002 20:20:33 -0000	1.4
--- PropertyChanger.java	15 May 2002 20:44:10 -0000	1.5
***************
*** 15,18 ****
--- 15,19 ----
   * @created   2 janvier 2002
   * @version   $Revision$
+  * @todo      Reference to Rickard Öberg
   */
  public interface PropertyChanger

[Ejtools-cvs] CVS: build switch.properties,1.6,1.7

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

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

Modified Files:
	switch.properties 
Log Message:
Add WebApp build section

Index: switch.properties
===================================================================
RCS file: /cvsroot/ejtools/build/switch.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** switch.properties	6 May 2002 20:36:41 -0000	1.6
--- switch.properties	15 May 2002 20:42:36 -0000	1.7
***************
*** 47,50 ****
--- 47,52 ----
  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
***************
*** 86,100 ****
  todo.library.xmlweb=true
  
- # Modules to webapp
- # --------------------------------------------------------------------------------
- #webapp.application.deployment=true
- webapp.application.jmx.browser=true
- #webapp.application.jndi.browser=true
- #webapp.application.management=true
- 
  # Modules to package
  # --------------------------------------------------------------------------------
  #package.application.deployment=true
! package.application.jmx.browser=true
  #package.application.jndi.browser=true
  #package.application.management=true
--- 88,97 ----
  todo.library.xmlweb=true
  
  # Modules to package
  # --------------------------------------------------------------------------------
  #package.application.deployment=true
! #package.application.jmx.browser=true
  #package.application.jndi.browser=true
  #package.application.management=true
+ package.webapp.jmx.browser=true
+ #package.webapp.jndi.browser=true

[Ejtools-cvs] CVS: build beaninfo.j,1.2,1.3

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

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

Modified Files:
	beaninfo.j 
Log Message:
BeanInfo generation by XDoclet (in progress)

Index: beaninfo.j
===================================================================
RCS file: /cvsroot/ejtools/build/beaninfo.j,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** beaninfo.j	15 May 2002 07:30:29 -0000	1.2
--- beaninfo.j	15 May 2002 17:48:50 -0000	1.3
***************
*** 109,113 ****
  
     /**
!     * Gets the defaultPropertyIndex attribute of the JNDIEntryBeanInfo object
      *
      * @return   The defaultPropertyIndex value
--- 109,113 ----
  
     /**
!     * Gets the defaultPropertyIndex attribute ...
      *
      * @return   The defaultPropertyIndex value
***************
*** 161,165 ****
  
     /**
!     * Gets the propertyDescriptors attribute of the JNDIEntryBeanInfo object
      *
      * @return   The propertyDescriptors value
--- 161,165 ----
  
     /**
!     * Gets the propertyDescriptors attribute ...
      *
      * @return   The propertyDescriptors value
***************
*** 169,174 ****
        try
        {
!          Vector properties = new Vector();
!          PropertyDescriptor property = null;
  
           <XDtClass:forAllClassTags tagName="beaninfo:property">
--- 169,174 ----
        try
        {
!          Vector descriptors = new Vector();
!          PropertyDescriptor descriptor = null;
  
           <XDtClass:forAllClassTags tagName="beaninfo:property">
***************
*** 176,206 ****
           try
           {
!             <XDtClass:ifDoesntHaveClassTag tagName="beaninfo:property" paramName="readOnly">
!             property = new PropertyDescriptor("<XDtClass:classTagValue tagName="beaninfo:property" paramName="name"/>",<XDtClass:fullClassName/>.class);
!             </XDtClass:ifDoesntHaveClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="readOnly">
!             property = new PropertyDescriptor("<XDtClass:classTagValue tagName="beaninfo:property" paramName="name"/>",<XDtClass:fullClassName/>.class, "getter", null);
!             </XDtClass:ifHasClassTag>
           }
           catch (IntrospectionException e)
           {
!             property = new PropertyDescriptor("<XDtClass:classTagValue tagName="beaninfo:property" paramName="name"/>",<XDtClass:fullClassName/>.class, "getter", null);
           }
  
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="displayName">property.setDisplayName("<XDtClass:classTagValue tagName="beaninfo:property" paramName="displayName"/>");</XDtClass:ifHasClassTag>
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="shortDescription">property.setShortDescription("<XDtClass:classTagValue tagName="beaninfo:property" paramName="shortDescription"/>");</XDtClass:ifHasClassTag>
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="expert">property.setExpert(<XDtClass:classTagValue tagName="beaninfo:property" paramName="expert" values="true,false"/>);</XDtClass:ifHasClassTag>
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="hidden">property.setHidden(<XDtClass:classTagValue tagName="beaninfo:property" paramName="hidden" values="true,false"/>);</XDtClass:ifHasClassTag>
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="preferred">property.setPreferred(<XDtClass:classTagValue tagName="beaninfo:property" paramName="preferred" values="true,false"/>);</XDtClass:ifHasClassTag>
- 
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="bound">property.setBound("<XDtClass:classTagValue tagName="beaninfo:property" paramName="bound" values="true,false"/>");</XDtClass:ifHasClassTag>
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="constrained">property.setConstrained("<XDtClass:classTagValue tagName="beaninfo:property" paramName="constrained" values="true,false"/>");</XDtClass:ifHasClassTag>
-          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="propertyEditor">property.setPropertyEditorClass(Class.forName("<XDtClass:classTagValue tagName="beaninfo:property" paramName="propertyEditor"/>"));</XDtClass:ifHasClassTag>
- 
-          properties.add(property);
- 
           </XDtClass:forAllClassTags>
  
!          return properties.toArray(new PropertyDescriptor[properties.size()]);
        }
        catch (Exception e)
--- 176,201 ----
           try
           {
!             descriptor = new PropertyDescriptor("<XDtClass:classTagValue tagName="beaninfo:property" paramName="name"/>",<XDtClass:fullClassName/>.class);
! 
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="displayName">descriptor.setDisplayName("<XDtClass:classTagValue tagName="beaninfo:property" paramName="displayName"/>");</XDtClass:ifHasClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="shortDescription">descriptor.setShortDescription("<XDtClass:classTagValue tagName="beaninfo:property" paramName="shortDescription"/>");</XDtClass:ifHasClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="expert">descriptor.setExpert(<XDtClass:classTagValue tagName="beaninfo:property" paramName="expert" values="true,false"/>);</XDtClass:ifHasClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="hidden">descriptor.setHidden(<XDtClass:classTagValue tagName="beaninfo:property" paramName="hidden" values="true,false"/>);</XDtClass:ifHasClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="preferred">descriptor.setPreferred(<XDtClass:classTagValue tagName="beaninfo:property" paramName="preferred" values="true,false"/>);</XDtClass:ifHasClassTag>
! 
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="bound">descriptor.setBound("<XDtClass:classTagValue tagName="beaninfo:property" paramName="bound" values="true,false"/>");</XDtClass:ifHasClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="constrained">descriptor.setConstrained("<XDtClass:classTagValue tagName="beaninfo:property" paramName="constrained" values="true,false"/>");</XDtClass:ifHasClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="propertyEditor">descriptor.setPropertyEditorClass(Class.forName("<XDtClass:classTagValue tagName="beaninfo:property" paramName="propertyEditor"/>"));</XDtClass:ifHasClassTag>
! 
!             descriptors.add(descriptor);
           }
           catch (IntrospectionException e)
           {
!             // Ignore it
           }
  
           </XDtClass:forAllClassTags>
  
!          return (PropertyDescriptor[]) descriptors.toArray(new PropertyDescriptor[descriptors.size()]);
        }
        catch (Exception e)

[Ejtools-cvs] CVS: build build_application.xml,1.8,1.9

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

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

Modified Files:
	build_application.xml 
Log Message:
Add webapp creation script

Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build_application.xml	15 May 2002 07:30:29 -0000	1.8
--- build_application.xml	15 May 2002 17:48:18 -0000	1.9
***************
*** 37,44 ****
  	<property name="dist.lib.ext" value="${dist.lib}/ext"/>
  	<property name="dist.logs" value="${dist.home}/logs"/>
- 	<property name="dist.webapp" value="${module.root}/webapp"/>
- 	<property name="dist.webapp.webinf" value="${dist.webapp}/WEB-INF"/>
- 	<property name="dist.webapp.webinf.classes" value="${dist.webapp.webinf}/classes"/>
- 	<property name="dist.webapp.webinf.lib" value="${dist.webapp.webinf}/lib"/>
  	<property name="src.home" value="${module.root}/src"/>
  	<property name="src.bin" value="${src.home}/bin"/>
--- 37,40 ----
***************
*** 95,102 ****
  		<mkdir dir="${dist.lib.ext}"/>
  		<mkdir dir="${dist.logs}"/>
- 		<mkdir dir="${dist.webapp}"/>
- 		<mkdir dir="${dist.webapp.webinf}"/>
- 		<mkdir dir="${dist.webapp.webinf.classes}"/>
- 		<mkdir dir="${dist.webapp.webinf.lib}"/>
  		<available file="${module.root}/lib.properties" property="has.lib.file"/>
  		<available file="${module.root}/lib.ext.properties" property="has.lib.ext.file"/>
--- 91,94 ----
***************
*** 121,131 ****
  			<classpath refid="compile.classpath"/>
  		</javac>
- 		<copy todir="${build.classes}">
- 			<fileset dir="${src.resources}">
- 				<include name="**/*.properties"/>
- 				<include name="**/*.gif"/>
- 				<include name="**/*.png"/>
- 			</fileset>
- 		</copy>
  	</target>
  	<!-- ==================== XMLBeans Target ================================== -->
--- 113,116 ----
***************
*** 148,151 ****
--- 133,143 ----
  	<!-- ==================== Build Target ===================================== -->
  	<target name="build" depends="compile,xmlbeans" description="Create binary">
+ 		<copy todir="${build.classes}">
+ 			<fileset dir="${src.resources}">
+ 				<include name="**/*.properties"/>
+ 				<include name="**/*.gif"/>
+ 				<include name="**/*.png"/>
+ 			</fileset>
+ 		</copy>
  		<!-- Create the Bootstrap JAR file -->
  		<jar jarfile="${build.lib}/run.jar" basedir="${build.classes}" manifest="${build.etc}/run.mf" includes="${module.starter}*.*"/>
***************
*** 188,215 ****
  		</copy>
  	</target>
- 	<!-- ==================== WebApp Target ===================================== -->
- 	<target name="webapp" depends="build" description="">
- 		<copy todir="${dist.webapp}">
- 			<fileset dir="${src.webapp.content}"/>
- 		</copy>
- 		<copy todir="${dist.webapp.webinf.classes}">
- 			<fileset dir="${build.classes}"/>
- 		</copy>
- 		<copy todir="${dist.webapp.webinf.lib}">
- 			<mapper type="flatten"/>
- 			<fileset dir="." includesfile="${module.root}/webapp.properties"/>
- 		</copy>
- 		<java classname="org.apache.jasper.JspC" fork="true">
- 			<classpath refid="compile.classpath"/>
- 			<arg value="-d"/>
- 			<arg value="${build.src}"/>
- 			<arg value="-uriroot"/>
- 			<arg value="${dist.webapp}"/>
- 			<arg value="-p"/>
- 			<arg value="${module.package}.servlet"/>
- 			<arg value="${dist.webapp}/index.jsp"/>
- 		</java>
- 		<jar jarfile="${dist.home}/${module.name}.war" basedir="${dist.webapp}"/>
- 	</target>
  	<!-- ==================== Javadoc Target ================================== -->
  	<target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc">
--- 180,183 ----
***************
*** 229,246 ****
  	</target>
  	<!-- ==================== Package Target =================================== -->
! 	<target name="package" depends="dist, webapp" description="">
! 		<tar tarfile="${output.root}/${module.name}.tar">
! 			<tarfileset dir="${dist.home}" mode="755">
! 				<include name="${dist.bin}/run.sh"/>
! 			</tarfileset>
! 			<tarfileset dir="${dist.home}">
! 				<include name="${dist.home}/**"/>
! 				<exclude name="${dist.bin}/run.sh"/>
! 			</tarfileset>
! 		</tar>
! 		<zip zipfile="${output.root}/${module.name}.zip">
! 			<fileset dir="${dist.home}"/>
! 		</zip>
! 	</target>
  	<!-- ==================== SVG Logo Target =================================== -->
  	<target name="logo" depends="prepare">
--- 197,201 ----
  	</target>
  	<!-- ==================== Package Target =================================== -->
! 	<target name="package" depends="dist" description=""/>
  	<!-- ==================== SVG Logo Target =================================== -->
  	<target name="logo" depends="prepare">
***************
*** 274,278 ****
  		<delete dir="${build.home}"/>
  		<delete dir="${dist.home}"/>
- 		<delete dir="${dist.webapp}"/>
  	</target>
  </project>
--- 229,232 ----

[Ejtools-cvs] CVS: build build_webapp.xml,NONE,1.1 build.xml,1.5,1.6 build_library.xml,1.2,1.3 build_thirdparty.xml,1.2,1.3 build_website.xml,1.2,1.3

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

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

Modified Files:
	build.xml build_library.xml build_thirdparty.xml 
	build_website.xml 
Added Files:
	build_webapp.xml 
Log Message:
Add webapp creation script

--- NEW FILE: build_webapp.xml ---
<?xml version="1.0"?>
<!--
/*
 * EJTools, the Enterprise Java Tools
 *
 * Distributable under LGPL license.
 * See terms of license at gnu.org.
 *
 * $Revision: 1.6 $
 */
-->
<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="todo" classname="xdoclet.doc.DocumentDocletTask"/>
	<!-- ==================== Module Definition ======================== -->
	<property name="module.root" value="${applications.root}/${module.name}"/>
	<!-- ==================== File and Directory Names ======================== -->
	<property name="build.home" value="${module.root}/output"/>
	<property name="build.classes" value="${build.home}/classes"/>
	<property name="build.conf" value="${build.home}/conf"/>
	<property name="build.doc" value="${build.home}/doc"/>
	<property name="build.doc.api" value="${build.doc}/api"/>
	<property name="build.doc.todo" value="${build.doc}/todo"/>
	<property name="build.etc" value="${build.home}/etc"/>
	<property name="build.lib" value="${build.home}/lib"/>
	<property name="build.src" value="${build.home}/src"/>
	<property name="webapp.home" value="${module.root}/webapp"/>
	<property name="webapp.lib" value="${webapp.home}/lib"/>
	<property name="src.home" value="${module.root}/src"/>
	<property name="src.bin" value="${src.home}/bin"/>
	<property name="src.conf" value="${src.home}/conf"/>
	<property name="src.etc" value="${src.home}/etc"/>
	<property name="src.main" value="${src.home}/main"/>
	<property name="src.resources" value="${src.home}/resources"/>
	<property name="src.webapp" value="${src.home}/webapp"/>
	<property name="src.webapp.content" value="${src.webapp}/content"/>
	<property name="src.webapp.resources" value="${src.webapp}/resources"/>
	<!-- ==================== Compilation Classpath =========================== -->
	<path id="compile.classpath">
		<fileset dir="${ejtools.common.root}" includes="*.jar"/>
		<fileset dir="${ejtools.adwt.root}" includes="*.jar"/>
		<fileset dir="${ejtools.xmlweb.root}" includes="*.jar"/>
		<fileset dir="${apache.ant.root}" includes="*.jar"/>
		<fileset dir="${apache.crimson.root}" includes="*.jar"/>
		<fileset dir="${apache.log4j.root}" includes="*.jar"/>
		<fileset dir="${apache.struts.root}" includes="*.jar"/>
		<fileset dir="${apache.tomcat.root}" includes="*.jar"/>
		<fileset dir="${apache.xalan.root}" includes="*.jar"/>
		<fileset dir="${dreambean.awt.root}" includes="*.jar"/>
		<fileset dir="${jboss.client.root}" includes="*.jar"/>
		<fileset dir="${jboss.jmx.root}" includes="*.jar"/>
		<fileset dir="${sourceforge.xdoclet.root}" includes="*.jar"/>
		<fileset dir="${sun.j2ee.root}" includes="*.jar"/>
		<fileset dir="${sun.jaxp.root}" includes="*.jar"/>
		<fileset dir="${sun.jmx.root}" includes="*.jar"/>
		<fileset dir="${sun.jndi.root}" includes="*.jar"/>
		<fileset dir="${sun.jsr77.root}" includes="*.jar"/>
		<fileset dir="${sun.jsr88.root}" includes="*.jar"/>
		<fileset dir="${sun.swing.root}" includes="*.jar"/>
	</path>
	<!-- ==================== Info Target ================================== -->
	<target name="info">
		<echo message="------------------------------------------------------------"/>
		<echo message="Module Web Application : ${module.name}"/>
		<echo message="------------------------------------------------------------"/>
	</target>
	<!-- ==================== Prepare Target ================================== -->
	<target name="prepare" depends="info">
		<mkdir dir="${build.home}"/>
		<mkdir dir="${build.classes}"/>
		<mkdir dir="${build.doc}"/>
		<mkdir dir="${build.doc.api}"/>
		<mkdir dir="${build.doc.todo}"/>
		<mkdir dir="${build.etc}"/>
		<mkdir dir="${build.lib}"/>
		<mkdir dir="${build.src}"/>
		<mkdir dir="${webapp.home}"/>
		<copy todir="${build.etc}">
			<fileset dir="${src.etc}">
				<include name="*.mf"/>
			</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>
	</target>
	<!-- ==================== Compile Target ================================== -->
	<target name="compile" depends="prepare" description="Compile Java sources">
		<!-- Compile Java classes as necessary -->
		<javac srcdir="${src.main}" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
			<classpath refid="compile.classpath"/>
		</javac>
	</target>
	<!-- ==================== Build Target ===================================== -->
	<target name="build" depends="compile" description="">
		<copy todir="${build.classes}">
			<fileset dir="${src.resources}">
				<include name="**/*.properties"/>
				<include name="**/*.gif"/>
				<include name="**/*.png"/>
			</fileset>
		</copy>
		<!--
		<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.home}"/>
			<arg value="-p"/>
			<arg value="${module.package}.servlet"/>
			<arg value="${webapp.home}/*.jsp"/>
		</java>
		-->
	</target>
	<!-- ==================== Dist Target ===================================== -->
	<target name="dist" depends="build" description="">
		<mkdir dir="${webapp.lib}"/>
		<copy todir="${webapp.lib}">
			<mapper type="flatten"/>
			<fileset dir="." includesfile="${module.root}/webapp.properties"/>
		</copy>
		<war warfile="${webapp.home}/${module.name}.war" webxml="${src.webapp}/web.xml">
			<fileset dir="${src.webapp.content}"/>
			<lib dir="${webapp.lib}"/>
			<webinf dir="${src.webapp.resources}"/>
			<classes dir="${build.classes}"/>
		</war>
		<delete dir="${webapp.lib}"/>
	</target>
	<!-- ==================== Javadoc Target ================================== -->
	<target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc">
		<javadoc sourcepath="${src.main}" destdir="${build.doc.api}" packagenames="${module.package}.*" windowtitle="${module.javadoc.title}" stylesheetfile="build/css/stylesheet.css">
			<classpath refid="compile.classpath"/>
		</javadoc>
	</target>
	<!-- ==================== Todo Target =================================== -->
	<target name="todo" depends="prepare" description="Create To Do documentation">
		<todo sourcepath="${src.main}" destdir="${build.doc.todo}" classpathref="compile.classpath">
			<fileset dir="${src.main}">
				<include name="**/*.java"/>
			</fileset>
			<info projectname="${module.display.name}"/>
		</todo>
		<copy file="build/css/info.css" todir="${build.doc.todo}" overwrite="yes"/>
	</target>
	<!-- ==================== Package Target =================================== -->
	<target name="package" depends="dist" description="">
		<copy todir="${output.root}" file="${webapp.home}/${module.name}.war"/>
	</target>
	<!-- ==================== Clean Target ==================================== -->
	<target name="clean" depends="info" description="Delete old build and dist directories">
		<delete dir="${build.home}"/>
		<delete dir="${dist.webapp}"/>
	</target>
</project>

Index: build.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml	6 May 2002 20:36:15 -0000	1.5
--- build.xml	15 May 2002 17:47:54 -0000	1.6
***************
*** 18,22 ****
  	<property file="build/switch.properties"/>
  	<!-- ==================== Everything Target ===================================== -->
! 	<target name="everything" depends="clean, build, logo, dist, webapp, javadoc, todo, package, website" description=""/>
  	<!-- ==================== Rebuild Target ===================================== -->
  	<target name="rebuild" depends="clean, build" description=""/>
--- 18,22 ----
  	<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=""/>
***************
*** 31,35 ****
  		<echo message="dist        : Create the distribution of the modules"/>
  		<echo message="clean       : Clean everyting"/>
- 		<echo message="webapp      : Create the Web Applications"/>
  		<echo message="javadoc     : Generate the JavaDoc for each module"/>
  		<echo message="todo        : Generate the ToDo list for each module"/>
--- 31,34 ----
***************
*** 98,109 ****
  	</target>
  	<!-- ======================================== -->
- 	<!-- Create the webapp for each application -->
- 	<!-- ======================================== -->
- 	<target name="webapp" description="">
- 		<antcall target="sub.applications">
- 			<param name="target" value="webapp"/>
- 		</antcall>
- 	</target>
- 	<!-- ======================================== -->
  	<!-- Create the distribution package for each application -->
  	<!-- ======================================== -->
--- 97,100 ----
***************
*** 112,115 ****
--- 103,109 ----
  			<param name="target" value="package"/>
  		</antcall>
+ 		<antcall target="sub.web.applications">
+ 			<param name="target" value="package"/>
+ 		</antcall>
  	</target>
  	<!-- ======================================== -->
***************
*** 136,139 ****
--- 130,136 ----
  			<param name="target" value="${target}"/>
  		</antcall>
+ 		<antcall target="sub.web.applications">
+ 			<param name="target" value="${target}"/>
+ 		</antcall>
  	</target>
  	<!-- **************************************** -->
***************
*** 216,219 ****
--- 213,233 ----
  			<param name="root" value="${applications.root}"/>
  			<param name="name" value="management"/>
+ 		</antcall>
+ 	</target>
+ 	<!-- **************************************** -->
+ 	<!-- Generic subtask which calls any target on applications -->
+ 	<!-- **************************************** -->
+ 	<target name="sub.web.applications" description="">
+ 		<antcall target="sub.call">
+ 			<param name="type" value="webapp"/>
+ 			<param name="target" value="${target}"/>
+ 			<param name="root" value="${applications.root}"/>
+ 			<param name="name" value="jmx.browser"/>
+ 		</antcall>
+ 		<antcall target="sub.call">
+ 			<param name="type" value="webapp"/>
+ 			<param name="target" value="${target}"/>
+ 			<param name="root" value="${applications.root}"/>
+ 			<param name="name" value="jndi.browser"/>
  		</antcall>
  	</target>

Index: build_library.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_library.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_library.xml	5 May 2002 19:49:41 -0000	1.2
--- build_library.xml	15 May 2002 17:47:54 -0000	1.3
***************
*** 1,121 ****
! <?xml version="1.0"?>
! <!--
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at gnu.org.
!  *
!  * $Revision$
!  */
! -->
! <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"/>
! 	<!-- ==================== Module Definition ======================== -->
! 	<property name="module.root" value="${libraries.root}/${module.name}"/>
! 	<!-- ==================== File and Directory Names ======================== -->
! 	<property name="build.home" value="${module.root}/output"/>
! 	<property name="build.classes" value="${build.home}/classes"/>
! 	<property name="build.doc" value="${build.home}/doc"/>
! 	<property name="build.doc.api" value="${build.doc}/api"/>
! 	<property name="build.doc.todo" value="${build.doc}/todo"/>
! 	<property name="build.etc" value="${build.home}/etc"/>
! 	<property name="build.lib" value="${build.home}/lib"/>
! 	<property name="dist.home" value="${module.root}/dist"/>
! 	<property name="src.home" value="${module.root}/src"/>
! 	<property name="src.etc" value="${src.home}/etc"/>
! 	<property name="src.main" value="${src.home}/main"/>
! 	<property name="src.resources" value="${src.home}/resources"/>
! 	<!-- ==================== Compilation Classpath =========================== -->
! 	<path id="compile.classpath">
! 		<fileset dir="${ejtools.common.root}" includes="*.jar"/>
! 		<fileset dir="${apache.ant.root}" includes="*.jar"/>
! 		<fileset dir="${apache.crimson.root}" includes="*.jar"/>
! 		<fileset dir="${apache.log4j.root}" includes="*.jar"/>
! 		<fileset dir="${dreambean.awt.root}" includes="*.jar"/>
! 		<fileset dir="${sourceforge.xdoclet.root}" includes="*.jar"/>
! 		<fileset dir="${sun.j2ee.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jaxp.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jmx.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jsr77.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jsr88.root}" includes="*.jar"/>
! 	</path>
! 	<!-- ==================== Info Target ================================== -->
! 	<target name="info">
! 		<echo message="------------------------------------------------------------"/>
! 		<echo message="Module Library : ${module.name}"/>
! 		<echo message="------------------------------------------------------------"/>
! 	</target>
! 	<!-- ==================== Prepare Target ================================== -->
! 	<target name="prepare" depends="info">
! 		<mkdir dir="${build.home}"/>
! 		<mkdir dir="${build.classes}"/>
! 		<mkdir dir="${build.etc}"/>
! 		<mkdir dir="${build.doc}"/>
! 		<mkdir dir="${build.doc.api}"/>
! 		<mkdir dir="${build.lib}"/>
! 		<copy todir="${build.etc}">
! 			<fileset dir="${src.home}/etc">
! 				<include name="*.mf"/>
! 			</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>
! 	</target>
! 	<!-- ==================== Compile Target ================================== -->
! 	<target name="compile" depends="prepare" description="Compile Java sources">
! 		<!-- Compile Java classes as necessary -->
! 		<javac srcdir="${src.home}/main" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
! 			<classpath refid="compile.classpath"/>
! 		</javac>
! 		<copy todir="${build.classes}">
! 			<fileset dir="${src.home}/resources">
! 				<include name="**/*.properties"/>
! 				<include name="**/*.gif"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Build Target ===================================== -->
! 	<target name="build" depends="compile" description="Create binary">
! 		<!-- Create the JAR file -->
! 		<jar jarfile="${build.lib}/${module.name}.jar" basedir="${build.classes}" manifest="${build.etc}/default.mf"/>
! 	</target>
! 	<!-- ==================== Dist Target ===================================== -->
! 	<target name="dist" depends="build" description="">
! 		<copy todir="${dist.home}">
! 			<fileset dir="${build.lib}">
! 				<include name="${module.name}.jar"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Javadoc Target ================================== -->
! 	<target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc">
! 		<javadoc sourcepath="${src.home}/main" destdir="${build.doc.api}" packagenames="${module.package}" windowtitle="${module.javadoc.title}" stylesheetfile="build/css/stylesheet.css">
! 			<classpath refid="compile.classpath"/>
! 		</javadoc>
! 	</target>
! 	<!-- ==================== Todo Target =================================== -->
! 	<target name="todo" depends="prepare" description="Create To Do documentation">
! 		<todo sourcepath="${src.main}" destdir="${build.doc.todo}" classpathref="compile.classpath">
! 			<fileset dir="${src.main}">
! 				<include name="**/*.java"/>
! 			</fileset>
! 			<info projectname="${module.display.name}"/>
! 		</todo>
! 		<copy file="build/css/info.css" todir="${build.doc.todo}" overwrite="yes"/>
! 	</target>
! 	<!-- ==================== Clean Target ==================================== -->
! 	<target name="clean" depends="info" description="Delete old build and dist directories">
! 		<delete dir="${build.home}"/>
! 		<delete dir="${dist.home}"/>
! 	</target>
! </project>
--- 1,121 ----
! <?xml version="1.0"?>
! <!--
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at gnu.org.
!  *
!  * $Revision$
!  */
! -->
! <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"/>
! 	<!-- ==================== Module Definition ======================== -->
! 	<property name="module.root" value="${libraries.root}/${module.name}"/>
! 	<!-- ==================== File and Directory Names ======================== -->
! 	<property name="build.home" value="${module.root}/output"/>
! 	<property name="build.classes" value="${build.home}/classes"/>
! 	<property name="build.doc" value="${build.home}/doc"/>
! 	<property name="build.doc.api" value="${build.doc}/api"/>
! 	<property name="build.doc.todo" value="${build.doc}/todo"/>
! 	<property name="build.etc" value="${build.home}/etc"/>
! 	<property name="build.lib" value="${build.home}/lib"/>
! 	<property name="dist.home" value="${module.root}/dist"/>
! 	<property name="src.home" value="${module.root}/src"/>
! 	<property name="src.etc" value="${src.home}/etc"/>
! 	<property name="src.main" value="${src.home}/main"/>
! 	<property name="src.resources" value="${src.home}/resources"/>
! 	<!-- ==================== Compilation Classpath =========================== -->
! 	<path id="compile.classpath">
! 		<fileset dir="${ejtools.common.root}" includes="*.jar"/>
! 		<fileset dir="${apache.ant.root}" includes="*.jar"/>
! 		<fileset dir="${apache.crimson.root}" includes="*.jar"/>
! 		<fileset dir="${apache.log4j.root}" includes="*.jar"/>
! 		<fileset dir="${dreambean.awt.root}" includes="*.jar"/>
! 		<fileset dir="${sourceforge.xdoclet.root}" includes="*.jar"/>
! 		<fileset dir="${sun.j2ee.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jaxp.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jmx.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jsr77.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jsr88.root}" includes="*.jar"/>
! 	</path>
! 	<!-- ==================== Info Target ================================== -->
! 	<target name="info">
! 		<echo message="------------------------------------------------------------"/>
! 		<echo message="Module Library : ${module.name}"/>
! 		<echo message="------------------------------------------------------------"/>
! 	</target>
! 	<!-- ==================== Prepare Target ================================== -->
! 	<target name="prepare" depends="info">
! 		<mkdir dir="${build.home}"/>
! 		<mkdir dir="${build.classes}"/>
! 		<mkdir dir="${build.etc}"/>
! 		<mkdir dir="${build.doc}"/>
! 		<mkdir dir="${build.doc.api}"/>
! 		<mkdir dir="${build.lib}"/>
! 		<copy todir="${build.etc}">
! 			<fileset dir="${src.home}/etc">
! 				<include name="*.mf"/>
! 			</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>
! 	</target>
! 	<!-- ==================== Compile Target ================================== -->
! 	<target name="compile" depends="prepare" description="Compile Java sources">
! 		<!-- Compile Java classes as necessary -->
! 		<javac srcdir="${src.home}/main" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
! 			<classpath refid="compile.classpath"/>
! 		</javac>
! 		<copy todir="${build.classes}">
! 			<fileset dir="${src.home}/resources">
! 				<include name="**/*.properties"/>
! 				<include name="**/*.gif"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Build Target ===================================== -->
! 	<target name="build" depends="compile" description="Create binary">
! 		<!-- Create the JAR file -->
! 		<jar jarfile="${build.lib}/${module.name}.jar" basedir="${build.classes}" manifest="${build.etc}/default.mf"/>
! 	</target>
! 	<!-- ==================== Dist Target ===================================== -->
! 	<target name="dist" depends="build" description="">
! 		<copy todir="${dist.home}">
! 			<fileset dir="${build.lib}">
! 				<include name="${module.name}.jar"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Javadoc Target ================================== -->
! 	<target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc">
! 		<javadoc sourcepath="${src.home}/main" destdir="${build.doc.api}" packagenames="${module.package}" windowtitle="${module.javadoc.title}" stylesheetfile="build/css/stylesheet.css">
! 			<classpath refid="compile.classpath"/>
! 		</javadoc>
! 	</target>
! 	<!-- ==================== Todo Target =================================== -->
! 	<target name="todo" depends="prepare" description="Create To Do documentation">
! 		<todo sourcepath="${src.main}" destdir="${build.doc.todo}" classpathref="compile.classpath">
! 			<fileset dir="${src.main}">
! 				<include name="**/*.java"/>
! 			</fileset>
! 			<info projectname="${module.display.name}"/>
! 		</todo>
! 		<copy file="build/css/info.css" todir="${build.doc.todo}" overwrite="yes"/>
! 	</target>
! 	<!-- ==================== Clean Target ==================================== -->
! 	<target name="clean" depends="info" description="Delete old build and dist directories">
! 		<delete dir="${build.home}"/>
! 		<delete dir="${dist.home}"/>
! 	</target>
! </project>

Index: build_thirdparty.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_thirdparty.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_thirdparty.xml	5 May 2002 19:49:41 -0000	1.2
--- build_thirdparty.xml	15 May 2002 17:47:54 -0000	1.3
***************
*** 1,110 ****
! <?xml version="1.0"?>
! <!--
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at gnu.org.
!  *
!  * $Revision$
!  */
! -->
! <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}"/>
! 	<!-- ==================== File and Directory Names ======================== -->
! 	<property name="build.home" value="${module.root}/output"/>
! 	<property name="build.classes" value="${build.home}/classes"/>
! 	<property name="build.doc" value="${build.home}/doc"/>
! 	<property name="build.doc.api" value="${build.doc}/api"/>
! 	<property name="build.etc" value="${build.home}/etc"/>
! 	<property name="build.lib" value="${build.home}/lib"/>
! 	<property name="dist.home" value="${module.root}/dist"/>
! 	<property name="src.home" value="${module.root}/src"/>
! 	<property name="src.etc" value="${src.home}/etc"/>
! 	<property name="src.main" value="${src.home}/main"/>
! 	<property name="src.resources" value="${src.home}/resources"/>
! 	<!-- ==================== Compilation Classpath =========================== -->
! 	<path id="compile.classpath">
! 		<fileset dir="${apache.crimson.root}" includes="*.jar"/>
! 		<fileset dir="${apache.log4j.root}" includes="*.jar"/>
! 		<fileset dir="${sun.j2ee.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jaxp.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jmx.root}" includes="*.jar"/>
! 	</path>
! 	<!-- ==================== Info Target ================================== -->
! 	<target name="info">
! 		<echo message="------------------------------------------------------------"/>
! 		<echo message="Module Thirdparty : ${vendor.name} ${module.name}"/>
! 		<echo message="------------------------------------------------------------"/>
! 	</target>
! 	<!-- ==================== Prepare Target ================================== -->
! 	<target name="prepare" depends="info">
! 		<mkdir dir="${build.home}"/>
! 		<mkdir dir="${build.classes}"/>
! 		<mkdir dir="${build.etc}"/>
! 		<mkdir dir="${build.doc}"/>
! 		<mkdir dir="${build.doc.api}"/>
! 		<mkdir dir="${build.lib}"/>
! 		<copy todir="${build.etc}">
! 			<fileset dir="${src.home}/etc">
! 				<include name="*.mf"/>
! 			</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>
! 	</target>
! 	<!-- ==================== Compile Target ================================== -->
! 	<target name="compile" depends="prepare" description="Compile Java sources">
! 		<!-- Compile Java classes as necessary -->
! 		<javac srcdir="${src.home}/main" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
! 			<classpath refid="compile.classpath"/>
! 		</javac>
! 		<copy todir="${build.classes}">
! 			<fileset dir="${src.home}/resources">
! 				<include name="**/*.properties"/>
! 				<include name="**/*.gif"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Build Target ===================================== -->
! 	<target name="build" depends="compile,javadoc" description="Create binary">
! 		<!-- Replace the version -->
! 		<replace dir="${build.etc}" token="@module.name@" value="${module.display.name}"/>
! 		<replace dir="${build.etc}" token="@version.major@" value="${version.major}"/>
! 		<replace dir="${build.etc}" token="@version.minor@" value="${version.minor}"/>
! 		<replace dir="${build.etc}" token="@version.revision@" value="${version.revision}"/>
! 		<replace dir="${build.etc}" token="@version.tag@" value="${version.tag}"/>
! 		<!-- Create the JAR file -->
! 		<jar jarfile="${build.lib}/${module.name}.jar" basedir="${build.classes}" manifest="${build.etc}/default.mf"/>
! 	</target>
! 	<!-- ==================== Dist Target ===================================== -->
! 	<target name="dist" depends="build" description="">
! 		<copy todir="${dist.home}">
! 			<fileset dir="${build.lib}">
! 				<include name="${module.name}.jar"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Javadoc Target ================================== -->
! 	<target name="javadoc" depends="compile" description="Create Javadoc API documentation" if="generate.javadoc">
! 		<javadoc sourcepath="${src.home}/main" destdir="${build.doc}/api" packagenames="${module.package}">
! 			<classpath refid="compile.classpath"/>
! 		</javadoc>
! 	</target>
! 	<!-- ==================== Todo Target =================================== -->
! 	<target name="todo" depends="prepare" description="Create To Do documentation"/>
! 	<!-- ==================== Clean Target ==================================== -->
! 	<target name="clean" depends="info" description="Delete old build and dist directories">
! 		<delete dir="${build.home}"/>
! 		<delete dir="${dist.home}"/>
! 	</target>
! </project>
--- 1,110 ----
! <?xml version="1.0"?>
! <!--
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at gnu.org.
!  *
!  * $Revision$
!  */
! -->
! <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}"/>
! 	<!-- ==================== File and Directory Names ======================== -->
! 	<property name="build.home" value="${module.root}/output"/>
! 	<property name="build.classes" value="${build.home}/classes"/>
! 	<property name="build.doc" value="${build.home}/doc"/>
! 	<property name="build.doc.api" value="${build.doc}/api"/>
! 	<property name="build.etc" value="${build.home}/etc"/>
! 	<property name="build.lib" value="${build.home}/lib"/>
! 	<property name="dist.home" value="${module.root}/dist"/>
! 	<property name="src.home" value="${module.root}/src"/>
! 	<property name="src.etc" value="${src.home}/etc"/>
! 	<property name="src.main" value="${src.home}/main"/>
! 	<property name="src.resources" value="${src.home}/resources"/>
! 	<!-- ==================== Compilation Classpath =========================== -->
! 	<path id="compile.classpath">
! 		<fileset dir="${apache.crimson.root}" includes="*.jar"/>
! 		<fileset dir="${apache.log4j.root}" includes="*.jar"/>
! 		<fileset dir="${sun.j2ee.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jaxp.root}" includes="*.jar"/>
! 		<fileset dir="${sun.jmx.root}" includes="*.jar"/>
! 	</path>
! 	<!-- ==================== Info Target ================================== -->
! 	<target name="info">
! 		<echo message="------------------------------------------------------------"/>
! 		<echo message="Module Thirdparty : ${vendor.name} ${module.name}"/>
! 		<echo message="------------------------------------------------------------"/>
! 	</target>
! 	<!-- ==================== Prepare Target ================================== -->
! 	<target name="prepare" depends="info">
! 		<mkdir dir="${build.home}"/>
! 		<mkdir dir="${build.classes}"/>
! 		<mkdir dir="${build.etc}"/>
! 		<mkdir dir="${build.doc}"/>
! 		<mkdir dir="${build.doc.api}"/>
! 		<mkdir dir="${build.lib}"/>
! 		<copy todir="${build.etc}">
! 			<fileset dir="${src.home}/etc">
! 				<include name="*.mf"/>
! 			</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>
! 	</target>
! 	<!-- ==================== Compile Target ================================== -->
! 	<target name="compile" depends="prepare" description="Compile Java sources">
! 		<!-- Compile Java classes as necessary -->
! 		<javac srcdir="${src.home}/main" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
! 			<classpath refid="compile.classpath"/>
! 		</javac>
! 		<copy todir="${build.classes}">
! 			<fileset dir="${src.home}/resources">
! 				<include name="**/*.properties"/>
! 				<include name="**/*.gif"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Build Target ===================================== -->
! 	<target name="build" depends="compile,javadoc" description="Create binary">
! 		<!-- Replace the version -->
! 		<replace dir="${build.etc}" token="@module.name@" value="${module.display.name}"/>
! 		<replace dir="${build.etc}" token="@version.major@" value="${version.major}"/>
! 		<replace dir="${build.etc}" token="@version.minor@" value="${version.minor}"/>
! 		<replace dir="${build.etc}" token="@version.revision@" value="${version.revision}"/>
! 		<replace dir="${build.etc}" token="@version.tag@" value="${version.tag}"/>
! 		<!-- Create the JAR file -->
! 		<jar jarfile="${build.lib}/${module.name}.jar" basedir="${build.classes}" manifest="${build.etc}/default.mf"/>
! 	</target>
! 	<!-- ==================== Dist Target ===================================== -->
! 	<target name="dist" depends="build" description="">
! 		<copy todir="${dist.home}">
! 			<fileset dir="${build.lib}">
! 				<include name="${module.name}.jar"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<!-- ==================== Javadoc Target ================================== -->
! 	<target name="javadoc" depends="compile" description="Create Javadoc API documentation" if="generate.javadoc">
! 		<javadoc sourcepath="${src.home}/main" destdir="${build.doc}/api" packagenames="${module.package}">
! 			<classpath refid="compile.classpath"/>
! 		</javadoc>
! 	</target>
! 	<!-- ==================== Todo Target =================================== -->
! 	<target name="todo" depends="prepare" description="Create To Do documentation"/>
! 	<!-- ==================== Clean Target ==================================== -->
! 	<target name="clean" depends="info" description="Delete old build and dist directories">
! 		<delete dir="${build.home}"/>
! 		<delete dir="${dist.home}"/>
! 	</target>
! </project>

Index: build_website.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_website.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_website.xml	5 May 2002 19:49:41 -0000	1.2
--- build_website.xml	15 May 2002 17:47:54 -0000	1.3
***************
*** 1,127 ****
! <?xml version="1.0"?>
! <!--
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at gnu.org.
!  *
!  * $Revision$
!  */
! -->
! <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"/>
! 	<property name="images.svg.root" value="${images.root}/svg"/>
! 	<!-- ==================== All Target =================================== -->
! 	<target name="all" depends="svg.rasterizer,xweb,javadoc.copy,todo.copy"/>
! 	<!-- ==================== JavaDoc Copy Target =================================== -->
! 	<target name="javadoc.copy" depends="xweb">
! 		<copy todir="${website.root}/output/libraries/adwt/api" overwrite="yes">
! 			<fileset dir="${libraries.root}/adwt/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/libraries/xmlweb/api" overwrite="yes">
! 			<fileset dir="${libraries.root}/xmlweb/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/deployment/api" overwrite="yes">
! 			<fileset dir="${applications.root}/deployment/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/jmx.browser/api" overwrite="yes">
! 			<fileset dir="${applications.root}/jmx.browser/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/jndi.browser/api" overwrite="yes">
! 			<fileset dir="${applications.root}/jndi.browser/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/management/api" overwrite="yes">
! 			<fileset dir="${applications.root}/management/output/doc/api"/>
! 		</copy>
! 	</target>
! 	<!-- ==================== ToDo Copy Target =================================== -->
! 	<target name="todo.copy" depends="xweb">
! 		<copy todir="${website.root}/output/libraries/adwt/todo" overwrite="yes">
! 			<fileset dir="${libraries.root}/adwt/output/doc/todo"/>
! 		</copy>
! 		<copy todir="${website.root}/output/libraries/xmlweb/todo" overwrite="yes">
! 			<fileset dir="${libraries.root}/xmlweb/output/doc/todo"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/jndi.browser/todo" overwrite="yes">
! 			<fileset dir="${applications.root}/jndi.browser/output/doc/todo"/>
! 		</copy>
! 	</target>
! 	<!-- ==================== Website Creation Target =================================== -->
! 	<target name="xweb" if="env.XWEBHOME">
! 		<echo message="Using XWEB (location is ${env.XWEBHOME})"/>
! 		<exec dir="${website.root}" executable="${env.XWEBHOME}/bin/wp.bat" os="Windows 2000">
! 			<!--
! 			<arg line="-preview"/>
! -->
! 			<arg line="website.xweb"/>
! 		</exec>
! 		<exec dir="${website.root}" executable="${env.XWEBHOME}/bin/wp" os="Linux">
! 			<arg line="-preview"/>
! 			<arg line="website.xweb"/>
! 		</exec>
! 	</target>
! 	<!-- ==================== EJTools SVG Target =================================== -->
! 	<target name="svg.rasterizer">
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="${images.svg.root}/*.svg"/>
! 		</java>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="700"/>
! 			<arg value="-h"/>
! 			<arg value="200"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools200.png"/>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="350"/>
! 			<arg value="-h"/>
! 			<arg value="100"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools100.png"/>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="280"/>
! 			<arg value="-h"/>
! 			<arg value="80"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools80.png"/>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="175"/>
! 			<arg value="-h"/>
! 			<arg value="50"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools50.png"/>
! 	</target>
! </project>
--- 1,127 ----
! <?xml version="1.0"?>
! <!--
! /*
!  * EJTools, the Enterprise Java Tools
!  *
!  * Distributable under LGPL license.
!  * See terms of license at gnu.org.
!  *
!  * $Revision$
!  */
! -->
! <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"/>
! 	<property name="images.svg.root" value="${images.root}/svg"/>
! 	<!-- ==================== All Target =================================== -->
! 	<target name="all" depends="svg.rasterizer,xweb,javadoc.copy,todo.copy"/>
! 	<!-- ==================== JavaDoc Copy Target =================================== -->
! 	<target name="javadoc.copy" depends="xweb">
! 		<copy todir="${website.root}/output/libraries/adwt/api" overwrite="yes">
! 			<fileset dir="${libraries.root}/adwt/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/libraries/xmlweb/api" overwrite="yes">
! 			<fileset dir="${libraries.root}/xmlweb/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/deployment/api" overwrite="yes">
! 			<fileset dir="${applications.root}/deployment/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/jmx.browser/api" overwrite="yes">
! 			<fileset dir="${applications.root}/jmx.browser/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/jndi.browser/api" overwrite="yes">
! 			<fileset dir="${applications.root}/jndi.browser/output/doc/api"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/management/api" overwrite="yes">
! 			<fileset dir="${applications.root}/management/output/doc/api"/>
! 		</copy>
! 	</target>
! 	<!-- ==================== ToDo Copy Target =================================== -->
! 	<target name="todo.copy" depends="xweb">
! 		<copy todir="${website.root}/output/libraries/adwt/todo" overwrite="yes">
! 			<fileset dir="${libraries.root}/adwt/output/doc/todo"/>
! 		</copy>
! 		<copy todir="${website.root}/output/libraries/xmlweb/todo" overwrite="yes">
! 			<fileset dir="${libraries.root}/xmlweb/output/doc/todo"/>
! 		</copy>
! 		<copy todir="${website.root}/output/projects/jndi.browser/todo" overwrite="yes">
! 			<fileset dir="${applications.root}/jndi.browser/output/doc/todo"/>
! 		</copy>
! 	</target>
! 	<!-- ==================== Website Creation Target =================================== -->
! 	<target name="xweb" if="env.XWEBHOME">
! 		<echo message="Using XWEB (location is ${env.XWEBHOME})"/>
! 		<exec dir="${website.root}" executable="${env.XWEBHOME}/bin/wp.bat" os="Windows 2000">
! 			<!--
! 			<arg line="-preview"/>
! -->
! 			<arg line="website.xweb"/>
! 		</exec>
! 		<exec dir="${website.root}" executable="${env.XWEBHOME}/bin/wp" os="Linux">
! 			<arg line="-preview"/>
! 			<arg line="website.xweb"/>
! 		</exec>
! 	</target>
! 	<!-- ==================== EJTools SVG Target =================================== -->
! 	<target name="svg.rasterizer">
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="${images.svg.root}/*.svg"/>
! 		</java>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="700"/>
! 			<arg value="-h"/>
! 			<arg value="200"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools200.png"/>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="350"/>
! 			<arg value="-h"/>
! 			<arg value="100"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools100.png"/>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="280"/>
! 			<arg value="-h"/>
! 			<arg value="80"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools80.png"/>
! 		<java jar="${apache.batik.root}/batik-rasterizer.jar" fork="true">
! 			<arg value="-d"/>
! 			<arg value="${images.root}"/>
! 			<arg value="-m"/>
! 			<arg value="image/png"/>
! 			<arg value="-w"/>
! 			<arg value="175"/>
! 			<arg value="-h"/>
! 			<arg value="50"/>
! 			<arg value="${images.svg.root}/ejtools.svg"/>
! 		</java>
! 		<move file="${images.root}/ejtools.png" tofile="${images.root}/ejtools50.png"/>
! 	</target>
! </project>

[Ejtools-cvs] CVS: build beaninfo.j,1.1,1.2 build.sh,1.3,1.4 build_application.xml,1.7,1.8

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

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

Modified Files:
	beaninfo.j build.sh build_application.xml 
Log Message:
Return to the xmlbeans generation for BeanInfo

Index: beaninfo.j
===================================================================
RCS file: /cvsroot/ejtools/build/beaninfo.j,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** beaninfo.j	13 May 2002 20:30:47 -0000	1.1
--- beaninfo.j	15 May 2002 07:30:29 -0000	1.2
***************
*** 7,17 ****
  import java.beans.BeanDescriptor;
  import java.beans.BeanInfo;
- import java.beans.IntrospectionException;
  import java.beans.Introspector;
! import java.beans.MethodDescriptor;
! import java.beans.ParameterDescriptor;
  import java.beans.PropertyDescriptor;
  import java.beans.SimpleBeanInfo;
- import java.beans.beancontext.BeanContextSupport;
  import java.lang.reflect.Method;
  import java.util.ResourceBundle;
--- 7,15 ----
  import java.beans.BeanDescriptor;
  import java.beans.BeanInfo;
  import java.beans.Introspector;
! import java.beans.IntrospectionException;
  import java.beans.PropertyDescriptor;
+ import java.beans.MethodDescriptor;
  import java.beans.SimpleBeanInfo;
  import java.lang.reflect.Method;
  import java.util.ResourceBundle;
***************
*** 62,66 ****
  
     /**
!     * Gets the additionalBeanInfo ...
      *
      * @return   The additionalBeanInfo value
--- 60,64 ----
  
     /**
!     * Gets the additionalBeanInfo attribute ...
      *
      * @return   The additionalBeanInfo value
***************
*** 82,86 ****
        catch (Exception e)
        {
!          System.err.println(e);
        }
        return biarr;
--- 80,84 ----
        catch (Exception e)
        {
!          // Ignore it
        }
        return biarr;
***************
*** 111,135 ****
  
     /**
!     * Gets the defaultPropertyIndex attribute ...
      *
      * @return   The defaultPropertyIndex value
      */
!    public int getDefaultPropertyIndex() {
        String defName = "<XDtClass:classTagValue tagName="beaninfo:class" paramName="defaultProperty" default=""/>";
!       if (defName.equals("")) return -1;
!       
        PropertyDescriptor[] pd = getPropertyDescriptors();
!       for (int i = 0; i < pd.length; i++) {
!          if (pd[i].getName().equals(defName)) {
              return i;
           }
        }
-             
        return -1;
!    }   
  
  
     /**
!     * Gets the icon attribute of the ...
      *
      * @param type  Description of the Parameter
--- 109,137 ----
  
     /**
!     * Gets the defaultPropertyIndex attribute of the JNDIEntryBeanInfo object
      *
      * @return   The defaultPropertyIndex value
      */
!    public int getDefaultPropertyIndex()
!    {
        String defName = "<XDtClass:classTagValue tagName="beaninfo:class" paramName="defaultProperty" default=""/>";
!       if (defName.equals(""))
!       {
!          return -1;
!       }
        PropertyDescriptor[] pd = getPropertyDescriptors();
!       for (int i = 0; i < pd.length; i++)
!       {
!          if (pd[i].getName().equals(defName))
!          {
              return i;
           }
        }
        return -1;
!    }
  
  
     /**
!     * Gets the icon attribute ...
      *
      * @param type  Description of the Parameter
***************
*** 159,225 ****
  
     /**
!     * Gets the methodDescriptors attribute ...
!     *
!     * @return   The methodDescriptors value
!     */
!    public MethodDescriptor[] getMethodDescriptors()
!    {
! //      MethodDescriptor[] methods = new MethodDescriptor[<methodCount/>];
!       int i = 0;
!       Method[] m;
!       Method method;
! //      <method>
!       try
!       {
!          m = Class.forName("<beanClass/>").getMethods();
!       }
!       catch (ClassNotFoundException e)
!       {
!          System.err.println(e);
!          return new MethodDescriptor[0];
!       }
!       method = null;
!       for (int j = 0; j != m.length; j++)
!       {
!          if (m[j].getName().equals("<methodName/>"))
!          {
!             method = m[j];
!             break;
!          }
!       }
!       if (method != null)
!       {
!          ParameterDescriptor[] pd = new ParameterDescriptor[method.getParameterTypes().length];
!          int pidx = 0;
! //         <parameter>
!          pd[pidx] = new ParameterDescriptor();
! //         <hasPropertyEditor>pd[pidx].setValue("propertyeditor","<propertyEditor/>");</hasPropertyEditor>
!          pd[pidx++].setDisplayName(res.getString("parameter.<methodName/>." + pidx + ".displayname"));
! //         </parameter>
!          if (pidx == 0)
!          {
!             methods[i] = new MethodDescriptor(method);
!          }
!          else
!          {
!             methods[i] = new MethodDescriptor(method, pd);
!          }
!          methods[i].setName("<methodName/>");
! //         <hasDisplayName>methods[i].setDisplayName(res.getString("method.<methodName/>.displayname"));</hasDisplayName>
! //         <hasShortDescription>methods[i].setShortDescription(res.getString("method.<methodName/>.shortdescription"));</hasShortDescription>
! //         <isExpert>methods[i].setExpert(true);</isExpert>
! //         <isHidden>methods[i].setHidden(true);</isHidden>
! //         <attribute>
!          methods[i].setValue("<attributeName/>", "<attributeValue/>");
! //         </attribute>
!          i++;
!       }
! //      </method>
!       return methods;
!    }
! 
! 
!    /**
!     * Gets the propertyDescriptors attribute ...
      *
      * @return   The propertyDescriptors value
--- 161,165 ----
  
     /**
!     * Gets the propertyDescriptors attribute of the JNDIEntryBeanInfo object
      *
      * @return   The propertyDescriptors value
***************
*** 229,266 ****
        try
        {
! //         PropertyDescriptor[] properties = new PropertyDescriptor[<propertyCount/>];
!          int i = 0;
! //         <property>
           try
           {
! //            <isReadOnly>if (false)</isReadOnly>
! //            properties[i] = new PropertyDescriptor("<propertyName/>",<beanClass/>.class);
! //            <isReadOnly>else
! //            properties[i] = new PropertyDescriptor("<propertyName/>",<beanClass/>.class, "<getter/>",null);
! //            </isReadOnly>
           }
           catch (IntrospectionException e)
           {
! //            properties[i] = new PropertyDescriptor("<propertyName/>",<beanClass/>.class, "<getter/>",null);
           }
! //         <isBound>properties[i].setBound(true);</isBound>
! //         <isConstrained>properties[i].setConstrained(true);</isConstrained>
! //         <hasPropertyEditor>properties[i].setPropertyEditorClass(Class.forName("<propertyEditor/>"));</hasPropertyEditor>
! //         <hasDisplayName>properties[i].setDisplayName(res.getString("property.<propertyName/>.displayname"));</hasDisplayName>
! //         <hasShortDescription>properties[i].setShortDescription(res.getString("property.<propertyName/>.shortdescription"));</hasShortDescription>
! //         <isExpert>properties[i].setExpert(true);</isExpert>
! //         <isHidden>properties[i].setHidden(true);</isHidden>
! //         <attribute>
!          properties[i].setValue("<attributeName/>", "<attributeValue/>");
! //         </attribute>
!          i++;
! //         </property>
!          return properties;
        }
        catch (Exception e)
        {
!          System.err.println(e);
!          return null;
        }
     }
  }
--- 169,212 ----
        try
        {
!          Vector properties = new Vector();
!          PropertyDescriptor property = null;
! 
!          <XDtClass:forAllClassTags tagName="beaninfo:property">
! 
           try
           {
!             <XDtClass:ifDoesntHaveClassTag tagName="beaninfo:property" paramName="readOnly">
!             property = new PropertyDescriptor("<XDtClass:classTagValue tagName="beaninfo:property" paramName="name"/>",<XDtClass:fullClassName/>.class);
!             </XDtClass:ifDoesntHaveClassTag>
!             <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="readOnly">
!             property = new PropertyDescriptor("<XDtClass:classTagValue tagName="beaninfo:property" paramName="name"/>",<XDtClass:fullClassName/>.class, "getter", null);
!             </XDtClass:ifHasClassTag>
           }
           catch (IntrospectionException e)
           {
!             property = new PropertyDescriptor("<XDtClass:classTagValue tagName="beaninfo:property" paramName="name"/>",<XDtClass:fullClassName/>.class, "getter", null);
           }
! 
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="displayName">property.setDisplayName("<XDtClass:classTagValue tagName="beaninfo:property" paramName="displayName"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="shortDescription">property.setShortDescription("<XDtClass:classTagValue tagName="beaninfo:property" paramName="shortDescription"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="expert">property.setExpert(<XDtClass:classTagValue tagName="beaninfo:property" paramName="expert" values="true,false"/>);</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="hidden">property.setHidden(<XDtClass:classTagValue tagName="beaninfo:property" paramName="hidden" values="true,false"/>);</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="preferred">property.setPreferred(<XDtClass:classTagValue tagName="beaninfo:property" paramName="preferred" values="true,false"/>);</XDtClass:ifHasClassTag>
! 
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="bound">property.setBound("<XDtClass:classTagValue tagName="beaninfo:property" paramName="bound" values="true,false"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="constrained">property.setConstrained("<XDtClass:classTagValue tagName="beaninfo:property" paramName="constrained" values="true,false"/>");</XDtClass:ifHasClassTag>
!          <XDtClass:ifHasClassTag tagName="beaninfo:property" paramName="propertyEditor">property.setPropertyEditorClass(Class.forName("<XDtClass:classTagValue tagName="beaninfo:property" paramName="propertyEditor"/>"));</XDtClass:ifHasClassTag>
! 
!          properties.add(property);
! 
!          </XDtClass:forAllClassTags>
! 
!          return properties.toArray(new PropertyDescriptor[properties.size()]);
        }
        catch (Exception e)
        {
!          // Ignore it
        }
+       return null;
     }
  }

Index: build.sh
===================================================================
RCS file: /cvsroot/ejtools/build/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.sh	6 May 2002 20:36:15 -0000	1.3
--- build.sh	15 May 2002 07:30:29 -0000	1.4
***************
*** 28,31 ****
--- 28,32 ----
  CP=$CP:$THIRDPARTY/dreambean/codegen/
  CP=$CP:$THIRDPARTY/dreambean/codegen/codegen.jar
+ CP=$CP:$THIRDPARTY/dreambean/xmlbeans/
  CP=$CP:$THIRDPARTY/dreambean/xmlbeans/xmlbeans.jar
  

Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build_application.xml	13 May 2002 20:30:47 -0000	1.7
--- build_application.xml	15 May 2002 07:30:29 -0000	1.8
***************
*** 132,135 ****
--- 132,136 ----
  	<target name="xmlbeans" depends="compile" if="has.dir.etc.beaninfo">
  		<mkdir dir="${build.src}"/>
+ 		<!--		
  		<xdoclet sourcepath="${src.main}" destdir="${build.src}" classpathref="compile.classpath">
  			<fileset dir="${src.main}">
***************
*** 139,148 ****
  			<template templateFile="build/beaninfo.j" destinationFile="{0}BeanInfo.java" havingClassTag="beaninfo:class"/>
  		</xdoclet>
! 		<!--		
  		<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"/>
  		</javac>
- -->
  	</target>
  	<!-- ==================== Build Target ===================================== -->
--- 140,148 ----
  			<template templateFile="build/beaninfo.j" destinationFile="{0}BeanInfo.java" havingClassTag="beaninfo:class"/>
  		</xdoclet>
! -->
  		<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"/>
  		</javac>
  	</target>
  	<!-- ==================== Build Target ===================================== -->