Overlord SVN: r379 - in cdl/trunk: docs/docbook/samplesguide/src/main/module and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-14 13:58:04 -0400 (Tue, 14 Oct 2008)
New Revision: 379
Modified:
cdl/trunk/distribution/src/main/release/README.txt
cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml
Log:
Updated documentation - readme and release note at top level, and CDL validator part of samples guide, to reference the Trailblazer guide in the JBossESB distribution.
Modified: cdl/trunk/distribution/src/main/release/README.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/README.txt 2008-10-14 16:33:23 UTC (rev 378)
+++ cdl/trunk/distribution/src/main/release/README.txt 2008-10-14 17:58:04 UTC (rev 379)
@@ -1 +1,7 @@
---README.txt (TBD)
+Overlord CDL README
+===================
+
+Please refer to the Getting Started section of the User Guide in the docs folder.
+This will explain how to install the Overlord CDL governance capabilities into the
+JBossESB environment, and how to run examples demonstrating the capabilities.
+
Modified: cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-14 16:33:23 UTC (rev 378)
+++ cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-14 17:58:04 UTC (rev 379)
@@ -1 +1,12 @@
-To Be Done.
+Overlord CDL 1.0-SNAPSHOT
+=========================
+
+See the README.txt for more information about the Overlord CDL release.
+
+This is the initial release of the CDL capabilities within the Overlord
+"SOA Governance" project. Additional information will be made available
+on the Overlord website (http://www.jboss.org/soag/). Free free to post
+questions to the User forum, or raise issues against the SOAG component
+in Jira issue tracker.
+
+Overlord-CDL Development Team
\ No newline at end of file
Modified: cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml 2008-10-14 16:33:23 UTC (rev 378)
+++ cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml 2008-10-14 17:58:04 UTC (rev 379)
@@ -8,12 +8,12 @@
<title>Trailblazer Example</title>
<para>
-This example can be found in the <filename>trailblazer</filename> folder, which contains an enhanced version of the trailblazer example found in the JBossESB distribution. The main changes are the introduction of a File Based Bank, and modifications to the message structures to enable a consistent conversation id to be carried with the messages.
+This example can be found in the <filename>trailblazer</filename> folder, which contains an enhanced version of the trailblazer example found in the JBossESB distribution. See the TrailBlazer Guide in the JBossESB distribution (<filename>$JBossESB/docs/samples/TBGuide.pdf</filename>) for more information about the example. The main changes are the introduction of a File Based Bank, and modifications to the message structures to enable a consistent conversation id to be carried with the messages.
</para>
<orderedlist>
<listitem>
-Update the <filename>$JbossAS/server/default/deploy/jbossesb.sar/jbossesb-properties.xml</filename> file, in the section entitled "transports" and specify all of the SMTP mail server settings for your environment.
+Update the <filename>$JBossAS/server/default/deploy/jbossesb.sar/jbossesb-properties.xml</filename> file, in the section entitled "transports" and specify all of the SMTP mail server settings for your environment.
</listitem>
<listitem>
Select the 'Import...' menu item, associated with the context menu on the background of the left panal (Navigator or Package depending on perspective being viewed). When the import dialog appears, select the <emphasis>General->ExistingProject from Workspace</emphasis> option and press the 'Next' button.
15 years, 6 months
- 1
- 0
Overlord SVN: r378 - in cdl/trunk: samples/jbossesb/brokerage/broker/src/main/resources/META-INF and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-10-14 12:33:23 -0400 (Tue, 14 Oct 2008)
New Revision: 378
Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/client/build.xml
Log:
* Fix the brokerage example, it won't have any errors in running multiple times.
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-11 23:44:14 UTC (rev 377)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-10-14 16:33:23 UTC (rev 378)
@@ -120,7 +120,7 @@
try {
session = getSession(message);
if (session != null && isFirstOrLastConversationAction(message, true)) {
- logger.debug("This is first conversation action to unschedule the item.");
+ logger.debug("This is first conversation action of message: [" + message.getBody().get() + "].");
unschedule(message);
unscheduledServiceItem = true;
}
@@ -139,7 +139,12 @@
SessionManager.updateObject(session);
logger.debug("Completed the session of " + session);
if (session.getParent() != null) {
- invokeSubsessionExitService(message, session);
+ if (session.getParent().getScheduleItems().size() == 0){
+ session.getParent().setStatus(SessionStatus.Completed);
+ SessionManager.updateObject(session.getParent());
+ } else {
+ invokeSubsessionExitService(message, session);
+ }
}
}
}
@@ -259,8 +264,10 @@
protected void sendAsyncMessage(Message message) throws Exception {
for(ScheduleItem si : scheduleItems) {
ServiceInvoker invoker = new ServiceInvoker(si.getCategory(), si.getName());
+ logger.debug("Deliver message [" + message.getBody() + "] to [" + si.getCategory() + "/" + si.getName() + "]");
invoker.deliverAsync(message);
}
+ scheduleItems.clear();
}
/**
@@ -348,9 +355,6 @@
private void invokeSubsessionExitService(Message message, Session session)
throws Exception {
List<ScheduleItem> items = session.getParent().getScheduleItems();
- if (items.size() <= 0) {
- throw new Exception("Completed sub-session, but haven't found any schedule items to run.");
- }
if (items.size() > 1) {
throw new Exception("Should be only one schedule item waiting for sub-session.");
}
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-11 23:44:14 UTC (rev 377)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml 2008-10-14 16:33:23 UTC (rev 378)
@@ -1,7 +1,7 @@
<?xml version = "1.0" encoding = "UTF-8"?>
<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..."
parameterReloadSecs="5000">
-
+
<providers>
<jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
@@ -303,8 +303,6 @@
process="process" name="s7-3">
<property name="serviceCategory" value="ESBBroker.BrokerParticipant" />
<property name="serviceName" value="CompleteTransaction.main" />
- <property name="returnServiceCategory" value="ESBBroker.BrokerParticipant" />
- <property name="returnServiceName" value="ESBBrokerProcess.main.8" />
<property name="bindDetails" >
<bind from-expression="getSelectedQuote()"
to-variable="quote" />
@@ -418,10 +416,10 @@
<property name="operation" value="getQuote" />
<property name="messageType" value="quote" />
<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}Broker"/>
- <property name="identities" >
- <identity type="primary" >
- <token name="id" locator="//@id" />
- <token name="supplierDesc" locator="//@supplierDesc" />
+ <property name="identities">
+ <identity type="primary">
+ <token name="id" locator="//@id"/>
+ <token name="supplierDesc" locator="//@supplierDesc"/>
</identity>
</property>
</action>
Modified: cdl/trunk/samples/jbossesb/client/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/client/build.xml 2008-10-11 23:44:14 UTC (rev 377)
+++ cdl/trunk/samples/jbossesb/client/build.xml 2008-10-14 16:33:23 UTC (rev 378)
@@ -1,4 +1,4 @@
-<project name="client" default="runClient" basedir=".">
+<project name="client" default="runPurchasingClient" basedir=".">
<property name="lib.dir" value="${basedir}/lib" />
<property name="classes.dir" value="${basedir}/target/classes" />
15 years, 6 months
- 1
- 0
Overlord SVN: r377 - in cdl/trunk/distribution/eclipse: features and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-11 19:44:14 -0400 (Sat, 11 Oct 2008)
New Revision: 377
Added:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810120039.jar
Removed:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810081506.jar
Modified:
cdl/trunk/distribution/eclipse/site.xml
Log:
Updated plugins
Deleted: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810120039.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cdl/trunk/distribution/eclipse/site.xml
===================================================================
--- cdl/trunk/distribution/eclipse/site.xml 2008-10-11 21:56:04 UTC (rev 376)
+++ cdl/trunk/distribution/eclipse/site.xml 2008-10-11 23:44:14 UTC (rev 377)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081506.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200810081506">
+ <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810120039.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200810120039">
<category name="JBossESB"/>
</feature>
- <feature url="features/org.scribble.conversation.feature_0.1.0.200810081506.jar" id="org.scribble.conversation.feature" version="0.1.0.200810081506">
+ <feature url="features/org.scribble.conversation.feature_0.1.0.200810120039.jar" id="org.scribble.conversation.feature" version="0.1.0.200810120039">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.experimental.feature_0.1.0.200810081506.jar" id="org.scribble.experimental.feature" version="0.1.0.200810081506">
+ <feature url="features/org.scribble.experimental.feature_0.1.0.200810120039.jar" id="org.scribble.experimental.feature" version="0.1.0.200810120039">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.feature_0.1.0.200810081506.jar" id="org.scribble.feature" version="0.1.0.200810081506">
+ <feature url="features/org.scribble.feature_0.1.0.200810120039.jar" id="org.scribble.feature" version="0.1.0.200810120039">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.protocol.feature_0.1.0.200810081506.jar" id="org.scribble.protocol.feature" version="0.1.0.200810081506">
+ <feature url="features/org.scribble.protocol.feature_0.1.0.200810120039.jar" id="org.scribble.protocol.feature" version="0.1.0.200810120039">
<category name="Common"/>
</feature>
<category-def name="JBossESB" label="JBossESB">
15 years, 7 months
- 1
- 0
Overlord SVN: r376 - cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-11 17:56:04 -0400 (Sat, 11 Oct 2008)
New Revision: 376
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBParser.java
Log:
Moved clearing dependencies for parsed reference outside parser.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBParser.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBParser.java 2008-10-10 20:39:15 UTC (rev 375)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBParser.java 2008-10-11 21:56:04 UTC (rev 376)
@@ -57,13 +57,6 @@
org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
org.scribble.model.DependencyManager.class, null);
- if (dm != null) {
-
- // Clear the dependencies so that they can be
- // re-initialized during the parsing of the model
- dm.clearDependencies(ref);
- }
-
try {
// Transform the text representation to DOM
DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance();
15 years, 7 months
- 1
- 0
Overlord SVN: r375 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb: generator and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-10 16:39:15 -0400 (Fri, 10 Oct 2008)
New Revision: 375
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
Log:
Partial implementation of solution for dealing with multiple models per resource, and multiple concrete models associated with an abstract reference.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java 2008-10-09 11:15:09 UTC (rev 374)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java 2008-10-10 20:39:15 UTC (rev 375)
@@ -68,13 +68,16 @@
ModelRepository.class, null);
if (mrep != null) {
- Model model=mrep.getModel(ref,
+ java.util.List<Model> models=mrep.getModels(ref,
new DefaultModelListener());
- if (model instanceof ConversationModel) {
- m_conversationModel = (ConversationModel)model;
-
- m_roles = m_conversationModel.getRoles();
+ for (int i=0; m_conversationModel == null &&
+ i < models.size(); i++) {
+ if (models.get(i) instanceof ConversationModel) {
+ m_conversationModel = (ConversationModel)models.get(i);
+
+ m_roles = m_conversationModel.getRoles();
+ }
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java 2008-10-09 11:15:09 UTC (rev 374)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java 2008-10-10 20:39:15 UTC (rev 375)
@@ -83,13 +83,16 @@
ModelRepository.class, null);
if (mrep != null) {
- Model model=mrep.getModel(ref,
- new DefaultModelListener());
-
- if (model instanceof ConversationModel) {
- m_conversationModel = (ConversationModel)model;
+ java.util.List<Model> models=mrep.getModels(ref,
+ new DefaultModelListener());
+
+ for (int i=0; m_conversationModel == null &&
+ i < models.size(); i++) {
+ if (models.get(i) instanceof ConversationModel) {
+ m_conversationModel = (ConversationModel)models.get(i);
- m_roles = m_conversationModel.getRoles();
+ m_roles = m_conversationModel.getRoles();
+ }
}
}
}
15 years, 7 months
- 1
- 0
Overlord SVN: r373 - in cdl/trunk/docs/docbook: samplesguide/src/main/module and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-09 06:59:41 -0400 (Thu, 09 Oct 2008)
New Revision: 373
Added:
cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlconformance.xml
cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml
Modified:
cdl/trunk/docs/docbook/samplesguide/src/main/master.xml
cdl/trunk/docs/docbook/samplesguide/src/main/module/overview.xml
cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml
Log:
Converted samples guide into docbook format.
Modified: cdl/trunk/docs/docbook/samplesguide/src/main/master.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/src/main/master.xml 2008-10-09 08:15:52 UTC (rev 372)
+++ cdl/trunk/docs/docbook/samplesguide/src/main/master.xml 2008-10-09 10:59:41 UTC (rev 373)
@@ -12,5 +12,7 @@
<toc/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/overview.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/cdlvalidator.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/cdlconformance.xml"/>
</book>
Added: cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlconformance.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlconformance.xml (rev 0)
+++ cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlconformance.xml 2008-10-09 10:59:41 UTC (rev 373)
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<chapter id="cdlconformance">
+ <title>CDL Conformance</title>
+
+ <para>
+There are two examples to demonstrate the conversation aware ESB actions, and the conformance checking against a choreography. These are <filename>purchasing</filename>, a simple customer/supplier example, and <filename>brokerage</filename> which extends the purchasing example through the introduction of a broker that mediates between potentially multiple suppliers to find the best deal.
+ </para>
+ <para>
+The other relevant folders for these examples are, <filename>common</filename> which contains the service implementation of the 'Credit Agency' which is used by both examples, and <filename>client</filename> which contains client applications to test both examples.
+ </para>
+
+ <section>
+ <title>Purchasing Example</title>
+
+ <para>
+The purchasing example describes the interactions between a Buyer, Store and Credit Agency. The flow for this example would be:
+ </para>
+ <itemizedlist>
+ <listitem>
+Buyer send a 'buy' request to Store
+ </listitem>
+ <listitem>
+Store send a 'credit check' request to the Credit Agency.
+ </listitem>
+ <listitem>
+If the Credit Agency returns a successful message, then the Store will send a 'BuyConfirmed' to user.
+ </listitem>
+ <listitem>
+If the Credit Agency returns a failed message, then the Store will send a 'BuyFailed' to user.
+ </listitem>
+ </itemizedlist>
+
+ <para>
+To check conformance, we need to import the model and service implementation projects into the Eclipse environment. This is achieved by:
+ </para>
+ <orderedlist>
+ <listitem>
+Select the 'Import...' menu item, associated with the context menu on the background of the left panal (Navigator or Package depending on perspective being viewed). When the import dialog appears, select the General->ExistingProject from Workspace option and press the 'Next' button.
+ </listitem>
+ <listitem>
+Ensuring that the 'Select root directory' radio button is selected, press the 'Browse' button and navigate to the <filename>samples/purchasing/models</filename> folder, press 'Ok' and then press 'Finish'.
+ </listitem>
+ <listitem>
+Then repeat steps (1) and (2) for the following project folders:
+ <itemizedlist>
+ <listitem>
+ <filename>samples/purchasing/store</filename>
+ </listitem>
+ <listitem>
+ <filename>samples/common/creditAgency</filename>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </orderedlist>
+ <para>
+The <filename>purchasing-models</filename> project contains the CDL used to perform conformance checking on the <filename>src/main/resources/META-INF/jboss-esb.xml</filename> files within the other projects. A full explanation of the conversation aware ESB actions can be found in the <emphasis>Conversational Aware ESB</emphasis> section of the <emphasis>User Guide</emphasis> in the <filename>docs</filename> folder.
+ </para>
+ <para>
+To provide a simple demonstration of the conformance checking:
+ </para>
+ <orderedlist>
+ <listitem>
+Double click on <filename>purchasing-store/src/main/resources/META-INF/jboss-esb.xml</filename>
+ </listitem>
+ <listitem>
+Scroll down to the second action, within the first service. This represents a <emphasis>ReceiveMessageAction</emphasis> and has a property defining the message type to be received.
+ </listitem>
+ <listitem>
+Edit the 'messageType' property value, e.g. by adding an 'X' to the end of the value.
+ </listitem>
+ <listitem>
+Then save the file. This should result in an error being generated, complaining about a type mismatch.
+ </listitem>
+ </orderedlist>
+ <para>
+The information regarding the expected message type is obtained from the choreography description in the <filename>purchasing-models</filename> project. To identify the precise interaction within the choreography that this error relates to, select the context menu associated with the error and choose the Quick Fix menu item. This will display a dialog with a list of fixes, select the <emphasis>Show referenced description</emphasis> option and press OK. This will cause the relevant interaction within the choreography description to be displayed.
+ </para>
+ <para>
+Another Quick Fix option associated with this error is <emphasis>Update from Referenced Description</emphasis>. By selecting this option, you will notice that the message type is changed back to the value without the 'X'.
+ </para>
+
+ <section>
+ <title>Running the Example</title>
+
+ <orderedlist>
+ <listitem>
+ First step is to install the ESB services. In a command window,
+ <itemizedlist>
+ <listitem>
+ Go to the <filename>$Overlord/samples/purchasing/store</filename> folder and execute <emphasis role="bold">ant deploy</emphasis>
+ </listitem>
+ <listitem>
+ Go to the $Overlord/samples/common/creditAgency folder and execute <emphasis role="bold">ant deploy</emphasis>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ Go to the <filename>$Overlord/samples/client</filename> folder and execute <emphasis role="bold">ant runPurchasingClient</emphasis>, which will send a 'BuyRequest' message to the Store, which will then perform the credit check before returning a response to the client.
+ </listitem>
+ </orderedlist>
+
+ <para>
+To see a different response from the client, change the <emphasis>isCreditValid</emphasis> method on the <emphasis>CreditAgencyPurchase</emphasis> class, within the <filename>common/creditAgency</filename> ESB service implementation, and then re-deploy the Credit Agency service. Then when the client is re-run, a 'BuyFailed' message will be returned.
+ </para>
+
+ </section>
+
+ </section>
+
+ <section>
+ <title>Brokerage Example</title>
+
+ <para>
+The brokerage example describes the interactions between a Customer, Broker, Supplier and Credit Agency. The flow for this example would be:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+Customer sends an 'enquiry' request to Broker
+ </listitem>
+ <listitem>
+Broker sends the request to one or more Suppliers concurrently
+ </listitem>
+ <listitem>
+When all of the quote responses have been received, or a timeout expires, the available information is returned to the Customer
+ </listitem>
+ <listitem>
+Customer decides whether to:
+ <itemizedlist>
+ <listitem>
+ Cancel the transaction, or
+ </listitem>
+ <listitem>
+ Send a 'buy' request to the Broker
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+If a 'buy' request is received by the Broker, it will send a 'credit check' request to the Credit Agency
+ </listitem>
+ <listitem>
+If the Credit Agency returns a successful message, then the Broker sends a 'buy' request to the Supplier selected by the Customer (in the 'buy' request), followed by a confirmation back to the Customer
+ </listitem>
+ <listitem>
+If the Credit Agency returns a failed message, then the Broker will inform the Customer
+ </listitem>
+ </itemizedlist>
+
+ <para>
+To check conformance, we need to import the model and service implementation projects into the Eclipse environment. This is achieved by:
+ </para>
+ <orderedlist>
+ <listitem>
+Select the 'Import...' menu item, associated with the context menu on the background of the left panal (Navigator or Package depending on perspective being viewed). When the import dialog appears, select the <emphasis>General->ExistingProject from Workspace</emphasis> option and press the 'Next' button.
+ </listitem>
+ <listitem>
+Ensuring that the 'Select root directory' radio button is selected, press the 'Browse' button and navigate to the <emphasis>samples/brokerage/models</emphasis> folder, press 'Ok' and then press 'Finish'.
+ </listitem>
+ <listitem>
+Then repeat steps (1) and (2) for the following project folders:
+ <itemizedlist>
+ <listitem>
+ <filename>samples/brokerage/broker</filename>
+ </listitem>
+ <listitem>
+ <filename>samples/brokerage/supplier</filename>
+ </listitem>
+ <listitem>
+ <filename>samples/common/creditAgency</filename> (if not already imported for the previous example)
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </orderedlist>
+ <para>
+The <filename>brokerage-models</filename> project contains the CDL used to perform conformance checking on the <filename>src/main/resources/META-INF/jboss-esb.xml</filename> files within the other brokerage projects. A full explanation of the conversation aware ESB actions can be found in the <emphasis>Conversational Aware ESB</emphasis> section of the <emphasis>User Guide</emphasis> in the <filename>docs</filename> folder.
+ </para>
+ <para>
+To provide a simple demonstration of the conformance checking:
+ </para>
+ <orderedlist>
+ <listitem>
+Double click on <filename>brokerage-broker/src/main/resources/META-INF/jboss-esb.xml</filename>
+ </listitem>
+ <listitem>
+Scroll down to the second action, within the first service. This represents a <emphasis>ReceiveMessageAction</emphasis> and has a property defining the message type to be received.
+ </listitem>
+ <listitem>
+Edit the 'messageType' property value, e.g. by adding an 'X' to the end of the value.
+ </listitem>
+ <listitem>
+Then save the file. This should result in an error being generated, complaining about a type mismatch.
+ </listitem>
+ </orderedlist>
+ <para>
+The information regarding the expected message type is obtained from the choreography description in the <filename>brokerage-models</filename> project. To identify the precise interaction within the choreography that this error relates to, select the context menu associated with the error and choose the Quick Fix menu item. This will display a dialog with a list of fixes, select the <emphasis>Show referenced description</emphasis> option and press OK. This will cause the relevant interaction within the choreography description to be displayed.
+ </para>
+
+ <section>
+ <title>Running the Example</title>
+
+ <orderedlist>
+ <listitem>
+ First step is to install the ESB services. In a command window,
+ <itemizedlist>
+ <listitem>
+ Go to the <filename>$Overlord/samples/brokerage/supplier</filename> folder and execute <emphasis role="bold">ant deploy</emphasis>
+ </listitem>
+ <listitem>
+ Go to the <filename>$Overlord/samples/brokerage/broker</filename> folder and execute <emphasis role="bold">ant deploy</emphasis>
+ </listitem>
+ <listitem>
+ Go to the <filename>$Overlord/samples/common/creditAgency</filename> folder and execute <emphasis role="bold">ant deploy</emphasis>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ Go to the <filename>$Overlord/samples/client</filename> folder and execute <emphasis role="bold">ant runBrokerageClient</emphasis>, which will initially send an 'enquiry' message to the Broker, which will communicate with the set of Suppliers to obtain the best quote. The client will then send a 'buy' request, which will result in the Broker performing a credit check before returning a response to the client.
+ </listitem>
+ </orderedlist>
+ </section>
+
+ </section>
+
+</chapter>
Added: cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml (rev 0)
+++ cdl/trunk/docs/docbook/samplesguide/src/main/module/cdlvalidator.xml 2008-10-09 10:59:41 UTC (rev 373)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<chapter id="cdlvalidator">
+ <title>CDL Validator</title>
+
+ <section>
+ <title>Trailblazer Example</title>
+
+ <para>
+This example can be found in the <filename>trailblazer</filename> folder, which contains an enhanced version of the trailblazer example found in the JBossESB distribution. The main changes are the introduction of a File Based Bank, and modifications to the message structures to enable a consistent conversation id to be carried with the messages.
+ </para>
+
+ <orderedlist>
+ <listitem>
+Update the <filename>$JbossAS/server/default/deploy/jbossesb.sar/jbossesb-properties.xml</filename> file, in the section entitled "transports" and specify all of the SMTP mail server settings for your environment.
+ </listitem>
+ <listitem>
+Select the 'Import...' menu item, associated with the context menu on the background of the left panal (Navigator or Package depending on perspective being viewed). When the import dialog appears, select the <emphasis>General->ExistingProject from Workspace</emphasis> option and press the 'Next' button.
+ </listitem>
+ <listitem>
+Ensuring that the 'Select root directory' radio button is selected, press the 'Browse' button and navigate to the <filename>samples/trailblazer/models</filename> folder, press 'Ok' and then press 'Finish'.
+
+<note>
+ <para>
+Once the models project has been installed, you can open the choreography for the trailblazer (trailblazer.cdm) and also a scenario representing a valid transaction associated with the choreography (LoanRequest.scn). In the choreography description editor, view the "Choreography Flows" tab to see the structure of the process.
+ </para>
+ <para>
+To simulate the scenario against the choreography, to ensure that the choreography correctly caters for the valid business scenario, the user should press the green 'play' button in the toolbar, associated with the Scenario Editor.
+ </para>
+</note>
+ </listitem>
+ <listitem>
+Update the <filename>trailblazer/trailblazer.properties</filename>
+ <para>
+Update the <property>file.bank.monitored.directory</property> and <property>file.output.directory</property> properties. These are folders used by the File Based Bank, and are set to <filename>/tmp/input</filename> and <filename>/tmp/output</filename> by default.
+ </para>
+ </listitem>
+ <listitem>
+Update the <filename>trailblazer/esb/conf/jboss-esb.xml</filename>
+ <para>
+There is a <emphasis>fs-provider</emphasis> block, update the <property>directory</property> attribute value to be the same as the <property>file.output.directory</property> value in <filename>trailblazer.properties</filename> file.
+ </para>
+ </listitem>
+ <listitem>
+Start the JBossAS server
+ </listitem>
+ <listitem>
+From the <filename>trailblazer</filename> folder, execute the command to start the ESB: <emphasis role="bold">ant deploy</emphasis>
+ <para>
+this should deploy the ESB and WAR files to your JBoss AS <filename>server/default</filename>.
+ </para>
+ </listitem>
+ <listitem>
+From the <filename>trailblazer/banks</filename> folder, execute the command to start the JMS Bank service: <emphasis role="bold">ant runJMSBank</emphasis>.
+ </listitem>
+ <listitem>
+From the <filename>trailblazer/banks</filename> folder, execute the command to start the JMS Bank service: <emphasis role="bold">ant runFileBank</emphasis>.
+ </listitem>
+ <listitem>
+In the Eclipse environment, select the context menu associated with the <filename>trailblazer.cdm</filename> file, and choose the <emphasis>Choreography->Monitor</emphasis> menu item. Wait for the monitor window to start, and indicate that the choreography is being monitored, shown in the status line at the bottom of the window.
+ </listitem>
+ <listitem>
+Start a browser and enter the URL: <ulink url="http://localhost:8080/trailblazer">localhost:8080/trailblazer</ulink>.
+ </listitem>
+ <listitem>
+Now you can submit quotes, You will see either a loan request rejected (single email) because the score is less than 4, or two emails (one from JMS bank and one from FileBased bank) with valid quotes. When entering subsequent quotes, make sure that the quote reference is updated, so that each session has a unique id.
+ </listitem>
+ </orderedlist>
+ <para>
+To demonstrate what occurs when the implementation deviates from the expected behaviour as defined in the choreography description, try the following steps:
+ </para>
+ <orderedlist>
+ <listitem>
+Edit the LoanBroker.java in the <filename>$Overlord/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker</filename> folder
+ </listitem>
+ <listitem>
+Find the following code within the <emphasis>processLoanRequest</emphasis> method, and change the 4 to a 7
+
+<programlisting>
+ //step 2 - check if score is acceptable
+
+ if (score >= 4) {
+</programlisting>
+ </listitem>
+ <listitem>
+Re-deploy the trailblazer example (step 7 above)
+ </listitem>
+ <listitem>
+Issue further loan requests, remembering to change the quote reference each time, until a Credit Check result of between 4 and 6 inclusive occurs, which will result in an out of sequence message being reported (in red) to the Choreography Monitor
+
+<note><para>
+It is currently a requirement that the choreography used within the Choreography Monitor is the same as the description used to locally monitor the services (i.e. within the overlord-cdl-validator.esb/models directory).
+</para></note>
+ </listitem>
+ </orderedlist>
+
+ </section>
+
+</chapter>
Modified: cdl/trunk/docs/docbook/samplesguide/src/main/module/overview.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/src/main/module/overview.xml 2008-10-09 08:15:52 UTC (rev 372)
+++ cdl/trunk/docs/docbook/samplesguide/src/main/module/overview.xml 2008-10-09 10:59:41 UTC (rev 373)
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<chapter id="overview">
- <title>Overview</title>
- <para>The Overlord CDL distribution contains two main types of functionality:</para>
- <orderedlist>
- <listitem>
- the ability to validate executing services against a choreography description (an example of runtime governance).
- </listitem>
- <listitem>
- the ability to build an ESB using 'conversation aware' actions which can be checked for conformance against a choreography description (an example of design time governance).
- </listitem>
- </orderedlist>
-
- <para>
- This document will describe the samples available to demonstrate each aspect of the functionality.
- </para>
- <para>
- Further information about configuring the runtime validation of services against a choreography can be found in the <emphasis role="bold">UserGuide</emphasis>.
- Information regarding the conversation aware ESB actions, and how to use them in conjunction with conformance checking against a choreography description, can also be found in the <emphasis role="bold">UserGuide</emphasis>.
- </para>
-
- <note>
- <para>
- Before attempting to install and run these examples, you must follow the instructions in the <emphasis role="bold">"Getting Started" Chapter</emphasis> of <emphasis role="bold">User Guide</emphasis> regarding installing Overlord CDL into a JBossAS environment.
- </para>
- </note>
-
-</chapter>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<chapter id="overview">
+ <title>Overview</title>
+ <para>The Overlord CDL distribution contains two main types of functionality:</para>
+ <orderedlist>
+ <listitem>
+ the ability to validate executing services against a choreography description (an example of runtime governance).
+ </listitem>
+ <listitem>
+ the ability to build an ESB using 'conversation aware' actions which can be checked for conformance against a choreography description (an example of design time governance).
+ </listitem>
+ </orderedlist>
+
+ <para>
+ This document will describe the samples available to demonstrate each aspect of the functionality.
+ </para>
+ <para>
+ Further information about configuring the runtime validation of services against a choreography can be found in the <emphasis role="bold">UserGuide</emphasis>.
+ Information regarding the conversation aware ESB actions, and how to use them in conjunction with conformance checking against a choreography description, can also be found in the <emphasis role="bold">UserGuide</emphasis>.
+ </para>
+
+ <note>
+ <para>
+ Before attempting to install and run these examples, you must follow the instructions in the <emphasis role="bold">"Getting Started" Chapter</emphasis> of the <emphasis role="bold">User Guide</emphasis> regarding installing Overlord CDL into a JBossAS environment.
+ </para>
+ </note>
+
+</chapter>
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-09 08:15:52 UTC (rev 372)
+++ cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml 2008-10-09 10:59:41 UTC (rev 373)
@@ -165,13 +165,13 @@
<para>
The one or more 'messageType' elements, contained within the 'route' element, defines the message type(s) that should be routed to the service descriptor associated with the 'route' element.
</para>
-<note>
+<note><para>
If a route is marked as <emphasis>initiate='true'</emphasis>, with the correct message type for an inbound message, but a service instance already exists for the identity information extracted from the message, then the route will not be selected. The converse is also true.
-</note>
+</para></note>
-<note>
+<note><para>
Similarly, even if a message type match is found, if the service instance is not in an appropriate state to invoke the target service descriptor, then the route will not be selected.
-</note>
+</para></note>
<para>
If no routes are found for a particular inbound message, then an exception will be reported.
</para>
@@ -740,9 +740,9 @@
<para>
The optional 'bindDetails' provides the means for the parent session to assign specific information from its state to the newly created pojo associated with the child session.
</para>
-<note>
+<note><para>
Currently the bound details from the parent will be copied into the child pojo, and therefore modifications will not be reflected back into the parent pojo.
-</note>
+</para></note>
<para>
The optional 'parentReference' is used to set a reference, on the child session's pojo, to the parent session's pojo. The value of the 'parentReference' identifies the property on the child session's pojo that will be used to reference the parent pojo.
</para>
@@ -823,9 +823,9 @@
This error has an associated <emphasis>quick fix</emphasis> to enable the missing activities to be inserted in the appropriate location within the ESB configuration.
</para>
-<note>
+<note><para>
When this resolution is selected, if it displays an error <quote>Could not insert activities found in referenced description</quote>, this means that it was not possible to insert the additional activities automatically.
-</note>
+</para></note>
</section>
<section>
@@ -838,9 +838,9 @@
This error has an associated <emphasis>quick fix</emphasis> to enable the type to be updated in the relevant activity within the ESB configuration.
</para>
-<note>
+<note><para>
When this resolution is selected, if it displays an error <quote>Could not update activity with information from referenced description</quote>, this means that it was not possible to update the information automatically.
-</note>
+</para></note>
</section>
<section>
@@ -852,9 +852,9 @@
This error has an associated <emphasis>quick fix</emphasis> to enable the unwanted activities to be removed from the ESB configuration.
</para>
-<note>
+<note><para>
When this resolution is selected, if it displays an error <quote>Could not delete activities from the model</quote>, this means that it was not possible to delete the activities automatically.
-</note>
+</para></note>
</section>
<section>
15 years, 7 months
- 1
- 0
Overlord SVN: r372 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-10-09 04:15:52 -0400 (Thu, 09 Oct 2008)
New Revision: 372
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
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/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/SendMessageAction.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/WhileAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
Log:
* Fix the break that is caused by my last commit.
* Add javadoc for ConversationAction class.
* Add samplesguide in the distribution.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2008-10-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2008-10-09 08:15:52 UTC (rev 372)
@@ -72,6 +72,11 @@
<outputDirectory>docs/userguide</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/samplesguide</outputDirectory>
+ </fileSet>
+
<!-- Copy samples -->
<fileSet>
<directory>src/main/release/samples/jbossesb</directory>
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-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java 2008-10-09 08:15:52 UTC (rev 372)
@@ -201,7 +201,9 @@
String parentProperty = session.getProperties().get(Session.PARENT_REFERENCE_KEY);
if (parentProperty!= null && session.getParent() != null) {
Object parentBizObj = session.getParent().getBusinessObject();
- MVEL.setProperty(session.getBusinessObject(), parentProperty, parentBizObj);
+ Object bizObj = session.getBusinessObject();
+ MVEL.setProperty(bizObj, parentProperty, parentBizObj);
+ session.setBusinessObject(bizObj);
}
}
}
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-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-10-09 08:15:52 UTC (rev 372)
@@ -44,8 +44,22 @@
import org.mvel.MVEL;
/**
- * Base activity, all the ESB aware actions extend from this one.
+ * Base activity, all the ESB conversation aware actions extend from this one.
*
+ * <pre>
+ * The procedure of processing a message is as following:
+ * 1. Get current session from the database.
+ * Include injecting context, such as injecting parent session business object if it exists
+ * 2. Unschedule current service, if it is first conversation action.
+ * 3. Handle Message. (This will be override by subclasses)
+ * 4. Save session object back to database.
+ * Update the parent session if it is necessary.
+ * 5. If it is the last conversation action in current service.
+ * And if it has no schedule items to invoke. Mark session status to 'Completed'
+ * 5.1 If it is sub-session, then invoke sub-session exit service.
+ * 6. Deliver message to services at last if it needs to.
+ * </pre>
+ *
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
* @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
*/
@@ -59,6 +73,8 @@
protected boolean unscheduledServiceItem = false;
+ protected boolean isCreateSessionAction = false;
+
protected Session session;
public ConversationAction(ConfigTree config) {
@@ -69,15 +85,78 @@
return(config);
}
- protected org.w3c.dom.Element getElement(Message message) throws Exception {
- org.w3c.dom.Element ret=null;
+ /**
+ * This is the method that deals with business logic for derived conversation actions.
+ * @param message
+ * @return
+ * @throws Exception
+ */
+ public abstract Message handle(Message message) throws Exception;
+
+
+ /**
+ * <pre>
+ * The procedure of processing a message is as following:
+ * 1. Get current session from the database.
+ * Include injecting context, such as injecting parent session business object if it exists
+ * 2. Unschedule current service, if it is first conversation action.
+ * 3. Handle Message. (This will be override by subclasses)
+ * 4. Save session object back to database.
+ * Update the parent session if it is necessary.
+ * 5. If it is the last conversation action in current service.
+ * And if it has no schedule items to invoke. Mark session status to 'Completed'
+ * 5.1 If it is sub-session, then invoke sub-session exit service.
+ * 6. Deliver message to services at last if it needs to.
+ * </pre>
+ *
+ * @param message
+ * @return
+ * @throws Exception
+ */
+ public final Message process(Message message) throws Exception {
- if (message.getBody().get() instanceof String) {
- ret = (org.w3c.dom.Element)XMLUtils.getNode((String)message.getBody().get());
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ Transaction transaction = hibernateSession.beginTransaction();
+ try {
+ session = getSession(message);
+ if (session != null && isFirstOrLastConversationAction(message, true)) {
+ logger.debug("This is first conversation action to unschedule the item.");
+ unschedule(message);
+ unscheduledServiceItem = true;
+ }
+
+ handle(message);
+
+ if (session != null && !isCreateSessionAction) {
+ SessionManager.updateObject(session);
+ updateParentSessionBizObject();
+ }
+
+ if (session != null && isFirstOrLastConversationAction(message, false)) {
+ logger.debug("This is the last conversation action.");
+ if (session.getScheduleItems().size() <= 0) {
+ session.setStatus(SessionStatus.Completed);
+ SessionManager.updateObject(session);
+ logger.debug("Completed the session of " + session);
+ if (session.getParent() != null) {
+ invokeSubsessionExitService(message, session);
+ }
+ }
+ }
+
+ transaction.commit();
+ } catch (Exception e) {
+ transaction.rollback();
+ throw new Exception("Error in process message: " + e, e);
+ } finally {
+ HibernateUtil.closeSession();
}
- return(ret);
+ sendAsyncMessage(message);
+
+ return message;
}
+
/**
*
@@ -162,10 +241,6 @@
return(mesgType);
}
- private Session getSession(Message message) throws Exception {
- return getSession(message, null);
- }
-
protected Session getSession(Message message, List<Identity> ids) throws Exception{
Session ret=(Session)message.getProperties().getProperty(MessageProperties.SESSION);
String sessionKey=(String)message.getProperties().getProperty(MessageProperties.SESSION_KEY);
@@ -180,82 +255,7 @@
}
return(ret);
}
-
- /**
- * Do not override this method, override the handle(message) instead.
- * @param message
- * @return
- * @throws Exception
- */
- public Message process(Message message) throws Exception {
- org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
- Transaction transaction = hibernateSession.beginTransaction();
- try {
- session = getSession(message);
- if (session != null && isFirstOrLastConversationAction(message, true)) {
- logger.debug("This is first conversation action to unschedule the item.");
- unschedule(message);
- unscheduledServiceItem = true;
- }
-
- handle(message);
-
- SessionManager.updateObject(session);
- updateParentSessionBizObject();
-
- if (session != null && isFirstOrLastConversationAction(message, false)) {
- logger.debug("This is the last conversation action.");
- if (session.getScheduleItems().size() <= 0) {
- session.setStatus(SessionStatus.Completed);
- SessionManager.updateObject(session);
- logger.debug("Completed the session of " + session);
- if (session.getParent() != null) {
- invokeSubsessionExitService(message, session);
- }
- }
- }
-
- transaction.commit();
- } catch (Exception e) {
- transaction.rollback();
- throw new Exception("Error in process message: " + e, e);
- } finally {
- HibernateUtil.closeSession();
- }
-
- sendAsyncMessage(message);
-
- return message;
- }
-
- private void updateParentSessionBizObject() {
- String parentProperty = session.getProperties().get(Session.PARENT_REFERENCE_KEY);
- if (parentProperty != null && session.getParent() != null) {
- Object parentBizObj = MVEL.eval(parentProperty, session.getBusinessObject());
- Session parentSession = session.getParent();
- parentSession.setBusinessObject(parentBizObj);
- SessionManager.updateObject(parentSession);
- }
- }
-
-
- private void invokeSubsessionExitService(Message message, Session session)
- throws Exception {
- List<ScheduleItem> items = session.getParent().getScheduleItems();
- if (items.size() <= 0) {
- throw new Exception("Completed sub-session, but haven't found any schedule items to run.");
- }
- if (items.size() > 1) {
- throw new Exception("Should be only one schedule item waiting for sub-session.");
- }
- //set parent session in current message.
- message.getProperties().setProperty(MessageProperties.SESSION_KEY, String.valueOf(session.getParent().getId()));
- ScheduleItem si = items.get(0);
- addScheduleItemToDeliver(si.getCategory(), si.getName());
- logger.info("Invoke scheduleItem of " + si + "in session " + session.getParent());
- }
-
protected void sendAsyncMessage(Message message) throws Exception {
for(ScheduleItem si : scheduleItems) {
ServiceInvoker invoker = new ServiceInvoker(si.getCategory(), si.getName());
@@ -264,7 +264,7 @@
}
/**
- *
+ * Determine whether the action is the first/last conversation aware action in current service.
* @param message
* @param isFirst : when isFirst is false, it will get the last conversation action.
* @return
@@ -284,6 +284,40 @@
return false;
}
+
+
+ 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())) {
+ logger.error("Add duplicated schedule item of " + category + "/" + name);
+ return;
+ }
+ }
+ ScheduleItem si = new ScheduleItem(category, name);
+ scheduleItems.add(si);
+ }
+
+ private org.w3c.dom.Element getElement(Message message) throws Exception {
+ org.w3c.dom.Element ret=null;
+
+ if (message.getBody().get() instanceof String) {
+ ret = (org.w3c.dom.Element)XMLUtils.getNode((String)message.getBody().get());
+ }
+
+ return(ret);
+ }
+
+ private void unschedule(Message message) throws Exception {
+ String serviceCategory=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
+ String serviceName=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
+ session.unschedule(serviceCategory, serviceName);
+ }
+
private ConfigTree getFirstOrLastConversationAction(boolean isFirst) throws ClassNotFoundException {
ConfigTree[] cts = config.getParent().getChildren(ActionProperties.ACTION_NODE);
ConfigTree config = null;
@@ -300,37 +334,34 @@
return config;
}
-
- protected void unschedule(Message message) throws Exception {
- String serviceCategory=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
- String serviceName=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
- session.unschedule(serviceCategory, serviceName);
+ private void updateParentSessionBizObject() {
+ String parentProperty = session.getProperties().get(Session.PARENT_REFERENCE_KEY);
+ if (parentProperty != null && session.getParent() != null) {
+ Object parentBizObj = MVEL.eval(parentProperty, session.getBusinessObject());
+ Session parentSession = session.getParent();
+ parentSession.setBusinessObject(parentBizObj);
+ SessionManager.updateObject(parentSession);
+ }
}
- 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())) {
- logger.error("Add duplicated schedule item of " + category + "/" + name);
- return;
- }
+ private void invokeSubsessionExitService(Message message, Session session)
+ throws Exception {
+ List<ScheduleItem> items = session.getParent().getScheduleItems();
+ if (items.size() <= 0) {
+ throw new Exception("Completed sub-session, but haven't found any schedule items to run.");
}
- ScheduleItem si = new ScheduleItem(category, name);
- scheduleItems.add(si);
+ if (items.size() > 1) {
+ throw new Exception("Should be only one schedule item waiting for sub-session.");
+ }
+ //set parent session in current message.
+ message.getProperties().setProperty(MessageProperties.SESSION_KEY, String.valueOf(session.getParent().getId()));
+ ScheduleItem si = items.get(0);
+ addScheduleItemToDeliver(si.getCategory(), si.getName());
+ logger.info("Invoke scheduleItem of " + si + "in session " + session.getParent());
}
-
- /**
- * This is the method that deals with business logic for derived conversation actions.
- * @param message
- * @return
- * @throws Exception
- */
- public abstract Message handle(Message message) throws Exception;
-
-
+ private Session getSession(Message message) throws Exception {
+ return getSession(message, null);
+ }
}
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-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java 2008-10-09 08:15:52 UTC (rev 372)
@@ -42,10 +42,6 @@
public Message handle(Message message) throws Exception{
- // If root session, then need to actually create session,
- // otherwise this would be invoked as part of a 'perform',
- // in which case the pre-initialized session would be
- // passed with the invocation.
String sessionName=getConfig().getAttribute(ActionProperties.SESSION_NAME);
if (sessionName != null) {
@@ -58,9 +54,10 @@
session = SessionManager.createSession(sessionName);
}
+ isCreateSessionAction = true;
logger.info("Set session '"+sessionName+"' = "+session);
- message.getProperties().setProperty(MessageProperties.SESSION, session);
+ //message.getProperties().setProperty(MessageProperties.SESSION, session);
message.getProperties().setProperty(MessageProperties.SESSION_KEY, String.valueOf(session.getId()));
} else {
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-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java 2008-10-09 08:15:52 UTC (rev 372)
@@ -51,6 +51,9 @@
private Logger logger = Logger.getLogger(SendMessageAction.class);
+ private ServiceInvoker serviceInvoker;
+ private Courier courier;
+ private Message sendMessage;
public SendMessageAction(ConfigTree config) {
super(config);
@@ -76,65 +79,48 @@
String categoryExpression = getConfig().getAttribute(SendMessageAction.SERVICE_CATEGORY_EXPRESSION);
List<Identity> ids=getIdentities(message, null);
- session.assimulateIdentities(ids);
+ session.assimulateIdentities(ids);
-
// Send message
- Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
- mesg.getBody().add(message.getBody().get());
+ sendMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ sendMessage.getBody().add(message.getBody().get());
if ((serviceCategory != null && serviceName != null)
|| (categoryExpression != null && nameExpression != null)) {
// Check if response details provided
if (respServiceName != null && respServiceCategory != null) {
- LogicalEPR lepr= new LogicalEPR(respServiceCategory, respServiceName);
+ LogicalEPR lepr= new LogicalEPR(respServiceCategory, respServiceName);
+ sendMessage.getHeader().getCall().setReplyTo(lepr);
- mesg.getHeader().getCall().setReplyTo(lepr);
-
// Schedule response action pipeline
session.schedule(respServiceCategory, respServiceName, message);
}
-
-
+
if (serviceCategory == null && serviceName == null) {
serviceCategory = (String) MVEL.eval(categoryExpression, session.getBusinessObject());
serviceName = (String) MVEL.eval(nameExpression, session.getBusinessObject());
}
- ServiceInvoker invoker = new ServiceInvoker(serviceCategory, serviceName);
- invoker.deliverAsync(mesg);
+ serviceInvoker = new ServiceInvoker(serviceCategory, serviceName);
- logger.info("Sent message to '"+serviceCategory+"/"+serviceName+"'");
-
} else if (clientEPR != null) {
- EPR epr = session.getEPR(clientEPR);
-
+ EPR epr = session.getEPR(clientEPR);
if (epr == null) {
- throw new Exception("Client EPR '"+clientEPR+"' does not exist in session");
+ throw new NullPointerException("Client EPR '"+clientEPR+"' does not exist in session");
}
- Courier courier=null;
-
- // Workaround, as CourierFactory currently does
- // not support logical EPRs.
+ // Workaround, as CourierFactory currently does not support logical EPRs.
if (epr instanceof LogicalEPR) {
courier = new LogicalCourier((LogicalEPR) epr);
} else {
courier = CourierFactory.getCourier(epr);
}
-
- logger.info("Sending response to '"+epr+"'");
-
- courier.deliver(mesg);
-
- courier.cleanup();
+
} else {
- throw new Exception("Failed to send message");
- }
+ throw new Exception("Failed to send message.");
+ }
- logger.info("MESSAGE TYPE '"+mesgMType+"' SENT.");
-
} else {
throw new Exception("Unexpected message type="+mesgMType+
", but expecting type="+requiredMType);
@@ -143,5 +129,19 @@
return(message);
}
+
+ @Override
+ protected void sendAsyncMessage(Message message) throws Exception {
+ if (serviceInvoker != null) {
+ serviceInvoker.deliverAsync(this.sendMessage);
+ } else if (courier != null) {
+ courier.deliver(this.sendMessage);
+ courier.cleanup();
+ } else {
+ throw new Exception ("Neither ServiceInvoker nor Courier can be found to deliver message");
+ }
+ logger.info("Message of '"+ sendMessage+"' has been sent.");
+ }
+
}
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-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java 2008-10-09 08:15:52 UTC (rev 372)
@@ -56,12 +56,14 @@
if (stateExpression != null) {
Object result = MVEL.eval(stateExpression, bstate);
MVEL.setProperty(bstate, variable, result);
+ session.setBusinessObject(bstate);
logger.info("populated from stateExpression of: " + stateExpression);
} else if (messageExpression != null) {
String xmlBody = (String) message.getBody().get();
Element element = (Element) XMLUtils.getNode(xmlBody);
String result = XMLUtils.executeXpath(element, messageExpression);
MVEL.setProperty(bstate, variable, result);
+ session.setBusinessObject(bstate);
logger.info("populated from messageExpression of: " + messageExpression);
} else {
throw new Exception ("Neither stateExpression nor messageExpression has been specified.");
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-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-10-09 08:15:52 UTC (rev 372)
@@ -62,10 +62,10 @@
logger.debug("decision method is : " + decisionMethod);
if (decisionMethod != null) {
Object response = MVEL.eval(getMvelMethodName(decisionMethod), session.getBusinessObject());
- if (response instanceof Boolean) {
+ if ((response instanceof Boolean) && (response != null) ) {
Boolean flag = (Boolean) response;
logger.info("The result of decision method is: " + flag);
- if (flag) {
+ if (flag.booleanValue()) {
String category = whileConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = whileConfig.getAttribute(ActionProperties.SERVICE_NAME);
session.schedule(category, name, message);
@@ -79,7 +79,7 @@
logger.info("Scheduled items of " + category + "/" + name + ".");
}
} else {
- throw new Exception("method return value is not Boolean.");
+ throw new Exception("method return value type is not Boolean Or is Null.");
}
} else {
throw new Exception("Haven't found the decision method in the configuration.");
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java 2008-10-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java 2008-10-09 08:15:52 UTC (rev 372)
@@ -34,6 +34,8 @@
private QuoteManager quoteManager;
private Quote quote = new Quote();
+
+ private String quoteValue;
public Supplier getSupplier() {
return supplier;
@@ -49,10 +51,18 @@
public void setQuote(Quote quote) {
this.quote = quote;
- quoteManager.getQuotes().add(this.quote);
}
+ public String getQuoteValue() {
+ return quoteValue;
+ }
+ public void setQuoteValue(String quoteValue) {
+ this.quoteValue = quoteValue;
+ this.quote.setValue(quoteValue);
+ this.quoteManager.getQuotes().add(quote);
+ }
+
public QuoteManager getQuoteManager() {
return quoteManager;
}
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-08 15:09:55 UTC (rev 371)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml 2008-10-09 08:15:52 UTC (rev 372)
@@ -304,7 +304,7 @@
<property name="serviceCategory" value="ESBBroker.BrokerParticipant" />
<property name="serviceName" value="CompleteTransaction.main" />
<property name="returnServiceCategory" value="ESBBroker.BrokerParticipant" />
- <property name="returnServiceName" value="ESBBrokerProcess.main.8" />
+ <property name="returnServiceName" value="ESBBrokerProcess.main.8" />
<property name="bindDetails" >
<bind from-expression="getSelectedQuote()"
to-variable="quote" />
@@ -433,7 +433,7 @@
<action class="org.jboss.soa.overlord.jbossesb.actions.SetStateAction"
process="process" name="s9-3">
- <property name="variable" value="quote.value" />
+ <property name="variable" value="quoteValue" />
<property name="messageExpression" value="/quote" />
</action>
</actions>
15 years, 7 months
- 1
- 0
Overlord SVN: r371 - cdl/trunk/samples/jbossesb/brokerage/models.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-08 11:09:55 -0400 (Wed, 08 Oct 2008)
New Revision: 371
Modified:
cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
Log:
Updated Credit Credit message types, to be consistent with the purchasing sample, and the CreditAgency implementation.
Modified: cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2008-10-08 14:12:14 UTC (rev 370)
+++ cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2008-10-08 15:09:55 UTC (rev 371)
@@ -6,9 +6,9 @@
<informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/>
<informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/>
<informationTypes description="This is the information type Cancel" name="Cancel" elementName="cancel"/>
- <informationTypes description="This is the information type CreditInformation" name="CreditInformation" elementName="creditInformation"/>
- <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="creditInvalid"/>
- <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="creditValid"/>
+ <informationTypes description="This is the information type CreditInformation" name="CreditInformation" elementName="CreditCheckRequest"/>
+ <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="CreditCheckInvalid"/>
+ <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="CreditCheckOk"/>
<informationTypes description="This is the information type Enquiry" name="Enquiry" typeName="" elementName="enquiry"/>
<informationTypes description="This is the information type OrderConfirmed" name="OrderConfirmed" elementName="orderConfirmed"/>
<informationTypes description="This is the information type OrderRejected" name="OrderRejected" elementName="orderRejected"/>
15 years, 7 months
- 1
- 0
Overlord SVN: r370 - in cdl/trunk/distribution/eclipse: features and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-08 10:12:14 -0400 (Wed, 08 Oct 2008)
New Revision: 370
Added:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810081506.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810081506.jar
Removed:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081151.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810081151.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810081151.jar
Modified:
cdl/trunk/distribution/eclipse/site.xml
Log:
Fixed validation issue.
Deleted: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810081151.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810081506.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810081506.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cdl/trunk/distribution/eclipse/site.xml
===================================================================
--- cdl/trunk/distribution/eclipse/site.xml 2008-10-08 14:06:00 UTC (rev 369)
+++ cdl/trunk/distribution/eclipse/site.xml 2008-10-08 14:12:14 UTC (rev 370)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081151.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200810081151">
+ <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810081506.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200810081506">
<category name="JBossESB"/>
</feature>
- <feature url="features/org.scribble.conversation.feature_0.1.0.200810081151.jar" id="org.scribble.conversation.feature" version="0.1.0.200810081151">
+ <feature url="features/org.scribble.conversation.feature_0.1.0.200810081506.jar" id="org.scribble.conversation.feature" version="0.1.0.200810081506">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.experimental.feature_0.1.0.200810081151.jar" id="org.scribble.experimental.feature" version="0.1.0.200810081151">
+ <feature url="features/org.scribble.experimental.feature_0.1.0.200810081506.jar" id="org.scribble.experimental.feature" version="0.1.0.200810081506">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.feature_0.1.0.200810081151.jar" id="org.scribble.feature" version="0.1.0.200810081151">
+ <feature url="features/org.scribble.feature_0.1.0.200810081506.jar" id="org.scribble.feature" version="0.1.0.200810081506">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.protocol.feature_0.1.0.200810081151.jar" id="org.scribble.protocol.feature" version="0.1.0.200810081151">
+ <feature url="features/org.scribble.protocol.feature_0.1.0.200810081506.jar" id="org.scribble.protocol.feature" version="0.1.0.200810081506">
<category name="Common"/>
</feature>
<category-def name="JBossESB" label="JBossESB">
15 years, 7 months
- 1
- 0
Overlord SVN: r369 - cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-10-08 10:06:00 -0400 (Wed, 08 Oct 2008)
New Revision: 369
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java
Log:
Cater for parentReference property being of a type implemented by the parent session, as opposed to always being the same class as the parent session.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java 2008-10-08 10:56:14 UTC (rev 368)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java 2008-10-08 14:06:00 UTC (rev 369)
@@ -179,7 +179,8 @@
if (parentCls != null && getService() != null &&
getService().getSessionClass() != null &&
- parentCls != getService().getSessionClass()) {
+ parentCls.isAssignableFrom(
+ getService().getSessionClass()) == false) {
l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
15 years, 7 months
- 1
- 0