[overlord-commits] Overlord SVN: r97 - in cdl/trunk: runtime/jbossesb and 7 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Jul 2 07:28:53 EDT 2008
Author: jeff.yuchang
Date: 2008-07-02 07:28:53 -0400 (Wed, 02 Jul 2008)
New Revision: 97
Added:
cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java
Modified:
cdl/trunk/pom.xml
cdl/trunk/runtime/jbossesb/pom.xml
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/IfAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java
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/WhenAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
cdl/trunk/samples/jbossesb/broker/pom.xml
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/Confirmation.java
cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java
cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java
cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml
cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml
Log:
* Using MVEL library.
Modified: cdl/trunk/pom.xml
===================================================================
--- cdl/trunk/pom.xml 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/pom.xml 2008-07-02 11:28:53 UTC (rev 97)
@@ -28,7 +28,7 @@
</developers>
<modules>
<module>runtime</module>
- <module>samples</module>
+ <!--module>samples</module-->
</modules>
<properties>
@@ -197,6 +197,12 @@
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
</repository>
+ <repository>
+ <id>codehaus</id>
+ <name>codehaus repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+
</repositories>
<distributionManagement>
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2008-07-02 11:28:53 UTC (rev 97)
@@ -58,6 +58,11 @@
<version>0.9.1</version>
</dependency>
<dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>1.3.4-java1.5</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
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-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -94,8 +94,8 @@
transaction = hibernateSession.beginTransaction();
//TODO: set variable here.
- String bindExpression = (String) message.getProperties().getProperty(MessageProperties.BIND_VARIABLE);
- Object value = message.getProperties().getProperty(MessageProperties.BIND_OBJECT);
+ //String bindExpression = (String) message.getProperties().getProperty(MessageProperties.BIND_VARIABLE);
+ //Object value = message.getProperties().getProperty(MessageProperties.BIND_OBJECT);
hibernateSession.save(businessState);
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-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -207,6 +207,10 @@
session.unschedule(serviceCategory, serviceName);
}
+ protected String getMvelMethodName(String method) {
+ return method + "()";
+ }
+
/**
* This is the method that deals with business logic for derived conversation actions.
* @param message
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -19,11 +19,10 @@
*/
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.ClassLoaderUtil;
import org.jboss.soa.overlord.conversation.Session;
+import org.mvel.MVEL;
/**
* This action represents a choice between a set of specified paths
@@ -53,31 +52,18 @@
String method=children[i].getAttribute("decision-method");
if (method != null) {
- // Try to invoke method on business object, to obtain a decision
try {
- Class cls= ClassLoaderUtil.loadClass(session.getPojoClass());
-
- Class[] clsParam = null;
- java.lang.reflect.Method m=cls.getMethod(method, clsParam);
-
- if (m != null) {
- Object[] objs = null;
- Object res= m.invoke(session.getBusinessObject(), objs);
+ Object res = MVEL.eval(getMvelMethodName(method), session.getBusinessObject());
+ if (res instanceof Boolean) {
- if (res instanceof Boolean) {
-
- f_register = ((Boolean)res).booleanValue();
-
- } else {
- logger.error("Result of method '"+method+
- "' on session '"+session+"' should be boolean," +
- " but got: "+res);
- }
+ f_register = ((Boolean)res).booleanValue();
+
} else {
- logger.error("Failed to find method '"+method+
- "' on session '"+session+"'");
+ logger.error("Result of method '"+method+
+ "' on session '"+session+"' should be boolean," +
+ " but got: "+res);
}
-
+
} catch(Exception e) {
logger.error("Failed to invoke decision method '"+
method+"' on session '"+session+"'", e);
@@ -95,8 +81,7 @@
return(message);
}
-
- private static Logger logger = Logger.getLogger(IfAction.class);
+
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -27,7 +27,6 @@
public static final String OPERATION="operation";
public static final String MESSAGE_TYPE="messageType";
- public static final String BIND_VARIABLE = "bind_variable";
- public static final String BIND_OBJECT = "bind_object";
+ public static final String BOUND_VARIABLE_KEY = "bound_variable_key";
}
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-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -19,9 +19,14 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import java.util.HashMap;
+import java.util.Map;
+
import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.conversation.Session;
+import org.mvel.MVEL;
/**
* @author jeffyu
@@ -39,24 +44,26 @@
public Message handle(Message message) throws Exception {
String serviceCategory = getConfig().getAttribute(ActionProperties.SERVICE_CATEGORY_PROPERTY);
String serviceName = getConfig().getAttribute(ActionProperties.SERVICE_NAME_PROPERTY);
+ Session session = getSession(message);
ConfigTree[] configs = getConfig().getAllChildren();
+ Map<String, Object> bindingVal = new HashMap<String, Object>();
+
for(ConfigTree ct : configs) {
if ("bind".equals(ct.getName())) {
String fromExpression = ct.getAttribute("from-expression");
String toVariable = ct.getAttribute("to-variable");
- //TODO: Object retrieving from the "fromExpression".
- Object o = new Object();
- message.getProperties().setProperty(MessageProperties.BIND_VARIABLE, toVariable);
- message.getProperties().setProperty(MessageProperties.BIND_OBJECT, o);
-
- ServiceInvoker serviceInvoker = new ServiceInvoker(serviceCategory, serviceName);
- serviceInvoker.deliverAsync(message);
+ Object o = MVEL.eval(fromExpression, session.getBusinessObject());
+ bindingVal.put(toVariable, o);
}
}
+ message.getProperties().setProperty(MessageProperties.BOUND_VARIABLE_KEY, bindingVal);
+ ServiceInvoker serviceInvoker = new ServiceInvoker(serviceCategory, serviceName);
+ serviceInvoker.deliverAsync(message);
+
return message;
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -19,12 +19,10 @@
*/
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;
+import org.mvel.MVEL;
/**
* @author jeffyu
@@ -69,12 +67,8 @@
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 (decision != null) {
+ Object res = MVEL.eval(getMvelMethodName(decision), session.getBusinessObject());
if (res instanceof Boolean) {
Boolean ret = (Boolean)res;
if (ret.booleanValue()) {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -21,8 +21,8 @@
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;
+import org.mvel.MVEL;
/**
* @author jeffyu
@@ -56,12 +56,8 @@
//TODO: Need to think about the expression.
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 (decisionMethod != null) {
+ Object response = MVEL.eval(getMvelMethodName(decisionMethod), session.getBusinessObject());
if (response instanceof Integer) {
Integer value = (Integer) response;
if (counter < value) {
Added: cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -0,0 +1,89 @@
+/*
+ * 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.util;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mvel.MVEL;
+
+import junit.framework.Assert;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class MVELUsageTest extends Assert {
+
+ private Example example;
+
+ @Before
+ public void setUp() {
+ example = new Example();
+ example.setProperty("exampleProperty");
+ }
+
+ @Test
+ public void testPropertyAssessor() throws Exception {
+ String expression = "property";
+ String value = (String)MVEL.eval(expression, example);
+
+ assertEquals("exampleProperty", value);
+ }
+
+ @Test
+ public void testInvokeMethod() throws Exception {
+ String expression = "isInvoked()";
+ boolean result = (Boolean)MVEL.eval(expression, example);
+ assertEquals(true, result);
+ }
+
+ @Test
+ public void testPropertyInjection() throws Exception {
+ String expression="property";
+ MVEL.setProperty(example, expression, "AnotherValue");
+ assertEquals("AnotherValue", MVEL.eval(expression, example));
+ }
+
+ @Test
+ public void testGetProperty() throws Exception {
+ String property = "property";
+ assertEquals("exampleProperty", MVEL.getProperty(property, example));
+ }
+
+
+ public class Example {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ public boolean isInvoked() {
+ return true;
+ }
+
+ }
+
+}
Modified: cdl/trunk/samples/jbossesb/broker/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/pom.xml 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/pom.xml 2008-07-02 11:28:53 UTC (rev 97)
@@ -55,7 +55,7 @@
</dependencies>
<build>
- <finalName>purchasing</finalName>
+ <finalName>broker</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -78,7 +78,7 @@
create="true"
drop="true"
export="true"
- outputfilename="purchasing-ddl.sql"
+ outputfilename="broker-ddl.sql"
delimiter=";"
format="true"/>
</hibernatetool>
@@ -96,7 +96,7 @@
<configuration>
<tasks>
<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" />
+ <copy file="target/broker.esb" todir="${deploy.dir}" overwrite="true" />
</tasks>
</configuration>
<goals>
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-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -44,8 +44,8 @@
@Column(name="ID")
private long id;
- @Column(name="TRANSACTION_ID")
- @OneToOne(mappedBy="TRANSACTION_ID")
+ @OneToOne
+ @JoinColumn(name="transaction_ID")
private CompleteTransactionMain transaction;
@OneToMany
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-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -23,6 +23,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
@@ -38,10 +39,14 @@
@Column(name="ID")
private long id;
- @OneToOne(mappedBy="quote")
- @Column(name="quote")
- private Quote confirmedQuote;
+ @OneToOne
+ @JoinColumn(name="Confirmation_ID")
+ private Confirmation confirmation;
+ @OneToOne
+ @JoinColumn(name="ID")
+ private Supplier supplier;
+
public long getId() {
return this.id;
}
@@ -50,13 +55,20 @@
this.id = id;
}
- public Quote getConfirmedQuote() {
- return confirmedQuote;
+ public Supplier getSupplier() {
+ return supplier;
}
- public void setConfirmedQuote(Quote confirmedQuote) {
- this.confirmedQuote = confirmedQuote;
+ public void setSupplier(Supplier supplier) {
+ this.supplier = supplier;
}
-
-
+
+ public Confirmation getConfirmation() {
+ return confirmation;
+ }
+
+ public void setConfirmation(Confirmation confirmation) {
+ this.confirmation = confirmation;
+ }
+
}
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -19,7 +19,10 @@
*/
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.Table;
import org.jboss.soa.overlord.conversation.HibernateObject;
@@ -35,8 +38,13 @@
private static final long serialVersionUID = 115L;
+ @Id @GeneratedValue
+ @Column(name="ID")
private long id;
+ @Column(name="DETAIL")
+ private String detail;
+
public long getId() {
return this.id;
}
@@ -45,4 +53,14 @@
this.id = id;
}
+ public String getDetail() {
+ return detail;
+ }
+
+ public void setDetail(String detail) {
+ this.detail = detail;
+ }
+
+
+
}
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -19,8 +19,42 @@
*/
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.Table;
+import org.jboss.soa.overlord.conversation.HibernateObject;
-public class Quote {
+ at Entity
+ at Table(name="T_QUOTE")
+public class Quote implements HibernateObject {
+
+ private static final long serialVersionUID = 12333L;
+ @Id @GeneratedValue
+ @Column(name="ID")
+ private long id;
+
+ @Column(name="VALUE")
+ private int value;
+
+ public long getId() {
+ return this.id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+
}
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -23,6 +23,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
@@ -42,10 +43,14 @@
@Column(name="ID")
private long id;
- @Column(name="SUPPLIER")
- @OneToOne(mappedBy="SUPPLIER")
+ @OneToOne
+ @JoinColumn(name="supplier_ID")
private Supplier supplier;
+ @OneToOne
+ @JoinColumn(name="quote_ID")
+ private Quote quote;
+
public long getId() {
return id;
}
@@ -61,6 +66,14 @@
public void setSupplier(Supplier supplier) {
this.supplier = supplier;
}
+
+ public Quote getQuote() {
+ return quote;
+ }
+
+ public void setQuote(Quote quote) {
+ this.quote = quote;
+ }
}
Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java 2008-07-02 11:28:53 UTC (rev 97)
@@ -23,6 +23,8 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.jboss.soa.overlord.conversation.HibernateObject;
@@ -47,6 +49,10 @@
@Column(name="SERVICE_NAME")
private String serviceName;
+ @ManyToOne
+ @JoinColumn(name="BROKER_ID")
+ private BrokerMain broker;
+
public long getId() {
return this.id;
}
@@ -70,6 +76,15 @@
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
+
+ public BrokerMain getBroker() {
+ return broker;
+ }
+
+ public void setBroker(BrokerMain broker) {
+ this.broker = broker;
+ }
+
}
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-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml 2008-07-02 11:28:53 UTC (rev 97)
@@ -1,14 +1,19 @@
<jbossesb-deployment>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker_reply</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker1</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker2</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker3</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker4</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker5</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker6</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker7</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency1</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency2</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker1</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker2</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker3</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker4</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker5</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker6</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker7</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker8</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker9</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker10</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker11</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker12</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker13</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker14</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker15</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=esb-loan-broker16</depends>
</jbossesb-deployment>
Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml 2008-07-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml 2008-07-02 11:28:53 UTC (rev 97)
@@ -54,6 +54,13 @@
<mapping class="org.jboss.soa.overlord.conversation.EPRWrapper"/>
<!-- List of Business State class -->
+ <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Supplier" />
+ <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
+ <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" />
+ <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Confirmation" />
+ <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Quote" />
+ <mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Request4QuoteMain" />
+
</session-factory>
</hibernate-configuration>
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-01 15:41:40 UTC (rev 96)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml 2008-07-02 11:28:53 UTC (rev 97)
@@ -2,76 +2,108 @@
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker_reply">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker1">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker1">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker2">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
+
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker2">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker3">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker3">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker4">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker4">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker5">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker5">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker6">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker6">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker7">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-broker7">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker8">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-creditAgency">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker9">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-creditAgency1">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker10">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-creditAgency2">
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker11">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker12">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker13">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker14">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker15">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-loan-broker16">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+
</server>
More information about the overlord-commits
mailing list