From: Bill D. <bde...@jb...> - 2005-09-29 23:08:29
|
User: bdecoste Date: 05/09/29 19:08:25 Modified: src/main/org/jboss/ejb3/dd EnterpriseBeans.java EnterpriseBean.java JBossDDObjectFactory.java Added: src/main/org/jboss/ejb3/dd CurrentMessage.java Consumer.java MessageProperties.java Log: jboss.xml for Consumer/Producer Revision Changes Path 1.17 +1 -6 jboss-ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBeans.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EnterpriseBeans.java =================================================================== RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBeans.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- EnterpriseBeans.java 27 Sep 2005 20:34:14 -0000 1.16 +++ EnterpriseBeans.java 29 Sep 2005 23:08:25 -0000 1.17 @@ -18,7 +18,7 @@ * @author <a href="mailto:bde...@jb...">William DeCoste</a> * ejbs.setCurrentEjbName(value); } else if * (localName.equals("jndi-name")){ ejbs.setJndiName(value); - * @version <tt>$Revision: 1.16 $</tt> + * @version <tt>$Revision: 1.17 $</tt> */ public class EnterpriseBeans { @@ -28,11 +28,6 @@ private EnterpriseBean currentEjb; - public void addService(Service service) - { - enterpriseBeans.add(service); - } - public void addInvoker(Invoker invoker) { currentEjb.addInvoker(invoker); 1.17 +6 -1 jboss-ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EnterpriseBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBean.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- EnterpriseBean.java 27 Sep 2005 20:34:14 -0000 1.16 +++ EnterpriseBean.java 29 Sep 2005 23:08:25 -0000 1.17 @@ -16,7 +16,7 @@ * 1.4 schema * * @author <a href="mailto:bde...@jb...">William DeCoste</a> - * @version <tt>$Revision: 1.16 $</tt> + * @version <tt>$Revision: 1.17 $</tt> */ public abstract class EnterpriseBean { @@ -208,6 +208,11 @@ return this instanceof SessionEnterpriseBean; } + public boolean isConsumer() + { + return this instanceof Consumer; + } + public boolean isEntityBean() { return this instanceof EntityEnterpriseBean; 1.15 +185 -2 jboss-ejb3/src/main/org/jboss/ejb3/dd/JBossDDObjectFactory.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossDDObjectFactory.java =================================================================== RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/dd/JBossDDObjectFactory.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- JBossDDObjectFactory.java 27 Sep 2005 20:34:14 -0000 1.14 +++ JBossDDObjectFactory.java 29 Sep 2005 23:08:25 -0000 1.15 @@ -15,7 +15,7 @@ * Represents the jboss.xml deployment descriptor for the 2.1 schema * * @author <a href="mailto:bde...@jb...">William DeCoste</a> - * @version <tt>$Revision: 1.14 $</tt> + * @version <tt>$Revision: 1.15 $</tt> */ public class JBossDDObjectFactory implements ObjectModelFactory { @@ -136,6 +136,58 @@ /** * Called when parsing of a new element started. */ + public Object newChild(Consumer consumer, UnmarshallingContext navigator, + String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + + if (localName.equals("current-message")) + { + child = new CurrentMessage(); + } + else if (localName.equals("message-properties")) + { + child = new MessageProperties(); + } + + return child; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(CurrentMessage message, UnmarshallingContext navigator, + String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + + if (localName.equals("method")) + { + child = new Method(); + } + + return child; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(MessageProperties properties, UnmarshallingContext navigator, + String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + + if (localName.equals("method")) + { + child = new Method(); + } + + return child; + } + + /** + * Called when parsing of a new element started. + */ public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) { @@ -149,6 +201,10 @@ { child = new Service(); } + else if (localName.equals("consumer")) + { + child = new Consumer(); + } else if (localName.equals("ejb-ref")) { child = new EjbRef(); @@ -189,10 +245,55 @@ /** * Called when parsing character is complete. */ + public void addChild(Consumer parent, CurrentMessage message, + UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.setCurrentMessage(message); + } + + /** + * Called when parsing character is complete. + */ + public void addChild(Consumer parent, MessageProperties message, + UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.setMessageProperties(message); + } + + /** + * Called when parsing character is complete. + */ + public void addChild(CurrentMessage parent, Method method, + UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addMethod(method); + } + + /** + * Called when parsing character is complete. + */ + public void addChild(MessageProperties parent, Method method, + UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addMethod(method); + } + + /** + * Called when parsing character is complete. + */ public void addChild(EnterpriseBeans parent, Service service, UnmarshallingContext navigator, String namespaceURI, String localName) { - parent.addService(service); + parent.addEnterpriseBean(service); + } + + /** + * Called when parsing character is complete. + */ + public void addChild(EnterpriseBeans parent, Consumer consumer, + UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addEnterpriseBean(consumer); } /** @@ -266,6 +367,7 @@ { parent.setClusterConfig(config); } + public void setValue(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { @@ -355,6 +457,75 @@ /** * Called when a child element with simple content is read for DD. */ + public void setValue(Consumer consumer, UnmarshallingContext navigator, + String namespaceURI, String localName, String value) + { + if (localName.equals("destination")) + { + consumer.setDestination(value); + } + else if (localName.equals("destinationType")) + { + consumer.setDestinationType(value); + } + else if (localName.equals("producer")) + { + consumer.setProducer(value); + } + else if (localName.equals("ejb-class")) + { + consumer.setEjbClass(value); + consumer.setEjbName(value); + } + else if (localName.equals("local")) + { + consumer.setLocal(value); + } + else if (localName.equals("remote")) + { + consumer.setRemote(value); + } + else if (localName.equals("jndi-name")) + { + consumer.setJndiName(value); + } + else if (localName.equals("local-jndi-name")) + { + consumer.setLocalJndiName(value); + } + else if (localName.equals("security-domain")) + { + consumer.setSecurityDomain(value); + } + else if (localName.equals("call-by-value")) + { + consumer.setCallByValue(true); + } + else if (localName.equals("run-as-principal")) + { + consumer.setRunAsPrincipal(value); + } + else if (localName.equals("aop-domain-name")) + { + consumer.setAopDomainName(value); + } + } + + /** + * Called when a child element with simple content is read for DD. + */ + public void setValue(MessageProperties properties, UnmarshallingContext navigator, + String namespaceURI, String localName, String value) + { + if (localName.equals("delivery")) + { + properties.setDelivery(value); + } + } + + /** + * Called when a child element with simple content is read for DD. + */ public void setValue(ClusterConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { @@ -399,6 +570,18 @@ /** * Called when a child element with simple content is read for DD. */ + public void setValue(Method method, UnmarshallingContext navigator, + String namespaceURI, String localName, String value) + { + if (localName.equals("method-name")) + { + method.setMethodName(value); + } + } + + /** + * Called when a child element with simple content is read for DD. + */ public void setValue(Invoker invoker, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { 1.1 date: 2005/09/29 23:08:25; author: bdecoste; state: Exp;jboss-ejb3/src/main/org/jboss/ejb3/dd/CurrentMessage.java Index: CurrentMessage.java =================================================================== /* * JBoss, the OpenSource J2EE webOS * * Distributable under LGPL license. * See terms of license at gnu.org. */ package org.jboss.ejb3.dd; import java.util.ArrayList; import java.util.List; /** * @author <a href="mailto:bde...@jb...">William DeCoste</a> * @version <tt>$Revision: 1.1 $</tt> */ public class CurrentMessage { private List methods = new ArrayList(); public List getMethods() { return methods; } public void addMethod(Method method) { methods.add(method); } public String toString() { StringBuffer sb = new StringBuffer(100); sb.append("["); sb.append("ejbName=").append(methods); sb.append("]"); return sb.toString(); } } 1.1 date: 2005/09/29 23:08:25; author: bdecoste; state: Exp;jboss-ejb3/src/main/org/jboss/ejb3/dd/Consumer.java Index: Consumer.java =================================================================== /* * JBoss, the OpenSource J2EE webOS * * Distributable under LGPL license. * See terms of license at gnu.org. */ package org.jboss.ejb3.dd; import org.jboss.logging.Logger; import java.util.List; import java.util.ArrayList; /** * @author <a href="mailto:bde...@jb...">William DeCoste</a> * @version <tt>$Revision: 1.1 $</tt> */ public class Consumer extends EnterpriseBean { private static final Logger log = Logger.getLogger(Consumer.class); private String destination = null; private String destinationType = null; private CurrentMessage currentMessage = null; private MessageProperties messageProperties = null; private String producer = null; public String getDestination() { return destination; } public void setDestination(String destination) { this.destination = destination; } public String getDestinationType() { return destinationType; } public void setDestinationType(String destinationType) { this.destinationType = destinationType; } public CurrentMessage getCurrentMessage() { return currentMessage; } public void setCurrentMessage(CurrentMessage currentMessage) { this.currentMessage = currentMessage; } public MessageProperties getMessageProperties() { return messageProperties; } public void setMessageProperties(MessageProperties messageProperties) { this.messageProperties = messageProperties; } public String getProducer() { return producer; } public void setProducer(String producer) { this.producer = producer; } public String toString() { StringBuffer sb = new StringBuffer(100); sb.append('['); sb.append(super.toString()); sb.append(", destination=" + destination); sb.append(", destinationType=" + destinationType); sb.append(']'); return sb.toString(); } } 1.1 date: 2005/09/29 23:08:25; author: bdecoste; state: Exp;jboss-ejb3/src/main/org/jboss/ejb3/dd/MessageProperties.java Index: MessageProperties.java =================================================================== /* * JBoss, the OpenSource J2EE webOS * * Distributable under LGPL license. * See terms of license at gnu.org. */ package org.jboss.ejb3.dd; import java.util.ArrayList; import java.util.List; /** * @author <a href="mailto:bde...@jb...">William DeCoste</a> * @version <tt>$Revision: 1.1 $</tt> */ public class MessageProperties { private List methods = new ArrayList(); private String delivery; public List getMethods() { return methods; } public void addMethod(Method method) { methods.add(method); } public String getDelivery() { return delivery; } public void setDelivery(String delivery) { this.delivery = delivery; } public String toString() { StringBuffer sb = new StringBuffer(100); sb.append("["); sb.append("methods=").append(methods); sb.append("]"); return sb.toString(); } } |