Author: jeff.yuchang Date: 2008-07-15 07:26:52 -0400 (Tue, 15 Jul 2008) New Revision: 165 Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java Log: * Make the broker example working. Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-07-15 11:26:52 UTC (rev 165) @@ -149,7 +149,7 @@ ScheduleItem si=new ScheduleItem(category, name); si.setSession(this); - logger.info("Scheduling: " + si + " by thread of " + Thread.currentThread().getName()); + logger.debug("Scheduling: " + si + " by thread of " + Thread.currentThread().getName()); synchronized(joinStates) { JoinState joinState = getJoinStateByScheduleItem(si); @@ -181,14 +181,14 @@ scheduleItems.add(si); SessionManager.saveObject(si); - logger.info("Finished scheduling "+si +"' by thread of " + Thread.currentThread().getName()); + logger.debug("Finished scheduling "+si +"' by thread of " + Thread.currentThread().getName()); } } public void unschedule(String category, String name) throws Exception { - logger.info("Unscheduling: '"+category+"/"+name+"' by thread of " + Thread.currentThread().getName() ); + logger.debug("Unscheduling: '"+category+"/"+name+"' by thread of " + Thread.currentThread().getName() ); synchronized(joinStates) { if (isScheduleItemInJoinState(category, name)) { @@ -204,7 +204,7 @@ scheduleItems.remove(si); SessionManager.removeObject(si); - logger.info("Finished unscheduling: " + si +"' by thread of " + Thread.currentThread().getName()); + logger.debug("Finished unscheduling: " + si +"' by thread of " + Thread.currentThread().getName()); } } Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-07-15 11:26:52 UTC (rev 165) @@ -93,8 +93,17 @@ } conversationSession.setBusinessObject(businessState); conversationSession.setParent(parentSession); - conversationSession.setServiceName(parentSession.getServiceName()); + + Service service = pojoclass.getAnnotation(Service.class); + if (service != null) { + conversationSession.setServiceName(service.name()); + conversationSession.setConversationType(service.conversationType()); + } else { + conversationSession.setServiceName(parentSession.getServiceName()); + conversationSession.setConversationType(parentSession.getConversationType()); + } + hibernateSession.save(conversationSession); return conversationSession; Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -53,6 +53,8 @@ private Set<ScheduleItem> scheduleItems = new HashSet<ScheduleItem>(); + protected boolean unscheduledServiceItem = false; + public ConversationAction(ConfigTree config) { this.config = config; } @@ -181,6 +183,7 @@ if (session != null && isFirstOrLastConversationAction(message, true)) { logger.debug("This is first conversation action to unschedule the item."); unschedule(message); + unscheduledServiceItem = true; } handle(message); Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -38,8 +38,6 @@ private static Logger logger = Logger.getLogger(MessageRouterAction.class); - private boolean routerFlag = false; - public MessageRouterAction(ConfigTree config) { super(config); } @@ -50,22 +48,28 @@ String messageType = getMessageType(message); logger.info("The received message type is [" + messageType + "]"); + boolean routerFlag = false; for (ConfigTree ct : children) { ConfigTree[] msgNodes = ct.getChildren("message"); String msgType = msgNodes[0].getAttribute("type"); if (routerFlag == false && messageType.equals(msgType)) { - List<Identity> ids = getIdentities(message, null, ct); + String svcDesc = ct.getAttribute(ActionProperties.SERVICE_DESCRIPTION_NAME); + List<Identity> ids = getIdentities(message, svcDesc, ct); Session session = getSession(message, ids); String serviceCategory = ct.getAttribute(ActionProperties.SERVICE_CATEGORY); String serviceName = ct.getAttribute(ActionProperties.SERVICE_NAME); String initiate = ct.getAttribute(ActionProperties.INITIATE); if ("true".equals(initiate) && session == null) { + logger.info("This is an initiate process of " + serviceCategory + "/" + serviceName); + routerFlag = true; invokeService(message, serviceCategory, serviceName); } else if (session != null){ List<ScheduleItem> items = session.getScheduleItems(); for (ScheduleItem item : items) { if (serviceCategory.equals(item.getCategory()) && serviceName.equals(item.getName())) { + logger.info("Invoking the service of " + serviceCategory + "/" + serviceName); + routerFlag = true; invokeService(message, serviceCategory, serviceName); } } @@ -83,7 +87,6 @@ String serviceName) throws MessageDeliverException { ServiceInvoker invoker = new ServiceInvoker(serviceCategory, serviceName); invoker.deliverAsync(message); - routerFlag = true; } } Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -57,7 +57,7 @@ logger.info("MESSAGE TYPE ["+mesgMType+"] RECEIVED."); - if (isFirstOrLastConversationAction(message, true)) { + if (unscheduledServiceItem == false && isFirstOrLastConversationAction(message, true)) { String category=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY); String name=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME); session.unschedule(category, name); Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -41,16 +41,14 @@ public Message handle(Message message) throws Exception{ String serviceDescriptionName = getConfig().getAttribute(ActionProperties.SERVICE_DESCRIPTION_NAME); List<Identity> ids = getIdentities(message, serviceDescriptionName); - System.out.println("Service Description Name------>" + serviceDescriptionName); - + Session session= getSession(message, ids); - String serviceName=getConfig().getAttribute(ActionProperties.SERVICE_NAME_PROPERTY); - String serviceCategory=getConfig().getAttribute(ActionProperties.SERVICE_CATEGORY_PROPERTY); - + String serviceName=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME); + String serviceCategory=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY); session.unschedule(serviceCategory, serviceName); - logger.debug("Finish retrieving session action"); + logger.debug("Finished retrieving session action."); return(message); } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-15 11:26:52 UTC (rev 165) @@ -60,10 +60,10 @@ private int supplierIndex = 0; @Column(name="selected_quote") - private int selected_quote = -1 ; + private String selectedQuoteValue ; @Column(name="selected_supplier") - private int selected_supplier = -1; + private String selectedSupplierDesc;; public BrokerMain() { initSuppliers(); @@ -131,26 +131,47 @@ public void setQuotes(List<Quote> quotes) { this.quotes = quotes; } + + public void setQuote(Quote quote) { + this.quotes.add(quote); + logger.info("add the quote value : " + quote); + } + - public int getSelected_quote() { - return selected_quote; + public String getSelectedQuoteValue() { + return selectedQuoteValue; } - public void setSelected_quote(int selected_quote) { - this.selected_quote = selected_quote; + public void setSelectedQuoteValue(String selectedQuoteValue) { + this.selectedQuoteValue = selectedQuoteValue; } - public int getSelected_supplier() { - return selected_supplier; + public String getSelectedSupplierDesc() { + return selectedSupplierDesc; } - public void setSelected_supplier(int selected_supplier) { - this.selected_supplier = selected_supplier; + public void setSelectedSupplierDesc(String selectedSupplierDesc) { + this.selectedSupplierDesc = selectedSupplierDesc; } - public void setQuote(Quote quote) { - this.quotes.add(quote); - logger.info("add the quote value : " + quote); + + public Supplier getSelectedSupplier() { + for (Supplier supplier : getSuppliers()) { + if (supplier.getServiceDescription().equals(selectedSupplierDesc)) { + return supplier; + } + } + return null; } + + public Quote getSelectedQuote() { + for (Quote quote : quotes) { + if (quote.getValue().equals(selectedQuoteValue)) { + return quote; + } + } + return null; + } + } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2008-07-15 11:26:52 UTC (rev 165) @@ -19,6 +19,7 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -28,9 +29,11 @@ import javax.persistence.Table; import org.jboss.soa.overlord.conversation.HibernateObject; +import org.jboss.soa.overlord.jbossesb.actions.Service; @Entity @Table(name="T_COMPLETE_TRANSACTION") +@Service(name="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction", conversationType="CompleteTransaction", root=false) public class CompleteTransactionMain implements HibernateObject { private static final long serialVersionUID = 111313L; @@ -39,12 +42,16 @@ @Column(name="ID") private long id; - @OneToOne + @OneToOne(cascade={CascadeType.ALL}) @JoinColumn(name="Confirmation_ID") - private Confirmation confirmation; + private Confirmation confirmation = new Confirmation(); @OneToOne - @JoinColumn(name="ID") + @JoinColumn(name="quote_ID") + private Quote quote; + + @OneToOne + @JoinColumn(name="complete_supplier_ID") private Supplier supplier; public long getId() { @@ -71,4 +78,13 @@ this.confirmation = confirmation; } + public Quote getQuote() { + return quote; + } + + public void setQuote(Quote quote) { + this.quote = quote; + } + + } Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008, + */ +package org.jboss.soa.overlord.samples.jbossesb.loan.broker; + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle { + + private static Logger logger = Logger.getLogger(SetCreditCheckRequestMessageAction.class); + + private ConfigTree config; + + public SetCreditCheckRequestMessageAction(ConfigTree config) { + this.config = config; + } + + public Message process(Message message) throws Exception{ + + Node node = XMLUtils.getNode((String)message.getBody().get()); + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>"); + + logger.info("Updated credit check request message: "+message.getBody().get()); + + return(message); + } + +} \ No newline at end of file Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008, + */ +package org.jboss.soa.overlord.samples.jbossesb.loan.broker; + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +/** + * @author jeffyu + * + */ +public class SetOrderConfirmRequestAction extends AbstractActionLifecycle { + + public static Logger logger = Logger.getLogger(SetOrderConfirmRequestAction.class); + + private ConfigTree config; + + public SetOrderConfirmRequestAction(ConfigTree config){ + this.config = config; + } + + public Message process(Message message) throws Exception { + Node node = XMLUtils.getNode((String)message.getBody().get()); + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + String supplier = (String) message.getProperties().getProperty("supplierDesc"); + String quoteValue = (String)message.getProperties().getProperty("quoteValue"); + + message.getBody().add("<orderConfirmRequest id=\"" + idValue +"\" supplierDesc=\"" + + supplier+"\" quoteValue=\"" + quoteValue + "\"></orderConfirmRequest>"); + + logger.info("Set 'orderConfirmRequest' : " + message.getBody().get()); + + return message; + } + +} Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -62,7 +62,7 @@ message.getBody().add(sbuffer.toString()); - logger.info("set quote list message :" + sbuffer.toString()); + logger.info("set quote list message :[" + sbuffer.toString() + "]"); return message; } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java 2008-07-15 11:26:52 UTC (rev 165) @@ -43,6 +43,16 @@ @Column(name="ID") private long id; + public boolean isCreditValid() { + boolean ret=false; + + ret = true; + + System.out.println("IS CREDIT VALID? "+ret); + + return(ret); + } + public long getId() { return this.id; } Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008, + */ +package org.jboss.soa.overlord.samples.jbossesb.loan.supplier; + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +/** + * @author jeffyu + * + */ +public class SetOrderConfirmResponseAction extends AbstractActionLifecycle { + + private Logger logger = Logger.getLogger(SetOrderConfirmResponseAction.class); + + private ConfigTree config; + + public SetOrderConfirmResponseAction(ConfigTree config) { + this.config = config; + } + + public Message process(Message message) throws Exception { + Node node = XMLUtils.getNode((String)message.getBody().get()); + + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + String quoteValue = node.getAttributes().getNamedItem("quoteValue").getNodeValue(); + + String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1"; + String confirmation = "The quote of " + quoteValue + " has been confirmed."; + + String body = "<orderConfirmResponse id=\"" + idValue + "\" supplierDesc = \"" + + supplierDesc+ "\">"+confirmation +"</orderConfirmResponse>"; + + message.getBody().add(body); + + logger.info("set 'orderConfirmResponse' of [" + body + "]"); + return message; + } + +} Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml 2008-07-15 11:26:52 UTC (rev 165) @@ -21,4 +21,6 @@ <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency1</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency2</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1</depends> + <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11</depends> + <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12</depends> </jbossesb-deployment> Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-15 11:26:52 UTC (rev 165) @@ -60,6 +60,21 @@ <jms-bus busid="SupplierService1"> <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier1" /> </jms-bus> + <jms-bus busid="SupplierService11"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier11" /> + </jms-bus> + <jms-bus busid="SupplierService12"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier12" /> + </jms-bus> + <jms-bus busid="CAService"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency" /> + </jms-bus> + <jms-bus busid="CAService1"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency1" /> + </jms-bus> + <jms-bus busid="CAService2"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency2" /> + </jms-bus> </jms-provider> </providers> @@ -85,7 +100,8 @@ <message type="enquiry" /> </route> <route service-category="ESBBroker.BrokerParticipant" - service-name="ESBBrokerProcess.main.5" > + service-name="ESBBrokerProcess.main.5" + serviceDescriptionName="{http://www.jboss.org/overlord/loanBroker}Br... > <identity type="primary" > <token name="id" locator="//@id" /> </identity> @@ -247,19 +263,9 @@ maxThreads="1"/> </listeners> <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction" - process="process" name="s5-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> - <property name="serviceName" value="ESBBrokerProcess.main.5" /> - <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SwitchAction" process="process" name="s5-2"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> <property name="paths"> <case service-category="ESBBroker.BrokerParticipant" service-name="ESBBrokerProcess.main.7" > @@ -283,7 +289,6 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="s6-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> <property name="operation" value="cancel" /> <property name="messageType" value="cancel" /> <property name="identities" > @@ -302,18 +307,25 @@ maxThreads="1"/> </listeners> <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.SetVariableAction" name="s7-1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> + <property name="variable" value="selectedSupplierDesc" /> + <property name="messageExpression" value="//@supplierDesc" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SetVariableAction" name="s7-2"> + <property name="variable" value="selectedQuoteValue" /> + <property name="messageExpression" value="//@quoteValue" /> + </action> <action class="org.jboss.soa.overlord.jbossesb.actions.PerformAction" - process="process" name="s7-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> + process="process" name="s7-3"> <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> <property name="serviceName" value="CompleteTransaction.main" /> - <property name="immediate" value="true" /> - <property name="joinServiceCategory" value="ESBBroker.BrokerParticipant" /> - <property name="joinServiceName" value="ESBBrokerProcess.main.8" /> + <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" /> + <property name="responseServiceName" value="ESBBrokerProcess.main.8" /> <property name="bindDetails" > - <bind from-expression="/quotes[/selectedQuote]" + <bind from-expression="getSelectedQuote()" to-variable="quote" /> - <bind from-expression="/suppliers[/selectedSupplier]" + <bind from-expression="getSelectedSupplier()" to-variable="supplier" /> </property> </action> @@ -327,9 +339,16 @@ maxThreads="1"/> </listeners> <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" name="temporarily"> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="s13-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> - + <property name="operation" value="confirm" /> + <property name="messageType" value="orderConfirmResponse" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> </action> </actions> </service> @@ -382,7 +401,6 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="s9-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Request4QuoteMain" /> <property name="operation" value="getQuote" /> <property name="messageType" value="quote" /> <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}Broker"/> @@ -426,7 +444,7 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="s10-2"> <property name="operation" value="buy" /> - <property name="messageType" value="purchaseDetails" /> + <property name="messageType" value="buy" /> <property name="clientEPR" value="buyer" /> <property name="identities" > <identity type="primary" > @@ -434,10 +452,13 @@ </identity> </property> </action> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetCreditCheckRequestMessageAction" + process="process" name="s10-3"> + </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="s10-3"> + process="process" name="s10-4"> <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditInformation" /> + <property name="messageType" value="CreditCheckRequest" /> <property name="serviceName" value="CreditAgency.Main" /> <property name="serviceCategory" value="ESBBroker.CreditAgency" /> <property name="responseServiceName" value="CompleteTransaction.main.1" /> @@ -461,6 +482,9 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction" process="process" name="s11-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> + <property name="serviceName" value="CompleteTransaction.main.1" /> + <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> + <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction... /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -472,7 +496,7 @@ <property name="paths"> <case service-category="ESBBroker.BrokerParticipant" service-name="CompleteTransaction.main.2" > - <message type="creditValid" /> + <message type="CreditCheckResponse" /> </case> <case service-category="ESBBroker.BrokerParticipant" service-name="CompleteTransaction.main.4" > @@ -494,25 +518,36 @@ process="process" name="s12-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditValid" /> + <property name="messageType" value="CreditCheckResponse" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> </identity> </property> </action> - - + <action class="org.jboss.soa.overlord.jbossesb.actions.SetMessageAction" process="process" name="s12-2"> - <property name="stateExpression" value="confirmation" /> + <property name="headerProperty" value="supplierDesc" /> + <property name="stateExpression" value="supplier.serviceDescription" /> </action> + + <action class="org.jboss.soa.overlord.jbossesb.actions.SetMessageAction" + process="process" name="s12-3"> + <property name="headerProperty" value="quoteValue" /> + <property name="stateExpression" value="quote.value" /> + </action> + + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetOrderConfirmRequestAction" + process="process" name="s12-4"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="s12-3"> + process="process" name="s12-5"> <property name="operation" value="confirm" /> - <property name="messageType" value="orderConfirmed" /> - <property name="serviceName" value="/supplier/serviceName" /> - <property name="serviceCategory" value="/supplier/serviceCategory" /> + <property name="messageType" value="orderConfirmRequest" /> + <property name="serviceNameExpression" value="supplier.serviceName" /> + <property name="serviceCategoryExpression" value="supplier.serviceCategory" /> <property name="responseServiceName" value="CompleteTransaction.main.3" /> <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" /> <property name="identities" > @@ -535,7 +570,8 @@ process="process" name="s13-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> <property name="operation" value="confirm" /> - <property name="messageType" value="bookingReference" /> + <property name="messageType" value="orderConfirmResponse" /> + <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction... /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -543,16 +579,16 @@ </property> </action> - - <action class="org.jboss.soa.overlord.jbossesb.actions.SetMessageAction" + <action class="org.jboss.soa.overlord.jbossesb.actions.SetVariableAction" process="process" name="s13-2"> - <property name="stateExpression" value="confirmation" /> + <property name="variable" value="confirmation.detail" /> + <property name="messageExpression" value="/orderConfirmResponse" /> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="s13-3"> <property name="operation" value="buy" /> - <property name="messageType" value="orderConfirmed" /> + <property name="messageType" value="orderConfirmResponse" /> <property name="clientEPR" value="buyer" /> <property name="identities" > <identity type="primary" > @@ -596,19 +632,52 @@ </actions> </service> - <service category="ESBBroker.Suppliers" name="Supplier1.main" description=""> + <service category="ESBBroker.Suppliers" name="Supplier1.main" description=""> <listeners> <jms-listener name="SupplierServiceListener1" busidref="SupplierService1" maxThreads="1"/> </listeners> <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.MessageRouterAction" + process="process" name="su-1"> + <property name="paths"> + <route service-category="ESBBroker.Suppliers" + service-name="Supplier1.main.1" + initiate="true"> + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + <message type="requestForQuote" /> + </route> + <route service-category="ESBBroker.Suppliers" + service-name="Supplier1.main.2" + initiate="true"> + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + <message type="orderConfirmRequest" /> + </route> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.Suppliers" name="Supplier1.main.1" description=""> + <listeners> + <jms-listener name="SupplierServiceListener11" + busidref="SupplierService11" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" - process="process" name="su1"> + process="process" name="su11-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" /> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" - process="process" name="su2"> + process="process" name="su11-2"> <property name="messageType" value="requestForQuote" /> <property name="clientEPR" value="broker" /> <property name="identities" > @@ -618,10 +687,10 @@ </identity> </property> </action> - <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetQuoteMessageAction" name="su3"> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetQuoteMessageAction" name="su11-3"> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="su4"> + process="process" name="su11-4"> <property name="messageType" value="quote" /> <property name="clientEPR" value="broker" /> <property name="identities" > @@ -633,6 +702,129 @@ </action> </actions> </service> + + <service category="ESBBroker.Suppliers" name="Supplier1.main.2" description=""> + <listeners> + <jms-listener name="SupplierServiceListener12" + busidref="SupplierService12" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" + process="process" name="su12-1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="su12-2"> + <property name="messageType" value="orderConfirmRequest" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetOrderConfirmResponseAction" name="su12-3"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="su12-4"> + <property name="messageType" value="orderConfirmResponse" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.CreditAgency" name="CreditAgency.Main" description=""> + <listeners> + <jms-listener name="CAListener" + busidref="CAService" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" + process="process" name="c1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="c2"> + <property name="operation" value="checkCredit" /> + <property name="messageType" value="CreditCheckRequest" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.IfAction" + process="process" name="c3"> + <property name="paths"> + <if decision-method="isCreditValid" + service-category="ESBBroker.CreditAgency" + service-name="CreditAgency.decision1" + immediate="true" /> + <else service-category="ESBBroker.CreditAgency" + service-name="CreditAgency.decision2" + immediate="true" /> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.CreditAgency" name="CreditAgency.decision1" description=""> + <listeners> + <jms-listener name="CAListener1" + busidref="CAService1" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckResponseMessageAction" + process="process" name="d2"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="d3"> + <property name="operation" value="checkCredit" /> + <property name="messageType" value="CreditCheckResponse" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> + </action> + </actions> + </service> + <service category="ESBBroker.CreditAgency" name="CreditAgency.decision2" description=""> + <listeners> + <jms-listener name="CAListener2" + busidref="CAService2" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckInvalidMessageAction" + process="process" name="e2"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="e3"> + <property name="operation" value="checkCredit" /> + <property name="messageType" value="CreditCheckInvalid" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> + </action> + </actions> + </service> + </services> </jbossesb> Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml 2008-07-15 11:26:52 UTC (rev 165) @@ -135,4 +135,18 @@ </depends> </mbean> +<mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11"> + <depends optional-attribute-name="DestinationManager"> + jboss.mq:service=DestinationManager + </depends> +</mbean> + +<mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12"> + <depends optional-attribute-name="DestinationManager"> + jboss.mq:service=DestinationManager + </depends> +</mbean> + </server> Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java =================================================================== --- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2008-07-15 11:26:52 UTC (rev 165) @@ -57,16 +57,21 @@ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true"); try { + System.out.println("========================================="); + System.out.println("Request: " + mesg.getBody().get()); Message reply=brokerInvoker.deliverSync(mesg, 50000); - System.out.println("Reply: "+reply.getBody().get()); - //String buyReq = "<buy id=\"20\"> </buy>"; - //mesg.getBody().add(buyReq); + Thread.sleep(10000);//Waiting... + + System.out.println("Sending Buy request to Broker..."); + String buyReq = "<buy id=\"20\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\&... quoteValue=\"10\"></buy>"; + mesg.getBody().add(buyReq); - //reply = brokerInvoker.deliverSync(mesg, 50000); - //System.out.println("Reply: " + reply.getBody().get()); - + System.out.println("Request: " + mesg.getBody().get()); + reply = brokerInvoker.deliverSync(mesg, 50000); + System.out.println("Reply: " + reply.getBody().get()); + System.out.println("========================================="); } catch (Exception e) { logger.error(e); e.printStackTrace(); Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java =================================================================== --- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-07-15 11:26:52 UTC (rev 165) @@ -57,6 +57,8 @@ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true"); try { + System.out.println("========================================="); + System.out.println("Request: "+mesg.getBody().get()); Message reply=brokerInvoker.deliverSync(mesg, 20000); if (reply != null) { @@ -64,7 +66,7 @@ } else { System.err.println("NO REPLY"); } - + System.out.println("========================================="); } catch (Exception e) { logger.error(e); e.printStackTrace();