User: oberg
Date: 00/05/30 11:32:21
Modified: src/main/org/jboss/ejb/deployment
ContainerConfigurations.java JDBCResource.java
ResourceManagers.java URLResource.java
jBossEjbJar.java jBossEnterpriseBeans.java
jBossEntity.java jBossFileManager.java
Added: src/main/org/jboss/ejb/deployment jBossEjbJarViewer.java
Log:
Major update. Too much to mention.
Revision Changes Path
1.5 +6 -44
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContainerConfigurations.java 2000/05/27 01:48:15 1.4
+++ ContainerConfigurations.java 2000/05/30 18:32:19 1.5
@@ -19,10 +19,7 @@
import org.w3c.dom.Document;
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.BeanContextViewer;
import com.dreambean.ejx.xml.XMLManager;
import com.dreambean.ejx.xml.XmlExternalizable;
import com.dreambean.ejx.Util;
@@ -33,7 +30,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]>Marc Fleury</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class ContainerConfigurations
extends BeanContextSupport
@@ -42,7 +39,7 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- Component c;
+ Customizer c;
// Static --------------------------------------------------------
@@ -131,46 +128,11 @@
{
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("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");
+ c = new BeanContextViewer();
+ c.setObject(this);
}
- return c;
+ return (Component)c;
}
// XmlExternalizable implementation ------------------------------
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCResource.java 2000/05/22 15:03:01 1.2
+++ JDBCResource.java 2000/05/30 18:32:19 1.3
@@ -25,7 +25,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JDBCResource
extends BeanContextChildSupport
@@ -62,7 +62,7 @@
public Component getComponent()
{
if (c == null)
- c = new GenericCustomizer(this);
+ c = new GenericCustomizer(false, this);
return (Component)c;
}
1.4 +15 -46 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceManagers.java 2000/05/22 15:03:02 1.3
+++ ResourceManagers.java 2000/05/30 18:32:19 1.4
@@ -17,10 +17,7 @@
import org.w3c.dom.Document;
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.BeanContextViewer;
import com.dreambean.ejx.xml.XMLManager;
import com.dreambean.ejx.xml.XmlExternalizable;
import com.dreambean.ejx.Util;
@@ -30,7 +27,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ResourceManagers
extends BeanContextSupport
@@ -39,16 +36,22 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- Component c;
+ Customizer c;
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
// Public --------------------------------------------------------
- public XmlExternalizable createResourceManager(String clazz)
+ public void createResourceManager(String clazz)
throws IOException, ClassNotFoundException
{
+ addResourceManager(clazz);
+ }
+
+ public XmlExternalizable addResourceManager(String clazz)
+ throws IOException, ClassNotFoundException
+ {
return (XmlExternalizable)instantiateChild(clazz);
}
@@ -81,44 +84,10 @@
{
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("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");
- }
+ c = new BeanContextViewer();
+ c.setObject(this);
+ }
+
return (Component)c;
}
@@ -151,7 +120,7 @@
{
String resType = ((Element)n).getAttribute("res-class");
- XmlExternalizable resMgr =
(XmlExternalizable)createResourceManager(resType);
+ XmlExternalizable resMgr =
(XmlExternalizable)addResourceManager(resType);
resMgr.importXml((Element)n);
}
1.3 +8 -2 jboss/src/main/org/jboss/ejb/deployment/URLResource.java
Index: URLResource.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/URLResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLResource.java 2000/04/26 06:41:31 1.2
+++ URLResource.java 2000/05/30 18:32:19 1.3
@@ -27,9 +27,10 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class URLResource
+ extends BeanContextChildSupport
implements BeanContextChildComponentProxy, XmlExternalizable, ResourceManager
{
// Constants -----------------------------------------------------
@@ -54,11 +55,16 @@
public String getType() { return "java.net.URL"; }
+ public void removeResource()
+ {
+ getBeanContext().remove(this);
+ }
+
// BeanContextChildComponentProxy implementation -----------------
public Component getComponent()
{
if (c == null)
- c = new GenericCustomizer(this);
+ c = new GenericCustomizer(false, this);
return c;
}
1.3 +23 -18 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jBossEjbJar.java 2000/05/22 15:03:02 1.2
+++ jBossEjbJar.java 2000/05/30 18:32:19 1.3
@@ -28,11 +28,10 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class jBossEjbJar
extends com.dreambean.ejx.ejb.EjbJar
- implements BeanContextContainerProxy
{
// Constants -----------------------------------------------------
public static final String JBOSS_DOCUMENT="jboss";
@@ -40,8 +39,9 @@
// Attributes ----------------------------------------------------
ResourceManagers rm;
ContainerConfigurations cc;
+ boolean secure;
- JTabbedPane con;
+ Customizer c;
// Static --------------------------------------------------------
@@ -58,30 +58,32 @@
}
// Public --------------------------------------------------------
+ public void setSecure(boolean s) { secure = s; }
+ public boolean isSecure() { return secure; }
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;
- }
-
+ // BeanContextChildComponentProxy implementation -----------------
+ public java.awt.Component getComponent()
+ {
+ if (c == null)
+ {
+ c = new jBossEjbJarViewer();
+ c.setObject(this);
+ }
+
+ return (java.awt.Component)c;
+ }
+
// XmlExternalizable implementation ------------------------------
public Element exportXml(Document doc)
throws Exception
{
Element ejbjar = doc.createElement("jboss");
+ XMLManager.addElement(ejbjar,"secure",new Boolean(isSecure()).toString());
+
ejbjar.appendChild(cc.exportXml(doc));
ejbjar.appendChild(rm.exportXml(doc));
ejbjar.appendChild(eb.exportXml(doc));
@@ -109,7 +111,10 @@
} else if (name.equals("container-configurations"))
{
cc.importXml((Element)n);
- }
+ } else if (name.equals("secure"))
+ {
+ setSecure(new Boolean(XMLManager.getString(n)).booleanValue());
+ }
}
} else
{
1.3 +3 -65
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jBossEnterpriseBeans.java 2000/05/22 15:03:02 1.2
+++ jBossEnterpriseBeans.java 2000/05/30 18:32:20 1.3
@@ -33,7 +33,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class jBossEnterpriseBeans
extends com.dreambean.ejx.ejb.EnterpriseBeans
@@ -41,7 +41,6 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- boolean secure = true;
Container c;
Component com;
@@ -51,8 +50,6 @@
// Constructors --------------------------------------------------
// Public --------------------------------------------------------
- public void setSecure(boolean s) { secure = s; }
- public boolean isSecure() { return secure; }
public com.dreambean.ejx.ejb.Entity addEntity()
@@ -77,70 +74,14 @@
}
}
- // 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
{
Element enterprisebeans = super.exportXml(doc);
- XMLManager.addElement(enterprisebeans,"secure",new
Boolean(isSecure()).toString());
-
+ // No settings
+
return enterprisebeans;
}
@@ -182,9 +123,6 @@
e.printStackTrace();
// Does not exist anymore...
}
- } else if (name.equals("secure"))
- {
- setSecure(new Boolean(XMLManager.getString(n)).booleanValue());
}
}
} else
1.3 +24 -3 jboss/src/main/org/jboss/ejb/deployment/jBossEntity.java
Index: jBossEntity.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/jBossEntity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jBossEntity.java 2000/05/19 07:34:31 1.2
+++ jBossEntity.java 2000/05/30 18:32:20 1.3
@@ -27,7 +27,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class jBossEntity
extends com.dreambean.ejx.ejb.Entity
@@ -38,7 +38,7 @@
// Attributes ----------------------------------------------------
String jndiName= "";
String configurationName = "";
-
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -67,7 +67,7 @@
{
return
(com.dreambean.ejx.ejb.EjbReference)instantiateChild("org.jboss.ejb.deployment.jBossEjbReference");
}
-
+
// XmlExternalizable implementation ------------------------------
public Element exportXml(Document doc)
throws Exception
@@ -155,4 +155,25 @@
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
+ class AttributeAggregate
+ extends BeanContextSupport
+ implements BeanContextContainerProxy
+ {
+ Container com = new GenericCustomizer(this);
+
+ public Container getContainer()
+ {
+ return com;
+ }
+
+ public Iterator iterator()
+ {
+ return getEjbReferences();
+ }
+
+ public String toString()
+ {
+ return "EJB references";
+ }
+ }
}
1.7 +2 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jBossFileManager.java 2000/05/28 19:39:01 1.6
+++ jBossFileManager.java 2000/05/30 18:32:20 1.7
@@ -31,7 +31,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class jBossFileManager
extends BeanContextServicesSupport
@@ -343,8 +343,7 @@
{
if (comp == null)
{
-// comp = new BeanContextPanel(ejbJar,"jBoss XML");
- comp = ejbJar.getContainer();
+ comp = ejbJar.getComponent();
}
return comp;
}
1.1 jboss/src/main/org/jboss/ejb/deployment/jBossEjbJarViewer.java
Index: jBossEjbJarViewer.java
===================================================================
/*
* Copyright 1999 by dreamBean Software,
* All rights reserved.
*/
package org.jboss.ejb.deployment;
import java.beans.Customizer;
import com.dreambean.awt.GenericCustomizer;
/**
* <description>
*
* @see <related>
* @author Rickard Oberg ([EMAIL PROTECTED])
* @version $Revision: 1.1 $
*/
public class jBossEjbJarViewer
extends com.dreambean.ejx.ejb.EjbJarViewer
implements Customizer
{
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
// Customizer implementation ------------------------------------
public void setObject(Object obj)
{
super.setObject(obj);
// Remove assembler descriptor tab
removeTabAt(indexOfTab("Assembly descriptor"));
jBossEjbJar ejbJar = (jBossEjbJar)obj;
// Init UI
addTab("Container configurations",
ejbJar.getContainerConfigurations().getComponent());
addTab("Resource managers",
ejbJar.getResourceManagers().getComponent());
}
}
