[overlord-commits] Overlord SVN: r87 - in trunk/cdl: samples and 7 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Jun 30 23:05:21 EDT 2008
Author: jeff.yuchang
Date: 2008-06-30 23:05:21 -0400 (Mon, 30 Jun 2008)
New Revision: 87
Added:
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
Modified:
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java
trunk/cdl/samples/jbossesb/README.txt
trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java
trunk/cdl/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml
trunk/cdl/samples/jbossesb/client/build.xml
trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
trunk/cdl/samples/jbossesb/client/src/jbossesb-properties.xml
trunk/cdl/samples/jbossesb/purchasing/pom.xml
trunk/cdl/samples/pom.xml
Log:
* Continuing update the broker example.(Not executable yet)
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -45,4 +45,6 @@
public static final String IMMEDIATE="immediate";
public static final String IDENTITIES="identities";
+
+ public static final String INITIATE = "initiate" ;
}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -40,7 +40,7 @@
*/
public abstract class ConversationAction extends AbstractActionLifecycle {
- private static Logger logger = Logger.getLogger(ConversationAction.class);
+ protected static Logger logger = Logger.getLogger(ConversationAction.class);
private ConfigTree config;
@@ -62,62 +62,66 @@
return(ret);
}
- protected java.util.List<Identity> getIdentities(Message message, String serviceDescriptionName) throws Exception {
- java.util.List<Identity> ret=null;
+ public List<Identity> getIdentities(Message message, String serviceDescriptionName, ConfigTree ct) throws Exception {
- // Check if identity already associated with message
- // and if not, then use token/locator information to
- // derive identity
- if (message.getProperties().getProperty(ActionProperties.IDENTITIES) == null) {
- ConfigTree[] children=getConfig().getAllChildren();
- java.util.List<Identity> ids=new java.util.Vector<Identity>();
-
- org.w3c.dom.Element elem=getElement(message);
-
- for (int i=0; i < children.length; i++) {
-
- if (children[i].getName().equals("identity")) {
- String type=children[i].getAttribute("type");
+ ConfigTree[] children=ct.getAllChildren();
+ java.util.List<Identity> ids=new java.util.Vector<Identity>();
+
+ org.w3c.dom.Element elem=getElement(message);
+
+ for (int i=0; i < children.length; i++) {
- ConfigTree[] tokens=children[i].getAllChildren();
-
- Map<String, String> properties = new HashMap<String, String>();
-
- for (int j=0; j < tokens.length; j++) {
- if (tokens[j].getName().equals("token")) {
- String locator=tokens[j].getAttribute("locator");
+ if (children[i].getName().equals("identity")) {
+ String type=children[i].getAttribute("type");
+
+ ConfigTree[] tokens=children[i].getAllChildren();
+
+ Map<String, String> properties = new HashMap<String, String>();
+
+ for (int j=0; j < tokens.length; j++) {
+ if (tokens[j].getName().equals("token")) {
+ String locator=tokens[j].getAttribute("locator");
+
+ try {
+ String value = XMLUtils.executeXpath(elem, locator);
+ properties.put(tokens[j].getAttribute("name"), value);
- try {
- String value = XMLUtils.executeXpath(elem, locator);
- properties.put(tokens[j].getAttribute("name"), value);
-
- } catch(Exception e) {
- logger.error("Failed to evaluate registry query '" + locator+"': "+e);
- throw new Exception(e);
- }
+ } catch(Exception e) {
+ logger.error("Failed to evaluate registry query '" + locator+"': "+e);
+ throw new Exception(e);
}
}
-
- Identity id = new Identity();
- id.setType(IdentityType.toIdentityType(type));
- id.setProperties(properties);
- id.setSession(getSession(message));
- if (serviceDescriptionName != null) {
- id.setServiceName(serviceDescriptionName);
- }
- ids.add(id);
}
+
+ Identity id = new Identity();
+ id.setType(IdentityType.toIdentityType(type));
+ id.setProperties(properties);
+ id.setSession(getSession(message));
+ if (serviceDescriptionName != null) {
+ id.setServiceName(serviceDescriptionName);
+ }
+ ids.add(id);
}
-
- ret = ids;
}
- return(ret);
+ return ids;
}
+
+ protected List<Identity> getIdentities(Message message, String serviceDescriptionName) throws Exception {
+
+ // Check if identity already associated with message
+ // and if not, then use token/locator information to
+ // derive identity
+ if (message.getProperties().getProperty(ActionProperties.IDENTITIES) == null) {
+ return getIdentities(message, serviceDescriptionName, getConfig());
+ }
+
+ return null;
+ }
+
protected String getMessageType(Message message) throws Exception {
- String mesgType=(String)message.getProperties().getProperty(
- MessageProperties.MESSAGE_TYPE);
+ String mesgType=(String)message.getProperties().getProperty( MessageProperties.MESSAGE_TYPE);
// NOTE: Only deals with XML at present
Added: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java (rev 0)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -0,0 +1,46 @@
+/*
+ * 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.jbossesb.actions;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class ConversationActionException extends RuntimeException {
+
+ private static final long serialVersionUID = -8332666951736901905L;
+
+ public ConversationActionException() {
+ super();
+ }
+
+ public ConversationActionException(String message) {
+ super(message);
+ }
+
+ public ConversationActionException(Throwable t) {
+ super(t);
+ }
+
+ public ConversationActionException(String message, Throwable t) {
+ super(message, t);
+ }
+
+}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,7 +19,6 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -32,8 +31,6 @@
*/
public class CreateSessionAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(CreateSessionAction.class);
-
public CreateSessionAction(ConfigTree config) {
super(config);
}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -22,6 +22,7 @@
import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.conversation.ClassLoaderUtil;
import org.jboss.soa.overlord.conversation.Session;
/**
@@ -54,7 +55,7 @@
if (method != null) {
// Try to invoke method on business object, to obtain a decision
try {
- Class cls= Thread.currentThread().getContextClassLoader().loadClass(session.getPojoClass());
+ Class cls= ClassLoaderUtil.loadClass(session.getPojoClass());
Class[] clsParam = null;
java.lang.reflect.Method m=cls.getMethod(method, clsParam);
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,43 +19,68 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import java.util.List;
+
import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.MessageUtil;
+import org.jboss.soa.overlord.conversation.Identity;
+import org.jboss.soa.overlord.conversation.ScheduleItem;
+import org.jboss.soa.overlord.conversation.Session;
/**
* @author jeffyu
*
*/
-public class MessageRouterAction extends AbstractActionLifecycle {
+public class MessageRouterAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(MessageRouterAction.class);
+ private boolean routerFlag = false;
- private ConfigTree config;
-
public MessageRouterAction(ConfigTree config) {
- this.config = config;
+ super(config);
}
- public Message process(Message message) throws Exception {
- ConfigTree[] children = config.getAllChildren();
- String messageType = MessageUtil.getMessageType(message.getBody().get());
+ @Override
+ public Message handle(Message message) throws Exception {
+ ConfigTree[] children = getConfig().getAllChildren();
+ String messageType = getMessageType(message);
+
logger.debug("The sent message type is [" + messageType + "]");
for (ConfigTree ct : children) {
ConfigTree[] msgNodes = ct.getChildren("message");
String msgType = msgNodes[0].getAttribute("type");
- if (messageType.equals(msgType)) {
- String serviceCategory = ct.getAttribute("service-category");
- String serviceName = ct.getAttribute("service-name");
- ServiceInvoker invoker = new ServiceInvoker(serviceCategory, serviceName);
- invoker.deliverAsync(message);
+ if (routerFlag == false && messageType.equals(msgType)) {
+ List<Identity> ids = getIdentities(message, null, 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) {
+ 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())) {
+ invokeService(message, serviceCategory, serviceName);
+ }
+ }
+ }
}
}
- throw new Exception ("Could not find any services to proceed!");
+ if (routerFlag == false) {
+ throw new ConversationActionException ("Could not find any appropriate services to proceed!");
+ }
+ return null;
}
+
+ private void invokeService(Message message, String serviceCategory,
+ String serviceName) throws MessageDeliverException {
+ ServiceInvoker invoker = new ServiceInvoker(serviceCategory, serviceName);
+ invoker.deliverAsync(message);
+ routerFlag = true;
+ }
+
}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,7 +19,6 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -29,8 +28,6 @@
*/
public class ParallelAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(ParallelAction.class);
-
public ParallelAction(ConfigTree config) {
super(config);
}
@@ -91,7 +88,6 @@
String name=children[i].getAttribute("service-name");
String immediate=children[i].getAttribute("immediate","false");
- logger.info("SESSION is stale?" + session.getJoinStates().get(0).getSpawnPath());
// Schedule service
session.schedule(category, name,
immediate.equalsIgnoreCase("true"),
Added: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java (rev 0)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -0,0 +1,43 @@
+/*
+ * 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.jbossesb.actions;
+
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class PerformAction extends ConversationAction {
+
+
+ public PerformAction(ConfigTree config) {
+ super(config);
+ }
+
+
+ @Override
+ public Message handle(Message message) throws Exception {
+
+ return null;
+ }
+
+}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,10 +19,8 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Identity;
import org.jboss.soa.overlord.conversation.Session;
@@ -32,8 +30,6 @@
*/
public class ReceiveMessageAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(ReceiveMessageAction.class);
-
public ReceiveMessageAction(ConfigTree config) {
super(config);
}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -21,7 +21,6 @@
import java.util.List;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Identity;
@@ -32,8 +31,6 @@
*/
public class RetrieveSessionAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(RetrieveSessionAction.class);
-
public RetrieveSessionAction(ConfigTree config) {
super(config);
}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,7 +19,6 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -29,8 +28,6 @@
*/
public class ScheduleStateAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(ScheduleStateAction.class);
-
public ScheduleStateAction(ConfigTree config) {
super(config);
}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,7 +19,6 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.eprs.LogicalEPR;
import org.jboss.soa.esb.client.ServiceInvoker;
@@ -39,8 +38,6 @@
*/
public class SendMessageAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(SendMessageAction.class);
-
public SendMessageAction(ConfigTree config) {
super(config);
}
Modified: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,7 +19,6 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -30,8 +29,6 @@
*/
public class SwitchAction extends ConversationAction {
- private static Logger logger = Logger.getLogger(SwitchAction.class);
-
public SwitchAction(ConfigTree config) {
super(config);
}
Added: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java (rev 0)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -0,0 +1,96 @@
+/*
+ * 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.jbossesb.actions;
+
+import java.lang.reflect.Method;
+
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.conversation.ClassLoaderUtil;
+import org.jboss.soa.overlord.conversation.Session;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class WhenAction extends ConversationAction {
+
+ public WhenAction(ConfigTree config) {
+ super(config);
+ }
+
+
+ @Override
+ public Message handle(Message message) throws Exception {
+ Session session = getSession(message);
+ int pathCount = 0;
+ String joinCategory = null;
+ String joinName = null;
+
+ for(ConfigTree ct : getConfig().getAllChildren()) {
+ if ("when".equals(ct.getName())) {
+ pathCount ++;
+ } else if ("join".equals(ct.getName())) {
+
+ if (joinName != null) {
+ logger.error("Join details already defined");
+ }
+
+ joinCategory = ct.getAttribute(ActionProperties.SERVICE_CATEGORY);
+ joinName = ct.getAttribute(ActionProperties.SERVICE_NAME);
+ }
+ }
+
+ if (joinCategory != null && joinName != null && pathCount > 0) {
+ session.join(joinCategory, joinName, pathCount);
+ }
+
+ for(ConfigTree ct : getConfig().getAllChildren()) {
+ if ("when".equals(ct.getName())) {
+ //TODO: make the expression as an method name temporarily
+ String decision = ct.getAttribute("expression");
+ String category = ct.getAttribute(ActionProperties.SERVICE_CATEGORY);
+ String name = ct.getAttribute(ActionProperties.SERVICE_NAME);
+ try {
+ Class<?> cls= ClassLoaderUtil.loadClass(session.getPojoClass());
+ Class<?>[] clsParam = null;
+ Method m=cls.getMethod(decision, clsParam);
+ if (m != null) {
+ Object[] params = null;
+ Object res = m.invoke(session.getBusinessObject(), params);
+ if (res instanceof Boolean) {
+ Boolean ret = (Boolean)res;
+ if (ret.booleanValue()) {
+ session.schedule(category, name, true, message);
+ }
+ } else {
+ logger.error("currently doesn't support the return value other than Boolean");
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Failed invoke decision method: " + decision);
+ }
+ }
+ }
+
+ return message;
+ }
+
+}
Added: trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
===================================================================
--- trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java (rev 0)
+++ trunk/cdl/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -0,0 +1,88 @@
+/*
+ * 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.jbossesb.actions;
+
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.conversation.ClassLoaderUtil;
+import org.jboss.soa.overlord.conversation.Session;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class WhileAction extends ConversationAction {
+
+ private int counter = 0;
+
+ public WhileAction(ConfigTree config) {
+ super(config);
+ }
+
+ @Override
+ public Message handle(Message message) throws Exception {
+ Session session = getSession(message);
+ ConfigTree whileConfig = null;
+ ConfigTree exitConfig = null;
+
+ ConfigTree[] configTrees = getConfig().getAllChildren();
+ for (ConfigTree ct : configTrees) {
+ if ("while".equals(ct.getName())) {
+ whileConfig = ct;
+ } else if ("exit".equals(ct.getName())){
+ exitConfig = ct;
+ } else {
+ throw new ConversationActionException("Unrecognized configuration Node in WhileAction");
+ }
+ }
+
+ String decisionMethod = whileConfig.getAttribute("decision-method");
+
+ Class<?> cls= ClassLoaderUtil.loadClass(session.getPojoClass());
+ Class<?>[] clsParam = null;
+ java.lang.reflect.Method m=cls.getMethod(decisionMethod, clsParam);
+ if (m != null) {
+ Object[] params = null;
+ Object response = m.invoke(session.getBusinessObject(), params);
+ if (response instanceof Integer) {
+ Integer value = (Integer) response;
+ if (counter < value) {
+ String category = whileConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
+ String name = whileConfig.getAttribute(ActionProperties.SERVICE_NAME);
+ session.schedule(category, name, true, message);
+ counter ++;
+ } else {
+ String category = exitConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
+ String name = exitConfig.getAttribute(ActionProperties.SERVICE_NAME);
+ session.schedule(category, name, true, message);
+ }
+ } else {
+ throw new ConversationActionException("method return value is not an Integer.");
+ }
+ } else {
+ throw new ConversationActionException("Haven't found the decision method in the configuration.");
+ }
+
+ return message;
+ }
+
+
+
+}
Modified: trunk/cdl/samples/jbossesb/README.txt
===================================================================
--- trunk/cdl/samples/jbossesb/README.txt 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/jbossesb/README.txt 2008-07-01 03:05:21 UTC (rev 87)
@@ -7,8 +7,8 @@
Settings required to edit before running:
-File: system/pom.xml
-- Update the "deploy.dir" to your JBossAS server directory.
+File: purchasing/pom.xml
+- Update the "deploy.dir" variable to your JBossAS server directory.
-- Notice Before jbossesb-rosetta.jar and jbossesb-config-model.jar get published in jboss maven repository, you need to install these two artifacts into
your local repository by using following commands:
@@ -18,7 +18,8 @@
Here we are using jbossesb-rosetta 4.2.1 version, jbossesb-config-model 1.0.1 version.
-Running instructions:
+
+Running instructions for purchasing example:
------------------------------------------------
To run the purchasing, follow these steps:
@@ -26,12 +27,12 @@
2 - from the $JBossAS, execute the command to start the ESB: "bin/run.sh", or "bin/run.bat" for windows.
-3 - from the $Purchasing/system execute the command to start the Hsql database: "ant startdb".
+3 - from the $purchasing: execute the command to start the Hsql database: "ant startdb".
-4 - Open up another shell, from the $Purchasing/system, execute the command to deploy the "Purchasing system": "mvn install"
+4 - Open up another shell, from the $Purchasing, execute the command to deploy the "Purchasing": "mvn install"
* this should deploy the ESB archive to your JBoss AS server/default.
-5 - from the $Purchasing/client, execute the command to run the client: "ant runClient"
+5 - from the $client, execute the command to run the client: "ant runClient"
You will see the "<BuyResponse id="5"></BuyResponse>" in the client console.
-6 - you can from the $Purchasing/system to run "ant dbmanager" to open up the database browser to check the data.
+6 - you can from the $purchasing to run "ant dbmanager" to open up the database browser to check the data.
Modified: trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java
===================================================================
--- trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -19,53 +19,8 @@
*/
package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import org.jboss.soa.overlord.conversation.HibernateObject;
- at Entity
- at Table(name="T_QUOTE")
-public class Quote implements HibernateObject {
-
- private static final long serialVersionUID = 111113L;
-
- @Id @GeneratedValue
- @Column(name="ID")
- private long id;
-
- @Column(name="SUPPLIER")
- @OneToOne(mappedBy="SUPPLIER")
- private Supplier supplier;
-
- @Column(name="QUOTE_VALUE")
- private int quoteValue;
+public class Quote {
- public long getId() {
- return this.id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public Supplier getSupplier() {
- return supplier;
- }
-
- public void setSupplier(Supplier supplier) {
- this.supplier = supplier;
- }
-
- public int getQuoteValue() {
- return quoteValue;
- }
-
- public void setQuoteValue(int quoteValue) {
- this.quoteValue = quoteValue;
- }
}
Added: trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
===================================================================
--- trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java (rev 0)
+++ trunk/cdl/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -0,0 +1,66 @@
+/*
+ * 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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.jboss.soa.overlord.conversation.HibernateObject;
+
+/**
+ * @author jeffyu
+ *
+ */
+ at Entity
+ at Table(name="T_REQUEST_QUOTE")
+public class Request4QuoteMain implements HibernateObject {
+
+ private static final long serialVersionUID = -6269132071760540966L;
+
+ @Id @GeneratedValue
+ @Column(name="ID")
+ private long id;
+
+ @Column(name="SUPPLIER")
+ @OneToOne(mappedBy="SUPPLIER")
+ private Supplier supplier;
+
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public Supplier getSupplier() {
+ return supplier;
+ }
+
+ public void setSupplier(Supplier supplier) {
+ this.supplier = supplier;
+ }
+
+
+}
Modified: trunk/cdl/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- trunk/cdl/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-01 03:05:21 UTC (rev 87)
@@ -70,14 +70,15 @@
<action class="org.jboss.soa.overlord.jbossesb.actions.MessageRouterAction"
process="process" name="s0-1">
<property name="paths">
- <route service-category="ESBBroker.BrokerParticipant"
- service-name="ESBBrokerProcess.main" >
+ <route service-category="ESBBroker.BrokerParticipant"
+ service-name="ESBBrokerProcess.main"
+ initiate="true">
<identity type="primary" >
<token name="id" locator="//@id" />
</identity>
<message type="enquiry" />
</route>
- <route service-category="ESBBroker.BrokerParticipant"
+ <route service-category="ESBBroker.BrokerParticipant"
service-name="ESBBrokerProcess.main.5" >
<identity type="primary" >
<token name="id" locator="//@id" />
@@ -200,7 +201,6 @@
<actions mep="OneWay">
<action class="org.jboss.soa.esb.actions.conversation.WhenAction"
process="process" name="s4-1">
- <property name="session" value="org.jboss.soa.esb.samples.broker.BrokerMain" />
<property name="paths">
<when expression="allQuotesReceived"
service-category="ESBBroker.BrokerParticipant"
@@ -359,7 +359,7 @@
<actions mep="OneWay">
<action class="org.jboss.soa.esb.actions.conversation.CreateSessionAction"
process="process" name="s8-1">
- <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Quote" />
+ <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Request4QuoteMain" />
</action>
<!-- NOTE: the service being sent the message is obtained by
@@ -585,5 +585,6 @@
</action>
</actions>
</service>
+
</services>
</jbossesb>
Modified: trunk/cdl/samples/jbossesb/client/build.xml
===================================================================
--- trunk/cdl/samples/jbossesb/client/build.xml 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/jbossesb/client/build.xml 2008-07-01 03:05:21 UTC (rev 87)
@@ -38,4 +38,11 @@
</java>
</target>
+ <target name="runBrokerClient" depends="compile">
+ <java fork="yes" classname="com.acme.services.buyer.BrokerClient">
+ <classpath refid="project.classpath" />
+ <classpath location="${classes.dir}" />
+ </java>
+ </target>
+
</project>
Added: trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
===================================================================
--- trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java (rev 0)
+++ trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -0,0 +1,76 @@
+/*
+ * 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 com.acme.services.buyer;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class BrokerClient {
+
+ private static Logger logger = Logger.getLogger(BuyerClient.class);
+
+ private ServiceInvoker brokerInvoker;
+
+ public BrokerClient() {
+
+ String regClass = Configuration.getRegistryFactoryClass();
+ System.setProperty("javax.xml.registry.ConnectionFactoryClass",regClass);
+
+ try {
+ brokerInvoker = new ServiceInvoker("ESBBroker.BrokerParticipant", "ESBBrokerProcess");
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to create ServiceInvoker", e);
+ }
+ }
+
+ public void run() {
+
+ String buyReq="<enquiry id=\"20\" ></enquiry>";
+
+ Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ mesg.getBody().add(buyReq);
+
+ try {
+ Message reply=brokerInvoker.deliverSync(mesg, 20000);
+
+ if (reply != null) {
+ System.out.println("Reply: "+reply.getBody().get());
+ } else {
+ System.err.println("NO REPLY");
+ }
+
+ } catch (Exception e) {
+ logger.error(e);
+ }
+ }
+
+ public static void main(String[] args) {
+ BrokerClient client=new BrokerClient();
+ client.run();
+ }
+}
Modified: trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
===================================================================
--- trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-07-01 03:05:21 UTC (rev 87)
@@ -1,3 +1,22 @@
+/*
+ * 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 com.acme.services.buyer;
import org.apache.log4j.Logger;
@@ -7,6 +26,9 @@
import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.common.Configuration;
+/**
+ * @author gary
+ */
public class BuyerClient {
private static Logger logger = Logger.getLogger(BuyerClient.class);
@@ -16,8 +38,7 @@
public BuyerClient() {
String regClass = Configuration.getRegistryFactoryClass();
- System.setProperty("javax.xml.registry.ConnectionFactoryClass",
- regClass);
+ System.setProperty("javax.xml.registry.ConnectionFactoryClass", regClass);
try {
brokerInvoker = new ServiceInvoker("PurchaseGoods.Broker", "Broker.main");
Modified: trunk/cdl/samples/jbossesb/client/src/jbossesb-properties.xml
===================================================================
--- trunk/cdl/samples/jbossesb/client/src/jbossesb-properties.xml 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/jbossesb/client/src/jbossesb-properties.xml 2008-07-01 03:05:21 UTC (rev 87)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
JBoss, Home of Professional Open Source
- Copyright 2006, JBoss Inc., and others contributors as indicated
+ 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.
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
- (C) 2005-2006,
+ (C) 2008,
@author JBoss Inc.
-->
<!-- $Id: jbossesb-unittest-properties.xml $ -->
Modified: trunk/cdl/samples/jbossesb/purchasing/pom.xml
===================================================================
--- trunk/cdl/samples/jbossesb/purchasing/pom.xml 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/jbossesb/purchasing/pom.xml 2008-07-01 03:05:21 UTC (rev 87)
@@ -95,7 +95,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <property name="deploy.dir" value="/var/local/jboss-4.2.2.GA/server/default/deploy" />
+ <property name="deploy.dir" value="/var/local/jboss-4.2.2.GA/server/default/deploy" />
<copy file="target/purchasing.esb" todir="${deploy.dir}" overwrite="true" />
</tasks>
</configuration>
Modified: trunk/cdl/samples/pom.xml
===================================================================
--- trunk/cdl/samples/pom.xml 2008-06-30 16:57:42 UTC (rev 86)
+++ trunk/cdl/samples/pom.xml 2008-07-01 03:05:21 UTC (rev 87)
@@ -16,7 +16,7 @@
</parent>
<modules>
- <module>jbossesb/purchasing/system</module>
+ <module>jbossesb/purchasing</module>
<module>jbossesb/broker</module>
</modules>
More information about the overlord-commits
mailing list