[overlord-commits] Overlord SVN: r388 - in cdl/trunk: docs/docbook/userguide/src/main/module and 7 other directories.

Saturday, 18 October 2008

Author: jeff.yuchang
Date: 2008-10-18 07:20:00 -0400 (Sat, 18 Oct 2008)
New Revision: 388

Modified:
   cdl/trunk/distribution/src/main/assembly/bin.xml
   cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml
   cdl/trunk/runtime/jbossesb/pom.xml
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java
  
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/ConversationAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.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/MessageRouterAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.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/ReceiveMessageAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.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/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java
  
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java
  
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/XMLUtilsTest.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
  
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
Log:
* Update the 'decision-method' to use 'expression' globally.
* Add javadoc for jbossesb actions module.
* Include the generated javadoc in distribution.
* Update the MessageRouterAction sample in the userguide.



Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================

--- cdl/trunk/distribution/src/main/assembly/bin.xml	2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml	2008-10-18 11:20:00 UTC (rev 388)
@@ -58,14 +58,6 @@
 			<outputDirectory>/install</outputDirectory>
 		</fileSet> 
 
-        <fileSet>
-            <directory>../docs/cdl/user</directory>
-            <outputDirectory>docs</outputDirectory>
-            <includes>
-               <include>**/*.pdf</include>
-            </includes>
-        </fileSet>
-	
 	    <!-- Copy docbook generated documents -->
         <fileSet>
 		  
<directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory>
@@ -77,6 +69,10 @@
 		   <outputDirectory>docs/samplesguide</outputDirectory>
 		</fileSet>
 
+        <fileSet>
+		   <directory>../runtime/jbossesb/target/javadoc</directory>
+		   <outputDirectory>docs/jbossesb-javadoc</outputDirectory>
+		</fileSet>
         <!-- Copy samples -->
 	    <fileSet>
 		    <directory>src/main/release/samples/jbossesb</directory>

Modified: cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml	2008-10-17
16:26:27 UTC (rev 387)
+++ cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml	2008-10-18
11:20:00 UTC (rev 388)
@@ -82,18 +82,24 @@
 					<route  service-category="ESBBroker.BrokerParticipant"
 							service-name="ESBBrokerProcess.main" 
 							initiate="true">
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-						<message type="enquiry" />
+						<message type="enquiry">
+				          	<identity type="primary" >
+							  <token name="id" locator="//@id" />
+						   </identity>
+				        </message>
 					</route>
 					<route  service-category="ESBBroker.BrokerParticipant"
 							service-name="ESBBrokerProcess.main.5" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-						<message type="buy" />
-						<message type="cancel" />
+						<message type="buy">
+				           <identity type="primary" >
+							 <token name="id" locator="//@id" />
+						   </identity>
+				        </message>
+						<message type="cancel">
+				           <identity type="primary" >
+							 <token name="id" locator="//@id" />
+						    </identity>
+				        </message>
 					</route>
 				</property>				
 			</action>

Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml	2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/pom.xml	2008-10-18 11:20:00 UTC (rev 388)
@@ -70,14 +70,47 @@
 			</dependency>
 		</dependencies>
 	
-	<reporting>
+	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-			</plugin>
+		    <plugin>
+			<artifactId>maven-javadoc-plugin</artifactId>
+			<executions>
+			  <execution>
+			    <id>generate-javadoc</id>
+			    <phase>package</phase>
+			    <goals>
+			      <goal>jar</goal>
+			    </goals>
+			  </execution>
+			</executions>
+			<configuration>
+			  <doclet>org.jboss.apiviz.APIviz</doclet>
+			  <docletArtifact>
+			    <groupId>org.jboss.apiviz</groupId>
+			    <artifactId>apiviz</artifactId>
+			    <version>1.2.4.GA</version>
+			  </docletArtifact>
+			  <aggregate>true</aggregate>
+			  <attach>false</attach>
+			  <additionalparam>
+			    -d ${project.build.directory}/javadoc
+			    -charset UTF-8
+			    -docencoding UTF-8
+			    -version
+			    -author
+			    -breakiterator
+			    -windowtitle "${project.name} ${project.version} API Reference"
+			    -doctitle "${project.name} ${project.version} API Reference"
+			    -bottom "Copyright © ${project.inceptionYear}-Present
${project.organization.name}. All Rights Reserved."
+			    -link http://java.sun.com/javase/6/docs/api/
+			    -sourceclasspath ${project.build.outputDirectory}
+			  </additionalparam>
+			  <encoding>UTF-8</encoding>
+			  <locale>en_US</locale>
+			</configuration>
+		      </plugin>
 	    </plugins>
-	</reporting>
+	</build>
 	
 </project>
 

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -32,7 +32,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -23,7 +23,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public interface HibernateObject extends Serializable {

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -36,7 +36,7 @@
 
 /**
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 
 @Entity

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
 /**
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 @Entity
 @Table(name="CDL_JOIN_STATES")

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
 /**
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -54,7 +54,7 @@
 /**
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 
 @Entity

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -37,7 +37,7 @@
  * of sessions.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class SessionManager {
 	

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-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -24,7 +24,7 @@
  * It defines the property name in the jboss-esb.xml.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 
 public class ActionProperties {

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-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -61,7 +61,7 @@
  * </pre>
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public abstract class ConversationAction extends AbstractActionLifecycle {
 	
@@ -292,12 +292,6 @@
 	}
 	
 	
-	
-	protected String getMvelMethodName(String method) {
-		return method + "()";
-	}
-	
-	
 	protected void addScheduleItemToDeliver(String category, String name) {
 		for (ScheduleItem si : scheduleItems) {
 			if (category.equals(si.getCategory()) && name.equals(si.getName())) {

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -29,7 +29,7 @@
  * This action creates a new session.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  * 
  */
 public class CreateSessionAction extends ConversationAction {

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-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -29,12 +29,13 @@
  * based on the message that has occurred.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class IfAction extends ConversationAction {
 	
 	public static final String IF_STATEMENT = "if";
 	public static final String ELSE_STATEMENT = "else";
+	public static final String EXPRESSION = "expression";
 	
 	private static Logger logger = Logger.getLogger(IfAction.class);
 	
@@ -59,10 +60,10 @@
 			}
 		}
 		
