User: oberg
Date: 00/05/22 08:03:03
Modified: src/main/org/jboss/ejb/deployment
ContainerConfiguration.java
ContainerConfigurations.java
EntityContainerConfiguration.java JDBCResource.java
ResourceManagers.java jBossEjbJar.java
jBossEnterpriseBeans.java jBossFileManager.java
Log:
Updated EJX-jBoss plugin GUI.
Revision Changes Path
1.4 +16 -3
jboss/src/main/org/jboss/ejb/deployment/ContainerConfiguration.java
Index: ContainerConfiguration.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/ContainerConfiguration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContainerConfiguration.java 2000/05/12 10:17:17 1.3
+++ ContainerConfiguration.java 2000/05/22 15:03:01 1.4
@@ -27,7 +27,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class ContainerConfiguration
extends BeanContextServicesSupport
@@ -38,6 +38,7 @@
// Attributes ----------------------------------------------------
String name= "";
String type= "";
+ boolean callLogging = false;
String containerInvoker= "";
String instancePool= "";
@@ -157,16 +158,24 @@
public void setTransactionManager(String tm) { transactionManager = tm; }
public String getTransactionManager() { return transactionManager; }
+ public void setCallLogging(boolean cl) { callLogging = cl; }
+ public boolean getCallLogging() { return callLogging; }
+
public String toString()
{
return name.equals("") ? "Container configuration" : name;
}
+ public void removeConfiguration()
+ {
+ getBeanContext().remove(this);
+ }
+
// BeanContextChildComponentProxy implementation -----------------
public Component getComponent()
{
if (c == null)
- c = new GenericCustomizer(this);
+ c = new GenericCustomizer(false, this);
return c;
}
@@ -177,6 +186,7 @@
Element containerconfiguration = doc.createElement("container-configuration");
XMLManager.addAttribute(containerconfiguration,"configuration-class",getClass().getName());
XMLManager.addElement(containerconfiguration,"container-name",getName());
+ XMLManager.addElement(containerconfiguration,"call-logging",new
Boolean(callLogging).toString());
XMLManager.addElement(containerconfiguration,"container-invoker",getContainerInvoker());
XMLManager.addElement(containerconfiguration,"instance-pool",getInstancePool());
XMLManager.addElement(containerconfiguration,"instance-cache",getInstanceCache());
@@ -236,7 +246,10 @@
if (name.equals("container-name"))
{
setName(n.hasChildNodes() ? XMLManager.getString(n) : "");
- } else if (name.equals("container-invoker"))
+ } else if (name.equals("call-logging"))
+ {
+ setCallLogging(new
Boolean(XMLManager.getString(n)).booleanValue());
+ } else if (name.equals("container-invoker"))
{
setContainerInvoker(n.hasChildNodes() ? XMLManager.getString(n) :
"");
} else if (name.equals("instance-pool"))
1.3 +48 -4
jboss/src/main/org/jboss/ejb/deployment/ContainerConfigurations.java
Index: ContainerConfigurations.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/ContainerConfigurations.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerConfigurations.java 2000/05/19 07:34:31 1.2
+++ ContainerConfigurations.java 2000/05/22 15:03:01 1.3
@@ -7,10 +7,12 @@
package org.jboss.ejb.deployment;
import java.awt.*;
+import java.awt.event.*;
import java.beans.*;
import java.beans.beancontext.*;
import java.io.*;
import java.util.*;
+import javax.swing.*;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -18,6 +20,9 @@
import org.w3c.dom.Element;
import com.dreambean.awt.GenericCustomizer;
+import com.dreambean.awt.GenericMethodDialog;
+import com.dreambean.awt.BeanContextPanel;
+import com.dreambean.awt.BeanContextTreeView;
import com.dreambean.ejx.xml.XMLManager;
import com.dreambean.ejx.xml.XmlExternalizable;
import com.dreambean.ejx.Util;
@@ -27,7 +32,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ContainerConfigurations
extends BeanContextSupport
@@ -36,7 +41,7 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- Customizer c;
+ Component c;
// Static --------------------------------------------------------
@@ -72,8 +77,47 @@
public Component getComponent()
{
if (c == null)
- c = new GenericCustomizer(this);
- return (Component)c;
+ {
+ c = new BeanContextPanel(this);
+ JSplitPane sp = (JSplitPane)c;
+ JScrollPane scrollPane = (JScrollPane)sp.getLeftComponent();
+
((BeanContextTreeView)scrollPane.getViewport().getView()).expandPath(((BeanContextTreeView)scrollPane.getViewport().getView()).getPathForRow(0));
+
((BeanContextTreeView)scrollPane.getViewport().getView()).setRootVisible(false);
+
+ JToolBar toolBar = new JToolBar();
+ toolBar.add(new AbstractAction("New")
+ {
+ public void actionPerformed(ActionEvent evt)
+ {
+ try
+ {
+ BeanInfo bi =
Introspector.getBeanInfo(ContainerConfigurations.class);
+
+ MethodDescriptor[] mdList =
bi.getMethodDescriptors();
+ for (int i = 0; i < mdList.length; i++)
+ {
+ if
(mdList[i].getName().equals("createContainerConfiguration"))
+ {
+ new
GenericMethodDialog(ContainerConfigurations.this, mdList[i],
(Frame)SwingUtilities.getRoot(c));
+ break;
+ }
+ }
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ JPanel p = new JPanel(new BorderLayout());
+ p.add("Center", c);
+ p.add("North", toolBar);
+
+ c = p;
+ c.setName("Container configurations");
+ }
+
+ return c;
}
// XmlExternalizable implementation ------------------------------
1.2 +35 -1
jboss/src/main/org/jboss/ejb/deployment/EntityContainerConfiguration.java
Index: EntityContainerConfiguration.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/EntityContainerConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityContainerConfiguration.java 2000/04/22 14:30:12 1.1
+++ EntityContainerConfiguration.java 2000/05/22 15:03:01 1.2
@@ -27,7 +27,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class EntityContainerConfiguration
extends ContainerConfiguration
@@ -35,12 +35,46 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
+ String commitOption = "A";
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
// Public --------------------------------------------------------
+ public void setCommitOption(String co) { commitOption = co; }
+ public String getCommitOption() { return commitOption; }
+
+ // XmlExternalizable implementation ------------------------------
+ public Element exportXml(Document doc)
+ throws Exception
+ {
+ Element containerconfiguration = super.exportXml(doc);
+
XMLManager.addElement(containerconfiguration,"commit-option",getCommitOption());
+
+ return containerconfiguration;
+ }
+
+ public void importXml(Element elt)
+ throws Exception
+ {
+ super.importXml(elt);
+
+ if (elt.getOwnerDocument().getDocumentElement().getTagName().equals("jboss"))
+ {
+ NodeList nl = elt.getChildNodes();
+ for (int i = 0; i < nl.getLength(); i++)
+ {
+ Node n = nl.item(i);
+ String name = n.getNodeName();
+
+ if (name.equals("commit-option"))
+ {
+ setCommitOption(n.hasChildNodes() ? XMLManager.getString(n) : "");
+ }
+ }
+ }
+ }
// Package protected ---------------------------------------------
1.2 +7 -1 jboss/src/main/org/jboss/ejb/deployment/JDBCResource.java
Index: JDBCResource.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/JDBCResource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCResource.java 2000/04/22 14:30:12 1.1
+++ JDBCResource.java 2000/05/22 15:03:01 1.2
@@ -25,9 +25,10 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JDBCResource
+ extends BeanContextChildSupport
implements BeanContextChildComponentProxy, XmlExternalizable, ResourceManager
{
// Constants -----------------------------------------------------
@@ -52,6 +53,11 @@
public String getType() { return "javax.sql.DataSource"; }
+ public void removeResource()
+ {
+ getBeanContext().remove(this);
+ }
+
// BeanContextChildComponentProxy implementation -----------------
public Component getComponent()
{
1.3 +46 -3 jboss/src/main/org/jboss/ejb/deployment/ResourceManagers.java
Index: ResourceManagers.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/ResourceManagers.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceManagers.java 2000/05/19 07:34:31 1.2
+++ ResourceManagers.java 2000/05/22 15:03:02 1.3
@@ -5,10 +5,12 @@
package org.jboss.ejb.deployment;
import java.awt.*;
+import java.awt.event.*;
import java.beans.*;
import java.beans.beancontext.*;
import java.io.*;
import java.util.*;
+import javax.swing.*;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -16,6 +18,9 @@
import org.w3c.dom.Element;
import com.dreambean.awt.GenericCustomizer;
+import com.dreambean.awt.GenericMethodDialog;
+import com.dreambean.awt.BeanContextPanel;
+import com.dreambean.awt.BeanContextTreeView;
import com.dreambean.ejx.xml.XMLManager;
import com.dreambean.ejx.xml.XmlExternalizable;
import com.dreambean.ejx.Util;
@@ -25,7 +30,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ResourceManagers
extends BeanContextSupport
@@ -34,7 +39,7 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- Customizer c;
+ Component c;
// Static --------------------------------------------------------
@@ -75,7 +80,45 @@
public Component getComponent()
{
if (c == null)
- c = new GenericCustomizer(this);
+ {
+ c = new BeanContextPanel(this);
+ JSplitPane sp = (JSplitPane)c;
+ JScrollPane scrollPane = (JScrollPane)sp.getLeftComponent();
+
((BeanContextTreeView)scrollPane.getViewport().getView()).expandPath(((BeanContextTreeView)scrollPane.getViewport().getView()).getPathForRow(0));
+
((BeanContextTreeView)scrollPane.getViewport().getView()).setRootVisible(false);
+
+ JToolBar toolBar = new JToolBar();
+ toolBar.add(new AbstractAction("New")
+ {
+ public void actionPerformed(ActionEvent evt)
+ {
+ try
+ {
+ BeanInfo bi =
Introspector.getBeanInfo(ResourceManagers.class);
+
+ MethodDescriptor[] mdList =
bi.getMethodDescriptors();
+ for (int i = 0; i < mdList.length; i++)
+ {
+ if
(mdList[i].getName().equals("createResourceManager"))
+ {
+ new
GenericMethodDialog(ResourceManagers.this, mdList[i],
(Frame)SwingUtilities.getRoot(c));
+ break;
+ }
+ }
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ JPanel p = new JPanel(new BorderLayout());
+ p.add("Center", c);
+ p.add("North", toolBar);
+
+ c = p;
+ c.setName("Resource managers");
+ }
return (Component)c;
}
1.2 +19 -1 jboss/src/main/org/jboss/ejb/deployment/jBossEjbJar.java
Index: jBossEjbJar.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/jBossEjbJar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jBossEjbJar.java 2000/05/19 07:11:51 1.1
+++ jBossEjbJar.java 2000/05/22 15:03:02 1.2
@@ -11,6 +11,7 @@
import java.beans.beancontext.*;
import java.io.*;
import java.util.*;
+import javax.swing.*;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -27,10 +28,11 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class jBossEjbJar
extends com.dreambean.ejx.ejb.EjbJar
+ implements BeanContextContainerProxy
{
// Constants -----------------------------------------------------
public static final String JBOSS_DOCUMENT="jboss";
@@ -38,6 +40,8 @@
// Attributes ----------------------------------------------------
ResourceManagers rm;
ContainerConfigurations cc;
+
+ JTabbedPane con;
// Static --------------------------------------------------------
@@ -58,6 +62,20 @@
public ResourceManagers getResourceManagers() { return rm; }
public ContainerConfigurations getContainerConfigurations() { return cc; }
+ public Container getContainer()
+ {
+ if (con == null)
+ {
+ // Create tabbed pane
+ con = new JTabbedPane();
+ con.add(cc.getComponent());
+ con.add(rm.getComponent());
+ con.add(eb.getContainer());
+ con.add(((jBossEnterpriseBeans)eb).getComponent());
+ }
+ return con;
+ }
+
// XmlExternalizable implementation ------------------------------
public Element exportXml(Document doc)
throws Exception
1.2 +68 -2
jboss/src/main/org/jboss/ejb/deployment/jBossEnterpriseBeans.java
Index: jBossEnterpriseBeans.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/jBossEnterpriseBeans.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jBossEnterpriseBeans.java 2000/05/19 07:11:51 1.1
+++ jBossEnterpriseBeans.java 2000/05/22 15:03:02 1.2
@@ -7,10 +7,12 @@
package org.jboss.ejb.deployment;
import java.awt.*;
+import java.awt.event.*;
import java.beans.*;
import java.beans.beancontext.*;
import java.io.*;
import java.util.*;
+import javax.swing.*;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -18,6 +20,10 @@
import org.w3c.dom.Element;
import com.dreambean.awt.GenericCustomizer;
+import com.dreambean.awt.GenericMethodDialog;
+import com.dreambean.awt.BeanContextPanel;
+import com.dreambean.awt.BeanContextTreeView;
+import com.dreambean.awt.GenericCustomizer;
import com.dreambean.ejx.xml.XMLManager;
import com.dreambean.ejx.xml.XmlExternalizable;
import com.dreambean.ejx.Util;
@@ -27,7 +33,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class jBossEnterpriseBeans
extends com.dreambean.ejx.ejb.EnterpriseBeans
@@ -36,6 +42,9 @@
// Attributes ----------------------------------------------------
boolean secure = true;
+
+ Container c;
+ Component com;
// Static --------------------------------------------------------
@@ -44,7 +53,8 @@
// Public --------------------------------------------------------
public void setSecure(boolean s) { secure = s; }
public boolean isSecure() { return secure; }
-
+
+
public com.dreambean.ejx.ejb.Entity addEntity()
throws IOException, ClassNotFoundException
{
@@ -67,6 +77,62 @@
}
}
+ // BeanContextContainerProxy implementation ----------------------
+ public Container getContainer()
+ {
+ if (c == null)
+ {
+ c = new BeanContextPanel(this);
+ JSplitPane sp = (JSplitPane)c;
+ JScrollPane scrollPane = (JScrollPane)sp.getLeftComponent();
+
((BeanContextTreeView)scrollPane.getViewport().getView()).expandPath(((BeanContextTreeView)scrollPane.getViewport().getView()).getPathForRow(0));
+
((BeanContextTreeView)scrollPane.getViewport().getView()).setRootVisible(false);
+ JToolBar toolBar = new JToolBar();
+ toolBar.add(new AbstractAction("Add JNDI name prefix")
+ {
+ public void actionPerformed(ActionEvent evt)
+ {
+ try
+ {
+ BeanInfo bi =
Introspector.getBeanInfo(jBossEnterpriseBeans.class);
+
+ MethodDescriptor[] mdList =
bi.getMethodDescriptors();
+ for (int i = 0; i < mdList.length; i++)
+ {
+ if
(mdList[i].getName().equals("addJndiPrefix"))
+ {
+ new
GenericMethodDialog(jBossEnterpriseBeans.this, mdList[i],
(Frame)SwingUtilities.getRoot(c));
+ break;
+ }
+ }
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ JPanel p = new JPanel(new BorderLayout());
+ p.add("Center", c);
+ p.add("North", toolBar);
+
+ c = p;
+ c.setName("Enterprise beans");
+ }
+ return (Container)c;
+ }
+
+ // BeanContextChildComponentProxy implementation -----------------
+ public Component getComponent()
+ {
+ if (com == null)
+ {
+ com = new GenericCustomizer(false, this);
+ com.setName("Application settings");
+ }
+ return com;
+ }
+
// XmlExternalizable implementation ------------------------------
public Element exportXml(Document doc)
throws Exception
1.5 +3 -2 jboss/src/main/org/jboss/ejb/deployment/jBossFileManager.java
Index: jBossFileManager.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/jBossFileManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jBossFileManager.java 2000/05/19 07:34:32 1.4
+++ jBossFileManager.java 2000/05/22 15:03:02 1.5
@@ -30,7 +30,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class jBossFileManager
extends BeanContextServicesSupport
@@ -329,7 +329,8 @@
{
if (comp == null)
{
- comp = new BeanContextPanel(ejbJar,"jBoss XML");
+// comp = new BeanContextPanel(ejbJar,"jBoss XML");
+ comp = ejbJar.getContainer();
}
return comp;
}
