Author: jeff.yuchang Date: 2008-07-18 02:13:24 -0400 (Fri, 18 Jul 2008) New Revision: 184 Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.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/creditAgency/CreditAgency.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml Log: [SOAG-37] Rename the 'response..' to 'return..' in PerformAction. * Add some missing session property for tool validation. * Update conversatioType value to have '@' Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-07-17 14:54:11 UTC (rev 183) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-07-18 06:13:24 UTC (rev 184) @@ -21,7 +21,7 @@ public class ActionProperties { - public static final String SESSION_NAME="session"; + public static final String SESSION_NAME = "session"; public static final String ACTION_NAME = "action"; public static final String ACTION_NODE = "action"; public static final String CLASS_NAME = "class"; @@ -30,25 +30,29 @@ public static final String SERVICE_NAME = "service-name"; //Send and receive action properties - public static final String OPERATION="operation"; - public static final String MESSAGE_TYPE="messageType"; + public static final String OPERATION = "operation"; + public static final String MESSAGE_TYPE = "messageType"; - public static final String CLIENT_EPR="clientEPR"; + public static final String CLIENT_EPR = "clientEPR"; - public static final String CATEGORY="category"; // request, response, notification + public static final String CATEGORY = "category"; // request, response, notification - public static final String SERVICE_NAME_PROPERTY="serviceName"; - public static final String SERVICE_CATEGORY_PROPERTY="serviceCategory"; + public static final String SERVICE_NAME_PROPERTY = "serviceName"; + public static final String SERVICE_CATEGORY_PROPERTY = "serviceCategory"; public static final String SERVICE_DESCRIPTION_NAME = "serviceDescriptionName"; - public static final String RESPONSE_SERVICE_NAME="responseServiceName"; - public static final String RESPONSE_SERVICE_CATEGORY="responseServiceCategory"; + public static final String RESPONSE_SERVICE_NAME = "responseServiceName"; + public static final String RESPONSE_SERVICE_CATEGORY = "responseServiceCategory"; + + public static final String RETURN_SERVICE_NAME = "returnServiceName"; + public static final String RETURN_SERVICE_CATEGORY = "returnServiceCategory"; + public static final String SERVICE_NAME_EXPRESSION = "serviceNameExpression"; public static final String SERVICE_CATEGORY_EXPRESSION = "serviceCategoryExpression"; - public static final String IMMEDIATE="immediate"; + public static final String IMMEDIATE = "immediate"; - public static final String IDENTITIES="identities"; + public static final String IDENTITIES = "identities"; public static final String INITIATE = "initiate" ; } Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-17 14:54:11 UTC (rev 183) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-18 06:13:24 UTC (rev 184) @@ -67,8 +67,8 @@ session.schedule(serviceCategory, serviceName, message); addScheduleItemToDeliver(serviceCategory, serviceName); - String responseCategory = getConfig().getAttribute(ActionProperties.RESPONSE_SERVICE_CATEGORY); - String responseName = getConfig().getAttribute(ActionProperties.RESPONSE_SERVICE_NAME); + String responseCategory = getConfig().getAttribute(ActionProperties.RETURN_SERVICE_CATEGORY); + String responseName = getConfig().getAttribute(ActionProperties.RETURN_SERVICE_NAME); if (responseCategory != null && responseName != null) { session.schedule(responseCategory, responseName, 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-17 14:54:11 UTC (rev 183) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-18 06:13:24 UTC (rev 184) @@ -35,7 +35,7 @@ import org.jboss.soa.overlord.conversation.HibernateObject; import org.jboss.soa.overlord.jbossesb.actions.Service; -@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="Broker", root=true) +@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="overlord.cdl.samples.broker@Broker", root=true) @Entity @Table(name="T_BROKER") public class BrokerMain implements HibernateObject{ 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-17 14:54:11 UTC (rev 183) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java 2008-07-18 06:13:24 UTC (rev 184) @@ -34,7 +34,7 @@ */ @Entity @Table(name="T_CREDIT_AGENCY") -@Service(conversationType="creditAgency", name="{http://www.jboss.org/overlord/loan/}creditAgency";, root=true) +@Service(conversationType=&quot;overlord.cdl.samples.broker(a)creditAgency&quot;, name="{http://www.jboss.org/overlord/loan/}creditAgency";, root=true) public class CreditAgency implements HibernateObject { private static final long serialVersionUID = 2111L; Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java 2008-07-17 14:54:11 UTC (rev 183) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SupplierMain.java 2008-07-18 06:13:24 UTC (rev 184) @@ -32,7 +32,7 @@ * @author jeffyu * */ -@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="Supplier", root=true) +@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="overlord.cdl.samples.broker@Supplier", root=true) @Entity @Table(name="T_SUPPLIER1_MAIN") public class SupplierMain implements HibernateObject { 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-17 14:54:11 UTC (rev 183) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-18 06:13:24 UTC (rev 184) @@ -183,8 +183,8 @@ <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> <property name="serviceName" value="RequestForQuote.main" /> - <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" /> - <property name="responseServiceName" value="ESBBrokerProcess.main.9" /> + <property name="returnServiceCategory" value="ESBBroker.BrokerParticipant" /> + <property name="returnServiceName" value="ESBBrokerProcess.main.9" /> <property name="bindDetails" > <bind from-expression="getCurrentSupplier()" to-variable="supplier" /> @@ -314,8 +314,8 @@ process="process" name="s7-3"> <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> <property name="serviceName" value="CompleteTransaction.main" /> - <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" /> - <property name="responseServiceName" value="ESBBrokerProcess.main.8" /> + <property name="returnServiceCategory" value="ESBBroker.BrokerParticipant" /> + <property name="returnServiceName" value="ESBBrokerProcess.main.8" /> <property name="bindDetails" > <bind from-expression="getSelectedQuote()" to-variable="quote" /> @@ -426,6 +426,7 @@ <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"/> @@ -507,8 +508,6 @@ <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" > @@ -815,6 +814,7 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="d3"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" /> <property name="operation" value="checkCredit" /> <property name="messageType" value="CreditCheckResponse" /> <property name="clientEPR" value="broker" /> @@ -839,6 +839,7 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="e3"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" /> <property name="operation" value="checkCredit" /> <property name="messageType" value="CreditCheckInvalid" /> <property name="clientEPR" value="broker" /> Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-07-17 14:54:11 UTC (rev 183) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-07-18 06:13:24 UTC (rev 184) @@ -28,7 +28,7 @@ import org.jboss.soa.overlord.conversation.HibernateObject; import org.jboss.soa.overlord.jbossesb.actions.Service; -@Service(name="{http://www.jboss.org/overlord/purchase}Broker", conversationType="Broker", root=true) +@Service(name="{http://www.jboss.org/overlord/purchase}Broker", conversationType="overlord.cdl.samples.purchasing@Broker", root=true) @Entity @Table(name = "T_PURCHASE_GOOD") public class PurchaseGoods implements HibernateObject{ Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-07-17 14:54:11 UTC (rev 183) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-07-18 06:13:24 UTC (rev 184) @@ -28,7 +28,7 @@ import org.jboss.soa.overlord.conversation.HibernateObject; import org.jboss.soa.overlord.jbossesb.actions.Service; -@Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="CreditAgency",root=true) +@Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.purchasing@CreditAgency",root=true) @Entity @Table(name="T_CA_PURCHASE") public class CreditAgencyPurchase implements HibernateObject { Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-17 14:54:11 UTC (rev 183) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-18 06:13:24 UTC (rev 184) @@ -116,8 +116,6 @@ process="process" name="b1"> <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" /> - <property name="serviceName" value="CreditResponse" /> - <property name="serviceCategory" value="PurchaseGoods.Broker" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -149,6 +147,7 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="b4"> + <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="operation" value="checkCredit" /> <property name="messageType" value="CreditCheckResponse" /> <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" /> @@ -183,6 +182,7 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction" process="process" name="b7"> + <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="serviceName" value="ReturnBuyerResponse" /> <property name="serviceCategory" value="PurchaseGoods.Broker" /> <property name="immediate" value="false" /> @@ -199,6 +199,7 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction" process="process" name="b9"> + <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="serviceName" value="ReturnBuyerResponse" /> <property name="serviceCategory" value="PurchaseGoods.Broker" /> <property name="immediate" value="false" /> @@ -218,6 +219,7 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="b12"> + <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="operation" value="buy" /> <property name="messageType" value="BuyResponse" /> <property name="clientEPR" value="client" /> @@ -239,9 +241,10 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="b14"> + <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="operation" value="checkCredit" /> <property name="messageType" value="CreditCheckInvalid" /> - <property name="ReceiveMessageAction" value="{http://www.jboss.org/overlord/purchase}Broker" /> + <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -254,7 +257,6 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="b16"> <property name="operation" value="buy" /> - <property name="faultName" value="BuyFailed" /> <property name="messageType" value="BuyFailed" /> <property name="clientEPR" value="client" /> <property name="identities" > @@ -315,6 +317,7 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="d3"> + <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="operation" value="checkCredit" /> <property name="messageType" value="CreditCheckResponse" /> <property name="clientEPR" value="broker" /> @@ -339,6 +342,7 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="e3"> + <property name="session" value="com.acme.services.broker.PurchaseGoods" /> <property name="operation" value="checkCredit" /> <property name="messageType" value="CreditCheckInvalid" /> <property name="clientEPR" value="broker" />