ejtools-cvs Mailing List for EJTools (Page 103)
Brought to you by:
letiemble
Menu
▾
▴
ejtools-cvs — Mailing list for CVS
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(471) |
May
(303) |
Jun
(176) |
Jul
(67) |
Aug
(64) |
Sep
(84) |
Oct
(148) |
Nov
(57) |
Dec
(272) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(356) |
Feb
(304) |
Mar
(214) |
Apr
(22) |
May
(7) |
Jun
(25) |
Jul
|
Aug
(5) |
Sep
(106) |
Oct
|
Nov
(95) |
Dec
(193) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
|
From: Laurent E. <let...@us...> - 2002-04-28 19:40:03
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser
In directory usw-pr-cvs1:/tmp/cvs-serv16824/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser
Modified Files:
JMXBrowser.java
Log Message:
Change from BeanContextPanel to BeanContextTreePanel
Index: JMXBrowser.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/JMXBrowser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JMXBrowser.java 25 Apr 2002 20:24:47 -0000 1.2
--- JMXBrowser.java 28 Apr 2002 13:06:25 -0000 1.3
***************
*** 12,16 ****
//import com.dreambean.awt.BeanContextPanel;
! import net.sourceforge.ejtools.awt.BeanContextPanel;
import net.sourceforge.ejtools.awt.action.Command;
import net.sourceforge.ejtools.awt.action.CommandAction;
--- 12,16 ----
//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;
***************
*** 95,99 ****
Server server = new Server();
add(server);
! frameService.setContent(new BeanContextPanel(server));
add(frameService);
--- 95,99 ----
Server server = new Server();
add(server);
! frameService.setContent(new BeanContextTreePanel(server));
add(frameService);
|
|
From: Laurent E. <let...@us...> - 2002-04-28 19:39:59
|
Update of /cvsroot/ejtools/applications/deployment/src/resources In directory usw-pr-cvs1:/tmp/cvs-serv18135/applications/deployment/src/resources Modified Files: ApplicationResources.properties ApplicationResources_fr_FR.properties Log Message: XPath API test Display list of DeployFactory Add some dtds Change title of application Index: ApplicationResources.properties =================================================================== RCS file: /cvsroot/ejtools/applications/deployment/src/resources/ApplicationResources.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ApplicationResources.properties 21 Apr 2002 18:48:26 -0000 1.1 --- ApplicationResources.properties 28 Apr 2002 10:21:49 -0000 1.2 *************** *** 8,12 **** # Title for Frame, Dialog, etc ! title.application=JNDI Browser title.information.defaultFactory.queue=Default QueueConnectionFactory Selection title.information.defaultFactory.topic=Default TopicConnectionFactory Selection --- 8,12 ---- # Title for Frame, Dialog, etc ! title.application=Deployment Console title.information.defaultFactory.queue=Default QueueConnectionFactory Selection title.information.defaultFactory.topic=Default TopicConnectionFactory Selection Index: ApplicationResources_fr_FR.properties =================================================================== RCS file: /cvsroot/ejtools/applications/deployment/src/resources/ApplicationResources_fr_FR.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ApplicationResources_fr_FR.properties 21 Apr 2002 18:48:26 -0000 1.1 --- ApplicationResources_fr_FR.properties 28 Apr 2002 10:21:49 -0000 1.2 *************** *** 8,12 **** # Title for Frame, Dialog, etc ! title.application=Navigateur JNDI title.information.defaultFactory.queue=Sélection du QueueConnectionFactory par défaut title.information.defaultFactory.topic=Sélection du TopicConnectionFactory par défaut --- 8,12 ---- # Title for Frame, Dialog, etc ! title.application=Deployment Console title.information.defaultFactory.queue=Sélection du QueueConnectionFactory par défaut title.information.defaultFactory.topic=Sélection du TopicConnectionFactory par défaut |
|
From: Laurent E. <let...@us...> - 2002-04-28 19:39:59
|
Update of /cvsroot/ejtools/applications/deployment/src/main/net/sourceforge/ejtools/deploy
In directory usw-pr-cvs1:/tmp/cvs-serv18135/applications/deployment/src/main/net/sourceforge/ejtools/deploy
Modified Files:
DeploymentBrowser.java Main.java
Log Message:
XPath API test
Display list of DeployFactory
Add some dtds
Change title of application
Index: DeploymentBrowser.java
===================================================================
RCS file: /cvsroot/ejtools/applications/deployment/src/main/net/sourceforge/ejtools/deploy/DeploymentBrowser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DeploymentBrowser.java 24 Apr 2002 20:10:41 -0000 1.2
--- DeploymentBrowser.java 28 Apr 2002 10:21:49 -0000 1.3
***************
*** 13,19 ****
import java.util.Iterator;
import javax.swing.ImageIcon;
// Other Imports
! import com.dreambean.awt.BeanContextPanel;
import net.sourceforge.ejtools.awt.action.Command;
import net.sourceforge.ejtools.awt.action.CommandAction;
--- 13,20 ----
import java.util.Iterator;
import javax.swing.ImageIcon;
+ import java.io.File;
// Other Imports
! import net.sourceforge.ejtools.awt.BeanContextListPanel;
import net.sourceforge.ejtools.awt.action.Command;
import net.sourceforge.ejtools.awt.action.CommandAction;
***************
*** 29,33 ****
import net.sourceforge.ejtools.awt.services.StatusBarServiceProvider;
import net.sourceforge.ejtools.awt.services.ToolBarServiceProvider;
! import net.sourceforge.ejtools.deploy.model.FactoryManagerServiceProvider;
import org.apache.log4j.Category;
--- 30,35 ----
import net.sourceforge.ejtools.awt.services.StatusBarServiceProvider;
import net.sourceforge.ejtools.awt.services.ToolBarServiceProvider;
! import net.sourceforge.ejtools.deploy.model.*;
! import net.sourceforge.ejtools.deploy.factories.*;
import org.apache.log4j.Category;
***************
*** 55,59 ****
AboutServiceProvider aboutService;
FactoryManagerServiceProvider factoryManagerService;
-
/** Description of the Field */
FrameServiceProvider frameService;
--- 57,60 ----
***************
*** 66,97 ****
- /** Constructor for the EJX object */
public DeploymentBrowser()
{
! SplashWindow splash = new SplashWindow("DeploymentBrowser starting...", 14);
! splash.show();
!
! cat.debug("JNDIBrowser starting...");
frameService = new FrameServiceProvider("SDI");
- splash.progress("Creating Frame Service...");
aboutService = new AboutServiceProvider(new AboutDialog());
- splash.progress("Creating About Service...");
menuBarService = new MenuBarServiceProvider();
- splash.progress("Creating MenuBar Service...");
toolBarService = new ToolBarServiceProvider();
- splash.progress("Creating ToolBar Service...");
statusBarService = new StatusBarServiceProvider();
- splash.progress("Creating StatusBar Service...");
-
factoryManagerService = new FactoryManagerServiceProvider();
try
{
! add(menuBarService);
! splash.progress("Adding MenuBar Service...");
! // add(toolBarService);
! // add(statusBarService);
frameService.setTitle(res.getString("title.application"));
--- 67,97 ----
public DeploymentBrowser()
{
! cat.debug("Deployment Console starting...");
frameService = new FrameServiceProvider("SDI");
aboutService = new AboutServiceProvider(new AboutDialog());
menuBarService = new MenuBarServiceProvider();
toolBarService = new ToolBarServiceProvider();
statusBarService = new StatusBarServiceProvider();
factoryManagerService = new FactoryManagerServiceProvider();
try
{
! WarProxy proxy = new WarProxy(Thread.currentThread().getContextClassLoader(), (new File("../conf/jmx.browser.war")).toURL());
! System.out.println(proxy.toString());
! String[] result = proxy.getText("//init-param");
! for(int i = 0; i < result.length; i++) {
! System.out.println(result[i]);
! }
!
!
!
!
!
!
! add(menuBarService);
frameService.setTitle(res.getString("title.application"));
***************
*** 108,120 ****
}
));
- splash.progress("Adding Exit Action...");
-
- add(frameService);
- splash.progress("Adding Frame Service...");
-
- add(aboutService);
- splash.progress("Adding About Service...");
-
- splash.dispose();
factoryManagerService.loadFactories();
--- 108,111 ----
***************
*** 123,126 ****
--- 114,122 ----
System.out.println("FACT " + it.next());
}
+
+ frameService.setContent(new BeanContextListPanel(factoryManagerService));
+
+ add(frameService);
+ add(aboutService);
}
catch (RuntimeException e)
***************
*** 128,131 ****
--- 124,131 ----
cat.warn("Error occured " + e.getMessage());
throw e;
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
}
}
Index: Main.java
===================================================================
RCS file: /cvsroot/ejtools/applications/deployment/src/main/net/sourceforge/ejtools/deploy/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Main.java 21 Apr 2002 18:49:40 -0000 1.1
--- Main.java 28 Apr 2002 10:21:49 -0000 1.2
***************
*** 15,18 ****
--- 15,19 ----
import java.security.PrivilegedExceptionAction;
import java.util.LinkedList;
+ import net.sourceforge.ejtools.deploy.model.*;
/**
***************
*** 52,55 ****
--- 53,57 ----
Thread.currentThread().setContextClassLoader(new URLClassLoader(pluginURLs, Thread.currentThread().getContextClassLoader()));
+
System.setSecurityManager(
new SecurityManager()
|
|
From: Laurent E. <let...@us...> - 2002-04-28 19:39:47
|
Update of /cvsroot/ejtools/applications/deployment/src/main/net/sourceforge/ejtools/deploy/model In directory usw-pr-cvs1:/tmp/cvs-serv18135/applications/deployment/src/main/net/sourceforge/ejtools/deploy/model Removed Files: FactoryManagerService.java FactoryManagerServiceProvider.java Log Message: XPath API test Display list of DeployFactory Add some dtds Change title of application --- FactoryManagerService.java DELETED --- --- FactoryManagerServiceProvider.java DELETED --- |
|
From: Laurent E. <let...@us...> - 2002-04-28 19:39:43
|
Update of /cvsroot/ejtools/build
In directory usw-pr-cvs1:/tmp/cvs-serv17394/build
Modified Files:
build_application.xml
Log Message:
Reformat file
Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_application.xml 26 Apr 2002 06:19:26 -0000 1.2
--- build_application.xml 28 Apr 2002 10:19:38 -0000 1.3
***************
*** 46,49 ****
--- 46,50 ----
<fileset dir="${apache.log4j.root}" includes="*.jar"/>
<fileset dir="${apache.struts.root}" includes="*.jar"/>
+ <fileset dir="${apache.xalan.root}" includes="*.jar"/>
<fileset dir="${dreambean.awt.root}" includes="*.jar"/>
<fileset dir="${jboss.client.root}" includes="*.jar"/>
|
|
From: Laurent E. <let...@us...> - 2002-04-28 19:39:13
|
Update of /cvsroot/ejtools/applications/management/src/conf In directory usw-pr-cvs1:/tmp/cvs-serv15672/applications/management/src/conf Modified Files: log4j.properties Log Message: Return to the default Index: log4j.properties =================================================================== RCS file: /cvsroot/ejtools/applications/management/src/conf/log4j.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** log4j.properties 22 Apr 2002 17:39:59 -0000 1.1 --- log4j.properties 28 Apr 2002 13:02:44 -0000 1.2 *************** *** 1,18 **** ! # Set root logger level to DEBUG and its only appender to A1. ! log4j.rootLogger=debug, stdout, R ! log4j.appender.stdout=org.apache.log4j.ConsoleAppender ! log4j.appender.stdout.layout=org.apache.log4j.PatternLayout - # Pattern to output the caller's file name and line number. - log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n - log4j.appender.R=org.apache.log4j.RollingFileAppender - log4j.appender.R.File=debug.log ! log4j.appender.R.MaxFileSize=100KB ! # Keep one backup file ! log4j.appender.R.MaxBackupIndex=1 - log4j.appender.R.layout=org.apache.log4j.PatternLayout - log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n --- 1,20 ---- ! # Set root category priority to DEBUG and its only appender to A1. ! log4j.rootCategory=DEBUG, A1 ! # A1 is set to be a ConsoleAppender. ! ! log4j.appender.A1=org.apache.log4j.ConsoleAppender ! ! ! ! # A1 uses PatternLayout. ! ! log4j.appender.A1.layout=org.apache.log4j.PatternLayout ! ! log4j.appender.A1.layout.ConversionPattern=[%-5p] %c %x - %m%n ! ! |
|
From: Laurent E. <let...@us...> - 2002-04-28 19:38:22
|
Update of /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt In directory usw-pr-cvs1:/tmp/cvs-serv15372/libraries/adwt/src/main/net/sourceforge/ejtools/awt Added Files: BeanContextListPanel.java BeanContextListView.java Log Message: Add List View of BeanContext (List and Panel) --- NEW FILE: BeanContextListPanel.java --- /* * EJTools, the Enterprise Java Tools * * Distributable under LGPL license. * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.awt; import java.awt.Container; import java.awt.Dimension; import java.beans.beancontext.*; import javax.swing.*; import javax.swing.event.*; import javax.swing.tree.*; /** *Description of the Class * * @author Administrator * @created 16 octobre 2001 */ public class BeanContextListPanel extends JSplitPane { JList list; /** *Constructor for the BeanContextListPanel object * * @param beancontext Description of Parameter */ public BeanContextListPanel(BeanContext beancontext) { this(beancontext, null); } /** *Constructor for the BeanContextListPanel object * * @param beancontext Description of Parameter * @param s Description of Parameter */ public BeanContextListPanel(BeanContext beancontext, String s) { super(1); if (s != null) { setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), s)); } list = new BeanContextListView(beancontext); JScrollPane jscrollpane = new JScrollPane(list); jscrollpane.setMinimumSize(new Dimension(200, 300)); jscrollpane.setPreferredSize(new Dimension(200, 300)); final JPanel dummyMsg = new JPanel(); dummyMsg.add(new JLabel("", 0)); setLeftComponent(jscrollpane); setRightComponent(dummyMsg); list.addListSelectionListener( new ListSelectionListener() { public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()) { return; } final int index = list.getSelectedIndex(); final ListModel model = list.getModel(); SwingUtilities.invokeLater( new Runnable() { public void run() { try { Object obj = ((BeanContextListView.ContextElement) model.getElementAt(index)).getUserObject(); if (obj instanceof BeanContextChildComponentProxy) { BeanContextChildComponentProxy beancontextchildcomponentproxy = (BeanContextChildComponentProxy) obj; setRightComponent(beancontextchildcomponentproxy.getComponent()); } else if (obj instanceof BeanContextContainerProxy) { BeanContextContainerProxy beancontextcontainerproxy = (BeanContextContainerProxy) obj; setRightComponent(beancontextcontainerproxy.getContainer()); } validate(); } catch (Exception _ex) { } } }); } }); list.getModel().addListDataListener( new ListDataListener() { public void intervalAdded(ListDataEvent e) { list.clearSelection(); setRightComponent(dummyMsg); validate(); } public void intervalRemoved(ListDataEvent e) { list.clearSelection(); setRightComponent(dummyMsg); validate(); } public void contentsChanged(ListDataEvent e) { list.clearSelection(); setRightComponent(dummyMsg); validate(); } }); } } --- NEW FILE: BeanContextListView.java --- /* * EJTools, the Enterprise Java Tools * * Distributable under LGPL license. * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.awt; import java.awt.*; import java.awt.event.*; import java.beans.*; import java.beans.beancontext.*; import java.lang.reflect.*; import java.util.*; import javax.swing.*; import javax.swing.event.*; /** * Description of the Class * * @author letiembl * @created 24 septembre 2001 */ public class BeanContextListView extends JList { static Class class$java$lang$Object; /** * Constructor for the BeanContextTreeView object * * @param beancontext Description of Parameter */ public BeanContextListView(BeanContext beancontext) { setModel(new BeanContextListModel(beancontext)); setCellRenderer( new DefaultListCellRenderer() { public Component getListCellRendererComponent(JList list, Object obj, int index, boolean isSelected, boolean cellHasFocus) { try { ContextElement contextelement = (ContextElement) obj; Object obj1 = contextelement.getUserObject(); super.getListCellRendererComponent(list, obj1, index, isSelected, cellHasFocus); if (contextelement.icon != null) { setIcon(contextelement.icon); } return this; } catch (Exception _ex) { System.err.println(_ex.getMessage()); return super.getListCellRendererComponent(list, obj, index, isSelected, cellHasFocus); } } }); } /** *Description of the Method * * @param s Description of Parameter * @return Description of the Returned Value */ static Class _mthclass$(String s) { try { return Class.forName(s); } catch (ClassNotFoundException classnotfoundexception) { throw new NoClassDefFoundError(classnotfoundexception.getMessage()); } } /** *Description of the Class * * @author Administrator * @created 16 octobre 2001 */ class BeanContextListModel implements ListModel, BeanContextMembershipListener { BeanContext context; Vector listeners = new Vector(); Vector content = new Vector(); /** *Constructor for the BeanContextListModel object * * @param beancontext Description of Parameter */ BeanContextListModel(BeanContext beancontext) { context = beancontext; context.addBeanContextMembershipListener(this); updateModel(); } /** *Gets the size attribute of the BeanContextListModel object * * @return The size value */ public int getSize() { return context.size(); } /** *Description of the Method * * @param index Description of Parameter * @return Description of the Returned Value */ public Object getElementAt(int index) { return content.elementAt(index); } /** *Adds a feature to the ListDataListener attribute of the BeanContextListModel object * * @param l The feature to be added to the ListDataListener attribute */ public void addListDataListener(ListDataListener l) { listeners.add(l); } /** *Description of the Method * * @param l Description of Parameter */ public void removeListDataListener(ListDataListener l) { listeners.remove(l); } /** *Description of the Method * * @param beancontextmembershipevent Description of Parameter */ public void childrenAdded(BeanContextMembershipEvent beancontextmembershipevent) { updateModel(); notifyListener(); } /** *Description of the Method * * @param beancontextmembershipevent Description of Parameter */ public void childrenRemoved(BeanContextMembershipEvent beancontextmembershipevent) { updateModel(); notifyListener(); } /** *Description of the Method */ private void notifyListener() { ListDataEvent event = new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, 0, content.size()); for (int i = 0; i < listeners.size(); i++) { ListDataListener listener = (ListDataListener) listeners.elementAt(i); listener.contentsChanged(event); } } /** *Description of the Method */ private void updateModel() { content.clear(); Iterator enum = context.iterator(); while (enum.hasNext()) { content.addElement(new ContextElement(enum.next())); } } } /** *Description of the Class * * @author Administrator * @created 16 octobre 2001 */ class ContextElement implements BeanContextChildComponentProxy { ImageIcon icon = null; String txt; Object obj; /** *Constructor for the ContextNode object * * @param obj1 Description of Parameter */ ContextElement(Object obj1) { obj = obj1; try { BeanInfo beaninfo = Introspector.getBeanInfo(obj1.getClass()); if (beaninfo.getIcon(1) != null) { icon = new ImageIcon(beaninfo.getIcon(1)); } Method method = obj1.getClass().getMethod("toString", new Class[0]); if (method.getDeclaringClass().equals(BeanContextListView.class$java$lang$Object == null ? ((Object) (BeanContextListView.class$java$lang$Object = BeanContextListView._mthclass$("java.lang.Object"))) : ((Object) (BeanContextListView.class$java$lang$Object)))) { txt = beaninfo.getBeanDescriptor().getDisplayName(); } } catch (Exception exception) { exception.printStackTrace(); } } /** *Gets the component attribute of the ContextNode object * * @return The component value */ public Component getComponent() { if (obj instanceof Component) { return (Component) obj; } if (obj instanceof BeanContextContainerProxy) { return ((BeanContextContainerProxy) obj).getContainer(); } if (obj instanceof BeanContextChildComponentProxy) { return ((BeanContextChildComponentProxy) obj).getComponent(); } else { return new JLabel("No GUI available", 0); } } /** *Gets the userObject attribute of the ContextNode object * * @return The userObject value */ public Object getUserObject() { return obj; } /** *Description of the Method * * @return Description of the Returned Value */ public String toString() { return txt != null ? txt : obj.toString(); } } } |
|
From: Laurent E. <let...@us...> - 2002-04-28 19:38:14
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model
In directory usw-pr-cvs1:/tmp/cvs-serv16586/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model
Modified Files:
ConnectionService.java EJBConnectionService.java
LocalConnectionService.java RMIConnectionService.java
Resource.java Server.java
Log Message:
Add access to createMBean and to unregisterMBean
Index: ConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/ConnectionService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConnectionService.java 22 Apr 2002 17:38:42 -0000 1.1
--- ConnectionService.java 28 Apr 2002 13:05:44 -0000 1.2
***************
*** 1,8 ****
package net.sourceforge.ejtools.jmxbrowser.model;
- import java.util.Set;
import java.io.Serializable;
import javax.management.Attribute;
import javax.management.MBeanInfo;
import javax.management.ObjectName;
import javax.management.QueryExp;
--- 1,9 ----
package net.sourceforge.ejtools.jmxbrowser.model;
import java.io.Serializable;
+ import java.util.Set;
import javax.management.Attribute;
import javax.management.MBeanInfo;
+ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.QueryExp;
***************
*** 18,41 ****
--- 19,147 ----
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;
+
+ /**
+ * Gets the defaultDomain attribute of the ConnectionService object
+ *
+ * @return The defaultDomain value
+ * @exception Exception Description of the Exception
+ */
public String getDefaultDomain() throws Exception;
+
+ /**
+ * Gets the mBeanCount attribute of the ConnectionService object
+ *
+ * @return The mBeanCount value
+ * @exception Exception Description of the Exception
+ */
public Integer getMBeanCount() throws Exception;
+
+ /**
+ * 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;
+
+ /**
+ * 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;
+
+ /**
+ * 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;
+
+ /**
+ * 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;
+
+ /**
+ * 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;
+
+
+ /**
+ * Description of the Method
+ *
+ * @param name Description of the Parameter
+ * @exception Exception Description of the Exception
+ */
+ public void unregisterMBean(ObjectName name) throws Exception;
+
+
+ /**
+ * Sets the eJBName attribute of the ConnectionService object
+ *
+ * @param ejbName The new eJBName value
+ */
public void setEJBName(String ejbName);
+
+ /**
+ * Sets the factory attribute of the ConnectionService object
+ *
+ * @param factory The new factory value
+ */
public void setFactory(String factory);
+
+ /**
+ * Sets the packages attribute of the ConnectionService object
+ *
+ * @param pkgs The new packages value
+ */
public void setPackages(String pkgs);
+
+ /**
+ * Sets the uRL attribute of the ConnectionService object
+ *
+ * @param url The new uRL value
+ */
public void setURL(String url);
}
Index: EJBConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/EJBConnectionService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EJBConnectionService.java 22 Apr 2002 17:38:59 -0000 1.1
--- EJBConnectionService.java 28 Apr 2002 13:05:44 -0000 1.2
***************
*** 4,7 ****
--- 4,8 ----
import javax.management.Attribute;
import javax.management.MBeanInfo;
+ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.QueryExp;
***************
*** 37,40 ****
--- 38,58 ----
/**
+ * 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
+ {
+ return getConnector().createMBean(className, name, loaderName, params, signature);
+ }
+
+
+ /**
* Getter for the attribute attribute
*
***************
*** 181,184 ****
--- 199,214 ----
* Description of the Method
*
+ * @param name Description of the Parameter
+ * @exception Exception Description of the Exception
+ */
+ public void unregisterMBean(ObjectName name) throws Exception
+ {
+ getConnector().unregisterMBean(name);
+ }
+
+
+ /**
+ * Description of the Method
+ *
* @return Description of the Returned Value
* @exception Exception Description of Exception
***************
*** 188,194 ****
if (connector == null)
{
! InitialContext context = new InitialContext();
! Object ref = context.lookup(this.ejbName);
! AdaptorHome home = (AdaptorHome) PortableRemoteObject.narrow(ref, AdaptorHome.class);
connector = home.create();
--- 218,224 ----
if (connector == null)
{
! InitialContext context = new InitialContext();
! Object ref = context.lookup(this.ejbName);
! AdaptorHome home = (AdaptorHome) PortableRemoteObject.narrow(ref, AdaptorHome.class);
connector = home.create();
***************
*** 197,198 ****
--- 227,229 ----
}
}
+
Index: LocalConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/LocalConnectionService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LocalConnectionService.java 22 Apr 2002 17:39:59 -0000 1.1
--- LocalConnectionService.java 28 Apr 2002 13:05:44 -0000 1.2
***************
*** 3,10 ****
import java.util.ArrayList;
import java.util.Set;
- import javax.management.MBeanServer;
- import javax.management.MBeanServerFactory;
import javax.management.Attribute;
import javax.management.MBeanInfo;
import javax.management.ObjectName;
import javax.management.QueryExp;
--- 3,11 ----
import java.util.ArrayList;
import java.util.Set;
import javax.management.Attribute;
import javax.management.MBeanInfo;
+ import javax.management.MBeanServer;
+ import javax.management.MBeanServerFactory;
+ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.QueryExp;
***************
*** 39,42 ****
--- 40,60 ----
/**
+ * 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
+ {
+ return getConnector().createMBean(className, name, loaderName, params, signature);
+ }
+
+
+ /**
* Getter for the attribute attribute
*
***************
*** 183,186 ****
--- 201,216 ----
* Description of the Method
*
+ * @param name Description of the Parameter
+ * @exception Exception Description of the Exception
+ */
+ public void unregisterMBean(ObjectName name) throws Exception
+ {
+ getConnector().unregisterMBean(name);
+ }
+
+
+ /**
+ * Description of the Method
+ *
* @return Description of the Returned Value
* @exception Exception Description of Exception
***************
*** 190,197 ****
if (connector == null)
{
! ArrayList servers = MBeanServerFactory.findMBeanServer(null);
! if (servers == null)
! throw new Exception("No MBeanServer found.");
! connector = (MBeanServer)servers.get(0);
}
--- 220,229 ----
if (connector == null)
{
! ArrayList servers = MBeanServerFactory.findMBeanServer(null);
! if (servers == null)
! {
! throw new Exception("No MBeanServer found.");
! }
! connector = (MBeanServer) servers.get(0);
}
Index: RMIConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/RMIConnectionService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RMIConnectionService.java 22 Apr 2002 17:41:20 -0000 1.1
--- RMIConnectionService.java 28 Apr 2002 13:05:44 -0000 1.2
***************
*** 4,7 ****
--- 4,8 ----
import javax.management.Attribute;
import javax.management.MBeanInfo;
+ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.QueryExp;
***************
*** 36,39 ****
--- 37,57 ----
/**
+ * 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
+ {
+ return getConnector().createMBean(className, name, loaderName, params, signature);
+ }
+
+
+ /**
* Getter for the attribute attribute
*
***************
*** 180,183 ****
--- 198,213 ----
* Description of the Method
*
+ * @param name Description of the Parameter
+ * @exception Exception Description of the Exception
+ */
+ public void unregisterMBean(ObjectName name) throws Exception
+ {
+ getConnector().unregisterMBean(name);
+ }
+
+
+ /**
+ * Description of the Method
+ *
* @return Description of the Returned Value
* @exception Exception Description of Exception
***************
*** 187,193 ****
if (connector == null)
{
! InitialContext context = new InitialContext();
! Object ref = context.lookup(this.ejbName);
! connector = (RMIAdaptor) PortableRemoteObject.narrow(ref, RMIAdaptor.class);
}
return connector;
--- 217,223 ----
if (connector == null)
{
! InitialContext context = new InitialContext();
! Object ref = context.lookup(this.ejbName);
! connector = (RMIAdaptor) PortableRemoteObject.narrow(ref, RMIAdaptor.class);
}
return connector;
Index: Resource.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Resource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Resource.java 24 Apr 2002 20:08:22 -0000 1.2
--- Resource.java 28 Apr 2002 13:05:44 -0000 1.3
***************
*** 42,45 ****
--- 42,80 ----
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)
+ {
+ BeanContextServices context = (BeanContextServices) getBeanContext();
+ ObjectInstance result = null;
+
+ if (context.hasService(ConnectionService.class))
+ {
+ try
+ {
+ ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
+
+ result = service.createMBean(className, name, loaderName, params, signature);
+
+ context.releaseService(this, this, ConnectionService.class);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ return result;
+ }
+
+
/**
* Getter for the attribute attribute
***************
*** 129,133 ****
{
// this.connector.addNotificationListener(this.objectName, updater, updater, null);
! c = new GenericMBeanCustomizer(true, this);
}
catch (Exception e)
--- 164,168 ----
{
// this.connector.addNotificationListener(this.objectName, updater, updater, null);
! c = new GenericMBeanCustomizer(this);
}
catch (Exception e)
***************
*** 289,292 ****
--- 324,354 ----
this.className = this.objectInstance.getClassName();
this.domain = this.objectName.getDomain();
+ }
+
+
+ /**
+ * Description of the Method
+ *
+ * @param name Description of the Parameter
+ */
+ public void unregisterMBean(ObjectName name)
+ {
+ BeanContextServices context = (BeanContextServices) getBeanContext();
+
+ if (context.hasService(ConnectionService.class))
+ {
+ try
+ {
+ ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
+
+ service.unregisterMBean(name);
+
+ context.releaseService(this, this, ConnectionService.class);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
}
Index: Server.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/model/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Server.java 24 Apr 2002 20:08:22 -0000 1.2
--- Server.java 28 Apr 2002 13:05:44 -0000 1.3
***************
*** 34,48 ****
protected Hashtable domains = new Hashtable();
/** Description of the Field */
- protected Hashtable mbeans = new Hashtable();
- /** Description of the Field */
protected String ejbName = "ejb/jmx/ejb/Adaptor";
/** Description of the Field */
protected String factory = "org.jnp.interfaces.NamingContextFactory";
/** Description of the Field */
protected String pkgs = "org.jboss.naming:org.jnp.interfaces";
/** Description of the Field */
protected String url = "localhost:1099";
- /** Description of the Field */
- protected String filter = "*:*";
--- 34,48 ----
protected Hashtable domains = new Hashtable();
/** Description of the Field */
protected String ejbName = "ejb/jmx/ejb/Adaptor";
/** Description of the Field */
protected String factory = "org.jnp.interfaces.NamingContextFactory";
/** Description of the Field */
+ protected String filter = "*:*";
+ /** Description of the Field */
+ protected Hashtable mbeans = new Hashtable();
+ /** Description of the Field */
protected String pkgs = "org.jboss.naming:org.jnp.interfaces";
/** Description of the Field */
protected String url = "localhost:1099";
***************
*** 68,79 ****
}
/** Description of the Method */
public void connect()
{
System.out.println("In connect");
!
this.clear();
! this.domains.clear();
! this.mbeans.clear();
BeanContextServices context = (BeanContextServices) getBeanContext();
--- 68,80 ----
}
+
/** Description of the Method */
public void connect()
{
System.out.println("In connect");
!
this.clear();
! this.domains.clear();
! this.mbeans.clear();
BeanContextServices context = (BeanContextServices) getBeanContext();
***************
*** 95,99 ****
Collection result = service.queryMBeans(new ObjectName(filter), null);
! int counter = result.size();
Vector resources = new Vector();
--- 96,100 ----
Collection result = service.queryMBeans(new ObjectName(filter), null);
! int counter = result.size();
Vector resources = new Vector();
***************
*** 115,122 ****
d.add(resource);
resource.setReference(oi);
! this.mbeans.put(resource.getCanonicalName(), resource);
}
! setCount(counter);
it = resources.iterator();
--- 116,123 ----
d.add(resource);
resource.setReference(oi);
! this.mbeans.put(resource.getCanonicalName(), resource);
}
! setCount(counter);
it = resources.iterator();
***************
*** 141,151 ****
- public Object searchObjectName(String objectName) {
- if (objectName!=null){
- return mbeans.get(objectName);
- }
- return null;
- }
-
/**
* Getter for the count attribute
--- 142,145 ----
***************
*** 169,177 ****
}
- public String getFilter()
- {
- return filter;
- }
-
/**
--- 163,166 ----
***************
*** 198,201 ****
--- 187,201 ----
/**
+ * Gets the filter attribute of the Server object
+ *
+ * @return The filter value
+ */
+ public String getFilter()
+ {
+ return filter;
+ }
+
+
+ /**
* Gets the packages attribute of the Server object
*
***************
*** 220,223 ****
--- 220,239 ----
/**
+ * Description of the Method
+ *
+ * @param objectName Description of the Parameter
+ * @return Description of the Return Value
+ */
+ public Object searchObjectName(String objectName)
+ {
+ if (objectName != null)
+ {
+ return mbeans.get(objectName);
+ }
+ return null;
+ }
+
+
+ /**
* Setter for the ejbName attribute
*
***************
*** 229,237 ****
}
- public void setFilter(String filter)
- {
- this.filter = filter;
- }
-
/**
--- 245,248 ----
***************
*** 247,250 ****
--- 258,272 ----
/**
+ * Sets the filter attribute of the Server object
+ *
+ * @param filter The new filter value
+ */
+ public void setFilter(String filter)
+ {
+ this.filter = filter;
+ }
+
+
+ /**
* Sets the packages attribute of the Server object
*
***************
*** 265,268 ****
--- 287,300 ----
{
this.url = url;
+ }
+
+
+ /**
+ * Description of the Method
+ *
+ * @param name Description of the Parameter
+ */
+ public void unregisterMBean(ObjectName name)
+ {
}
|
|
From: Laurent E. <let...@us...> - 2002-04-28 19:38:04
|
Update of /cvsroot/ejtools/applications/management/src/main/net/sourceforge/ejtools/management/model
In directory usw-pr-cvs1:/tmp/cvs-serv16275/applications/management/src/main/net/sourceforge/ejtools/management/model
Modified Files:
ConnectionService.java Resource.java
Log Message:
Modifications to use MBeanCustomizer (to remove later)
Index: ConnectionService.java
===================================================================
RCS file: /cvsroot/ejtools/applications/management/src/main/net/sourceforge/ejtools/management/model/ConnectionService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConnectionService.java 22 Apr 2002 17:38:42 -0000 1.1
--- ConnectionService.java 28 Apr 2002 13:04:42 -0000 1.2
***************
*** 4,7 ****
--- 4,8 ----
import javax.management.Attribute;
import javax.management.MBeanInfo;
+ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.QueryExp;
***************
*** 36,39 ****
--- 37,57 ----
/**
+ * 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
+ {
+ return null;
+ }
+
+
+ /**
* Gets the attribute attribute of the ConnectionService object
*
***************
*** 129,138 ****
- // public Set queryNames(ObjectName name) throws Exception
- // {
- // return (getEJB().queryNames(name));
- // }
-
-
/**
* Setter for the eJBName attribute
--- 147,150 ----
***************
*** 180,183 ****
--- 192,206 ----
this.url = url;
remote = null;
+ }
+
+
+ /**
+ * Description of the Method
+ *
+ * @param name Description of the Parameter
+ * @exception Exception Description of the Exception
+ */
+ public void unregisterMBean(ObjectName name) throws Exception
+ {
}
Index: Resource.java
===================================================================
RCS file: /cvsroot/ejtools/applications/management/src/main/net/sourceforge/ejtools/management/model/Resource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Resource.java 22 Apr 2002 17:41:03 -0000 1.1
--- Resource.java 28 Apr 2002 13:04:42 -0000 1.2
***************
*** 37,40 ****
--- 37,74 ----
/**
+ * Description of the Method
+ *
+ * @param className Description of the Parameter
+ * @param name Description of the Parameter
+ * @param loaderName Description of the Parameter
+ * @param params Description of the Parameter
+ * @param signature Description of the Parameter
+ * @return Description of the Return Value
+ */
+ public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature)
+ {
+ BeanContextServices context = (BeanContextServices) getBeanContext();
+ ObjectInstance result = null;
+
+ if (context.hasService(ConnectionService.class))
+ {
+ try
+ {
+ ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
+
+ result = service.createMBean(className, name, loaderName, params, signature);
+
+ context.releaseService(this, this, ConnectionService.class);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ return result;
+ }
+
+
+ /**
* Gets the attribute attribute of the Resource object
*
***************
*** 107,111 ****
try
{
! c = new GenericMBeanCustomizer(true, this);
}
catch (Exception e)
--- 141,145 ----
try
{
! c = new GenericMBeanCustomizer(this);
}
catch (Exception e)
***************
*** 235,238 ****
--- 269,299 ----
{
return (this.canonicalName == null ? "undefined" : this.canonicalName);
+ }
+
+
+ /**
+ * Description of the Method
+ *
+ * @param name Description of the Parameter
+ */
+ public void unregisterMBean(ObjectName name)
+ {
+ BeanContextServices context = (BeanContextServices) getBeanContext();
+
+ if (context.hasService(ConnectionService.class))
+ {
+ try
+ {
+ ConnectionService service = (ConnectionService) context.getService(this, this, ConnectionService.class, this, this);
+
+ service.unregisterMBean(name);
+
+ context.releaseService(this, this, ConnectionService.class);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
}
}
|
|
From: Laurent E. <let...@us...> - 2002-04-26 06:19:29
|
Update of /cvsroot/ejtools/build
In directory usw-pr-cvs1:/tmp/cvs-serv13657/build
Modified Files:
build.xml build_application.xml general.properties
Log Message:
Add some comments
Add some new libraries
Index: build.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml 17 Apr 2002 20:48:54 -0000 1.1
--- build.xml 26 Apr 2002 06:19:26 -0000 1.2
***************
*** 1,18 ****
! <project name="Overall Build File" default="dist" basedir="..">
! <!-- ==================== Global Definitions ======================== -->
<property file="build/general.properties"/>
<property file="build/location.properties"/>
<property file="build/switch.properties"/>
-
-
<!-- ==================== Everything Target ===================================== -->
! <target name="everything" depends="clean, build, javadoc, todo, website" description="">
! </target>
!
<!-- ==================== Rebuild Target ===================================== -->
! <target name="rebuild" depends="clean, build" description="">
</target>
!
! <!-- ==================== Build Target ===================================== -->
<target name="build" description="">
<antcall target="sub">
--- 1,51 ----
! <project name="EJTools Build File" default="dist" basedir="..">
! <!-- ======================================== -->
! <!-- Global Definitions -->
! <!-- ======================================== -->
<property file="build/general.properties"/>
<property file="build/location.properties"/>
<property file="build/switch.properties"/>
<!-- ==================== Everything Target ===================================== -->
! <target name="everything" depends="clean, build, logo, dist, webapp, javadoc, todo, package, website" description=""/>
<!-- ==================== Rebuild Target ===================================== -->
! <target name="rebuild" depends="clean, build" description=""/>
! <!-- ======================================== -->
! <!-- Displayed on demand or on failure -->
! <!-- ======================================== -->
! <target name="help" description="">
! <echo message="------------------------------------------------------------"/>
! <echo message="EJTools Build System Help :"/>
! <echo/>
! <echo message="everything : Blah Blah"/>
! <echo message="build : Blah Blah"/>
! <echo message="dist : Blah Blah"/>
! <echo message="clean : Blah Blah"/>
! <echo message="webapp : Blah Blah"/>
! <echo message="javadoc : Blah Blah"/>
! <echo message="todo : Blah Blah"/>
! <echo message="logo : Blah Blah"/>
! <echo message="package : Blah Blah"/>
! <echo message="tarball : Blah Blah"/>
! <echo message="------------------------------------------------------------"/>
</target>
! <!-- ======================================== -->
! <!-- Creates the output directory for the releases -->
! <!-- ======================================== -->
! <target name="prepare" description="">
! <mkdir dir="${output.root}"/>
! </target>
! <!-- ======================================== -->
! <!-- Delete the output directory -->
! <!-- Executes the clean target on each modules -->
! <!-- ======================================== -->
! <target name="clean" description="">
! <delete dir="${output.root}"/>
! <antcall target="sub">
! <param name="target" value="clean"/>
! </antcall>
! </target>
! <!-- ======================================== -->
! <!-- Executes the build target on each modules -->
! <!-- ======================================== -->
<target name="build" description="">
<antcall target="sub">
***************
*** 20,39 ****
</antcall>
</target>
!
! <!-- ==================== Build Target ===================================== -->
! <target name="dist" description="">
<antcall target="sub">
<param name="target" value="dist"/>
</antcall>
</target>
!
! <!-- ==================== Web Application Target ===================================== -->
! <target name="webapp" description="">
! <antcall target="sub.applications">
! <param name="target" value="webapp"/>
! </antcall>
! </target>
!
! <!-- ==================== Javadoc Target ===================================== -->
<target name="javadoc" description="">
<property name="generate.javadoc" value="true"/>
--- 53,67 ----
</antcall>
</target>
! <!-- ======================================== -->
! <!-- Executes the dist target on each modules -->
! <!-- ======================================== -->
! <target name="dist" depends="prepare" description="">
<antcall target="sub">
<param name="target" value="dist"/>
</antcall>
</target>
! <!-- ======================================== -->
! <!-- Executes the javadoc target on each modules -->
! <!-- ======================================== -->
<target name="javadoc" description="">
<property name="generate.javadoc" value="true"/>
***************
*** 42,47 ****
</antcall>
</target>
!
! <!-- ==================== Todo Target ===================================== -->
<target name="todo" description="">
<antcall target="sub">
--- 70,76 ----
</antcall>
</target>
! <!-- ======================================== -->
! <!-- Executes the todo target on each modules -->
! <!-- ======================================== -->
<target name="todo" description="">
<antcall target="sub">
***************
*** 49,75 ****
</antcall>
</target>
!
! <!-- ==================== Todo Target ===================================== -->
! <target name="logo" description="">
<antcall target="sub.applications">
<param name="target" value="logo"/>
</antcall>
</target>
!
! <!-- ==================== Website Target ===================================== -->
! <target name="website" description="">
! <ant antfile="build/build_website.xml">
! </ant>
</target>
!
! <!-- ==================== Clean Target ===================================== -->
! <target name="clean" description="">
! <antcall target="sub">
! <param name="target" value="clean"/>
</antcall>
</target>
!
!
! <!-- ==================== Sub Target ===================================== -->
<target name="sub" description="">
<antcall target="sub.thirdparty">
--- 78,109 ----
</antcall>
</target>
! <!-- ==================== Logo Target ===================================== -->
! <target name="logo" depends="build" description="">
<antcall target="sub.applications">
<param name="target" value="logo"/>
</antcall>
</target>
! <!-- ==================== Web Application Target ===================================== -->
! <target name="webapp" description="">
! <antcall target="sub.applications">
! <param name="target" value="webapp"/>
! </antcall>
</target>
! <!-- ==================== Package Target ===================================== -->
! <target name="package" description="">
! <antcall target="sub.applications">
! <param name="target" value="package"/>
</antcall>
</target>
! <!-- ======================================== -->
! <!-- WebSite -->
! <!-- Build the EJTools website -->
! <!-- ======================================== -->
! <target name="website" depends="javadoc, todo" description="">
! <ant antfile="build/build_website.xml"/>
! </target>
! <!-- **************************************** -->
! <!-- Generic subtask which calls the subtask for thirdparty, libraries and applications -->
! <!-- **************************************** -->
<target name="sub" description="">
<antcall target="sub.thirdparty">
***************
*** 83,89 ****
</antcall>
</target>
!
!
! <!-- ==================== Thirdparty Target ===================================== -->
<target name="sub.thirdparty" description="">
<antcall target="sub.call">
--- 117,123 ----
</antcall>
</target>
! <!-- **************************************** -->
! <!-- Generic subtask which calls any target on thirdparty -->
! <!-- **************************************** -->
<target name="sub.thirdparty" description="">
<antcall target="sub.call">
***************
*** 100,105 ****
</antcall>
</target>
!
! <!-- ==================== Libraries Target ===================================== -->
<target name="sub.libraries" description="">
<antcall target="sub.call">
--- 134,140 ----
</antcall>
</target>
! <!-- **************************************** -->
! <!-- Generic subtask which calls any target on lirabries -->
! <!-- **************************************** -->
<target name="sub.libraries" description="">
<antcall target="sub.call">
***************
*** 134,139 ****
</antcall>
</target>
!
! <!-- ==================== Applications Target ===================================== -->
<target name="sub.applications" description="">
<antcall target="sub.call">
--- 169,175 ----
</antcall>
</target>
! <!-- **************************************** -->
! <!-- Generic subtask which calls any target on applications -->
! <!-- **************************************** -->
<target name="sub.applications" description="">
<antcall target="sub.call">
***************
*** 162,167 ****
</antcall>
</target>
!
! <!-- ==================== Sub Target ===================================== -->
<target name="sub.call" description="" if="${target}.${type}.${name}">
<ant antfile="build/build_${type}.xml" target="${target}">
--- 198,204 ----
</antcall>
</target>
! <!-- **************************************** -->
! <!-- Generic subtask which calls any target on any modules -->
! <!-- **************************************** -->
<target name="sub.call" description="" if="${target}.${type}.${name}">
<ant antfile="build/build_${type}.xml" target="${target}">
Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_application.xml 17 Apr 2002 20:48:54 -0000 1.1
--- build_application.xml 26 Apr 2002 06:19:26 -0000 1.2
***************
*** 3,14 ****
<property file="build/general.properties"/>
<property file="build/location.properties"/>
-
<!-- ==================== Task Definitions ======================== -->
<taskdef name="xmlbean" classname="com.dreambean.xmlbeans.ant.XMLBeans"/>
<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"/>
--- 3,11 ----
***************
*** 21,25 ****
<property name="build.lib" value="${build.home}/lib"/>
<property name="build.src" value="${build.home}/src"/>
-
<property name="dist.home" value="${module.root}/dist"/>
<property name="dist.bin" value="${dist.home}/bin"/>
--- 18,21 ----
***************
*** 28,37 ****
<property name="dist.lib" value="${dist.home}/lib"/>
<property name="dist.lib.ext" value="${dist.lib}/ext"/>
-
<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"/>
--- 24,31 ----
***************
*** 43,47 ****
<property name="src.webapp.content" value="${src.webapp}/content"/>
<property name="src.webapp.resources" value="${src.webapp}/resources"/>
-
<!-- ==================== Compilation Classpath =========================== -->
<path id="compile.classpath">
--- 37,40 ----
***************
*** 65,69 ****
<fileset dir="${sun.swing.root}" includes="*.jar"/>
</path>
-
<!-- ==================== Info Target ================================== -->
<target name="info">
--- 58,61 ----
***************
*** 72,76 ****
<echo message="------------------------------------------------------------"/>
</target>
-
<!-- ==================== Prepare Target ================================== -->
<target name="prepare" depends="info">
--- 64,67 ----
***************
*** 83,87 ****
<mkdir dir="${build.lib}"/>
<mkdir dir="${build.src}"/>
-
<mkdir dir="${dist.home}"/>
<mkdir dir="${dist.bin}"/>
--- 74,77 ----
***************
*** 89,173 ****
<mkdir dir="${dist.lib}"/>
<mkdir dir="${dist.lib.ext}"/>
-
<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"/>
<available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/>
!
! <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>
-
<copy todir="${build.classes}">
<fileset dir="${src.resources}">
! <include name="**/*.properties"/>
! <include name="**/*.gif"/>
! <include name="**/*.png"/>
! </fileset>
</copy>
</target>
-
<!-- ==================== XMLBeans Target ================================== -->
! <target name="xmlbeans" depends="compile" if="has.dir.etc.beaninfo">
! <mkdir dir="${build.src}"/>
! <xmlbean destdir="${build.src}"
! srcdir="../${src.etc}/beaninfo"
! includes="**"
! excludes="**/CVS/**"/>
! <javac srcdir="${build.src}"
! destdir="${build.classes}"
! classpath="${classpath}"
! debug="${compile.debug}"
! deprecation="${compile.deprecation}"
! optimize="${compile.optimize}"
! includes="**/*BeanInfo.java"
! excludes="**/CVS/**">
<classpath refid="compile.classpath"/>
! </javac>
! </target>
!
<!-- ==================== Build Target ===================================== -->
<target name="build" depends="compile,xmlbeans" description="Create binary">
<!-- Create the Bootstrap JAR file -->
! <jar jarfile="${build.lib}/run.jar"
! basedir="${build.classes}"
! manifest="${build.etc}/run.mf"
! includes="${module.starter}*.*"/>
!
<!-- Create the Module JAR file -->
! <jar jarfile="${build.lib}/${module.name}.jar"
! basedir="${build.classes}"
! manifest="${build.etc}/${module.name}.mf"
! excludes="${module.starter}*.*"/>
</target>
-
<!-- ==================== Dist Target ===================================== -->
<target name="dist" depends="dist.copy.lib,dist.copy.lib.ext" description=""/>
-
<!-- ==================== Dist Binaries Copy Target ===================================== -->
<target name="dist.copy" depends="build" description="">
--- 79,133 ----
<mkdir dir="${dist.lib}"/>
<mkdir dir="${dist.lib.ext}"/>
<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"/>
<available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/>
! <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>
<copy todir="${build.classes}">
<fileset dir="${src.resources}">
! <include name="**/*.properties"/>
! <include name="**/*.gif"/>
! <include name="**/*.png"/>
! </fileset>
</copy>
</target>
<!-- ==================== XMLBeans Target ================================== -->
! <target name="xmlbeans" depends="compile" if="has.dir.etc.beaninfo">
! <mkdir dir="${build.src}"/>
! <xmlbean destdir="${build.src}" srcdir="../${src.etc}/beaninfo" includes="**" excludes="**/CVS/**"/>
! <javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**">
<classpath refid="compile.classpath"/>
! </javac>
! </target>
<!-- ==================== Build Target ===================================== -->
<target name="build" depends="compile,xmlbeans" description="Create binary">
<!-- Create the Bootstrap JAR file -->
! <jar jarfile="${build.lib}/run.jar" basedir="${build.classes}" manifest="${build.etc}/run.mf" includes="${module.starter}*.*"/>
<!-- Create the Module JAR file -->
! <jar jarfile="${build.lib}/${module.name}.jar" basedir="${build.classes}" manifest="${build.etc}/${module.name}.mf" excludes="${module.starter}*.*"/>
</target>
<!-- ==================== Dist Target ===================================== -->
<target name="dist" depends="dist.copy.lib,dist.copy.lib.ext" description=""/>
<!-- ==================== Dist Binaries Copy Target ===================================== -->
<target name="dist.copy" depends="build" description="">
***************
*** 175,257 ****
<fileset dir="${src.bin}"/>
</copy>
-
<copy todir="${dist.conf}">
<fileset dir="${src.conf}"/>
</copy>
-
<copy todir="${dist.bin}">
! <fileset dir="${build.lib}">
! <include name="run.jar"/>
! </fileset>
! </copy>
!
! <copy todir="${dist.lib}">
! <fileset dir="${build.lib}">
! <include name="${module.name}.jar"/>
! </fileset>
! </copy>
</target>
-
<!-- ==================== Dist Libraries Copy Target ===================================== -->
<target name="dist.copy.lib" depends="dist.copy" description="" if="has.lib.file">
! <copy todir="${dist.lib}">
! <mapper type="flatten"/>
! <fileset dir="." includesfile="${module.root}/lib.properties"/>
! </copy>
</target>
-
<!-- ==================== Dist External Libraires Target ===================================== -->
<target name="dist.copy.lib.ext" depends="dist.copy" description="" if="has.lib.ext.file">
! <copy todir="${dist.lib.ext}">
! <mapper type="flatten"/>
! <fileset dir="." includesfile="${module.root}/lib.ext.properties"/>
! </copy>
</target>
-
<!-- ==================== WebApp Target ===================================== -->
! <target name="webapp" depends="dist.copy" description="" if="has.lib.ext.file">
! <copy todir="${dist.webapp}">
! <fileset dir="${src.webapp.content}">
! </fileset>
! </copy>
!
! <copy todir="${dist.webapp.webinf.classes}">
! <fileset dir="${build.classes}">
! </fileset>
! </copy>
!
! <copy todir="${dist.webapp.webinf.lib}">
! <mapper type="flatten"/>
! <fileset dir="." includesfile="${module.root}/webapp.properties"/>
! </copy>
!
<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">
! <javadoc sourcepath="${src.main}"
! destdir="${build.doc.api}"
! packagenames="net.sourceforge.ejtools.*"
! 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>
!
<!-- ==================== SVG Logo Target =================================== -->
<target name="logo" depends="prepare">
--- 135,211 ----
<fileset dir="${src.bin}"/>
</copy>
<copy todir="${dist.conf}">
<fileset dir="${src.conf}"/>
</copy>
<copy todir="${dist.bin}">
! <fileset dir="${build.lib}">
! <include name="run.jar"/>
! </fileset>
! </copy>
! <copy todir="${dist.lib}">
! <fileset dir="${build.lib}">
! <include name="${module.name}.jar"/>
! </fileset>
! </copy>
</target>
<!-- ==================== Dist Libraries Copy Target ===================================== -->
<target name="dist.copy.lib" depends="dist.copy" description="" if="has.lib.file">
! <copy todir="${dist.lib}">
! <mapper type="flatten"/>
! <fileset dir="." includesfile="${module.root}/lib.properties"/>
! </copy>
</target>
<!-- ==================== Dist External Libraires Target ===================================== -->
<target name="dist.copy.lib.ext" depends="dist.copy" description="" if="has.lib.ext.file">
! <copy todir="${dist.lib.ext}">
! <mapper type="flatten"/>
! <fileset dir="." includesfile="${module.root}/lib.ext.properties"/>
! </copy>
</target>
<!-- ==================== WebApp Target ===================================== -->
! <target name="webapp" depends="build" description="" if="has.lib.ext.file">
! <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>
<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">
! <javadoc sourcepath="${src.main}" destdir="${build.doc.api}" packagenames="net.sourceforge.ejtools.*" 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, 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">
***************
*** 281,285 ****
<delete file="${src.resources}/images/logo.svg"/>
</target>
-
<!-- ==================== Clean Target ==================================== -->
<target name="clean" depends="info" description="Delete old build and dist directories">
--- 235,238 ----
***************
*** 287,290 ****
<delete dir="${dist.home}"/>
<delete dir="${dist.webapp}"/>
! </target>
</project>
--- 240,243 ----
<delete dir="${dist.home}"/>
<delete dir="${dist.webapp}"/>
! </target>
</project>
Index: general.properties
===================================================================
RCS file: /cvsroot/ejtools/build/general.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** general.properties 17 Apr 2002 20:48:54 -0000 1.1
--- general.properties 26 Apr 2002 06:19:26 -0000 1.2
***************
*** 26,27 ****
--- 26,28 ----
thirdparty.root=thirdparty
website.root=website
+ output.root=output
|
|
From: Laurent E. <let...@us...> - 2002-04-26 06:18:49
|
Update of /cvsroot/ejtools/build In directory usw-pr-cvs1:/tmp/cvs-serv13523/build Modified Files: switch.properties Log Message: Build and Dist JMX Browser and JNDI Browser Index: switch.properties =================================================================== RCS file: /cvsroot/ejtools/build/switch.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** switch.properties 17 Apr 2002 20:48:54 -0000 1.1 --- switch.properties 26 Apr 2002 06:18:46 -0000 1.2 *************** *** 39,48 **** #dist.application.deployment=true dist.application.jmx.browser=true ! #dist.application.jndi.browser=true ! dist.application.management=true dist.library.adwt=true dist.library.common=true dist.library.j2ee.icons=true ! dist.library.jboss.provider=true dist.library.xmlweb=true dist.thirdparty.jsr77=true --- 39,48 ---- #dist.application.deployment=true dist.application.jmx.browser=true ! dist.application.jndi.browser=true ! #dist.application.management=true dist.library.adwt=true dist.library.common=true dist.library.j2ee.icons=true ! #dist.library.jboss.provider=true dist.library.xmlweb=true dist.thirdparty.jsr77=true *************** *** 82,84 **** --- 82,94 ---- # 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 |
|
From: Laurent E. <let...@us...> - 2002-04-25 20:25:41
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/WEB-INF In directory usw-pr-cvs1:/tmp/cvs-serv29194/webapp/content/WEB-INF Modified Files: application.tld struts-config_1_0.dtd Log Message: Add new taglib to display MBean attribute and parameters Index: application.tld =================================================================== RCS file: /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/WEB-INF/application.tld,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** application.tld 24 Apr 2002 20:01:12 -0000 1.1 --- application.tld 25 Apr 2002 20:25:36 -0000 1.2 *************** *** 25,30 **** </tag> <tag> ! <name>connect</name> ! <tagclass>net.sourceforge.ejtools.jmxbrowser.web.taglib.ObjectNameLinkTag</tagclass> <bodycontent>empty</bodycontent> <info/> --- 25,30 ---- </tag> <tag> ! <name>mbeanAttributeAccess</name> ! <tagclass>net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanAttributeAccessTag</tagclass> <bodycontent>empty</bodycontent> <info/> *************** *** 35,40 **** </attribute> <attribute> ! <name>page</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> --- 35,164 ---- </attribute> <attribute> ! <name>scope</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>filter</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>ignore</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! </tag> ! <tag> ! <name>mbeanAttributeClass</name> ! <tagclass>net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanAttributeClassTag</tagclass> ! <bodycontent>empty</bodycontent> ! <info/> ! <attribute> ! <name>name</name> ! <required>true</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>scope</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>filter</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>ignore</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! </tag> ! <tag> ! <name>mbeanAttributeValue</name> ! <tagclass>net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanAttributeValueTag</tagclass> ! <bodycontent>empty</bodycontent> ! <info/> ! <attribute> ! <name>name</name> ! <required>true</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>property</name> ! <required>true</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>scope</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>filter</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>ignore</name> ! <required>false</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! </tag> ! <tag> ! <name>mbeanAttributeEditor</name> ! <tagclass>net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanAttributeEditorTag</tagclass> ! <bodycontent>empty</bodycontent> ! <info/> ! <attribute> ! <name>name</name> ! <required>true</required> ! <rtexprvalue>true</rtexprvalue> ! </attribute> ! <attribute> ! <name>property</name> <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>filter</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>ignore</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + <tag> + <name>mbeanParameterClass</name> + <tagclass>net.sourceforge.ejtools.jmxbrowser.web.taglib.MBeanParameterClassTag</tagclass> + <bodycontent>empty</bodycontent> + <info/> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>filter</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>ignore</name> + <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> Index: struts-config_1_0.dtd =================================================================== RCS file: /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/WEB-INF/struts-config_1_0.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: Laurent E. <let...@us...> - 2002-04-25 20:25:40
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/webapp/content
In directory usw-pr-cvs1:/tmp/cvs-serv29194/webapp/content
Modified Files:
detail.jsp
Log Message:
Add new taglib to display MBean attribute and parameters
Index: detail.jsp
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/webapp/content/detail.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** detail.jsp 24 Apr 2002 20:01:13 -0000 1.1
--- detail.jsp 25 Apr 2002 20:25:36 -0000 1.2
***************
*** 138,142 ****
<bean:write name="parameter" property="name"/>
<jsp:text></a> (</jsp:text>
! <bean:write name="parameter" property="type"/>
<jsp:text>)</jsp:text>
<br/>
--- 138,142 ----
<bean:write name="parameter" property="name"/>
<jsp:text></a> (</jsp:text>
! <app:mbeanParameterClass name="parameter"/>
<jsp:text>)</jsp:text>
<br/>
***************
*** 240,244 ****
<logic:iterate name="detail.info" property="attributes" id="attribute" type="javax.management.MBeanAttributeInfo">
<tr bgcolor="#EEEEEE">
! <td valign="top" align="right">
<jsp:text><a href="javascript:alert('</jsp:text>
<bean:write name="attribute" property="description"/>
--- 240,244 ----
<logic:iterate name="detail.info" property="attributes" id="attribute" type="javax.management.MBeanAttributeInfo">
<tr bgcolor="#EEEEEE">
! <td valign="top" align="left">
<jsp:text><a href="javascript:alert('</jsp:text>
<bean:write name="attribute" property="description"/>
***************
*** 248,260 ****
</td>
<td class="attributeValue" valign="top" align="left">
! <bean:write name="attribute" property="type"/>
</td>
! <td class="attributeValue" valign="top" align="left">
! <bean:write name="attribute" property="is"/>
! <bean:write name="attribute" property="readable"/>
! <bean:write name="attribute" property="writable"/>
</td>
<td class="attributeValue" valign="top" align="left">
! <bean:write name="attribute"/>
</td>
</tr>
--- 248,258 ----
</td>
<td class="attributeValue" valign="top" align="left">
! <app:mbeanAttributeClass name="attribute"/>
</td>
! <td class="attributeValue" valign="top" align="center">
! <app:mbeanAttributeAccess name="attribute"/>
</td>
<td class="attributeValue" valign="top" align="left">
! <app:mbeanAttributeEditor name="detail" property="attribute"/>
</td>
</tr>
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:24:54
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser In directory usw-pr-cvs1:/tmp/cvs-serv28821/net/sourceforge/ejtools/jmxbrowser Modified Files: AboutDialog.java JMXBrowser.java Main.java Log Message: Pretty print the code Index: AboutDialog.java =================================================================== RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/AboutDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AboutDialog.java 22 Apr 2002 17:38:25 -0000 1.1 --- AboutDialog.java 25 Apr 2002 20:24:47 -0000 1.2 *************** *** 1,7 **** /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.jmxbrowser; --- 1,7 ---- /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.jmxbrowser; *************** *** 39,49 **** { /** Description of the Field */ - private JPanel panel = null; - /** Description of the Field */ private static Category cat = Category.getInstance(AboutDialog.class.getName()); /** Constructor for the AboutServiceProvider object */ ! public AboutDialog() { } --- 39,51 ---- { /** Description of the Field */ private static Category cat = Category.getInstance(AboutDialog.class.getName()); + /** Description of the Field */ + private JPanel panel = null; /** Constructor for the AboutServiceProvider object */ ! public AboutDialog() ! { ! } Index: JMXBrowser.java =================================================================== RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/JMXBrowser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JMXBrowser.java 22 Apr 2002 17:39:23 -0000 1.1 --- JMXBrowser.java 25 Apr 2002 20:24:47 -0000 1.2 *************** *** 1,7 **** /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.jmxbrowser; --- 1,7 ---- /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.jmxbrowser; *************** *** 40,43 **** --- 40,47 ---- { /** 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 */ *************** *** 51,58 **** /** 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; --- 55,58 ---- *************** *** 77,84 **** /* ! * statusBarService.addZone("status"); ! * statusBarService.setContent("status", "Ready"); ! * statusBarService.addZone("hour", StatusBarService.RIGHT); ! * statusBarService.setContent("hour", "10:25:32", new ImageIcon(getClass().getResource("/images/container.gif"))); */ add(new ExitAction( --- 77,84 ---- /* ! * statusBarService.addZone("status"); ! * statusBarService.setContent("status", "Ready"); ! * statusBarService.addZone("hour", StatusBarService.RIGHT); ! * statusBarService.setContent("hour", "10:25:32", new ImageIcon(getClass().getResource("/images/container.gif"))); */ add(new ExitAction( Index: Main.java =================================================================== RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/Main.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Main.java 22 Apr 2002 17:40:31 -0000 1.1 --- Main.java 25 Apr 2002 20:24:47 -0000 1.2 *************** *** 1,7 **** /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.jmxbrowser; --- 1,7 ---- /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.jmxbrowser; |
|
From: Laurent E. <let...@us...> - 2002-04-25 20:24:11
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web
In directory usw-pr-cvs1:/tmp/cvs-serv28556
Modified Files:
JMXTree.java
Log Message:
Pretty print the code
Index: JMXTree.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/JMXTree.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JMXTree.java 24 Apr 2002 20:08:22 -0000 1.2
--- JMXTree.java 25 Apr 2002 20:24:07 -0000 1.3
***************
*** 7,47 ****
import net.sourceforge.ejtools.xml.beans.*;
public class JMXTree extends BeanContextServicesSupport
{
protected Server server;
protected ConnectionServiceProvider connectionProvider;
- public JMXTree() {
- try {
- connectionProvider = new ConnectionServiceProvider("LOCAL");
- server = new Server();
! add(connectionProvider);
! add(server);
! } catch(Exception e) {
! e.printStackTrace();
! }
}
- public String getDefaultDomain() {
- return server.getDefaultDomain();
- }
- public int getCount() {
- return server.getCount();
- }
! public Object searchObjectName(String objectName) {
! return server.searchObjectName(objectName);
! }
- public void view(String filter) {
- server.setFilter(filter);
- server.connect();
- }
! public Collection getServer() {
! return server;
! }
}
--- 7,99 ----
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()
! {
! try
! {
! connectionProvider = new ConnectionServiceProvider("LOCAL");
! server = new Server();
! add(connectionProvider);
! add(server);
!
! }
! catch (Exception e)
! {
! e.printStackTrace();
! }
}
! /**
! * 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()
! {
! return server.getCount();
! }
!
!
! /**
! * 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();
! }
}
+
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:24:11
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form
In directory usw-pr-cvs1:/tmp/cvs-serv28556/form
Modified Files:
DetailForm.java FilterForm.java
Log Message:
Pretty print the code
Index: DetailForm.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form/DetailForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DetailForm.java 24 Apr 2002 20:01:13 -0000 1.1
--- DetailForm.java 25 Apr 2002 20:24:07 -0000 1.2
***************
*** 13,17 ****
public final class DetailForm extends ActionForm
{
! private String reference = null;
--- 13,18 ----
public final class DetailForm extends ActionForm
{
! /** Description of the Field */
! protected String reference = null;
***************
*** 25,35 ****
* Setter for the factory attribute
*
! * @param factory The new value for factory attribute
*/
! public void setReference(String reference )
{
! this.reference = reference ;
}
/**
* Getter for the factory attribute
--- 26,37 ----
* 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
***************
*** 39,44 ****
public String getReference()
{
! return reference ;
}
/**
--- 41,47 ----
public String getReference()
{
! return reference;
}
+
/**
Index: FilterForm.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/form/FilterForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilterForm.java 24 Apr 2002 20:01:31 -0000 1.1
--- FilterForm.java 25 Apr 2002 20:24:07 -0000 1.2
***************
*** 13,17 ****
public final class FilterForm extends ActionForm
{
! private String filter = "*:*";
--- 13,18 ----
public final class FilterForm extends ActionForm
{
! /** Description of the Field */
! protected String filter = "*:*";
***************
*** 25,35 ****
* Setter for the factory attribute
*
! * @param factory The new value for factory attribute
*/
public void setFilter(String filter)
{
! this.filter= filter;
}
/**
* Getter for the factory attribute
--- 26,37 ----
* 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
***************
*** 42,45 ****
--- 44,48 ----
}
+
/**
* Description of the Method
***************
*** 66,67 ****
--- 69,71 ----
}
}
+
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:24:10
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action
In directory usw-pr-cvs1:/tmp/cvs-serv28556/action
Modified Files:
DetailAction.java FilterAction.java
Log Message:
Pretty print the code
Index: DetailAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/DetailAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DetailAction.java 24 Apr 2002 20:01:13 -0000 1.1
--- DetailAction.java 25 Apr 2002 20:24:07 -0000 1.2
***************
*** 57,61 ****
ActionErrors errors = new ActionErrors();
! // TODO : put in Constants
String ref = request.getParameter("reference");
--- 57,61 ----
ActionErrors errors = new ActionErrors();
! // TODO : put in Constants
String ref = request.getParameter("reference");
***************
*** 63,67 ****
HttpSession session = request.getSession();
! System.out.println("perform session "+session.getId());
System.out.println("Session " + session);
--- 63,67 ----
HttpSession session = request.getSession();
! System.out.println("perform session " + session.getId());
System.out.println("Session " + session);
***************
*** 73,79 ****
{
session.setAttribute(Constants.DETAIL, o);
! System.out.println("Object " + o);
session.setAttribute(Constants.DETAIL_INFO, o.getMBeanInfo());
! System.out.println("Object " + o.getMBeanInfo());
}
--- 73,79 ----
{
session.setAttribute(Constants.DETAIL, o);
! System.out.println("Object " + o);
session.setAttribute(Constants.DETAIL_INFO, o.getMBeanInfo());
! System.out.println("Object " + o.getMBeanInfo());
}
Index: FilterAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/FilterAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilterAction.java 24 Apr 2002 20:01:31 -0000 1.1
--- FilterAction.java 25 Apr 2002 20:24:07 -0000 1.2
***************
*** 33,37 ****
! public FilterAction() { }
--- 33,40 ----
! /**Constructor for the FilterAction object */
! public FilterAction()
! {
! }
***************
*** 49,62 ****
public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
! JMXTree tree = null;
! String filter = "*:*";
! if (form != null) {
! filter = ((FilterForm) form).getFilter();
! }
! if ((filter == null) ||("".equals(filter))) {
! // TODO Put in Constants
! filter = "*:*";
! }
System.out.println("filter " + filter);
--- 52,67 ----
public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
! JMXTree tree = null;
! String filter = "*:*";
! if (form != null)
! {
! filter = ((FilterForm) form).getFilter();
! }
! if ((filter == null) || ("".equals(filter)))
! {
! // TODO Put in Constants
! filter = "*:*";
! }
System.out.println("filter " + filter);
***************
*** 79,83 ****
HttpSession session = request.getSession();
! tree = (JMXTree) session.getAttribute(Constants.TREE);
System.out.println("perform session " + session.getId());
--- 84,88 ----
HttpSession session = request.getSession();
! tree = (JMXTree) session.getAttribute(Constants.TREE);
System.out.println("perform session " + session.getId());
***************
*** 85,110 ****
if (tree == null)
{
! tree = new JMXTree();
session.setAttribute(Constants.TREE, tree);
}
! tree.view(filter);
// 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"));
}
}
--- 90,115 ----
if (tree == null)
{
! tree = new JMXTree();
session.setAttribute(Constants.TREE, tree);
}
! tree.view(filter);
// 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"));
}
}
+
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:23:40
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv28360
Modified Files:
ConnectTag.java
Log Message:
Add session debugging
Index: ConnectTag.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib/ConnectTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConnectTag.java 24 Apr 2002 20:07:04 -0000 1.1
--- ConnectTag.java 25 Apr 2002 20:23:34 -0000 1.2
***************
*** 89,93 ****
HttpSession session = pageContext.getSession();
! System.out.println("ConnectTag session "+session.getId());
if ((session != null) && (session.getAttribute(name) != null))
--- 89,93 ----
HttpSession session = pageContext.getSession();
! System.out.println("ConnectTag session " + session.getId());
if ((session != null) && (session.getAttribute(name) != null))
***************
*** 120,121 ****
--- 120,122 ----
}
}
+
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:20:51
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv27307
Added Files:
MBeanAttributeAccessTag.java MBeanAttributeClassTag.java
MBeanAttributeEditorTag.java MBeanAttributeValueTag.java
MBeanParameterClassTag.java
Log Message:
Initial Import
--- NEW FILE: MBeanAttributeAccessTag.java ---
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;
import org.apache.struts.util.ResponseUtils;
/**
* 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()
{
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)
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)
{
String result = messages.getMessage("access.ro");
if (info.isIs() || info.isReadable())
{
if (info.isWritable())
{
result = messages.getMessage("access.rw");
}
}
else
{
if (info.isWritable())
{
result = messages.getMessage("access.wo");
}
}
return result;
}
}
--- NEW FILE: MBeanAttributeClassTag.java ---
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;
/**
* 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()
{
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)
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;
}
}
--- NEW FILE: MBeanAttributeEditorTag.java ---
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()
{
return (this.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);
}
/**
* 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
{
System.out.println("addProperty " + propertyeditor + " " + attributeInfo.getName());
String output = "";
Object obj = null;
Object[] array = null;
try
{
if (attributeInfo.isReadable())
{
obj = object.getAttribute(object.getObjectName(), attributeInfo.getName());
}
if (obj != null)
{
array = (Object[]) obj;
}
}
catch (Throwable _ex)
{
}
for (int i = 0; i < array.length; i++)
{
try
{
PropertyEditor propertyeditor1 = (PropertyEditor) propertyeditor.getClass().newInstance();
propertyeditor1.setValue(array[i]);
output = propertyeditor1.getAsText();
output = output + "<br/>";
if (filter)
ResponseUtils.write(pageContext, ResponseUtils.filter(output));
else
ResponseUtils.write(pageContext, output);
}
catch (Exception _ex)
{
}
}
}
/**
* 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
{
System.out.println("addProperty " + propertyeditor + " " + attributeInfo.getName());
String output = "";
try
{
if (attributeInfo.isReadable())
{
propertyeditor.setValue(object.getAttribute(object.getObjectName(), attributeInfo.getName()));
}
}
catch (Throwable _ex)
{
}
if (attributeInfo.isWritable())
{
output = propertyeditor.getAsText();
}
else
{
output = propertyeditor.getAsText();
}
if (filter)
ResponseUtils.write(pageContext, ResponseUtils.filter(output));
else
ResponseUtils.write(pageContext, output);
}
/**
* 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
{
System.out.println("Getting value for attribute " + attributeInfo.getName());
String output = "<i>Unsupported Class : " + attributeInfo.getType() + "</i>";
if (filter)
ResponseUtils.write(pageContext, ResponseUtils.filter(output));
else
ResponseUtils.write(pageContext, output);
}
static
{
PropertyEditorManager.setEditorSearchPath(new String[]{"sun.beans.editors", "net.sourceforge.ejtools.awt.editors"});
}
}
--- NEW FILE: MBeanAttributeValueTag.java ---
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;
}
}
--- NEW FILE: MBeanParameterClassTag.java ---
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
{
// Look up the requested bean (if necessary)
MBeanParameterInfo info = (MBeanParameterInfo) RequestUtils.lookup(pageContext, name, scope);
if (ignore)
{
if (info == null)
{
return (SKIP_BODY);
}
// Nothing to output
}
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()
{
return (this.name);
}
/**
* Getter for the scope attribute
*
* @return The value of scope attribute
*/
public String getScope()
{
return (this.scope);
}
/** Release all allocated resources. */
public void release()
{
super.release();
filter = true;
ignore = false;
name = null;
scope = null;
}
/**
* 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;
}
}
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:17:02
|
Update of /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt In directory usw-pr-cvs1:/tmp/cvs-serv25491/adwt/src/main/net/sourceforge/ejtools/awt Modified Files: GenericMBeanCustomizer.java Log Message: Add test for null PropertyEditor on array value property Index: GenericMBeanCustomizer.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/GenericMBeanCustomizer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GenericMBeanCustomizer.java 18 Apr 2002 21:10:30 -0000 1.1 --- GenericMBeanCustomizer.java 25 Apr 2002 20:16:57 -0000 1.2 *************** *** 1,7 **** /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at gnu.org. */ package net.sourceforge.ejtools.awt; --- 1,7 ---- /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at gnu.org. */ package net.sourceforge.ejtools.awt; *************** *** 103,106 **** --- 103,272 ---- /** + * Gets the class attribute of the GenericMBeanCustomizer class + * + * @param fullPathClassName Description of the Parameter + * @return The class value + */ + static Class getClass(String fullPathClassName) + { + if (fullPathClassName.equals("int")) + { + return Integer.TYPE; + } + if (fullPathClassName.equals("short")) + { + return Short.TYPE; + } + if (fullPathClassName.equals("long")) + { + return Long.TYPE; + } + if (fullPathClassName.equals("byte")) + { + return Byte.TYPE; + } + if (fullPathClassName.equals("char")) + { + return Character.TYPE; + } + if (fullPathClassName.equals("float")) + { + return Float.TYPE; + } + if (fullPathClassName.equals("double")) + { + return Double.TYPE; + } + if (fullPathClassName.equals("boolean")) + { + return Boolean.TYPE; + } + + Class c = null; + try + { + c = Class.forName(fullPathClassName); + } + catch (Throwable e) + { + } + + System.out.println("Class is " + c); + + return c; + } + + + /** + * Sets the Object attribute of the GenericCustomizer object + * + * @param obj The new Object value + */ + public void setObject(Object obj) + { + try + { + p.removeAll(); + + if (obj == null) + { + validate(); + repaint(); + return; + } + + object = (MBeanAccessor) obj; + MBeanInfo beaninfo = object.getMBeanInfo(); + + GridBagConstraints gridbagconstraints = new GridBagConstraints(); + gridbagconstraints.insets = new Insets(3, 3, 3, 3); + gridbagconstraints.anchor = GridBagConstraints.NORTH; + gridbagconstraints.weighty = 1.0D; + + beanGui = new JPanel(new GridBagLayout()); + beanGui.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), object.getCanonicalName())); + + mbai = beaninfo.getAttributes(); + if (mbai != null) + { + for (int i = 0; i < mbai.length; i++) + { + PropertyEditor propertyeditor = null; + Class c = getClass(mbai[i].getType()); + + if (c == null) + { + addUnsupportedProperty(mbai[i]); + } + else + { + + if (c.isArray()) + { + Class componentType = c.getComponentType(); + propertyeditor = PropertyEditorManager.findEditor(componentType); + + if (propertyeditor == null) + { + propertyeditor = PropertyEditorManager.findEditor(String.class); + } + addArrayProperty(propertyeditor, mbai[i]); + } + else + { + propertyeditor = PropertyEditorManager.findEditor(c); + + if (propertyeditor == null) + { + propertyeditor = PropertyEditorManager.findEditor(String.class); + } + addProperty(propertyeditor, mbai[i]); + } + gridbagconstraints.weighty = 1.0D; + } + } + } + + if (showMethods) + { + mboi = beaninfo.getOperations(); + gridbagconstraints.gridwidth = GridBagConstraints.REMAINDER; + gridbagconstraints.fill = GridBagConstraints.BOTH; + if (mboi != null) + { + for (int j = 0; j < mboi.length; j++) + { + if (!mboi[j].getName().startsWith("get") && !mboi[j].getName().startsWith("set") && !mboi[j].getName().startsWith("is")) + { + JButton jbutton = new JButton(mboi[j].getName()); + jbutton.setToolTipText(mboi[j].getDescription()); + beanGui.add(jbutton, gridbagconstraints); + jbutton.addActionListener(new MethodInvoker(mboi[j])); + } + } + } + } + + gridbagconstraints.weighty = 0.0D; + gridbagconstraints.weightx = 1.0D; + gridbagconstraints.fill = GridBagConstraints.BOTH; + p.add(beanGui, gridbagconstraints); + + // Add a spacer + gridbagconstraints.weighty = 1.0D; + p.add(new JLabel(" "), gridbagconstraints); + + validate(); + repaint(); + } + catch (Exception exception) + { + System.out.println("Exception occurred"); + exception.printStackTrace(); + } + } + + + /** * Adds a feature to the ArrayProperty attribute of the GenericCustomizer * object *************** *** 329,338 **** } } ! ! public void addUnsupportedProperty(MBeanAttributeInfo attributeInfo) { System.out.println("In addUnsupportedProperty " + attributeInfo.getType()); ! GridBagConstraints gridbagconstraints = new GridBagConstraints(); gridbagconstraints.insets = new Insets(3, 3, 3, 3); --- 495,509 ---- } } ! ! ! /** ! * Adds a feature to the UnsupportedProperty attribute of the GenericMBeanCustomizer object ! * ! * @param attributeInfo The feature to be added to the UnsupportedProperty attribute ! */ public void addUnsupportedProperty(MBeanAttributeInfo attributeInfo) { System.out.println("In addUnsupportedProperty " + attributeInfo.getType()); ! GridBagConstraints gridbagconstraints = new GridBagConstraints(); gridbagconstraints.insets = new Insets(3, 3, 3, 3); *************** *** 359,465 **** /** - * Sets the Object attribute of the GenericCustomizer object - * - * @param obj The new Object value - */ - public void setObject(Object obj) - { - try - { - p.removeAll(); - - if (obj == null) - { - validate(); - repaint(); - return; - } - - object = (MBeanAccessor) obj; - MBeanInfo beaninfo = object.getMBeanInfo(); - - GridBagConstraints gridbagconstraints = new GridBagConstraints(); - gridbagconstraints.insets = new Insets(3, 3, 3, 3); - gridbagconstraints.anchor = GridBagConstraints.NORTH; - gridbagconstraints.weighty = 1.0D; - - beanGui = new JPanel(new GridBagLayout()); - beanGui.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), object.getCanonicalName())); - - mbai = beaninfo.getAttributes(); - if (mbai != null) - { - for (int i = 0; i < mbai.length; i++) - { - PropertyEditor propertyeditor = null; - Class c = getClass(mbai[i].getType()); - - if (c == null) { - addUnsupportedProperty(mbai[i]); - } else { - - if (c.isArray()) - { - Class componentType = c.getComponentType(); - propertyeditor = PropertyEditorManager.findEditor(componentType); - - addArrayProperty(propertyeditor, mbai[i]); - } - else - { - propertyeditor = PropertyEditorManager.findEditor(c); - - if (propertyeditor == null) - { - propertyeditor = PropertyEditorManager.findEditor(String.class); - } - addProperty(propertyeditor, mbai[i]); - } - gridbagconstraints.weighty = 1.0D; - } - } - } - - if (showMethods) - { - mboi = beaninfo.getOperations(); - gridbagconstraints.gridwidth = GridBagConstraints.REMAINDER; - gridbagconstraints.fill = GridBagConstraints.BOTH; - if (mboi != null) - { - for (int j = 0; j < mboi.length; j++) - { - if (!mboi[j].getName().startsWith("get") && !mboi[j].getName().startsWith("set") && !mboi[j].getName().startsWith("is")) - { - JButton jbutton = new JButton(mboi[j].getName()); - jbutton.setToolTipText(mboi[j].getDescription()); - beanGui.add(jbutton, gridbagconstraints); - jbutton.addActionListener(new MethodInvoker(mboi[j])); - } - } - } - } - - gridbagconstraints.weighty = 0.0D; - gridbagconstraints.weightx = 1.0D; - gridbagconstraints.fill = GridBagConstraints.BOTH; - p.add(beanGui, gridbagconstraints); - - // Add a spacer - gridbagconstraints.weighty = 1.0D; - p.add(new JLabel(" "), gridbagconstraints); - - validate(); - repaint(); - } - catch (Exception exception) - { - System.out.println("Exception occurred"); - exception.printStackTrace(); - } - } - - - /** * Description of the Method * --- 530,533 ---- *************** *** 475,534 **** /** - * Gets the class attribute of the GenericMBeanCustomizer class - * - * @param fullPathClassName Description of the Parameter - * @return The class value - */ - static Class getClass(String fullPathClassName) - { - if (fullPathClassName.equals("int")) - { - return Integer.TYPE; - } - if (fullPathClassName.equals("short")) - { - return Short.TYPE; - } - if (fullPathClassName.equals("long")) - { - return Long.TYPE; - } - if (fullPathClassName.equals("byte")) - { - return Byte.TYPE; - } - if (fullPathClassName.equals("char")) - { - return Character.TYPE; - } - if (fullPathClassName.equals("float")) - { - return Float.TYPE; - } - if (fullPathClassName.equals("double")) - { - return Double.TYPE; - } - if (fullPathClassName.equals("boolean")) - { - return Boolean.TYPE; - } - - Class c = null; - try - { - c = Class.forName(fullPathClassName); - } - catch (Throwable e) - { - } - - System.out.println("Class is " + c); - - return c; - } - - - /** * Description of the Class * --- 543,546 ---- *************** *** 573,587 **** } /* ! * AS Adapt to the JMXConnector exceptions ! * catch( InvocationTargetException e ) { ! * if( e.getTargetException() instanceof PropertyVetoException ) { ! * JOptionPane.showMessageDialog( ! * (Frame) SwingUtilities.windowForComponent( GenericMBeanCustomizer.this ), ! * "Could not change value:" + e.getTargetException().getMessage(), ! * "Error", ! * JOptionPane.ERROR_MESSAGE ! * ); ! * } ! * } */ catch (Exception e) --- 585,599 ---- } /* ! * AS Adapt to the JMXConnector exceptions ! * catch( InvocationTargetException e ) { ! * if( e.getTargetException() instanceof PropertyVetoException ) { ! * JOptionPane.showMessageDialog( ! * (Frame) SwingUtilities.windowForComponent( GenericMBeanCustomizer.this ), ! * "Could not change value:" + e.getTargetException().getMessage(), ! * "Error", ! * JOptionPane.ERROR_MESSAGE ! * ); ! * } ! * } */ catch (Exception e) *************** *** 732,743 **** else { ! ! new GenericMBeanMethodDialog( ! object, ! object.getObjectName(), ! info, ! (Frame) frame ! ); ! } } --- 744,755 ---- else { ! ! new GenericMBeanMethodDialog( ! object, ! object.getObjectName(), ! info, ! (Frame) frame ! ); ! } } *************** *** 748,752 **** PropertyEditorManager.setEditorSearchPath(new String[]{"sun.beans.editors", "net.sourceforge.ejtools.awt.editors"}); } - } --- 760,763 ---- |
Update of /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml
In directory usw-pr-cvs1:/tmp/cvs-serv24669/xmlweb/src/main/net/sourceforge/ejtools/xml
Modified Files:
XmlComponent.java XmlContainer.java XmlEditor.java
XmlLink.java XmlPrintable.java XmlText.java XmlTreeNode.java
Log Message:
Change XML generation from DOM Element to toXml method
Index: XmlComponent.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/XmlComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlComponent.java 20 Apr 2002 11:42:51 -0000 1.1
--- XmlComponent.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 45,69 ****
*
* @param document Description of Parameter
- * @exception Exception Description of Exception
- */
- public void appendTo(Document document) throws Exception
- {
- document.appendChild(this.printXml(document));
- }
-
-
-
- /**
- * Description of the Method
- *
- * @param document Description of Parameter
* @return Description of the Returned Value
* @exception Exception Description of Exception
*/
! public Element printXml(Document document) throws Exception
{
! Element element = document.createElement(this.name);
! return element;
}
--- 45,58 ----
*
* @param document Description of Parameter
* @return Description of the Returned Value
* @exception Exception Description of Exception
*/
! public String toXml()
{
! String result = "";
! result= result+ "<"+this.name+"/>\n";
!
! return result;
}
Index: XmlContainer.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/XmlContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlContainer.java 20 Apr 2002 11:42:51 -0000 1.1
--- XmlContainer.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 43,49 ****
* @exception Exception Description of Exception
*/
! public Element printXml(Document document) throws Exception
{
! Element element = document.createElement(this.name);
// Append the children
--- 43,51 ----
* @exception Exception Description of Exception
*/
! public String toXml()
{
! String result = "";
!
! result= result+ "<"+this.name+">\n";
// Append the children
***************
*** 51,58 ****
{
XmlPrintable object = (XmlPrintable) this.elementAt(i);
! element.appendChild(object.printXml(document));
}
! return element;
}
--- 53,62 ----
{
XmlPrintable object = (XmlPrintable) this.elementAt(i);
! result = result + object.toXml();
}
! result= result+ "</"+this.name+">\n";
!
! return result;
}
Index: XmlEditor.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/XmlEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlEditor.java 20 Apr 2002 11:42:51 -0000 1.1
--- XmlEditor.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 69,79 ****
* @exception Exception Description of Exception
*/
! public Element printXml(Document document) throws Exception
{
! Element element = super.printXml(document);
! element.setAttribute("type", this.type);
! return element;
}
}
--- 69,81 ----
* @exception Exception Description of Exception
*/
! public String toXml()
{
! String result = "";
! result= result+ "<"+this.name+" type=\""+this.type+"\">";
! result= result + this.text;
! result= result+ "</"+this.name+">\n";
! return result;
}
}
Index: XmlLink.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/XmlLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlLink.java 20 Apr 2002 11:42:51 -0000 1.1
--- XmlLink.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 69,79 ****
* @exception Exception Description of Exception
*/
! public Element printXml(Document document) throws Exception
{
! Element element = super.printXml(document);
! element.setAttribute("target", this.target);
! return element;
}
}
--- 69,81 ----
* @exception Exception Description of Exception
*/
! public String toXml()
{
! String result = "";
! result= result+ "<"+this.name+" target=\""+this.target +"\">";
! result= result + this.text;
! result= result+ "</"+this.name+">\n";
! return result;
}
}
Index: XmlPrintable.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/XmlPrintable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlPrintable.java 20 Apr 2002 11:42:51 -0000 1.1
--- XmlPrintable.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 25,38 ****
* @exception Exception Description of Exception
*/
! public Element printXml(Document document) throws Exception;
!
!
! /**
! * Description of the Method
! *
! * @param document Description of Parameter
! * @exception Exception Description of Exception
! */
! public void appendTo(Document document) throws Exception;
}
--- 25,29 ----
* @exception Exception Description of Exception
*/
! public String toXml();
}
Index: XmlText.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/XmlText.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlText.java 20 Apr 2002 11:42:51 -0000 1.1
--- XmlText.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 80,91 ****
* @exception Exception Description of Exception
*/
! public Element printXml(Document document) throws Exception
{
! Element element = super.printXml(document);
! element.appendChild(document.createTextNode(this.text));
! return element;
}
}
-
--- 80,92 ----
* @exception Exception Description of Exception
*/
! public String toXml()
{
! String result = "";
! result= result+ "<"+this.name+">";
! result= result + this.text;
! result= result+ "</"+this.name+">\n";
! return result;
}
}
Index: XmlTreeNode.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/XmlTreeNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlTreeNode.java 20 Apr 2002 11:42:51 -0000 1.1
--- XmlTreeNode.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 1,7 ****
/*
! * EJTools, the Enterprise Java Tools
*
! * Distributable under LGPL license.
! * See terms of license at www.gnu.org.
*/
package net.sourceforge.ejtools.xml;
--- 1,7 ----
/*
! * EJTools, the Enterprise Java Tools
*
! * Distributable under LGPL license.
! * See terms of license at www.gnu.org.
*/
package net.sourceforge.ejtools.xml;
***************
*** 18,27 ****
public class XmlTreeNode extends XmlContainer
{
- protected String smallIcon = null;
- protected String bigIcon = null;
/** Description of the Field */
! protected Object userObject = null;
/** Description of the Field */
protected XmlPrintable object = null;
--- 18,29 ----
public class XmlTreeNode extends XmlContainer
{
/** Description of the Field */
! protected String bigIcon = null;
/** Description of the Field */
protected XmlPrintable object = null;
+ /** Description of the Field */
+ protected String smallIcon = null;
+ /** Description of the Field */
+ protected Object userObject = null;
***************
*** 32,49 ****
}
- public Element printXml(Document document) throws Exception
- {
- Element element = super.printXml(document);
-
- if (smallIcon != null) {
- element.setAttribute("small-icon", this.smallIcon);
- }
- if (bigIcon != null) {
- element.setAttribute("big-icon", this.bigIcon);
- }
! return element;
}
/**
* Setter for the userObject attribute
--- 34,49 ----
}
! /**
! * Getter for the userObject attribute
! *
! * @return The value of userObject attribute
! */
! public Object getUserObject()
! {
! return userObject;
}
+
/**
* Setter for the userObject attribute
***************
*** 79,89 ****
/**
! * Getter for the userObject attribute
*
! * @return The value of userObject attribute
*/
! public Object getUserObject()
{
! return userObject;
}
--- 79,89 ----
/**
! * Description of the Method
*
! * @return Description of the Returned Value
*/
! public String toString()
{
! return "Xml TreeNode (userObject=" + userObject + ")";
}
***************
*** 92,100 ****
* Description of the Method
*
! * @return Description of the Returned Value
*/
! public String toString()
{
! return "Xml TreeNode (userObject=" + userObject + ")";
}
}
--- 92,123 ----
* Description of the Method
*
! * @return Description of the Return Value
*/
! public String toXml()
{
! String result = "";
!
! result = result + "<" + this.name;
! if (smallIcon != null)
! {
! result = result + " small-icon=\"" + this.smallIcon + "\"";
! }
! if (bigIcon != null)
! {
! result = result + " big-icon=\"" + this.bigIcon + "\"";
! }
! result = result + " objref=\"" + this.userObject.getClass().getName() + "@" + this.userObject.hashCode() + "\"";
! result = result + ">\n";
!
! // Append the children
! for (int i = 0; i < this.size(); i++)
! {
! XmlPrintable object = (XmlPrintable) this.elementAt(i);
! result = result + object.toXml();
! }
!
! result = result + "</" + this.name + ">\n";
!
! return result;
}
}
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:15:30
|
Update of /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/beans In directory usw-pr-cvs1:/tmp/cvs-serv24669/xmlweb/src/main/net/sourceforge/ejtools/xml/beans Modified Files: BeanContextXmlTree.java MethodXmlCustomizer.java PropertyXmlCustomizer.java Log Message: Change XML generation from DOM Element to toXml method Index: BeanContextXmlTree.java =================================================================== RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/beans/BeanContextXmlTree.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BeanContextXmlTree.java 20 Apr 2002 11:42:07 -0000 1.1 --- BeanContextXmlTree.java 25 Apr 2002 20:15:25 -0000 1.2 *************** *** 1,7 **** /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.xml.beans; --- 1,7 ---- /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.xml.beans; *************** *** 9,12 **** --- 9,13 ---- import java.beans.beancontext.BeanContext; import java.util.Collection; + import java.util.Hashtable; import java.util.Iterator; *************** *** 21,24 **** --- 22,29 ---- public class BeanContextXmlTree extends XmlTreeNode { + /** Description of the Field */ + protected Hashtable contents = new Hashtable(); + + /** * Constructor for the BeanContextXmlTree object *************** *** 29,32 **** --- 34,39 ---- { this.setUserObject(context); + contents.put(context.getClass().getName() + "@" + context.hashCode(), context); + System.out.println("REF " + context.getClass().getName() + "@" + context.hashCode()); updateTree((BeanContext) getUserObject(), this); } *************** *** 36,39 **** --- 43,62 ---- * Description of the Method * + * @param reference Description of the Parameter + * @return Description of the Return Value + */ + public Object search(String reference) + { + if (reference != null) + { + return contents.get(reference); + } + return null; + } + + + /** + * Description of the Method + * * @param collection Description of Parameter * @param node Description of Parameter *************** *** 47,50 **** --- 70,75 ---- XmlTreeNode node2 = new XmlTreeNode(); node2.setUserObject(obj); + contents.put(obj.getClass().getName() + "@" + obj.hashCode(), obj); + System.out.println("REF " + obj.getClass().getName() + "@" + obj.hashCode()); node.add(node2); Index: MethodXmlCustomizer.java =================================================================== RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/beans/MethodXmlCustomizer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MethodXmlCustomizer.java 20 Apr 2002 11:42:07 -0000 1.1 --- MethodXmlCustomizer.java 25 Apr 2002 20:15:25 -0000 1.2 *************** *** 81,87 **** * @exception Exception Description of Exception */ ! public Element printXml(Document document) throws Exception { // Build output Element element = super.printXml(document); --- 81,88 ---- * @exception Exception Description of Exception */ ! public String toXml() { // Build output + /* Element element = super.printXml(document); *************** *** 91,94 **** --- 92,97 ---- return element; + */ + return "<method/>"; } } Index: PropertyXmlCustomizer.java =================================================================== RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/beans/PropertyXmlCustomizer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PropertyXmlCustomizer.java 20 Apr 2002 11:42:07 -0000 1.1 --- PropertyXmlCustomizer.java 25 Apr 2002 20:15:25 -0000 1.2 *************** *** 133,138 **** * @exception Exception Description of Exception */ ! public Element printXml(Document document) throws Exception { // Build output Element element = super.printXml(document); --- 133,139 ---- * @exception Exception Description of Exception */ ! public String toXml() { + /* // Build output Element element = super.printXml(document); *************** *** 143,146 **** --- 144,149 ---- return element; + */ + return "<property/>"; } } |
|
From: Laurent E. <let...@us...> - 2002-04-25 20:15:30
|
Update of /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv24669/xmlweb/src/main/net/sourceforge/ejtools/xml/taglib
Modified Files:
BeanContextXmlProxyTag.java XslApplyTag.java
Log Message:
Change XML generation from DOM Element to toXml method
Index: BeanContextXmlProxyTag.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/taglib/BeanContextXmlProxyTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BeanContextXmlProxyTag.java 20 Apr 2002 11:42:34 -0000 1.1
--- BeanContextXmlProxyTag.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 91,100 ****
if (object != null)
{
- XmlDocument doc = new XmlDocument();
-
XmlComponent comp = object.getXmlProxy();
- comp.appendTo(doc);
! doc.writeXml(new XmlWriteContext(pageContext.getOut(), 3));
}
}
--- 91,97 ----
if (object != null)
{
XmlComponent comp = object.getXmlProxy();
! pageContext.getOut().print(comp.toXml());
}
}
Index: XslApplyTag.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/xmlweb/src/main/net/sourceforge/ejtools/xml/taglib/XslApplyTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XslApplyTag.java 20 Apr 2002 11:42:34 -0000 1.1
--- XslApplyTag.java 25 Apr 2002 20:15:25 -0000 1.2
***************
*** 81,85 ****
body = bodyContent.getString().trim();
! System.out.println(body);
return (SKIP_BODY);
--- 81,85 ----
body = bodyContent.getString().trim();
! // System.out.println(body);
return (SKIP_BODY);
|
|
From: Laurent E. <let...@us...> - 2002-04-25 20:14:23
|
Update of /cvsroot/ejtools/libraries/jboss.provider In directory usw-pr-cvs1:/tmp/cvs-serv24024/jboss.provider Added Files: module.properties Log Message: Initial Import --- NEW FILE: module.properties --- version.major=1 version.minor=0 version.revision=0 version.tag=alpha module.name=jboss.provider module.display.name=JBoss Deployment Provider module.archive.name=ejtools.jboss.jsr88.provider module.package=org.jboss.enterprise.deploy.spi.* module.javadoc.title=EJTools - JBoss Deployment Provider |
|
From: Laurent E. <let...@us...> - 2002-04-25 20:14:23
|
Update of /cvsroot/ejtools/libraries/common/src/main/net/sourceforge/ejtools/util In directory usw-pr-cvs1:/tmp/cvs-serv24024/common/src/main/net/sourceforge/ejtools/util Added Files: ClassTools.java Log Message: Initial Import --- NEW FILE: ClassTools.java --- package net.sourceforge.ejtools.util; import java.io.*; import java.rmi.*; 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 org.apache.log4j.*; /** * Description of the Class * * @author letiembl * @created 25 avril 2002 */ public abstract class ClassTools { /** * Getter for the class attribute * * @param fullPathClassName Description of Parameter * @return The value of class attribute */ public static Class getClass(String fullPathClassName) { if (fullPathClassName.equals("int")) { return Integer.TYPE; } if (fullPathClassName.equals("short")) { return Short.TYPE; } if (fullPathClassName.equals("long")) { return Long.TYPE; } if (fullPathClassName.equals("byte")) { return Byte.TYPE; } if (fullPathClassName.equals("char")) { return Character.TYPE; } if (fullPathClassName.equals("float")) { return Float.TYPE; } if (fullPathClassName.equals("double")) { return Double.TYPE; } if (fullPathClassName.equals("boolean")) { return Boolean.TYPE; } Class c = null; try { c = Class.forName(fullPathClassName); } catch (Throwable e) { } return c; } /** * Description of the Method * * @param s Description of Parameter * @return Description of the Returned Value */ public static String classDisplay(String s) { String result = s; if (s == null) return null; if (s.startsWith("[Z")) result = "boolean[]"; if (s.startsWith("[C")) result = "char[]"; if (s.startsWith("[D")) result = "double[]"; if (s.startsWith("[F")) result = "float[]"; if (s.startsWith("[I")) result = "int[]"; if (s.startsWith("[S")) result = "short[]"; if (s.startsWith("[J")) result = "long[]"; if (s.startsWith("[B")) result = "byte[]"; if (s.startsWith("[L")) { result = s.substring(2, s.length() - 1) + "[]"; } return result; } } |
10 messages has been excluded from this view by a project administrator.
