|-----Original Message-----
|From: [EMAIL PROTECTED]
|[mailto:[EMAIL PROTECTED]]On Behalf Of jBoss CVS
|Development
|Sent: Thursday, December 28, 2000 3:28 AM
|To: [EMAIL PROTECTED]
|Subject: [jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejb/deployment
|jBossEnterpriseBeans.java jBossEntity.java jBossSession.java
|| * @see <related>
| * @author Rickard �berg ([EMAIL PROTECTED])
| - * @version $Revision: 1.5 $
| + * @version $Revision: 1.6 $
| */
| public class jBossEnterpriseBeans
| extends com.dreambean.ejx.ejb.EnterpriseBeans
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
and these are closed source?
We had a working version of these a month ago with open code. Rickard,
please tell me you are not replacing working open code by closed source
equivalent in the core... not looking good, ... please tell I am wrong on
this one.
marc
| @@ -43,17 +43,17 @@
| // Constants -----------------------------------------------------
|
| // Attributes ----------------------------------------------------
| -
| - Container c;
| - Component com;
|
| + Container c;
| + Component com;
| +
| // Static --------------------------------------------------------
|
| // Constructors --------------------------------------------------
|
| // Public --------------------------------------------------------
|
| -
| +
| public com.dreambean.ejx.ejb.Entity addEntity()
| throws IOException, ClassNotFoundException
| {
| @@ -63,18 +63,18 @@
| public com.dreambean.ejx.ejb.Session addSession()
| throws IOException, ClassNotFoundException
| {
| - return
|(com.dreambean.ejx.ejb.Session)instantiateChild("org.jboss.ejb.depl
oyment.JBossSession");
| + return
|(com.dreambean.ejx.ejb.Session)instantiateChild("org.jboss.ejb.depl
oyment.jBossSession");
| }
|
| - public void addJndiPrefix(String prefix)
| - {
| - Iterator enum = super.iterator();
| - while(enum.hasNext())
| - {
| - jBossEnterpriseBean bean =
|(jBossEnterpriseBean)enum.next();
| - bean.setJndiName(prefix + bean.getJndiName());
| - }
| - }
| + public void addJndiPrefix(String prefix)
| + {
| + Iterator enum = super.iterator();
| + while(enum.hasNext())
| + {
| + jBossEnterpriseBean bean = (jBossEnterpriseBean)enum.next();
| + bean.setJndiName(prefix + bean.getJndiName());
| + }
| + }
|
| // XmlExternalizable implementation ------------------------------
| public Element exportXml(Document doc)
| @@ -82,8 +82,8 @@
| {
| Element enterprisebeans = super.exportXml(doc);
|
| - // No settings
| -
| + // No settings
| +
| return enterprisebeans;
| }
|
|
|
|
| 1.5 +42 -42
|jboss/src/main/org/jboss/ejb/deployment/jBossEntity.java
|
| Index: jBossEntity.java
| ===================================================================
| RCS file:
|/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/jBossE
|ntity.java,v
| retrieving revision 1.4
| retrieving revision 1.5
| diff -u -r1.4 -r1.5
| --- jBossEntity.java 2000/12/07 15:44:17 1.4
| +++ jBossEntity.java 2000/12/28 11:28:27 1.5
| @@ -28,7 +28,7 @@
| *
| * @see <related>
| * @author Rickard �berg ([EMAIL PROTECTED])
| - * @version $Revision: 1.4 $
| + * @version $Revision: 1.5 $
| */
| public class jBossEntity
| extends com.dreambean.ejx.ejb.Entity
| @@ -39,7 +39,7 @@
| // Attributes ----------------------------------------------------
| String jndiName= "";
| String configurationName = "";
| -
| +
| // Static --------------------------------------------------------
|
| // Constructors --------------------------------------------------
| @@ -65,7 +65,7 @@
| public com.dreambean.ejx.ejb.ResourceReference addResourceReference()
| throws Exception
| {
| - return
|(com.dreambean.ejx.ejb.ResourceReference)instantiateChild("org.jbos
s.ejb.deployment.JBossResourceReference");
| + return
|(com.dreambean.ejx.ejb.ResourceReference)instantiateChild("org.jbos
s.ejb.deployment.jBossResourceReference");
| }
|
| public com.dreambean.ejx.ejb.EjbReference addEjbReference()
| @@ -73,10 +73,10 @@
| {
| return
|(com.dreambean.ejx.ejb.EjbReference)instantiateChild("org.jboss.ejb
.deployment.jBossEjbReference");
| }
| -
| +
| // XmlExternalizable implementation ------------------------------
| public Element exportXml(Document doc)
| - throws Exception
| + throws Exception
| {
| Element entity = doc.createElement("entity");
| XMLManager.addElement(entity,"ejb-name",getEjbName());
| @@ -100,21 +100,21 @@
| public void importXml(Element elt)
| throws Exception
| {
| - 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("jndi-name"))
| - {
| - setJndiName(n.hasChildNodes() ?
|XMLManager.getString(n) : "");
| + 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("jndi-name"))
| + {
| + setJndiName(n.hasChildNodes() ?
|XMLManager.getString(n) : "");
| } else if (name.equals("configuration-name"))
| {
| setConfigurationName(n.hasChildNodes() ?
|XMLManager.getString(n) : "");
| - } else if (name.equals("resource-ref"))
| + } else if (name.equals("resource-ref"))
| {
| NodeList rnl =
|((Element)n).getElementsByTagName("res-ref-name");
| String resName = XMLManager.getString(rnl.item(0));
| @@ -143,12 +143,12 @@
| }
| }
| }
| - }
| - } else // EJB-JAR XML
| - {
| + }
| + } else // EJB-JAR XML
| + {
| super.importXml(elt);
| setJndiName(getEjbName());
| - }
| + }
| }
|
| public void propertyChange(PropertyChangeEvent evt)
| @@ -161,25 +161,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";
| - }
| - }
| + 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.4 +2 -2
|jboss/src/main/org/jboss/ejb/deployment/jBossSession.java
|
| Index: jBossSession.java
| ===================================================================
| RCS file:
|/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/jBossS
|ession.java,v
| retrieving revision 1.3
| retrieving revision 1.4
| diff -u -r1.3 -r1.4
| --- jBossSession.java 2000/12/07 15:44:17 1.3
| +++ jBossSession.java 2000/12/28 11:28:27 1.4
| @@ -22,7 +22,7 @@
| *
| * @see <related>
| * @author Rickard �berg ([EMAIL PROTECTED])
| - * @version $Revision: 1.3 $
| + * @version $Revision: 1.4 $
| */
| public class jBossSession
| extends com.dreambean.ejx.ejb.Session
| @@ -54,7 +54,7 @@
| public com.dreambean.ejx.ejb.ResourceReference addResourceReference()
| throws Exception
| {
| - return
|(com.dreambean.ejx.ejb.ResourceReference)instantiateChild("org.jbos
s.ejb.deployment.JBossResourceReference");
| + return
|(com.dreambean.ejx.ejb.ResourceReference)instantiateChild("org.jbos
s.ejb.deployment.jBossResourceReference");
| }
|
| public com.dreambean.ejx.ejb.EjbReference addEjbReference()
|
|
|
|
|