-		String decisionMethod = ifConfig.getAttribute("decision-method");
-		logger.debug("decision method is : " + decisionMethod);
-		if (decisionMethod != null) {
-			Object response = MVEL.eval(getMvelMethodName(decisionMethod),
session.getBusinessObject());
+		String expression = ifConfig.getAttribute(EXPRESSION);
+		logger.debug("decision method is : " + expression);
+		if (expression != null) {
+			Object response = MVEL.eval(expression, session.getBusinessObject());
 			if (response instanceof Boolean) {
 				Boolean flag = (Boolean) response;
 				logger.info("The result of decision method is: " + flag);
@@ -71,13 +72,13 @@
 					String name = ifConfig.getAttribute(ActionProperties.SERVICE_NAME);
 					session.schedule(category, name, message);
 					addScheduleItemToDeliver(category, name);
-					logger.info("Scheduled items of " + category + "/" + name +
".");
+					logger.info("Scheduled items of [" + category + "/" + name +
"].");
 				} else if (elseConfig != null){
 					String category = elseConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
 					String name = elseConfig.getAttribute(ActionProperties.SERVICE_NAME);
 					session.schedule(category, name, message);
 					addScheduleItemToDeliver(category, name);
-					logger.info("Scheduled items of " + category + "/" + name +
".");
+					logger.info("Scheduled items of [" + category + "/" + name +
"].");
 				}
 			} else {
 				throw new Exception("method return value is not Boolean.");

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-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -23,7 +23,7 @@
  * Define message constants.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public class MessageProperties {

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -30,9 +30,9 @@
 import org.jboss.soa.overlord.jbossesb.ScheduleItem;
 
 /**
- * Route message to different services according to the 'MessageType'.
+ * The action is used to perform routing of the inbound requests.
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class MessageRouterAction extends ConversationAction {
 	

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
  * This action represents a parallel construct.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class ParallelAction extends ConversationAction {
 	

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-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  * 
  */
 public class PerformAction extends ConversationAction {

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -26,10 +26,13 @@
 import org.jboss.soa.overlord.jbossesb.Identity;
 
 /**
- * Receive activity.
+ * <p>
+ * The ReceiveMessageAction is used to explicitly define the message type that should be
received. 
+ * If an RPC style has been used, then the optional operation name can also be defined. 
+ * </p>
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class ReceiveMessageAction extends ConversationAction {
 	
@@ -45,7 +48,7 @@
 		String serviceName =
getConfig().getAttribute(ActionProperties.SERVICE_DESCRIPTION_NAME);
 		
 		if (requiredMType == null) {
-			throw new Exception("Message type not defined");
+			throw new Exception("Message type is not defined");
 		}
 		
 		String mesgMType=getMessageType(message);
@@ -57,26 +60,22 @@
 			session=getSession(message, ids);
 			session.assimulateIdentities(ids);
 			
-			logger.info("MESSAGE TYPE ["+mesgMType+"] RECEIVED.");
+			logger.info("MESSAGE TYPE [ "+ mesgMType +" ] RECEIVED.");
 			
 			if (unscheduledServiceItem == false &&
isFirstOrLastConversationAction(message, true)) {
 				String
category=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
 				String name=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
 				session.unschedule(category, name);
-				logger.info("Finished unscheduling of " + category + "/" +
name);
+				logger.debug("Finished unscheduling of [" + category + "/" + name
+ "]");
 			}
 			
 			EPR replyTo = message.getHeader().getCall().getReplyTo();
-			// Store any response EPR
 			if (clientEPR != null && replyTo != null) {
 				session.setEPR(clientEPR, replyTo);
 			}
 			
 		} else {
-			
-			// Unexpected message
-			throw new Exception("Unexpected message type="+mesgMType+
-					", but expecting type="+requiredMType);
+			throw new Exception("Unexpected message type= "+ mesgMType + ", but
expecting type="+requiredMType);
 		}
 		
 		return(message);

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
  * This action gets an existed session.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class RetrieveSessionAction extends ConversationAction {
 	

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
  * Schedule state activity.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class ScheduleStateAction extends ConversationAction {
 	

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -40,7 +40,7 @@
  * Send message activity.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class SendMessageAction extends ConversationAction {
 	

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
 /**
  * Set object into the 'ESB Message' Object.
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public class SetMessageAction extends ConversationAction {

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -28,7 +28,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class SetStateAction extends ConversationAction {
 	

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -28,7 +28,7 @@
  * based on the message that has occurred.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class SwitchAction extends ConversationAction {
 	

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-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -26,7 +26,7 @@
 
 /** 
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public class WhenAction extends ConversationAction {
@@ -45,25 +45,23 @@
 	public Message handle(Message message) throws Exception {
 		
 		for(ConfigTree ct : getConfig().getAllChildren()) {
-			if (WHEN_STATEMENT.equals(ct.getName())) {
-				//TODO: make the expression as an method name temporarily
-				String decision = ct.getAttribute(EXPRESSION);
+			if (WHEN_STATEMENT.equals(ct.getName())) {				
+				String expression = ct.getAttribute(EXPRESSION);
 				String category = ct.getAttribute(ActionProperties.SERVICE_CATEGORY);
 				String name = ct.getAttribute(ActionProperties.SERVICE_NAME);
 
-				if (decision != null) {
-					Object res = MVEL.eval(getMvelMethodName(decision), session.getBusinessObject());
-					logger.debug("The result of expression of " + decision + " is "
+ res);
+				if (expression != null) {
+					Object res = MVEL.eval(expression, session.getBusinessObject());
 					if (res instanceof Boolean) {
 						Boolean ret = (Boolean)res;
 						if (ret.booleanValue()) {
 							session.schedule(category, name, message);
 							addScheduleItemToDeliver(category, name);
-							logger.info("Scheduled: " + category + '/' + name);
+							logger.info("Scheduled item of [" + category + '/' + name +
"]");
 							break;
 						}
 					} else {
-						logger.error("currently doesn't support the return value other than
Boolean");
+						logger.error("currently doesn't support the return value other than
Boolean " + expression);
 					}
 				}
 			}

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-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -26,13 +26,13 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class WhileAction extends ConversationAction {
 	
 	public static final String WHILE_BRANCH = "while";
 	public static final String EXIT_BRANCH = "exit";
-	public static final String DECISION_METHOD = "decision-method";
+	public static final String EXPRESSION = "expression";
 	
 	private Logger logger = Logger.getLogger(WhileAction.class);
 	
@@ -57,11 +57,10 @@
 			}
 		}
 		
-		//TODO: Need to think about the expression.
-		String decisionMethod = whileConfig.getAttribute(DECISION_METHOD);
-		logger.debug("decision method is : " + decisionMethod);
-		if (decisionMethod != null) {
-			Object response = MVEL.eval(getMvelMethodName(decisionMethod),
session.getBusinessObject());
+		String expression = whileConfig.getAttribute(EXPRESSION);
+
+		if (expression != null) {
+			Object response = MVEL.eval(expression, session.getBusinessObject());
 			if ((response instanceof Boolean) && (response != null) ) {
 				Boolean flag = (Boolean) response;
 				logger.info("The result of decision method is: " + flag);
@@ -70,13 +69,13 @@
 					String name = whileConfig.getAttribute(ActionProperties.SERVICE_NAME);
 					session.schedule(category, name, message);
 					addScheduleItemToDeliver(category, name);
-					logger.info("Scheduled items of " + category + "/" + name +
".");
+					logger.info("Scheduled items of [" + category + "/" + name +
"].");
 				} else {
 					String category = exitConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
 					String name = exitConfig.getAttribute(ActionProperties.SERVICE_NAME);
 					session.schedule(category, name, message);
 					addScheduleItemToDeliver(category, name);
-					logger.info("Scheduled items of " + category + "/" + name +
".");
+					logger.info("Scheduled items of [" + category + "/" + name +
"].");
 				}
 			} else {
 				throw new Exception("method return value type is not Boolean Or is
Null.");

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -21,7 +21,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public class ClassLoaderUtil {

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -26,7 +26,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public class HibernateUtil {

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -29,7 +29,7 @@
  * messages.
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class MessageUtil {
 	

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -24,7 +24,7 @@
  * qualified names (with local parts and namespaces).
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 public class NameSpaceUtil {
 	

Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -33,7 +33,7 @@
 /**
  * 
  * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary
Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  */
 
 public class XMLUtils {

Modified:
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	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public class MVELUsageTest extends Assert {

Modified:
cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/XMLUtilsTest.java
===================================================================
---
cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/XMLUtilsTest.java	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/XMLUtilsTest.java	2008-10-18
11:20:00 UTC (rev 388)
@@ -26,7 +26,7 @@
 
 /**
  * 
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
  *
  */
 public class XMLUtilsTest extends Assert{

Modified:
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
===================================================================
---
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml	2008-10-18
11:20:00 UTC (rev 388)
@@ -147,7 +147,7 @@
 							process="process" name="s2-1">
 					<property name="session"
value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
 					<property name="paths">
-						<while  decision-method="hasSuppliers"
+						<while  expression="hasSuppliers()"
 								service-category="ESBBroker.BrokerParticipant"
 								service-name="ESBBrokerProcess.main.2"
 								immediate="true" />
@@ -193,7 +193,7 @@
 							process="process" name="s4-1">
 					<property name="session"
value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
 					<property name="paths">
-						<when expression="receivedAllQuotes"
+						<when expression="receivedAllQuotes()"
 								service-category="ESBBroker.BrokerParticipant"
 								service-name="ESBBrokerProcess.main.4" />
 					</property>				

Modified:
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
---
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml	2008-10-17
16:26:27 UTC (rev 387)
+++
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml	2008-10-18
11:20:00 UTC (rev 388)
@@ -33,7 +33,7 @@
                 </action>
                 <action
class="org.jboss.soa.overlord.jbossesb.actions.IfAction" name="c3"
process="process">
                     <property name="paths">
-                        <if decision-method="isCreditValid"
immediate="true" service-category="PurchaseGoods.CreditAgency"
service-name="CreditAgency.decision1"/>
+                        <if expression="isCreditValid()"
immediate="true" service-category="PurchaseGoods.CreditAgency"
service-name="CreditAgency.decision1"/>
                         <else immediate="true"
service-category="PurchaseGoods.CreditAgency"
service-name="CreditAgency.decision2"/>
                     </property>
                 </action>


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

[overlord-commits] Overlord SVN: r388 - in cdl/trunk: docs/docbook/userguide/src/main/module and 7 other directories.