Overlord SVN: r799 - in cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src: java/org/jboss/savara/tools/jbossesb/eclipse and 8 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-24 16:44:21 -0400 (Mon, 24 Aug 2009)
New Revision: 799
Added:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractESBModelChangeRule.java
Removed:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java
Modified:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java
Log:
Change overlord to savara, remove stateful actions and refactor stateless actions to be the default set of actions. Fixed some of the unit tests - some still to fix.
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -173,27 +173,7 @@
checkStatus();
}
});
-
- Button statelessButton=new Button(group, SWT.CHECK);
- statelessButton.setSelection(true);
-
- gd = new GridData();
- gd.horizontalSpan = 1;
- gd.widthHint = 60;
- statelessButton.setLayoutData(gd);
-
- m_statelessButtons.add(statelessButton);
-
- statelessButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- checkStatus();
- }
- });
-
+
Text projectName=new Text(group, SWT.NONE);
String prjName=m_localModelRefs.get(i).getLocatedRole();
@@ -384,7 +364,6 @@
if (m_roleButtons.get(i).getSelection()) {
generator.generateRole(m_localModelRefs.get(i),
- m_statelessButtons.get(i).getSelection(),
m_projectNames.get(i).getText());
}
}
@@ -427,7 +406,6 @@
private ConversationModel m_conversationModel=null;
private java.util.List<ModelReference> m_localModelRefs=null;
private java.util.List<Button> m_roleButtons=new java.util.Vector<Button>();
- private java.util.List<Button> m_statelessButtons=new java.util.Vector<Button>();
private java.util.List<Text> m_projectNames=new java.util.Vector<Text>();
private Combo m_build=null;
private java.util.List<BuildSystem> m_buildSystems=
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -31,7 +31,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.soa.overlord.jbossesb";
+ public static final String PLUGIN_ID = "org.jboss.soa.savara.jbossesb";
// The shared instance
private static Activator plugin;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -121,13 +121,11 @@
* supplied role.
*
* @param localModelRef The local model reference
- * @param stateless Whether the generated role should be stateless
* @param projectName The project name
* @throws Exception Failed to generate role
*/
public void generateRole(ModelReference localModelRef,
- boolean stateless, String projectName)
- throws Exception {
+ String projectName) throws Exception {
if (logger.isLoggable(Level.FINEST)) {
logger.finest("Generate local model '"+localModelRef+"' for: "+
@@ -153,60 +151,59 @@
((ConversationModel)localModel).getConversation() != null) {
ConversationModel lcm=(ConversationModel)localModel;
- // Check if stateless version of model is required
- if (stateless) {
- StatelessTransformer transformer=
- (StatelessTransformer)
- RegistryFactory.getRegistry().getExtension(
- StatelessTransformer.class,null);
+ StatelessTransformer transformer=
+ (StatelessTransformer)
+ RegistryFactory.getRegistry().getExtension(
+ StatelessTransformer.class,null);
- if (transformer != null) {
- Conversation statelessConversation=(Conversation)
- transformer.transform(lcm.getConversation(),
- new ModelReference(JBossESBNotation.NOTATION_CODE));
-
- if (statelessConversation != null) {
+ if (transformer != null) {
+ Conversation statelessConversation=(Conversation)
+ transformer.transform(lcm.getConversation(),
+ new ModelReference(JBossESBNotation.NOTATION_CODE));
- if (logger.isLoggable(Level.FINEST)) {
- try {
- org.scribble.export.Exporter exporter=
- (org.scribble.export.Exporter)
- RegistryFactory.getRegistry().getExtension(
- org.scribble.export.Exporter.class, null);
-
- org.scribble.export.text.TextFormatter formatter=
- new org.scribble.export.text.TextFormatter();
-
- java.io.ByteArrayOutputStream os=
- new java.io.ByteArrayOutputStream();
-
- formatter.setOutputStream(os);
-
- exporter.export(new ModelReference(JBossESBNotation.NOTATION_CODE),
- statelessConversation, formatter);
-
- String str=new String(os.toByteArray());
-
- System.out.println("EXPORTED CDM TO JBESB STATELESS:");
- System.out.println(str);
-
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
+ if (statelessConversation != null) {
+
+ if (logger.isLoggable(Level.FINEST)) {
+ try {
+ org.scribble.export.Exporter exporter=
+ (org.scribble.export.Exporter)
+ RegistryFactory.getRegistry().getExtension(
+ org.scribble.export.Exporter.class, null);
- lcm.setConversation(statelessConversation);
- } else {
- logger.severe("Failed to transform to stateless conversation");
+ org.scribble.export.text.TextFormatter formatter=
+ new org.scribble.export.text.TextFormatter();
+
+ java.io.ByteArrayOutputStream os=
+ new java.io.ByteArrayOutputStream();
+
+ formatter.setOutputStream(os);
+
+ exporter.export(new ModelReference(JBossESBNotation.NOTATION_CODE),
+ statelessConversation, formatter);
+
+ String str=new String(os.toByteArray());
+
+ System.out.println("EXPORTED CDM TO JBESB STATELESS:");
+ System.out.println(str);
+
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
+
+ lcm.setConversation(statelessConversation);
+ } else {
+ logger.severe("Failed to transform to stateless conversation");
}
+ } else {
+ logger.severe("Failed to locate stateless transformer");
}
ModelReference targetRef=
new ModelReference(JBossESBNotation.NOTATION_CODE);
DefaultESBLanguageModel target=
- new DefaultESBLanguageModel(targetRef, stateless);
+ new DefaultESBLanguageModel(targetRef);
ModelGenerator generator=(ModelGenerator)
RegistryFactory.getRegistry().getExtension(
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -76,11 +76,9 @@
* This constructor initializes a new ESB configuration.
*
* @param source The model reference for the JBossESB configuration
- * @param stateless Whether the model is stateless
*/
- public DefaultESBLanguageModel(ModelReference source, boolean stateless) {
+ public DefaultESBLanguageModel(ModelReference source) {
m_source = source;
- m_stateless = stateless;
initializeNewConfig();
}
@@ -181,12 +179,6 @@
while (serviter.hasNext()) {
ESBService service=serviter.next();
- // If any service is stateless, then mark the model
- // as stateless
- if (service.isStateless()) {
- m_stateless = true;
- }
-
if (service.isRoot()) {
/*
@@ -252,33 +244,7 @@
getConversations().add(conv);
}
}
-
- //Add session class to list
- String sessionClass=service.getSessionName();
-
- if (sessionClass != null &&
- sessionClasses.contains(sessionClass) == false) {
- sessionClasses.add(sessionClass);
- }
}
-
- // Add dependency on session classes
- for (int i=0; i < sessionClasses.size(); i++) {
- String sessionClass=sessionClasses.get(i);
- int index=sessionClass.lastIndexOf('.');
- String nspace="";
- String local=sessionClass;
-
- if (index != -1) {
- nspace = sessionClass.substring(0, index);
- local = sessionClass.substring(index+1);
-
- dm.recordDependency(getModelReference(),
- new ModelReference(nspace, local,
- null, JAVA_NOTATION),
- DependencyType.Uses);
- }
- }
}
if (logger.isLoggable(java.util.logging.Level.FINEST)) {
@@ -611,14 +577,6 @@
}
/**
- * This method returns whether the model is stateless.
- *
- * @return Whether the model is stateless
- */
- public boolean isStateless() {
- return(m_stateless);
- }
-
/**
* This method returns a custom classloader that uses the project's
* classpath to locate classes referenced by the ESB config file.
@@ -647,7 +605,6 @@
private String m_contents=null;
private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
private ClassLoader m_classLoader=null;
- private boolean m_stateless=false;
public class InnerModelListener implements ModelListener {
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -42,13 +42,9 @@
public static final String NAME_ATTR = "name";
public static final String DESCRIPTION_ATTR = "description";
public static final String CATEGORY_ATTR = "category";
- public static final String ROOT_PROPERTY = "root";
- public static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
public static final String CONVERSATION_TYPE_PROPERTY = "conversationType";
public static final String SERVICE_DESCRIPTION_NAME_PROPERTY = "serviceDescriptionName";
- public static final String SERVICE_ANNOTATION = "org.jboss.soa.overlord.jbossesb.actions.Service";
public static final String SERVICE_ELEMENT = "service";
- public static final String RETRIEVE_SESSION_ACTION_CLASS = "org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction";
public static final String ACTION_ELEMENT = "action";
public static final String ACTIONS_ELEMENT = "actions";
@@ -185,25 +181,6 @@
*/
public void validate(ModelListener l) {
- // Check that the service specifies a session
- if (isSessionBased() && getSessionClass() == null) {
-
- // Find first conversation based action to use as
- // focus - if not found then use the service itself
- ESBAction focus=getFirstSessionBasedAction();
- ModelObject src=this;
-
- if (focus instanceof ModelObject) {
- src = (ModelObject)focus;
- }
-
- l.error(new ModelIssue(src, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.savara.tools.jbossesb.model.Messages"),
- "_NOT_SPECIFIED_SESSION_CLASS",
- new String[]{})));
- }
-
for (int i=0; i < m_actions.size(); i++) {
m_actions.get(i).validate(l);
}
@@ -319,60 +296,7 @@
return(false);
}
- protected java.lang.annotation.Annotation getServiceAnnotation(String session) {
- java.lang.annotation.Annotation ret=null;
-
- try {
- ClassLoader cl=
- org.jboss.savara.tools.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
-
- Class<?> cls=Class.forName(session, true, cl);
-
- // TODO: This should be replaced by direct lookup
- // of Service annotation - but library not available
- // at the moment
- java.lang.annotation.Annotation[] annotations=
- cls.getAnnotations();
- for (int i=0; ret == null &&
- i < annotations.length; i++) {
- try {
- if (annotations[i].annotationType().getName().equals(
- SERVICE_ANNOTATION)) {
- ret = annotations[i];
- }
- } catch(Throwable ex) {
- logger.log(java.util.logging.Level.SEVERE,
- "ANNOTATION: "+
- annotations[i].annotationType(), ex);
- }
- }
-
- } catch(Throwable e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get session class '"+session+"'", e);
- }
-
- return(ret);
- }
-
/**
- * This method determines whether the ESB service represents a
- * loop construct.
- *
- * @return Whether the service represents a loop
- */
- public boolean isLoop() {
- boolean ret=false;
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- ret = action.isLoop();
- }
-
- return(ret);
- }
-
- /**
* This method determines whether the ESB service descriptor represents
* a 'root' conversation.
*
@@ -381,46 +305,8 @@
public boolean isRoot() {
boolean ret=false;
- if (isStateless()) {
- // Check for gateway service
- ret = isGateway();
-
- } else {
- // Determine if the root property is true
- // on the create session action
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- if (action.isSessionType()) {
- String bool=action.getPropertyValue(ROOT_PROPERTY);
- if (bool != null) {
- ret = bool.equalsIgnoreCase("true");
- } else {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(ROOT_PROPERTY,
- (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof Boolean) {
- ret = ((Boolean)val).booleanValue();
- }
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'root' annotation value", t);
- }
- }
- }
- }
- }
- }
+ // Check for gateway service
+ ret = isGateway();
return(ret);
}
@@ -435,12 +321,8 @@
boolean ret=false;
ESBAction action=null;
- if (isStateless()) {
- if (getActions().size() > 0) {
- action = getActions().get(0);
- }
- } else {
- action = getFirstSessionBasedAction();
+ if (getActions().size() > 0) {
+ action = getActions().get(0);
}
if (action != null) {
@@ -485,44 +367,6 @@
}
/**
- * This method determines whether the gateway service is
- * related to a stateless session.
- *
- * @return Whether the gateway service is stateless
- */
- public boolean isStateless() {
- boolean ret=false;
-
- for (int i=0; ret == false && i < m_actions.size(); i++) {
- if (m_actions.get(i).isStateless()) {
- ret = true;
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the first session based action in the
- * service descriptor.
- *
- * @return The first session based action, or null if none exist
- */
- public ESBAction getFirstSessionBasedAction() {
- ESBAction ret=null;
-
- for (int i=0; ret == null && i < m_actions.size(); i++) {
- ret=m_actions.get(i);
-
- if (ret.isSessionBased() == false) {
- ret = null;
- }
- }
-
- return(ret);
- }
-
- /**
* This method returns the service description name associated with the
* ESB service.
*
@@ -531,44 +375,10 @@
public String getServiceDescriptionName() {
String ret=null;
- if (isStateless()) {
- ESBAction action=getGatewayAction();
-
- if (action != null) {
- ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
- }
- } else {
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- if (action.isSessionType() || (action.getActionClass() != null &&
- action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
- ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
-
- if (ret == null) {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(NAME_ATTR, (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof String) {
- ret = (String)val;
- }
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'name' annotation value", t);
- }
- }
- }
- }
- }
+ ESBAction action=getGatewayAction();
+
+ if (action != null) {
+ ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
}
return(ret);
@@ -583,107 +393,14 @@
public String getConversationType() {
String ret=null;
- if (isStateless()) {
- ESBAction action=getGatewayAction();
-
- if (action != null) {
- ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
- }
- } else {
- ESBAction action=getFirstSessionBasedAction();
+ ESBAction action=getGatewayAction();
- if (action != null) {
- if (action.isSessionType()) {
- ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
-
- if (ret == null) {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
- (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof String) {
- ret = (String)val;
- }
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'name' annotation value", t);
- }
- }
- }
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the session name associated with the service
- * descriptor.
- *
- * @return The session name
- */
- public String getSessionName() {
- String ret=null;
- ESBAction action=getFirstSessionBasedAction();
-
if (action != null) {
- ret = action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+ ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
}
return(ret);
}
-
- /**
- * This method returns the session class associated with the service
- * descriptor.
- *
- * @return The session class
- */
- public Class<?> getSessionClass() {
- Class<?> ret=null;
- String session=getSessionName();
-
- if (session != null) {
- try {
- ClassLoader cl=
- org.jboss.savara.tools.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
-
- ret = Class.forName(session, true, cl);
-
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get session class '"+session+"'", e);
- }
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the service is related to a behavioural
- * session.
- *
- * @return Whether the service is session based
- */
- public boolean isSessionBased() {
- boolean ret=false;
-
- for (int i=0; ret == false && i < m_actions.size(); i++) {
- ret = m_actions.get(i).isSessionBased();
- }
-
- return(ret);
- }
/**
* This method converts the ESB service into a Conversation, if
@@ -702,8 +419,8 @@
ret.derivedFrom(this);
ret.getBlock().derivedFrom(this);
- // Determine if conversation is stateless
- ret.setStateless(isStateless());
+ // Conversation is stateless
+ ret.setStateless(true);
// Configure model name
LocatedName modelName=new LocatedName();
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -42,21 +42,6 @@
public void validate(ModelListener l);
/**
- * This method determines if the action represents a loop construct.
- *
- * @return Whether the action represents a loop construct
- */
- public boolean isLoop();
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased();
-
- /**
* This method determines whether the ESB action represents
* a new session type.
*
@@ -73,15 +58,6 @@
public boolean isGateway();
/**
- * This method determines whether a gateway action is
- * stateless. This method is only relevant when the
- * isGateway() method returns true.
- *
- * @return Whether the action is a stateless
- */
- public boolean isStateless();
-
- /**
* This method indicates whether this action performs another
* sub-conversation.
*
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -126,11 +126,4 @@
*/
public String getJMSDefinition(String jmsBusId);
- /**
- * This method returns whether the model is stateless.
- *
- * @return Whether the model is stateless
- */
- public boolean isStateless();
-
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -103,14 +103,6 @@
public boolean removeAction(ESBAction action);
/**
- * This method determines whether the ESB service represents a
- * loop construct.
- *
- * @return Whether the service represents a loop
- */
- public boolean isLoop();
-
- /**
* This method determines whether the ESB service descriptor represents
* a 'root' conversation.
*
@@ -143,14 +135,6 @@
public ESBAction getGatewayAction();
/**
- * This method determines whether the gateway service is
- * related to a stateless session.
- *
- * @return Whether the gateway service is stateless
- */
- public boolean isStateless();
-
- /**
* This method returns the service description name associated with the
* ESB service.
*
@@ -167,38 +151,6 @@
public String getConversationType();
/**
- * This method returns the session name associated with the service
- * descriptor.
- *
- * @return The session name
- */
- public String getSessionName();
-
- /**
- * This method returns the session class associated with the service
- * descriptor.
- *
- * @return The session class
- */
- public Class<?> getSessionClass();
-
- /**
- * This method determines whether the service is related to a behavioural
- * session.
- *
- * @return Whether the service is session based
- */
- public boolean isSessionBased();
-
- /**
- * This method returns the first session based action in the
- * service descriptor.
- *
- * @return The first session based action, or null if none exist
- */
- public ESBAction getFirstSessionBasedAction();
-
- /**
* This method converts the actions associated with the ESB service into
* activities that can be checked for conformance against a conversation
* type.
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -17,7 +17,7 @@
*/
package org.jboss.savara.tools.jbossesb.model.actions;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
import org.scribble.model.*;
import org.scribble.model.admin.ModelIssue;
@@ -227,27 +227,8 @@
}
}
}
-
+
/**
- * This method determines if the action represents a loop construct.
- *
- * @return Whether the action represents a loop construct
- */
- public boolean isLoop() {
- return(false);
- }
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased() {
- return(false);
- }
-
- /**
* This method determines whether the ESB action represents
* a new session type.
*
@@ -268,16 +249,6 @@
}
/**
- * This method determines whether the gateway service is
- * related to a stateless session.
- *
- * @return Whether the gateway service is stateless
- */
- public boolean isStateless() {
- return(false);
- }
-
- /**
* This method indicates whether this action performs another
* sub-conversation.
*
@@ -523,21 +494,6 @@
}
/**
- * This method sets the business object type property.
- *
- * @param name The business object type
- */
- public void setBusinessObjectType(String type) {
-
- org.w3c.dom.Element prop=getPropertyElement(
- DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, type);
- }
- }
-
- /**
* This method returns the XML configuration representation of the action.
*
* @return The XML configuration for the action
@@ -594,7 +550,7 @@
return(m_links);
}
- private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
+ //private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
private ESBService m_service=null;
private org.w3c.dom.Element m_action=null;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -25,7 +25,7 @@
*
* @author gary
*/
-public abstract class AbstractInteractionMessageAction extends AbstractStatelessESBAction {
+public abstract class AbstractInteractionMessageAction extends AbstractESBAction {
private static final long serialVersionUID = 3272234577154434603L;
Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.savara.tools.jbossesb.model.actions;
-
-import java.util.logging.Logger;
-
-import org.scribble.model.admin.ModelIssue;
-import org.scribble.model.admin.ModelListener;
-import org.jboss.savara.tools.jbossesb.model.*;
-import org.jboss.savara.tools.jbossesb.model.util.ProblemDefinitions;
-
-/**
- * This is the generic ESB action class.
- *
- * @author gary
- */
-public abstract class AbstractStatelessESBAction extends AbstractESBAction {
-
- private static final long serialVersionUID = -4436864250793029006L;
-
- /**
- * The constructor for initializing the action based on
- * an existing DOM element.
- */
- protected AbstractStatelessESBAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * The contructor for initializing a new action.
- */
- protected AbstractStatelessESBAction(ESBService service,
- String actionClass) {
- super(service, actionClass);
- }
-
- /**
- * This method determines whether the gateway service is
- * related to a stateless session.
- *
- * @return Whether the gateway service is stateless
- */
- @Override
- public boolean isStateless() {
- return(true);
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
-}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -28,7 +28,7 @@
*
* @author gary
*/
-public class IfAction extends AbstractStatelessESBAction {
+public class IfAction extends AbstractESBAction {
private static final long serialVersionUID = 9005791673502330699L;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties 2009-08-24 20:44:21 UTC (rev 799)
@@ -17,7 +17,9 @@
# */
_IF_ORDER_WRONG=IfAction must have an 'if' path, followed by zero or more 'elseif' paths and ending with an optional 'else' path
+_NOT_SPECIFIED_PROPERTY=The property '{0}' has not been specified
_NOT_SPECIFIED_SERVICE_DETAILS=Send does not provide service category and name
_NOT_SPECIFIED_SERVICE_OR_CLIENT_ROLE=Send does not contain request service category/name or response client role
_PATH_SERVICE_DETAILS_MISSING=One or more paths are missing the service cateogry and/or name
_SWITCH_ONE_OR_MORE_PATHS=Switch action must specify atleast one case
+_UNKNOWN_PROPERTY=The property '{0}' is unknown
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -29,7 +29,7 @@
*
* @author gary
*/
-public class SwitchAction extends AbstractStatelessESBAction {
+public class SwitchAction extends AbstractESBAction {
private static final long serialVersionUID = 3765702614644769281L;
@@ -107,7 +107,7 @@
*/
@Override
public boolean isGateway() {
- return(isStateless());
+ return(true);
}
/**
@@ -118,7 +118,7 @@
*/
@Override
public boolean isSessionType() {
- return(isStateless());
+ return(true);
}
/**
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractESBModelChangeRule.java (from rev 794, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractESBModelChangeRule.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractESBModelChangeRule.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.*;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+
+/**
+ * This is the abstract stateless ESB model change rule.
+ */
+public abstract class AbstractESBModelChangeRule extends AbstractModelChangeRule {
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context) and inserted
+ * model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object being inserted
+ * @param ref The optional reference model object
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isInsertSupported(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ boolean ret=false;
+
+ if ((context.getParent() instanceof ESBService ||
+ (ref != null && ref.getSource().getObject()
+ instanceof AbstractESBAction &&
+ ((AbstractESBAction)ref.getSource().getObject()).getService() != null)) &&
+ model instanceof ESBLanguageModel) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the ESB service associated with the
+ * optional model object reference or the context.
+ *
+ * @param context The context
+ * @param ref The optional model object
+ * @return The ESB service, or null if not found
+ */
+ protected ESBService getESBService(ModelChangeContext context,
+ ModelObject ref) {
+ ESBService ret=(ESBService)context.getParent();
+
+ if (ref != null && ref.getSource().getObject() instanceof AbstractESBAction) {
+ ret = ((AbstractESBAction)ref.getSource().getObject()).getService();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines the position of the supplied
+ * model object within the supplied service.
+ *
+ * @param service The service
+ * @param ref The optional model object
+ * @return The position, or -1 if not found
+ */
+ protected int getPosition(ESBService service, ModelObject ref) {
+ int ret=-1;
+
+ // Check if reference model object provided, and if so,
+ // if it has a position within the service
+ if (ref != null && ref.getSource().getObject() instanceof ESBAction) {
+ ret = service.getActions().indexOf((ESBAction)
+ ref.getSource().getObject());
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context)
+ * and deleted model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object to be removed
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isDeleteSupported(ModelChangeContext context,
+ Model model, ModelObject mobj) {
+ boolean ret=false;
+
+ if (mobj.getSource().getObject() instanceof AbstractESBAction &&
+ (context.getParent() instanceof ESBService ||
+ ((AbstractESBAction)mobj.getSource().getObject()).getService() != null) &&
+ model instanceof ESBLanguageModel) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method removes the supplied model object from the
+ * supplied model. The model object representation must
+ * contain the necessary model specific to remove the
+ * object from the underlying model representation.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param mobj The model object to be deleted
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean delete(ModelChangeContext context,
+ Model model, ModelObject mobj) {
+ boolean ret=false;
+ ESBService service=getESBService(context, mobj);
+ ESBAction action=(ESBAction)mobj.getSource().getObject();
+
+ if (action != null && service != null) {
+ ret = service.getActions().remove(action);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context)
+ * and modified model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param fromObj The source model object
+ * @param toObj The model object to be updated
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isUpdateSupported(ModelChangeContext context,
+ Model model, ModelObject fromObj, ModelObject toObj) {
+ boolean ret=false;
+
+ if (context.getParent() instanceof ESBService &&
+ model instanceof ESBLanguageModel) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+}
Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -1,173 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.savara.tools.jbossesb.model.change;
-
-import org.jboss.savara.tools.jbossesb.model.*;
-import org.jboss.savara.tools.jbossesb.model.actions.*;
-import org.scribble.model.*;
-import org.scribble.model.change.*;
-
-/**
- * This is the abstract stateless ESB model change rule.
- */
-public abstract class AbstractStatelessESBModelChangeRule extends AbstractModelChangeRule {
-
- /**
- * This method determines whether the rule is appropriate
- * for the supplied type of model, parent (in the context) and inserted
- * model object.
- *
- * @param context The context
- * @param model The model
- * @param mobj The model object being inserted
- * @param ref The optional reference model object
- * @return Whether the rule supports the supplied information
- */
- @Override
- public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj, ModelObject ref) {
- boolean ret=false;
-
- if ((context.getParent() instanceof ESBService ||
- (ref != null && ref.getSource().getObject()
- instanceof AbstractESBAction &&
- ((AbstractESBAction)ref.getSource().getObject()).getService() != null)) &&
- model instanceof ESBLanguageModel &&
- ((ESBLanguageModel)model).isStateless()) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method returns the ESB service associated with the
- * optional model object reference or the context.
- *
- * @param context The context
- * @param ref The optional model object
- * @return The ESB service, or null if not found
- */
- protected ESBService getESBService(ModelChangeContext context,
- ModelObject ref) {
- ESBService ret=(ESBService)context.getParent();
-
- if (ref != null && ref.getSource().getObject() instanceof AbstractESBAction) {
- ret = ((AbstractESBAction)ref.getSource().getObject()).getService();
- }
-
- return(ret);
- }
-
- /**
- * This method determines the position of the supplied
- * model object within the supplied service.
- *
- * @param service The service
- * @param ref The optional model object
- * @return The position, or -1 if not found
- */
- protected int getPosition(ESBService service, ModelObject ref) {
- int ret=-1;
-
- // Check if reference model object provided, and if so,
- // if it has a position within the service
- if (ref != null && ref.getSource().getObject() instanceof ESBAction) {
- ret = service.getActions().indexOf((ESBAction)
- ref.getSource().getObject());
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the rule is appropriate
- * for the supplied type of model, parent (in the context)
- * and deleted model object.
- *
- * @param context The context
- * @param model The model
- * @param mobj The model object to be removed
- * @return Whether the rule supports the supplied information
- */
- @Override
- public boolean isDeleteSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
- boolean ret=false;
-
- if (mobj.getSource().getObject() instanceof AbstractESBAction &&
- (context.getParent() instanceof ESBService ||
- ((AbstractESBAction)mobj.getSource().getObject()).getService() != null) &&
- model instanceof ESBLanguageModel &&
- ((ESBLanguageModel)model).isStateless()) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method removes the supplied model object from the
- * supplied model. The model object representation must
- * contain the necessary model specific to remove the
- * object from the underlying model representation.
- *
- * @param context The context
- * @param model The model being changed
- * @param mobj The model object to be deleted
- * @return Whether the change has been applied
- */
- @Override
- public boolean delete(ModelChangeContext context,
- Model model, ModelObject mobj) {
- boolean ret=false;
- ESBService service=getESBService(context, mobj);
- ESBAction action=(ESBAction)mobj.getSource().getObject();
-
- if (action != null && service != null) {
- ret = service.getActions().remove(action);
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the rule is appropriate
- * for the supplied type of model, parent (in the context)
- * and modified model object.
- *
- * @param context The context
- * @param model The model
- * @param fromObj The source model object
- * @param toObj The model object to be updated
- * @return Whether the rule supports the supplied information
- */
- @Override
- public boolean isUpdateSupported(ModelChangeContext context,
- Model model, ModelObject fromObj, ModelObject toObj) {
- boolean ret=false;
-
- if (context.getParent() instanceof ESBService &&
- model instanceof ESBLanguageModel &&
- ((ESBLanguageModel)model).isStateless()) {
- ret = true;
- }
-
- return(ret);
- }
-}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -33,7 +33,7 @@
* This is the model change rule for the Conversation Interaction.
*/
@RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE)
-public class ConversationInteractionModelChangeRule extends AbstractStatelessESBModelChangeRule {
+public class ConversationInteractionModelChangeRule extends AbstractESBModelChangeRule {
/**
* This method determines whether the rule is appropriate
@@ -142,12 +142,6 @@
service.addAction(action, pos);
- if (((ESBService)context.getParent()).getFirstSessionBasedAction() == action &&
- interaction.getEnclosingDefinition() instanceof Conversation) {
- action.setBusinessObjectType(ConversationUtil.getBusinessObjectType(
- ((Conversation)interaction.getEnclosingDefinition())));
- }
-
if (interaction.getReplyToLabel() != null) {
if (interaction.getToRole() != null) {
@@ -336,12 +330,6 @@
endService.addAction(action, endPos);
- if (endService.getFirstSessionBasedAction() == action &&
- interaction.getEnclosingDefinition() instanceof Conversation) {
- action.setBusinessObjectType(ConversationUtil.getBusinessObjectType(
- ((Conversation)interaction.getEnclosingDefinition())));
- }
-
// Check if subsequent initiator found, requiring
// a new service
/* IS STILL REQUIRED?
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -49,8 +49,7 @@
boolean ret=false;
if (mobj instanceof Conversation &&
- model instanceof ESBLanguageModel &&
- ((ESBLanguageModel)model).isStateless()) {
+ model instanceof ESBLanguageModel) {
ret = true;
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -34,7 +34,7 @@
* This is the model change rule for the If grouping construct.
*/
@RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE)
-public class IfModelChangeRule extends AbstractStatelessESBModelChangeRule {
+public class IfModelChangeRule extends AbstractESBModelChangeRule {
private static final String NAME_SUFFIX = "_main";
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -47,8 +47,7 @@
boolean ret=false;
if (mobj instanceof ConversationModel &&
- model instanceof ESBLanguageModel &&
- ((ESBLanguageModel)model).isStateless()) {
+ model instanceof ESBLanguageModel) {
ret = true;
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -50,8 +50,7 @@
if (fromObj instanceof TypeReference &&
toObj instanceof TypeReference &&
- model instanceof ESBLanguageModel &&
- ((ESBLanguageModel)model).isStateless() == true) {
+ model instanceof ESBLanguageModel) {
ret = true;
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -108,13 +108,15 @@
defn = defns.get(0);
}
- if (generator != null && defn != null) {
+ if (cm.getConversation().isStateless() == false) {
+ result.addError(this, new Throwable("Only currently support stateless conversations: "+filename));
+
+ } else if (generator != null && defn != null) {
ModelReference targetRef=
new ModelReference(JBossESBNotation.NOTATION_CODE);
DefaultESBLanguageModel target=
- new DefaultESBLanguageModel(targetRef,
- cm.getConversation().isStateless());
+ new DefaultESBLanguageModel(targetRef);
generator.generate(targetRef,
defn.getLocatedName().getRole(),
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -30,7 +30,7 @@
ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
org.w3c.dom.Element config=model.getESBConfiguration();
@@ -114,7 +114,7 @@
ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
org.w3c.dom.Element config=model.getESBConfiguration();
@@ -176,7 +176,7 @@
ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
org.w3c.dom.Element config=model.getESBConfiguration();
@@ -222,7 +222,7 @@
ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
TestESBService service=new TestESBService();
service.setCategory(category);
@@ -242,7 +242,7 @@
ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
TestESBService service1=new TestESBService();
service1.setCategory(category);
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -24,135 +24,20 @@
public class DefaultESBServiceTest extends TestCase {
- public void testValidateSessionClassRequired() {
+ public void testIsSessionType() {
DefaultESBService service=new DefaultESBService(null, null);
TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
+ act1.isSessionType(true);
service.getActions().add(act1);
- TestModelListener l=new TestModelListener();
-
- l.addExpectedError(org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.savara.tools.jbossesb.model.Messages"),
- "_NOT_SPECIFIED_SESSION_CLASS",
- new String[]{}));
-
- service.validate(l);
-
- if (l.isValid() == false) {
- fail(l.invalidMessage());
- }
- }
-
- public void testValidateSessionClassNotRequired() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestModelListener l=new TestModelListener();
-
- service.validate(l);
-
- if (l.isValid() == false) {
- fail(l.invalidMessage());
- }
- }
-
- public void testIsLoop() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setLoop(true);
-
- service.getActions().add(act1);
-
- if (service.isLoop() == false) {
- fail("Service should be loop");
- }
- }
-
- public void testIsLoopFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
-
- service.getActions().add(act1);
-
- if (service.isLoop()) {
- fail("Service is not a loop");
- }
- }
-
- public void testIsRoot() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
- act1.setPropertyValue(DefaultESBService.ROOT_PROPERTY, "true");
-
- service.getActions().add(act1);
-
- if (service.isRoot() == false) {
- fail("Service should be root");
- }
- }
-
- public void testIsRootFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
-
- service.getActions().add(act1);
-
- if (service.isRoot()) {
- fail("Service should NOT be root");
- }
- }
-
- public void testIsSessionBased() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
-
- service.getActions().add(act1);
-
- if (service.isSessionBased() == false) {
- fail("Service should be SessionBased");
- }
- }
-
- public void testIsSessionBasedFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
-
- service.getActions().add(act1);
-
- if (service.isSessionBased()) {
- fail("Service should NOT be SessionBased");
- }
- }
-
- public void testIsCreateSession() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
-
- service.getActions().add(act1);
-
if (service.isSessionType() == false) {
- fail("Service should be 'create session'");
+ fail("Service should be 'session type'");
}
}
- public void testIsCreateSessionFalse() {
+ public void testIsSessionTypeFalse() {
DefaultESBService service=new DefaultESBService(null, null);
TestESBAction act1=new TestESBAction();
@@ -160,7 +45,7 @@
service.getActions().add(act1);
if (service.isSessionType()) {
- fail("Service should NOT be 'create session'");
+ fail("Service should NOT be 'session type'");
}
}
@@ -170,8 +55,8 @@
DefaultESBService service=new DefaultESBService(null, null);
TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
+ act1.isSessionType(true);
+ act1.setGateway(true);
act1.setPropertyValue(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY,
name);
@@ -189,8 +74,8 @@
DefaultESBService service=new DefaultESBService(null, null);
TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
+ act1.isSessionType(true);
+ act1.setGateway(true);
act1.setPropertyValue(DefaultESBService.CONVERSATION_TYPE_PROPERTY,
name);
@@ -202,24 +87,6 @@
}
}
- public void testGetSessionName() {
- String name="session1";
-
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY,
- name);
-
- service.getActions().add(act1);
-
- if (service.getSessionName().equals(name) == false) {
- fail("Session name '"+service.getSessionName()+
- "' invalid, expecting: "+name);
- }
- }
-
public void testBaseConfiguration() {
String category="category";
String name="name";
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -63,43 +63,25 @@
m_initiator = initiator;
}
- public boolean isLoop() {
- return(m_loop);
- }
-
- public void setLoop(boolean bool) {
- m_loop = bool;
- }
-
public boolean isPerform() {
// TODO Auto-generated method stub
return false;
}
- public boolean isSessionBased() {
- return(m_sessionBased);
- }
-
- public void setSessionBased(boolean bool) {
- m_sessionBased = bool;
- }
-
public boolean isSessionType() {
- return(m_createSession);
+ return(m_sessionType);
}
- public void setCreateSession(boolean bool) {
- m_createSession = bool;
+ public void isSessionType(boolean bool) {
+ m_sessionType = bool;
}
public boolean isGateway() {
- // TODO Auto-generated method stub
- return false;
+ return(m_gateway);
}
-
- public boolean isStateless() {
- // TODO Auto-generated method stub
- return false;
+
+ public void setGateway(boolean bool) {
+ m_gateway = bool;
}
public boolean hasProperty(String property) {
@@ -112,9 +94,8 @@
}
- private boolean m_sessionBased=false;
- private boolean m_loop=false;
private boolean m_initiator=false;
- private boolean m_createSession=false;
+ private boolean m_sessionType=false;
+ private boolean m_gateway=false;
private java.util.Map<String,String> m_property=new java.util.Hashtable<String, String>();
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -619,14 +619,4 @@
fail("Action is flagged as a 'CreateSession'");
}
}
-
- public void testIsSessionBased() {
- TestESBService service=new TestESBService();
-
- IfAction action=new IfAction(service, null);
-
- if (action.isSessionBased() == false) {
- fail("Action is not flagged as a 'SessionBased'");
- }
- }
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -30,7 +30,6 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("identities", "");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -53,34 +52,6 @@
}
}
- public void testValidateNoIdentities() {
- TestESBService service=new TestESBService();
- service.setRoot(true);
-
- java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("messageType", "");
-
- org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
-
- ReceiveMessageAction action=new ReceiveMessageAction(service, elem);
-
- service.getActions().add(action);
-
- TestModelListener l=new TestModelListener();
-
- l.addExpectedError(org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_PROPERTY",
- new String[]{"identities"}));
-
- action.validate(l);
-
- if (l.isValid() == false) {
- fail(l.invalidMessage());
- }
- }
-
public void testConvertRoles() {
TestESBService service=new TestESBService();
@@ -274,14 +245,4 @@
fail("Action is flagged as a 'CreateSession'");
}
}
-
- public void testIsSessionBased() {
- TestESBService service=new TestESBService();
-
- ReceiveMessageAction action=new ReceiveMessageAction(service, null);
-
- if (action.isSessionBased() == false) {
- fail("Action is not flagged as a 'SessionBased'");
- }
- }
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -35,9 +35,8 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("identities", "");
- props.put("serviceCategory", "");
- props.put("serviceName", "");
+ props.put(SendMessageAction.SERVICE_CATEGORY, "x");
+ props.put(SendMessageAction.SERVICE_NAME, "y");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -60,42 +59,12 @@
}
}
- public void testValidateNoIdentities() {
- TestESBService service=new TestESBService();
- service.setRoot(true);
-
- java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("messageType", "");
- props.put("clientRole", "");
-
- org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
-
- SendMessageAction action=new SendMessageAction(service, elem);
-
- service.getActions().add(action);
-
- TestModelListener l=new TestModelListener();
-
- l.addExpectedError(org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_PROPERTY",
- new String[]{"identities"}));
-
- action.validate(l);
-
- if (l.isValid() == false) {
- fail(l.invalidMessage());
- }
- }
-
public void testValidateNoDestination() {
TestESBService service=new TestESBService();
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
props.put("messageType", "");
- props.put("identities", "");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -108,7 +77,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.savara.tools.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_REQ_RESP_EPR",
+ "_NOT_SPECIFIED_SERVICE_OR_CLIENT_ROLE",
new String[]{}));
action.validate(l);
@@ -118,13 +87,13 @@
}
}
+ /*
public void testValidateResponseService() {
TestESBService service=new TestESBService();
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
props.put("messageType", "");
- props.put("identities", "");
props.put("serviceCategory", "cat1");
props.put("serviceName", "name1");
props.put("responseServiceCategory", "cat2");
@@ -156,6 +125,7 @@
fail(l.invalidMessage());
}
}
+ */
public void testConvertRoles() {
TestESBService service=new TestESBService();
@@ -350,14 +320,4 @@
fail("Action is flagged as a 'CreateSession'");
}
}
-
- public void testIsSessionBased() {
- TestESBService service=new TestESBService();
-
- SendMessageAction action=new SendMessageAction(service, null);
-
- if (action.isSessionBased() == false) {
- fail("Action is not flagged as a 'SessionBased'");
- }
- }
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -183,7 +183,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.savara.tools.jbossesb.model.stateful.actions.Messages"),
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
@@ -365,18 +365,8 @@
SwitchAction action=new SwitchAction(service, null);
- if (action.isSessionType() == true) {
- fail("Action is flagged as a 'CreateSession'");
+ if (action.isSessionType() == false) {
+ fail("Should be a session type");
}
}
-
- public void testIsSessionBased() {
- TestESBService service=new TestESBService();
-
- SwitchAction action=new SwitchAction(service, null);
-
- if (action.isSessionBased() == false) {
- fail("Action is not flagged as a 'SessionBased'");
- }
- }
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java 2009-08-24 20:41:24 UTC (rev 798)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java 2009-08-24 20:44:21 UTC (rev 799)
@@ -29,6 +29,9 @@
public class ConversationInteractionModelChangeRuleTest extends TestCase {
+ public void testPlaceHolder() {
+ }
+
/*
public void testInsertFirstReceiveAction() {
ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
14 years, 8 months
- 1
- 0
Overlord SVN: r798 - cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-24 16:41:24 -0400 (Mon, 24 Aug 2009)
New Revision: 798
Modified:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java
Log:
Change overlord to savara reference.
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java 2009-08-24 09:30:12 UTC (rev 797)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java 2009-08-24 20:41:24 UTC (rev 798)
@@ -13,7 +13,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.overlord.cdl.validator.jbossesb";
+ public static final String PLUGIN_ID = "org.jboss.savara.tools.jbossesb.cdl";
// The shared instance
private static Activator plugin;
@@ -70,5 +70,5 @@
(t == null ? "" : ": "+t));
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.validator.jbossesb.eclipse");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.cdl.eclipse");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java 2009-08-24 09:30:12 UTC (rev 797)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java 2009-08-24 20:41:24 UTC (rev 798)
@@ -65,7 +65,7 @@
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.validator.jbossesb.eclipse");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.cdl.eclipse");
private static final String ANNOTATIONS_FOLDER="annotations";
private static final String PATH_SEPARATOR = "/";
14 years, 8 months
- 1
- 0
Overlord SVN: r797 - cdl/tags/1.0-M2/docs/docbook/gettingstartedguide/src/main/module.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-24 05:30:12 -0400 (Mon, 24 Aug 2009)
New Revision: 797
Modified:
cdl/tags/1.0-M2/docs/docbook/gettingstartedguide/src/main/module/installation.xml
Log:
Update getting started doc to reference separate pi4soa tech preview plugin update site
Modified: cdl/tags/1.0-M2/docs/docbook/gettingstartedguide/src/main/module/installation.xml
===================================================================
--- cdl/tags/1.0-M2/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2009-08-24 07:04:55 UTC (rev 796)
+++ cdl/tags/1.0-M2/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2009-08-24 09:30:12 UTC (rev 797)
@@ -83,7 +83,12 @@
</para>
<para>
NOTE: When doing the plugin update, if it complains about unresolved dependencies, then the key components to install/update are the core feature (in the modeller category) and the technology preview feature (in the incubator category).
- </para>
+ </para>
+ <note>
+ <para>
+Once the main pi4soa plugins have been updated, it will also be necessary to install an additional 'technology preview' feature. This can be achieved by adding a new update site for URL http://pi4soa.sourceforge.net/updates-tp and loading the new feature from this site.
+ </para>
+ </note>
<para>
If just the service validation capabilities are being used, then no further configuration of the Eclipse environment is necessary.
However if the conversational ESB actions, with conformance checking against a Choreography Description, will be used, then the following additional steps will be required:
14 years, 8 months
- 1
- 0
Overlord SVN: r796 - in cdl/trunk: distribution/src/main/assembly and 8 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-24 03:04:55 -0400 (Mon, 24 Aug 2009)
New Revision: 796
Modified:
cdl/trunk/distribution/pom.xml
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml
Log:
* SOAG-114
Modified: cdl/trunk/distribution/pom.xml
===================================================================
--- cdl/trunk/distribution/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/distribution/pom.xml 2009-08-24 07:04:55 UTC (rev 796)
@@ -74,19 +74,16 @@
<groupId>sun-jaxws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.1.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>sun-jaxws</groupId>
<artifactId>jsr181-api</artifactId>
<version>2.1.1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-24 07:04:55 UTC (rev 796)
@@ -159,7 +159,7 @@
<outputDirectory>samples/brokerage/broker/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.savara:savara-runtime-jbossesb:jar</include>
<include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
<include>log4j:log4j</include>
</includes>
@@ -168,7 +168,7 @@
<outputDirectory>samples/brokerage/supplier/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.savara:savara-runtime-jbossesb:jar</include>
<include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
<include>log4j:log4j</include>
</includes>
@@ -177,7 +177,7 @@
<outputDirectory>samples/purchasing/store/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.savara:savara-runtime-jbossesb:jar</include>
<include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
<include>log4j:log4j</include>
</includes>
@@ -186,7 +186,7 @@
<outputDirectory>samples/common/creditAgency/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.savara:savara-runtime-jbossesb:jar</include>
<include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
<include>log4j:log4j</include>
<include>sun-jaxws:jaxws-api</include>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-08-24 07:04:55 UTC (rev 796)
@@ -32,7 +32,9 @@
<condition property="messaging.present">
<available file="${server.dir}/deploy/jboss-messaging.sar"/>
</condition>
-
+ <condition property="messaging.present">
+ <available file="${server.dir}/deploy/messaging" />
+ </condition>
<condition property="jbossmq.present">
<not>
<isset property="messaging.present"/>
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle {
@@ -37,11 +38,26 @@
}
public Message process(Message message) throws Exception{
+ StringBuffer sbuffer = new StringBuffer();
Node node = XMLUtils.getNode((String)message.getBody().get());
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
- message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>");
+ sbuffer.append("<CreditCheckRequest id=\"" + idValue +"\">");
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</CreditCheckRequest>");
+
+ message.getBody().add(sbuffer.toString());
+
logger.info("Updated credit check request message: "+message.getBody().get());
return(message);
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* @author jeffyu
@@ -43,8 +44,7 @@
public Message process(Message message) throws Exception {
Node node = XMLUtils.getNode((String)message.getBody().get());
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
-
- message.getBody().add("<orderConfirmed id=\"" + idValue +"\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\" quoteValue=\"10\">" +
+ message.getBody().add("<orderConfirmed id=\"" + idValue +"\" supplierDesc=\"{http://www.jboss.org/savara/loanBroker}Supplier1\" quoteValue=\"10\">" +
"</orderConfirmed>");
logger.info(message.getBody().get());
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -28,7 +28,7 @@
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
String quoteValue = node.getAttributes().getNamedItem("quoteValue").getNodeValue();
- String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1";
+ String supplierDesc = "{http://www.jboss.org/savara/loanBroker}Supplier1";
String confirmation = "The quote of " + quoteValue + " has been confirmed.";
String body = "<bookingReference id=\"" + idValue + "\" supplierDesc = \""
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -25,7 +25,7 @@
Node node = XMLUtils.getNode((String)message.getBody().get());
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
- String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1";
+ String supplierDesc = "{http://www.jboss.org/savara/loanBroker}Supplier1";
String body = "<quote id=\"" + idValue + "\" supplierDesc = \""
+ supplierDesc+ "\">10</quote>";
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2009-08-24 07:04:55 UTC (rev 796)
@@ -21,7 +21,7 @@
<jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierTxnProcessor"/>
</listeners>
<actions>
- <action class="org.jboss.savara.jbossesb.actionsSwitchAction" name="ESBBrokerProcess_SupplierTxnProcessor_action_1" process="process">
+ <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_SupplierTxnProcessor_action_1" process="process">
<property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-SupplierTxnProcessor"/>
<property name="conversationType" value="savara.samples.LoanBroker@SupplierTxnProcessor"/>
<property name="paths">
@@ -37,7 +37,7 @@
<jms-listener busidref="busId2" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierTxnProcessor__1"/>
</listeners>
<actions>
- <action class="org.jboss.savara.jbossesb.actionsReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
+ <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="orderConfirmed"/>
<property name="clientRole" value="Broker" />
@@ -45,7 +45,7 @@
</action>
<action class="org.jboss.savara.examples.supplier.SetOrderConfirmResponseAction" name="su-1">
</action>
- <action class="org.jboss.savara.jbossesb.actionsSendMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_2" process="process">
+ <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_2" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="bookingReference"/>
<property name="clientRole" value="Broker"/>
@@ -58,7 +58,7 @@
<jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierQuoteEngine"/>
</listeners>
<actions>
- <action class="org.jboss.savara.jbossesb.actionsSwitchAction" name="ESBBrokerProcess_SupplierQuoteEngine_action_1" process="process">
+ <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_SupplierQuoteEngine_action_1" process="process">
<property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-SupplierQuoteEngine"/>
<property name="conversationType" value="savara.samples.LoanBroker@SupplierQuoteEngine"/>
<property name="paths">
@@ -74,7 +74,7 @@
<jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierQuoteEngine__1"/>
</listeners>
<actions>
- <action class="org.jboss.savara.jbossesb.actionsReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
+ <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
<property name="clientRole" value="Broker" />
@@ -82,7 +82,7 @@
</action>
<action class="org.jboss.savara.examples.supplier.SetQuoteMessageAction" name="su1-2">
</action>
- <action class="org.jboss.savara.jbossesb.actionsSendMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_2" process="process">
+ <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_2" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="quote"/>
<property name="clientRole" value="Broker"/>
Modified: cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -27,6 +27,7 @@
/**
* @author gary
+ * @author Jeff Yu
*/
public class BuyerClient {
@@ -47,11 +48,15 @@
}
public void run() {
-
- String buyReq="<BuyRequest id=\"5\" ></BuyRequest>";
+
+ StringBuffer sbuffer = new StringBuffer();
+ sbuffer.append("<BuyRequest id=\"5\">");
+ sbuffer.append("<account>105</account>");
+ sbuffer.append("<amount>253</amount>");
+ sbuffer.append("</BuyRequest>");
Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
- mesg.getBody().add(buyReq);
+ mesg.getBody().add(sbuffer.toString());
mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
try {
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-24 07:04:55 UTC (rev 796)
@@ -40,7 +40,7 @@
<jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_CreditAgency"/>
</listeners>
<actions>
- <action class="org.jboss.soa.overlord.jbossesb.actions.stateless.SwitchAction" name="PurchaseGoodsProcess_CreditAgency_action_1" process="process">
+ <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="PurchaseGoodsProcess_CreditAgency_action_1" process="process">
<property name="serviceDescriptionName" value="{org.jboss.savara.examples.purchasegoods}PurchaseGoodsProcess-CreditAgency"/>
<property name="conversationType" value="savara.samples.Common@CreditAgency"/>
<property name="paths">
@@ -64,7 +64,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.IfAction" name="PurchaseGoodsProcess_CreditAgency__1_action_2" process="process">
<property name="paths">
- <if service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__2" decision-class="org.jboss.overlord.examples.creditAgency.CreditAgencyDecision"/>
+ <if service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__2" decision-class="org.jboss.savara.examples.creditAgency.CreditAgencyDecision"/>
<elseif service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__3"/>
</property>
</action>
@@ -75,7 +75,7 @@
<jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_CreditAgency__2"/>
</listeners>
<actions>
- <action name="custom-1" process="process" class="org.jboss.overlord.examples.creditAgency.SetCreditCheckResponseMessageAction">
+ <action name="custom-1" process="process" class="org.jboss.savara.examples.creditAgency.SetCreditCheckResponseMessageAction">
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_CreditAgency__2_action_1" process="process">
<property name="operation" value="checkCredit"/>
@@ -90,7 +90,7 @@
<jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_CreditAgency__3"/>
</listeners>
<actions>
- <action name="custom-2" process="process" class="org.jboss.overlord.examples.creditAgency.SetCreditCheckInvalidMessageAction">
+ <action name="custom-2" process="process" class="org.jboss.savara.examples.creditAgency.SetCreditCheckInvalidMessageAction">
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_CreditAgency__3_action_1" process="process">
<property name="operation" value="checkCredit"/>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/*
* @author gary
@@ -41,10 +42,25 @@
public Message process(Message message) throws Exception{
+ StringBuffer sbuffer = new StringBuffer();
Node node = XMLUtils.getNode((String)message.getBody().get());
+
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ sbuffer.append("<BuyFailed id=\"" + idValue +"\">");
+
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</BuyFailed>");
- message.getBody().add("<BuyFailed id=\"" + idValue +"\"></BuyFailed>");
+ message.getBody().add(sbuffer.toString());
logger.info("Updated buy message: " + message.getBody().get());
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class SetBuyResponseMessageAction extends AbstractActionLifecycle {
@@ -37,11 +38,25 @@
}
public Message process(Message message) throws Exception{
-
+ StringBuffer sbuffer = new StringBuffer();
Node node = XMLUtils.getNode((String)message.getBody().get());
+
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
- message.getBody().add("<BuyConfirmed id=\"" + idValue +"\"></BuyConfirmed>");
+ sbuffer.append("<BuyConfirmed id=\"" + idValue +"\">");
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</BuyConfirmed>");
+ message.getBody().add(sbuffer.toString());
+
logger.info("Updated buy message: " + message.getBody().get());
return(message);
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java 2009-08-24 07:04:55 UTC (rev 796)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle {
@@ -37,11 +38,25 @@
}
public Message process(Message message) throws Exception{
-
+ StringBuffer sbuffer = new StringBuffer();
Node node = XMLUtils.getNode((String)message.getBody().get());
+
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
- message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>");
+ sbuffer.append("<CreditCheckRequest id=\"" + idValue +"\">");
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</CreditCheckRequest>");
+
+ message.getBody().add(sbuffer.toString());
logger.info("Updated credit check request message: " + message.getBody().get());
return(message);
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml 2009-08-23 16:55:05 UTC (rev 795)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml 2009-08-24 07:04:55 UTC (rev 796)
@@ -51,7 +51,7 @@
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
<property name="serviceCategory" value="org.jboss.savara.examples.purchasegoods"/>
- <property name="serviceName" value=PurchaseGoodsProcess_CreditAgency""/>
+ <property name="serviceName" value="PurchaseGoodsProcess_CreditAgency"/>
<property name="responseServiceCategory" value="org.jboss.savara.examples.purchasegoods"/>
<property name="responseServiceName" value="checkCredit"/>
</action>
14 years, 8 months
- 1
- 0
Overlord SVN: r795 - in cdl/trunk: distribution and 13 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-23 12:55:05 -0400 (Sun, 23 Aug 2009)
New Revision: 795
Removed:
cdl/trunk/distribution/src/main/release/version.properties
Modified:
cdl/trunk/distribution/pom.xml
cdl/trunk/distribution/src/files/validator/jbossesb/build.xml
cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/assembly/docs.xml
cdl/trunk/distribution/src/main/release/README.txt
cdl/trunk/distribution/src/main/release/install/build.xml
cdl/trunk/distribution/src/main/release/install/deployment.properties
cdl/trunk/docs/docbook/gettingstartedguide/pom.xml
cdl/trunk/docs/docbook/samplesguide/pom.xml
cdl/trunk/docs/docbook/userguide/pom.xml
cdl/trunk/pom.xml
cdl/trunk/samples/jbossesb/README.txt
cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
cdl/trunk/samples/pom.xml
Log:
Modified: cdl/trunk/distribution/pom.xml
===================================================================
--- cdl/trunk/distribution/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -26,28 +26,68 @@
<version>1.0-SNAPSHOT</version>
<url>http://www.jboss.org/overlord/savara</url>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>savara</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
<properties>
<maven.test.skip>true</maven.test.skip>
- <cdl.version>${project.version}</cdl.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.savara.runtime</groupId>
- <artifactId>jbossesb</artifactId>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.savara.validator</groupId>
- <artifactId>jbossesb</artifactId>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<version>${pom.version}</version>
+ <classifier>dist</classifier>
+ <type>zip</type>
</dependency>
<dependency>
- <groupId>org.jboss.savara.validator</groupId>
- <artifactId>jbossesb-assembly</artifactId>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-validator-jbossesb</artifactId>
<version>${pom.version}</version>
- <type>esb</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-validator-jbossesb</artifactId>
+ <version>${pom.version}</version>
+ <classifier>dist</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId>
+ <artifactId>jbossesb-rosetta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>2.1.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: cdl/trunk/distribution/src/files/validator/jbossesb/build.xml
===================================================================
--- cdl/trunk/distribution/src/files/validator/jbossesb/build.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/files/validator/jbossesb/build.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -41,7 +41,7 @@
<!-- ==================================================================== -->
<target name="deploy" depends="register-validator-filter,messaging-dependencies,jbossmq-dependencies">
- <echo message="Deploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files to the target server '${target-server}'." />
+ <echo message="Deploy pi4soa.sar, savara-validator-jbossesb.esb files to the target server '${target-server}'." />
<copy todir="${target-server}/deploy/pi4soa.sar">
<fileset dir="${basedir}/pi4soa.sar">
<exclude name="jms/**" />
@@ -49,15 +49,15 @@
</copy>
<copy todir="${target-server}/deploy/pi4soa.sar"
file="${basedir}/pi4soa.sar/jms/${jms.service.file}" />
- <copy todir="${target-server}/deploy/overlord-cdl-validator.esb">
- <fileset dir="${basedir}/overlord-cdl-validator.esb" />
+ <copy todir="${target-server}/deploy/savara-validator-jbossesb.esb">
+ <fileset dir="${basedir}/savara-validator-jbossesb.esb" />
</copy>
</target>
<target name="undeploy" depends="unregister-validator-filter">
- <echo message="Undeploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files from the target sever '${target-server}'."/>
+ <echo message="Undeploy pi4soa.sar, savara-validator-jbossesb.esb files from the target sever '${target-server}'."/>
<delete dir="${target-server}/deploy/pi4soa.sar" />
- <delete dir="${target-server}/deploy/overlord-cdl-validator.esb" />
+ <delete dir="${target-server}/deploy/savara-validator-jbossesb.esb" />
</target>
<target name="register-validator-filter">
@@ -71,6 +71,5 @@
<delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
<copy file="${basedir}/conf/jbossesb-properties.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
</target>
-
</project>
Modified: cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt
===================================================================
--- cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt 2009-08-23 16:55:05 UTC (rev 795)
@@ -5,7 +5,7 @@
-----------------------
1 - pi4soa.sar
-2 - overlord-cdl-validator.esb It contains the monitor config file (WS-CDL file) that will be used by the Filter.
+2 - savara-validator-jbossesb.esb It contains the monitor config file (WS-CDL file) that will be used by the Filter.
3 - conf/ It contains the proper configuration for governance deployment.
@@ -15,11 +15,11 @@
Instructions for deploying/undeploying by using ANT (recommended)
------------------------------------------------------------------
-1 - Go to $overlord-cdl/install directory.
+1 - Go to $savara/install directory.
-2 - Run "ant deploy-cdl-validator" to deploy the validator libraries.
+2 - Run "ant deploy-savara-validator" to deploy the validator libraries.
-3 - Run "ant undeploy-cdl-validator" to undeploy the validator libraries.
+3 - Run "ant undeploy-savara-validator" to undeploy the validator libraries.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -29,18 +29,14 @@
<fileSets>
<fileSet>
- <directory>eclipse</directory>
+ <directory>src/files/eclipse</directory>
<outputDirectory>tools</outputDirectory>
</fileSet>
-
- <fileSet>
- <directory>../runtime/jbossesb/target</directory>
- <outputDirectory>modules/runtime-jbossesb-${cdl.version}</outputDirectory>
- <includes>
- <include>savara-runtime.esb-dist.zip</include>
- </includes>
- </fileSet>
-
+
+ <fileSet>
+ <directory>src/files/validator/jbossesb</directory>
+ <outputDirectory>modules/savara-validator-jbossesb</outputDirectory>
+ </fileSet>
<!--Copy files like License and samples etc -->
<fileSet>
@@ -57,6 +53,148 @@
<outputDirectory>/install</outputDirectory>
</fileSet>
+ <!-- copy documents -->
+ <fileSet>
+ <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/userguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/samplesguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/gettingstartedguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../runtime/jbossesb/target/javadoc</directory>
+ <outputDirectory>docs/savara-runtime-jbossesb-javadoc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../validator/jbossesb/target/javadoc</directory>
+ <outputDirectory>docs/savara-validator-jbossesb-javadoc</outputDirectory>
+ </fileSet>
+ <!-- End of copying documents -->
+
+ <!-- copy samples -->
+
+ <fileSet>
+ <directory>src/main/release/samples/jbossesb</directory>
+ <outputDirectory>samples</outputDirectory>
+ </fileSet>
+
+ <!-- Copy the cdl model for examples -->
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/models</directory>
+ <outputDirectory>samples/models/brokerage</outputDirectory>
+ <excludes>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/purchasing/models</directory>
+ <outputDirectory>samples/models/purchasing</outputDirectory>
+ <excludes>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/broker/src</directory>
+ <outputDirectory>samples/brokerage/broker/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/supplier/src</directory>
+ <outputDirectory>samples/brokerage/supplier/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/purchasing/store/src</directory>
+ <outputDirectory>samples/purchasing/store/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/common/creditAgency/src</directory>
+ <outputDirectory>samples/common/creditAgency/src</outputDirectory>
+ </fileSet>
+
+ <!-- copy client & trailblazer example-->
+ <fileSet>
+ <directory>../samples/jbossesb/client</directory>
+ <outputDirectory>samples/client</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/trailblazer</directory>
+ <outputDirectory>samples/trailblazer</outputDirectory>
+ </fileSet>
+ <!-- End of copying examples -->
+
</fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>modules</outputDirectory>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.savara:savara-runtime-jbossesb:zip:dist</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/savara-validator-jbossesb</outputDirectory>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.savara:savara-validator-jbossesb:zip:dist</include>
+ </includes>
+ </dependencySet>
+
+ <!-- Need to copy libraries into each of the samples Eclipse projects
+ as the jars must be referenced locally within each project. The
+ versions have been removed from the jars, as the Eclipse projects
+ need to explicitly refer to each Jar in the .classpath file, so
+ removing the version from the name avoids having to find a way
+ to automatically update the .classpath file -->
+ <dependencySet>
+ <outputDirectory>samples/brokerage/broker/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/brokerage/supplier/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/purchasing/store/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/common/creditAgency/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.savara:savara-runtime-jbossesb</include>
+ <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include>
+ <include>log4j:log4j</include>
+ <include>sun-jaxws:jaxws-api</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>sun-jaxws:jsr181-api</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
</assembly>
Modified: cdl/trunk/distribution/src/main/assembly/docs.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/docs.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/main/assembly/docs.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -25,27 +25,32 @@
<formats>
<format>zip</format>
</formats>
-
+
<fileSets>
- <fileSet>
- <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory>
- <outputDirectory>docs/userguide</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory>
- <outputDirectory>docs/samplesguide</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory>
- <outputDirectory>docs/gettingstartedguide</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>../runtime/jbossesb/target/javadoc</directory>
- <outputDirectory>docs/jbossesb-javadoc</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/userguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/samplesguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>docs/gettingstartedguide</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../runtime/jbossesb/target/javadoc</directory>
+ <outputDirectory>docs/savara-runtime-jbossesb-javadoc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../validator/jbossesb/target/javadoc</directory>
+ <outputDirectory>docs/savara-validator-jbossesb-javadoc</outputDirectory>
+ </fileSet>
</fileSets>
Modified: cdl/trunk/distribution/src/main/release/README.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/README.txt 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/main/release/README.txt 2009-08-23 16:55:05 UTC (rev 795)
@@ -1,8 +1,8 @@
-Overlord CDL README
+Savara README
===================
Please refer to the Installation section, within the Getting Started Guide in the docs
-folder, which explains how to install the Overlord CDL governance capabilities into the
+folder, which explains how to install the CDL governance capabilities into the
JBossESB environment.
If you are new to SOA Governance using CDL, then please refer to the Getting Started
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -1,11 +1,10 @@
-<project name="Overlord_CDL_Installer" default="deploy-cdl-runtime" basedir=".">
+<project name="Overlord_CDL_Installer" default="deploy-savara-runtime" basedir=".">
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
- <property file="../version.properties" />
<property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
<property name="conf.dir" value="${server.dir}/conf"/>
@@ -25,34 +24,36 @@
<fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/>
</target>
- <target name="deploy-cdl-runtime" description="Deploys Overlord CDL Runtime to the server">
- <echo message="Deploy overlord cdl runtime to JBoss ESB server" />
- <unzip src="${modules}/runtime-jbossesb-${cdl.version}/savara-runtime.esb-dist.zip" dest="${deploy.dir}" />
+ <target name="deploy-savara-runtime" description="Deploys Savara Runtime to the server">
+ <echo message="Deploy savara runtime to JBoss ESB server" />
+ <copy todir="${deploy.dir}/savara-runtime-jbossesb.esb">
+ <fileset dir="${modules}/savara-runtime-jbossesb.esb"/>
+ </copy>
</target>
- <target name="undeploy-cdl-runtime" description="Undeploys Overlord CDL Runtime">
- <echo message="Undeploy the overlord-cdl-runtime.esb from JBoss ESB server" />
- <delete dir="${deploy.dir}/savara-runtime.esb" />
+ <target name="undeploy-savara-runtime" description="Undeploys Savara Runtime">
+ <echo message="Undeploy the savara runtime jbossesb from JBoss ESB server" />
+ <delete dir="${deploy.dir}/savara-runtime-jbossesb.esb" />
</target>
- <target name="deploy-cdl-validator" depends="check.deploy.props" description="Deploys Overlord CDL validator to the server">
- <echo message="Deploy Overlord CDL validator" />
- <ant dir="${modules}/validator-jbossesb-${cdl.version}" target="deploy">
+ <target name="deploy-savara-validator" depends="check.deploy.props" description="Deploys Savara validator to the server">
+ <echo message="Deploy Savara validator" />
+ <ant dir="${modules}/savara-validator-jbossesb" target="deploy">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
</target>
- <target name="undeploy-cdl-validator" depends="check.deploy.props" description="Undeploys Overlord CDL validator to the server">
- <echo message="Undeploy Overlord CDL validator" />
- <ant dir="${modules}/validator-jbossesb-${cdl.version}" target="undeploy">
+ <target name="undeploy-savara-validator" depends="check.deploy.props" description="Undeploys Overlord CDL validator to the server">
+ <echo message="Undeploy Savara validator" />
+ <ant dir="${modules}/savara-validator-jbossesb" target="undeploy">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
</target>
- <target name="deploy" depends="deploy-cdl-runtime, deploy-cdl-validator" description="Deploy Overlord CDL components."/>
+ <target name="deploy" depends="deploy-savara-runtime, deploy-savara-validator" description="Deploy Savara components."/>
- <target name="undeploy" depends="undeploy-cdl-runtime, undeploy-cdl-validator" description="Undeploy Overlord CDL components."/>
+ <target name="undeploy" depends="undeploy-savara-runtime, undeploy-savara-validator" description="Undeploy Savara components."/>
</project>
Modified: cdl/trunk/distribution/src/main/release/install/deployment.properties
===================================================================
--- cdl/trunk/distribution/src/main/release/install/deployment.properties 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/main/release/install/deployment.properties 2009-08-23 16:55:05 UTC (rev 795)
@@ -7,11 +7,11 @@
# This path should not include spaces.
# Use of relative paths or paths with spaces will cause runtime errors
# when deploying and executing the quickstart and the trailblazers.
-# (e.g. /local/deploy/jboss-4.2.3.GA)
-org.jboss.esb.server.home=/local/deploy/jboss-4.2.3.GA
+# (e.g. /local/deploy/jboss-5.1.0.GA)
+org.jboss.esb.server.home=/local/deploy/jboss-5.1.0.GA
# The Configuration of JBoss AS to Use
# (e.g. default)
org.jboss.esb.server.config=default
# The directory for JBossESB home
-# (e.g. /local/deploy/jbossesb-4.5.GA)
-org.jboss.esb.home=/local/deploy/jbossesb-4.5.GA
+# (e.g. /local/deploy/jbossesb-4.6.GA)
+org.jboss.esb.home=/local/deploy/jbossesb-4.6.GA
Deleted: cdl/trunk/distribution/src/main/release/version.properties
===================================================================
--- cdl/trunk/distribution/src/main/release/version.properties 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/distribution/src/main/release/version.properties 2009-08-23 16:55:05 UTC (rev 795)
@@ -1 +0,0 @@
-cdl.version=1.0-SNAPSHOT
Modified: cdl/trunk/docs/docbook/gettingstartedguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/gettingstartedguide/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/docs/docbook/gettingstartedguide/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -7,7 +7,7 @@
<groupId>org.jboss.savara.docs</groupId>
<artifactId>gettingstartedguide</artifactId>
<packaging>jdocbook</packaging>
- <name>Overlord::CDL::Docs::gettingstartedguide</name>
+ <name>Savara::docs::gettingstartedguide</name>
<parent>
<groupId>org.jboss.savara</groupId>
Modified: cdl/trunk/docs/docbook/samplesguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/docs/docbook/samplesguide/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -7,7 +7,7 @@
<groupId>org.jboss.savara.docs</groupId>
<artifactId>samplesguide</artifactId>
<packaging>jdocbook</packaging>
- <name>Overlord::CDL::Docs::samplesguide</name>
+ <name>Savara::docs::samplesguide</name>
<parent>
<groupId>org.jboss.savara</groupId>
Modified: cdl/trunk/docs/docbook/userguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/docs/docbook/userguide/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -7,7 +7,7 @@
<groupId>org.jboss.savara.docs</groupId>
<artifactId>userguide</artifactId>
<packaging>jdocbook</packaging>
- <name>Overlord::CDL::Docs::userguide</name>
+ <name>Savara::docs::userguide</name>
<parent>
<groupId>org.jboss.savara</groupId>
Modified: cdl/trunk/pom.xml
===================================================================
--- cdl/trunk/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -144,7 +144,7 @@
<junit.version>4.4</junit.version>
<rosetta.version>4.5</rosetta.version>
<log4j.version>1.2.14</log4j.version>
- <mvel.version>1.3.4-java1.5</mvel.version>
+ <mvel.version>1.3.4-java1.5</mvel.version>
</properties>
<dependencyManagement>
Modified: cdl/trunk/samples/jbossesb/README.txt
===================================================================
--- cdl/trunk/samples/jbossesb/README.txt 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/samples/jbossesb/README.txt 2009-08-23 16:55:05 UTC (rev 795)
@@ -1,7 +1,7 @@
Samples Readme
==============
-This folder contains samples associated with the Overlord CDL project.
+This folder contains samples associated with the Savara project.
Information on the samples, and the instructions to run them, can be found in the Samples Guide within the docs folder.
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
- <artifactId>jbossesb-broker</artifactId>
+ <artifactId>samples-broker</artifactId>
<packaging>jar</packaging>
<name>Savara::Samples::Broker</name>
<url>http://www.jboss.org/overlord</url>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
- <artifactId>jbossesb-supplier</artifactId>
+ <artifactId>samples-supplier</artifactId>
<packaging>jar</packaging>
<name>Savara::Samples::Supplier</name>
<url>http://www.jboss.org/overlord</url>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
- <artifactId>jbossesb-creditAgency</artifactId>
+ <artifactId>samples-creditAgency</artifactId>
<packaging>jar</packaging>
<name>Savara::Samples::CreditAgency</name>
<url>http://www.jboss.org/overlord</url>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
- <artifactId>jbossesb-purchasing</artifactId>
+ <artifactId>samples-store</artifactId>
<packaging>jar</packaging>
- <name>Savara::Samples::Purchasing</name>
+ <name>Savara::Samples::Store</name>
<url>http://www.jboss.org/savara</url>
<parent>
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2009-08-21 21:09:21 UTC (rev 794)
+++ cdl/trunk/samples/pom.xml 2009-08-23 16:55:05 UTC (rev 795)
@@ -16,11 +16,14 @@
<modules>
<module>jbossesb/common/creditAgency</module>
+ <module>jbossesb/brokerage/broker</module>
+ <module>jbossesb/brokerage/supplier</module>
+ <module>jbossesb/purchasing/store</module>
</modules>
<properties>
<jaxb.version>2.1</jaxb.version>
- <savara.version>1.0-SNAPSHOT</savara.version>
+ <savara.version>1.0-SNAPSHOT</savara.version>
</properties>
<dependencyManagement>
@@ -32,21 +35,21 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.savara.runtime</groupId>
- <artifactId>savara-jbossesb</artifactId>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<version>${savara.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>sun-jaxws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1.1</version>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>sun-jaxws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>2.1.1</version>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>2.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
14 years, 8 months
- 1
- 0
Overlord SVN: r794 - in cdl/trunk/tools/eclipse/plugins: org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component and 17 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-21 17:09:21 -0400 (Fri, 21 Aug 2009)
New Revision: 794
Added:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SendMessageAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/UnsupportedAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRuleTest.java
Removed:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/
Modified:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElementFactory.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELModelParserRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/GenerateAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/PropertyUtil.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBModelParserRule.java
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java
Log:
Changed package name and removed the stateful ESB actions - and renamed the stateless actions to be the default. Need to improve the unit tests for the stateless actions, as stateful ones were more advanced but have been removed. Also need to remove 'stateless' checkbox from generator dialog window.
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -12,7 +12,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.overlord.cdl.bpel";
+ public static final String PLUGIN_ID = "org.jboss.savara.tools.bpel";
// The shared instance
private static Activator plugin;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElementFactory.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElementFactory.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElementFactory.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -23,7 +23,7 @@
public class BPELElementFactory {
public static final String MODEL_COMPONENTS_PACKAGE =
- "org.jboss.tools.overlord.cdl.bpel.model.component";
+ "org.jboss.savara.tools.bpel.model.component";
/**
* This method creates a BPELElement instance relevant to the
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELModelParserRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELModelParserRule.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELModelParserRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -107,5 +107,5 @@
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.bpel.parser");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.bpel.parser");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF 2009-08-21 21:09:21 UTC (rev 794)
@@ -27,20 +27,9 @@
org.jboss.savara.tools.jbossesb.editor.JBossESBConfigEditorManager,
org.jboss.savara.tools.jbossesb.validation.ESBLanguageModelValidationRule,
org.jboss.savara.tools.jbossesb.export.ESBLanguageModelStreamExportRule,
- org.jboss.savara.tools.jbossesb.model.change.stateless.LanguageToConversationModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateless.ConversationModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateless.ConversationInteractionModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateless.IfModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateless.TypeReferenceModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.LanguageToConversationModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.ConversationModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.ConversationInteractionModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.MessageSignatureModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.TypeReferenceModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.IfModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.ParallelModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.RunModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.SpawnModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.WhenModelChangeRule,
- org.jboss.savara.tools.jbossesb.model.change.stateful.WhileModelChangeRule
+ org.jboss.savara.tools.jbossesb.model.change.LanguageToConversationModelChangeRule,
+ org.jboss.savara.tools.jbossesb.model.change.ConversationModelChangeRule,
+ org.jboss.savara.tools.jbossesb.model.change.ConversationInteractionModelChangeRule,
+ org.jboss.savara.tools.jbossesb.model.change.IfModelChangeRule,
+ org.jboss.savara.tools.jbossesb.model.change.TypeReferenceModelChangeRule
Bundle-ActivationPolicy: lazy
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/GenerateAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/GenerateAction.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/GenerateAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -109,7 +109,7 @@
mbox.open();
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.actions");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.actions");
private ISelection m_selection=null;
private IWorkbenchPart m_targetPart=null;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -421,7 +421,7 @@
logger.log(java.util.logging.Level.SEVERE, mesg, ex);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.dialogs");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.dialogs");
private IFile m_file=null;
private ConversationModel m_conversationModel=null;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -88,5 +88,5 @@
(t == null ? "" : ": "+t));
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.eclipse");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.eclipse");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -57,7 +57,7 @@
*/
public class BusinessObjectTypeGenerator implements ConversationBasedGenerator {
- private static final String GENERATOR_MESSAGES = "org.jboss.tools.overlord.cdl.runtime.jbossesb.generator.Messages";
+ private static final String GENERATOR_MESSAGES = "org.jboss.savara.tools.jbossesb.generator.Messages";
/**
* This method generates the relevant artefacts based on
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -84,5 +84,5 @@
}
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.generator");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -506,7 +506,7 @@
return(m_context);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.generator");
private IFile m_file=null;
private java.util.List<ModelReference> m_localModelRefs=null;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -78,5 +78,5 @@
return(buf.toString());
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.generator");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -80,5 +80,5 @@
return(buf.toString());
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.generator");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -119,7 +119,7 @@
return(m_joins.contains(service));
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
private java.util.List<ESBService> m_serviceStack=new java.util.Vector<ESBService>();
private java.util.List<ESBService> m_joins=new java.util.Vector<ESBService>();
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -638,7 +638,7 @@
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
private ModelReference m_source=null;
private org.w3c.dom.Element m_esbConfig=null;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -46,9 +46,9 @@
public static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
public static final String CONVERSATION_TYPE_PROPERTY = "conversationType";
public static final String SERVICE_DESCRIPTION_NAME_PROPERTY = "serviceDescriptionName";
- public static final String SERVICE_ANNOTATION = "org.jboss.soa.overlord.jbossesb.stateful.actions.Service";
+ public static final String SERVICE_ANNOTATION = "org.jboss.soa.overlord.jbossesb.actions.Service";
public static final String SERVICE_ELEMENT = "service";
- public static final String RETRIEVE_SESSION_ACTION_CLASS = "org.jboss.soa.overlord.jbossesb.stateful.actions.RetrieveSessionAction";
+ public static final String RETRIEVE_SESSION_ACTION_CLASS = "org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction";
public static final String ACTION_ELEMENT = "action";
public static final String ACTIONS_ELEMENT = "actions";
@@ -199,7 +199,7 @@
l.error(new ModelIssue(src, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.Messages"),
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
"_NOT_SPECIFIED_SESSION_CLASS",
new String[]{})));
}
@@ -913,7 +913,7 @@
return("ESBService: "+getCategory()+"/"+getName()+"["+getSource()+"]");
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
private ESBLanguageModel m_model=null;
private org.w3c.dom.Element m_service=null;
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
-import org.jboss.savara.tools.jbossesb.model.stateful.actions.UnsupportedAction;
+import org.jboss.savara.tools.jbossesb.model.actions.UnsupportedAction;
/**
* This class provides a factory for ESBAction instances.
@@ -29,12 +29,10 @@
public class ESBActionFactory {
public static final String MODEL_ACTION_PACKAGE =
- "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.";
+ "org.jboss.savara.tools.jbossesb.model.actions.";
public static final String CLASS_ATTR = "class";
public static final String CONVERSATION_ACTION_PACKAGE =
- "org.jboss.soa.overlord.jbossesb.";
- public static final String STATELESS="stateless.actions.";
- public static final String STATEFUL="stateful.actions.";
+ "org.jboss.savara.jbossesb.actions.";
/**
* This method creates an ESBAction instance relevant to the
@@ -54,35 +52,20 @@
if (actionType.startsWith(CONVERSATION_ACTION_PACKAGE)) {
actionType = actionType.substring(CONVERSATION_ACTION_PACKAGE.length());
- String stateValue=null;
-
- if (actionType.startsWith(STATEFUL)) {
- actionType = actionType.substring(STATEFUL.length());
- stateValue = STATEFUL;
- } else if (actionType.startsWith(STATELESS)) {
- actionType = actionType.substring(STATELESS.length());
- stateValue = STATELESS;
- }
-
- if (stateValue != null) {
+ try {
+ Class<?> cls=(Class<?>)
+ Class.forName(MODEL_ACTION_PACKAGE+actionType);
- try {
- Class<?> cls=(Class<?>)
- Class.forName(MODEL_ACTION_PACKAGE+
- stateValue+actionType);
-
- java.lang.reflect.Constructor<?> con=
- cls.getConstructor(new Class<?>[]{ESBService.class,
- org.w3c.dom.Element.class});
-
- ret = (ESBAction)con.newInstance(new Object[]{service, action});
-
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Unable to find action class '"+
- MODEL_ACTION_PACKAGE+stateValue+
- actionType+"'", e);
- }
+ java.lang.reflect.Constructor<?> con=
+ cls.getConstructor(new Class<?>[]{ESBService.class,
+ org.w3c.dom.Element.class});
+
+ ret = (ESBAction)con.newInstance(new Object[]{service, action});
+
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Unable to find action class '"+
+ MODEL_ACTION_PACKAGE+actionType+"'", e);
}
}
@@ -109,24 +92,11 @@
if (actionType.startsWith(MODEL_ACTION_PACKAGE)) {
actionType = actionType.substring(MODEL_ACTION_PACKAGE.length());
- String stateValue=null;
-
- if (actionType.startsWith(STATEFUL)) {
- actionType = actionType.substring(STATEFUL.length());
- stateValue = STATEFUL;
- } else if (actionType.startsWith(STATELESS)) {
- actionType = actionType.substring(STATELESS.length());
- stateValue = STATELESS;
- }
-
- if (stateValue != null) {
- ret = CONVERSATION_ACTION_PACKAGE+
- stateValue+actionType;
- }
+ ret = CONVERSATION_ACTION_PACKAGE+actionType;
}
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -188,7 +188,7 @@
mandatory.get(i));
l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.Messages"),
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{mandatory.get(i)}), props));
}
@@ -203,7 +203,7 @@
getMandatoryProperties().contains(propName) == false) {
l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.Messages"),
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
"_UNKNOWN_PROPERTY",
new String[]{propName})));
}
@@ -220,7 +220,7 @@
if (link.isRemote() == false) {
l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.Messages"),
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{link.getCategory(),link.getName()})));
}
@@ -594,7 +594,7 @@
return(m_links);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
private ESBService m_service=null;
private org.w3c.dom.Element m_action=null;
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractInteractionMessageAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractInteractionMessageAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,145 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+
+/**
+ * The abstract model component for the 'ReceiveMessageAction'
+ * and 'SendMessageAction'.
+ *
+ * @author gary
+ */
+public abstract class AbstractInteractionMessageAction extends AbstractStatelessESBAction {
+
+ private static final long serialVersionUID = 3272234577154434603L;
+
+ public static final String MESSAGE_TYPE = "messageType";
+ public static final String OPERATION = "operation";
+ public static final String CLIENT_ROLE = "clientRole";
+ public static final String EPR_STORE = "eprStore";
+
+ /**
+ * The constructor for the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param action The XML configuration details for the action
+ */
+ public AbstractInteractionMessageAction(ESBService service,
+ org.w3c.dom.Element action) {
+ super(service, action);
+ }
+
+ /**
+ * The contructor for initializing a new action.
+ */
+ protected AbstractInteractionMessageAction(ESBService service,
+ String actionClass) {
+ super(service, actionClass);
+ }
+
+ /**
+ * This method returns the mandatory property names.
+ *
+ * @return The mandatory property names
+ */
+ @Override
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(MESSAGE_TYPE);
+ return(ret);
+ }
+
+ /**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(OPERATION);
+ ret.add(CLIENT_ROLE);
+ ret.add(EPR_STORE);
+ return(ret);
+ }
+
+ /**
+ * This method sets the operation property.
+ *
+ * @param operation The operation
+ */
+ public void setOperation(String operation) {
+
+ if (operation != null) {
+ org.w3c.dom.Element prop=getPropertyElement(OPERATION);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, operation);
+ }
+ } else {
+ removePropertyElement(OPERATION);
+ }
+ }
+
+ /**
+ * This method sets the message type.
+ *
+ * @param type The message type
+ */
+ public void setMessageType(String type) {
+
+ org.w3c.dom.Element prop=getPropertyElement(MESSAGE_TYPE);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, type);
+ }
+ }
+
+ /**
+ * This method returns the message type.
+ *
+ * @return The message type
+ */
+ public String getMessageType() {
+ String ret=null;
+
+ org.w3c.dom.Element prop=getPropertyElement(MESSAGE_TYPE);
+
+ if (prop != null && prop.hasAttribute(VALUE_ATTR)) {
+ ret = prop.getAttribute(VALUE_ATTR);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method sets the client's EPR label property.
+ *
+ * @param epr The client EPR label
+ */
+ public void setClientEPR(String epr) {
+
+ org.w3c.dom.Element prop=getPropertyElement(CLIENT_ROLE);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, epr);
+ }
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractStatelessESBAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractStatelessESBAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import java.util.logging.Logger;
+
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.ProblemDefinitions;
+
+/**
+ * This is the generic ESB action class.
+ *
+ * @author gary
+ */
+public abstract class AbstractStatelessESBAction extends AbstractESBAction {
+
+ private static final long serialVersionUID = -4436864250793029006L;
+
+ /**
+ * The constructor for initializing the action based on
+ * an existing DOM element.
+ */
+ protected AbstractStatelessESBAction(ESBService service,
+ org.w3c.dom.Element action) {
+ super(service, action);
+ }
+
+ /**
+ * The contructor for initializing a new action.
+ */
+ protected AbstractStatelessESBAction(ESBService service,
+ String actionClass) {
+ super(service, actionClass);
+ }
+
+ /**
+ * This method determines whether the gateway service is
+ * related to a stateless session.
+ *
+ * @return Whether the gateway service is stateless
+ */
+ @Override
+ public boolean isStateless() {
+ return(true);
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model");
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/IfAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/IfAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,290 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
+import org.scribble.conversation.model.*;
+
+/**
+ * The model component for the 'IfAction'.
+ *
+ * @author gary
+ */
+public class IfAction extends AbstractStatelessESBAction {
+
+ private static final long serialVersionUID = 9005791673502330699L;
+
+ public static final String SERVICE_NAME = "service-name";
+ public static final String SERVICE_CATEGORY = "service-category";
+ public static final String EXPRESSION = "expression"; // ???
+ public static final String ELSE = "else";
+ public static final String ELSEIF = "elseif";
+ public static final String IF = "if";
+ public static final String PATHS = "paths";
+
+ /**
+ * The constructor for the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param action The XML configuration details for the action
+ */
+ public IfAction(ESBService service,
+ org.w3c.dom.Element action) {
+ super(service, action);
+ }
+
+ /**
+ * This constructor initializes the DOM element for
+ * the action.
+ *
+ * @param service The reference to the service in which
+ * the action will be contained
+ */
+ public IfAction(ESBService service) {
+ super(service, ESBActionFactory.getConversationAction(
+ IfAction.class));
+ }
+
+ /**
+ * This method initializes the links with the ESB service descriptors
+ * identified in each path of the action.
+ */
+ @Override
+ public void initializeLinks() {
+ super.initializeLinks();
+
+ org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
+
+ for (int i=0; i < nl.getLength(); i++) {
+
+ org.w3c.dom.Node n=nl.item(i);
+
+ if (n instanceof org.w3c.dom.Element &&
+ (n.getNodeName().equals(IF) ||
+ n.getNodeName().equals(ELSEIF) ||
+ n.getNodeName().equals(ELSE))) {
+ if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
+ ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
+ String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
+ String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
+
+ // Lookup service associated with category and name
+ ESBService service=getService().getModel().getService(category, name);
+
+ // Initialize link, even if service is null - this will be
+ // reported as a validation error later
+ getLinks().add(new ESBLink(category, name, service, true));
+ }
+ }
+ }
+ }
+
+ /**
+ * This method returns the mandatory property names.
+ *
+ * @return The mandatory property names
+ */
+ @Override
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
+ }
+
+ /**
+ * This method validates the ESB action and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ @Override
+ public void validate(ModelListener l) {
+ super.validate(l);
+
+ org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
+ boolean f_if=false;
+ boolean f_else=false;
+ boolean f_orderWrong=false;
+ boolean f_serviceDetailsMissing=false;
+
+ for (int i=0; nl != null && i < nl.getLength(); i++) {
+
+ org.w3c.dom.Node n=nl.item(i);
+
+ if (n instanceof org.w3c.dom.Element) {
+ if (n.getNodeName().equals(IF)) {
+ if (f_if) {
+ f_orderWrong = true;
+ }
+
+ f_if = true;
+
+ if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
+ ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
+ f_serviceDetailsMissing = true;
+ }
+
+ } else if (n.getNodeName().equals(ELSEIF)) {
+
+ if (f_if == false || f_else) {
+ f_orderWrong = true;
+ }
+
+ if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
+ ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
+ f_serviceDetailsMissing = true;
+ }
+
+ } else if (n.getNodeName().equals(ELSE)) {
+
+ if (f_if == false || f_else) {
+ f_orderWrong = true;
+ }
+
+ f_else = true;
+
+ if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
+ ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
+ f_serviceDetailsMissing = true;
+ }
+ }
+ }
+ }
+
+ // Report any errors
+ if (nl != null && (f_if == false || f_orderWrong)) {
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_IF_ORDER_WRONG",
+ new String[]{})));
+ }
+
+ if (f_serviceDetailsMissing) {
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_PATH_SERVICE_DETAILS_MISSING",
+ new String[]{})));
+ }
+ }
+
+ /**
+ * This method converts the ESB action into an equivalent
+ * behavioural description for conformance checking.
+ *
+ * @param activities The list of activities that will contain
+ * the converted action(s)
+ * @param context The conversion context
+ */
+ @Override
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context) {
+
+ org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
+
+ If choice=new If();
+ activities.add(choice);
+
+ for (int i=0; i < nl.getLength(); i++) {
+
+ org.w3c.dom.Node n=nl.item(i);
+
+ if (n instanceof org.w3c.dom.Element) {
+ if (n.getNodeName().equals(IF) ||
+ n.getNodeName().equals(ELSEIF)) {
+ String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
+ String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
+
+ // TODO: Convert the conditional expression if defined
+
+ ConditionalBlock cond=new ConditionalBlock();
+ choice.getConditionalBlocks().add(cond);
+
+ ESBService service=getService().getModel().getService(category, name);
+
+ if (service != null) {
+ service.convert(cond.getContents(), context);
+ }
+ } else if (n.getNodeName().equals(ELSE)) {
+ String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
+ String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
+
+ Block block=new Block();
+ choice.setElseBlock(block);
+
+ ESBService service=getService().getModel().getService(category, name);
+
+ if (service != null) {
+ service.convert(block.getContents(), context);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This method adds a path to the if action.
+ *
+ * @param type The type of path (IF, ELSEIF or ELSE)
+ * @param category The service category
+ * @param name The service name
+ * @param immediate Whether invocation should be immediate
+ * @param expr The expression, if type is IF or ELSEIF
+ * @param position The position, if type is ELSEIF
+ */
+ public void addPath(String type, String category, String name,
+ boolean immediate, String expr, int position) {
+
+ org.w3c.dom.NodeList nl=
+ getAction().getElementsByTagName(PROPERTY_ELEMENT);
+
+ org.w3c.dom.Element paths=null;
+
+ for (int i=0; paths == null && i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element) {
+ String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
+
+ if (propName != null && propName.equals(PATHS)) {
+ paths = (org.w3c.dom.Element)nl.item(i);
+ }
+ }
+ }
+
+ if (paths == null) {
+ paths = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
+ paths.setAttribute(NAME_ATTR, PATHS);
+
+ getAction().appendChild(paths);
+ }
+
+ org.w3c.dom.Element path=getAction().getOwnerDocument().createElement(type);
+ path.setAttribute(SERVICE_CATEGORY, category);
+ path.setAttribute(SERVICE_NAME, name);
+
+ if (expr != null && (type == IF || type == ELSEIF)) {
+ path.setAttribute(EXPRESSION, expr);
+ }
+
+ paths.appendChild(path);
+ }
+}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/Messages.properties 2009-08-21 21:09:21 UTC (rev 794)
@@ -15,3 +15,9 @@
# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# * MA 02110-1301, USA.
# */
+
+_IF_ORDER_WRONG=IfAction must have an 'if' path, followed by zero or more 'elseif' paths and ending with an optional 'else' path
+_NOT_SPECIFIED_SERVICE_DETAILS=Send does not provide service category and name
+_NOT_SPECIFIED_SERVICE_OR_CLIENT_ROLE=Send does not contain request service category/name or response client role
+_PATH_SERVICE_DETAILS_MISSING=One or more paths are missing the service cateogry and/or name
+_SWITCH_ONE_OR_MORE_PATHS=Switch action must specify atleast one case
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageAction.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/ReceiveMessageAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageAction.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.scribble.conversation.model.*;
+import org.scribble.model.*;
+
+/**
+ * The model component for the 'ReceiveMessageAction'.
+ *
+ * @author gary
+ */
+public class ReceiveMessageAction extends AbstractInteractionMessageAction {
+
+ private static final long serialVersionUID = -4957103938232460319L;
+
+ /**
+ * The constructor for the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param action The XML configuration details for the action
+ */
+ public ReceiveMessageAction(ESBService service,
+ org.w3c.dom.Element action) {
+ super(service, action);
+ }
+
+ /**
+ * This constructor initializes the DOM element for
+ * the action.
+ *
+ * @param service The reference to the service in which
+ * the action will be contained
+ */
+ public ReceiveMessageAction(ESBService service) {
+ super(service, ESBActionFactory.getConversationAction(
+ ReceiveMessageAction.class));
+ }
+
+ /**
+ * This method converts the ESB action into an equivalent
+ * behavioural description for conformance checking.
+ *
+ * @param activities The list of activities that will contain
+ * the converted action(s)
+ * @param context The conversion context
+ */
+ @Override
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context) {
+
+ ConversationInteraction recv=new ConversationInteraction();
+ activities.add(recv);
+
+ recv.derivedFrom(this);
+
+ MessageSignature ms=new MessageSignature();
+ ms.derivedFrom(this);
+
+ recv.setMessageSignature(ms);
+
+ ms.setOperation(getPropertyValue(OPERATION));
+
+ String type=getPropertyValue(MESSAGE_TYPE);
+ if (type != null && type.length() > 0) {
+ String ns=null;
+ String local=type;
+
+ if (type.charAt(0) == '{') {
+ int endindex=type.indexOf('}');
+
+ if (endindex != -1) {
+ ns = type.substring(1, endindex);
+ local = type.substring(endindex+1);
+ }
+ }
+
+ TypeReference ref=new TypeReference();
+ ref.setLocalpart(local);
+ ref.setNamespace(ns);
+
+ ref.derivedFrom(this);
+
+ ms.getTypes().add(ref);
+ }
+
+ // Initialize the 'to' role to be this participant
+ if (context.getRole() != null) {
+ recv.setToRole(new Role(context.getRole()));
+ }
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SendMessageAction.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SendMessageAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SendMessageAction.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SendMessageAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,295 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import java.util.logging.Logger;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.scribble.conversation.model.*;
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
+
+/**
+ * The model component for the 'SendMessageAction'.
+ *
+ * @author gary
+ */
+public class SendMessageAction extends AbstractInteractionMessageAction {
+
+ private static final long serialVersionUID = 2714230118722655345L;
+
+ public static final String SERVICE_NAME = "serviceName";
+ public static final String SERVICE_CATEGORY = "serviceCategory";
+ public static final String RESPONSE_SERVICE_NAME = "responseServiceName";
+ public static final String RESPONSE_SERVICE_CATEGORY = "responseServiceCategory";
+
+ /**
+ * The constructor for the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param action The XML configuration details for the action
+ */
+ public SendMessageAction(ESBService service,
+ org.w3c.dom.Element action) {
+ super(service, action);
+ }
+
+ /**
+ * This constructor initializes the DOM element for
+ * the action.
+ *
+ * @param service The reference to the service in which
+ * the action will be contained
+ */
+ public SendMessageAction(ESBService service) {
+ super(service, ESBActionFactory.getConversationAction(
+ SendMessageAction.class));
+ }
+
+ /**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+
+ ret.add(SERVICE_NAME);
+ ret.add(SERVICE_CATEGORY);
+ ret.add(RESPONSE_SERVICE_NAME);
+ ret.add(RESPONSE_SERVICE_CATEGORY);
+
+ return(ret);
+ }
+
+ /**
+ * This method validates the ESB action and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ @Override
+ public void validate(ModelListener l) {
+ super.validate(l);
+
+ // If sending request, then category/name must be specified,
+ // else a response requires the 'client epr'. Validate that
+ // either case is true.
+ if (getPropertyValue(SERVICE_CATEGORY) != null &&
+ getPropertyValue(SERVICE_NAME) != null) {
+ // Sending a request
+
+ // Check if values have been provided
+ if (getPropertyValue(SERVICE_CATEGORY).trim().length() == 0 ||
+ getPropertyValue(SERVICE_NAME).trim().length() == 0) {
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_SERVICE_DETAILS",
+ new String[]{})));
+ }
+
+ } else if (getPropertyValue(CLIENT_ROLE) != null) {
+ // Sending a response
+
+ // TODO: Validate that the client EPR has been sent on
+ // a preceding received request
+ } else {
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_SERVICE_OR_CLIENT_ROLE",
+ new String[]{})));
+ }
+ }
+
+ /**
+ * This method converts the ESB action into an equivalent
+ * behavioural description for conformance checking.
+ *
+ * @param activities The list of activities that will contain
+ * the converted action(s)
+ * @param context The conversion context
+ */
+ @Override
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context) {
+
+ ConversationInteraction send=new ConversationInteraction();
+ activities.add(send);
+
+ send.derivedFrom(this);
+
+ MessageSignature ms=new MessageSignature();
+ ms.derivedFrom(this);
+
+ send.setMessageSignature(ms);
+
+ ms.setOperation(getPropertyValue(OPERATION));
+
+ String type=getPropertyValue(MESSAGE_TYPE);
+ if (type != null && type.length() > 0) {
+ String ns=null;
+ String local=type;
+
+ if (type.charAt(0) == '{') {
+ int endindex=type.indexOf('}');
+
+ if (endindex != -1) {
+ ns = type.substring(1, endindex);
+ local = type.substring(endindex+1);
+ }
+ }
+
+ TypeReference ref=new TypeReference();
+ ref.setLocalpart(local);
+ ref.setNamespace(ns);
+
+ ref.derivedFrom(this);
+
+ ms.getTypes().add(ref);
+ }
+
+ // Initialize the 'from' role to be this participant
+ // (for now until 'to' role can be set)
+ if (context.getRole() != null) {
+ send.setFromRole(new Role(context.getRole()));
+ }
+
+ // Check if reply destination has been defined
+ if (hasProperty(RESPONSE_SERVICE_CATEGORY) &&
+ hasProperty(RESPONSE_SERVICE_NAME)) {
+ String responseName=getPropertyValue(RESPONSE_SERVICE_NAME);
+ String responseCategory=getPropertyValue(RESPONSE_SERVICE_CATEGORY);
+
+ ESBService serv=getService().getModel().
+ getService(responseCategory, responseName);
+
+ Definition defn=send.getEnclosingDefinition().
+ getTopLevelDefinition();
+
+ if (serv == null) {
+ logger.severe("Failed to find response ESB service '"+
+ responseCategory+"/"+responseName+"'");
+
+ } else if (context.isOnStack(serv)) {
+
+ // Ignore service as don't want to recursively
+ // process it
+
+ } else if (defn != null && defn.isStateless()) {
+ If ifelem=null;
+
+ context.push(serv);
+
+ for (int i=0; ifelem == null &&
+ i < defn.getBlock().getContents().size(); i++) {
+ if (defn.getBlock().getContents().get(i) instanceof If) {
+ ifelem = (If)defn.getBlock().getContents().get(i);
+ }
+ }
+
+ if (ifelem != null) {
+
+ if (serv.getActions().size() == 1 &&
+ serv.getActions().get(0) instanceof SwitchAction) {
+ // Work through case entries and add each
+ // to top level conversation stateless 'if'
+ SwitchAction sw=(SwitchAction)serv.getActions().get(0);
+
+ for (int i=0; i < sw.getNumberOfCases(); i++) {
+ String name=sw.getCaseServiceName(i);
+ String category=sw.getCaseServiceCategory(i);
+
+ ESBService subServ=getService().getModel().
+ getService(category, name);
+
+ if (subServ == null) {
+ logger.severe("Failed to find response sub ESB service '"+
+ category+"/"+name+"'");
+ } else {
+ ConditionalBlock cb=new ConditionalBlock();
+
+ ifelem.getConditionalBlocks().add(cb);
+
+ subServ.convert(cb.getContents(), context);
+ }
+ }
+ } else {
+ ConditionalBlock cb=new ConditionalBlock();
+
+ ifelem.getConditionalBlocks().add(cb);
+
+ serv.convert(cb.getContents(), context);
+ }
+ } else {
+ logger.severe("Unable to find top level 'stateless' IF activity");
+ }
+
+ context.pop(serv);
+ }
+ }
+ }
+
+ /**
+ * This method sets the destination service descriptor properties.
+ *
+ * @param category The category
+ * @param name The name
+ */
+ public void setDestination(String category, String name) {
+
+ org.w3c.dom.Element prop=getPropertyElement(SERVICE_CATEGORY);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, category);
+ }
+
+ prop = getPropertyElement(SERVICE_NAME);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, name);
+ }
+ }
+
+ /**
+ * This method sets the response service descriptor properties.
+ *
+ * @param category The category
+ * @param name The name
+ */
+ public void setResponseDestination(String category, String name) {
+
+ org.w3c.dom.Element prop=getPropertyElement(RESPONSE_SERVICE_CATEGORY);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, category);
+ }
+
+ prop = getPropertyElement(RESPONSE_SERVICE_NAME);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, name);
+ }
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model.actions");
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SwitchAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/SwitchAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,450 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
+import org.scribble.conversation.model.*;
+
+/**
+ * The model component for the 'SwitchAction'.
+ *
+ * @author gary
+ */
+public class SwitchAction extends AbstractStatelessESBAction {
+
+ private static final long serialVersionUID = 3765702614644769281L;
+
+ public static final String TYPE_ATTR = "type";
+ public static final String DESCRIPTION_ATTR = "description";
+ public static final String MESSAGE_ELEMENT = "message";
+ public static final String EVENT_ELEMENT = "event";
+ private static final String SERVICE_NAME = "service-name";
+ private static final String SERVICE_CATEGORY = "service-category";
+ private static final String CASE = "case";
+ private static final String PATHS = "paths";
+ public static final String CONVERSATION_TYPE = "conversationType";
+
+ /**
+ * The constructor for the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param action The XML configuration details for the action
+ */
+ public SwitchAction(ESBService service,
+ org.w3c.dom.Element action) {
+ super(service, action);
+ }
+
+ /**
+ * This constructor initializes the DOM element for
+ * the action.
+ *
+ * @param service The reference to the service in which
+ * the action will be contained
+ */
+ public SwitchAction(ESBService service) {
+ super(service, ESBActionFactory.getConversationAction(
+ SwitchAction.class));
+ }
+
+ /**
+ * This method initializes the links with the ESB service descriptors
+ * identified in each path of the action.
+ */
+ @Override
+ public void initializeLinks() {
+ super.initializeLinks();
+
+ org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
+
+ for (int i=0; i < nl.getLength(); i++) {
+
+ org.w3c.dom.Node n=nl.item(i);
+
+ if (n instanceof org.w3c.dom.Element &&
+ n.getNodeName().equals(CASE)) {
+ if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
+ ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
+ String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
+ String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
+
+ // Lookup service associated with category and name
+ ESBService service=getService().getModel().getService(category, name);
+
+ // Initialize link, even if service is null - this will be
+ // reported as a validation error later
+ getLinks().add(new ESBLink(category, name, service, true));
+ }
+ }
+ }
+ }
+
+ /**
+ * This method determines whether the action is a gateway
+ * for inbound requests.
+ *
+ * @return Whether the action is a gateway
+ */
+ @Override
+ public boolean isGateway() {
+ return(isStateless());
+ }
+
+ /**
+ * This method determines whether the ESB action represents
+ * a new session type.
+ *
+ * @return Whether the action represents a new session type
+ */
+ @Override
+ public boolean isSessionType() {
+ return(isStateless());
+ }
+
+ /**
+ * This method returns the mandatory property names.
+ *
+ * @return The mandatory property names
+ */
+ @Override
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
+ }
+
+ /**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ @Override
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=super.getOptionalProperties();
+ ret.add(CONVERSATION_TYPE);
+ return(ret);
+ }
+
+ /**
+ * This method validates the ESB action and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ @Override
+ public void validate(ModelListener l) {
+ super.validate(l);
+
+ org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
+ int pathCount=0;
+ boolean f_serviceDetailsMissing=false;
+
+ for (int i=0; nl != null && i < nl.getLength(); i++) {
+
+ org.w3c.dom.Node n=nl.item(i);
+
+ if (n instanceof org.w3c.dom.Element) {
+ if (n.getNodeName().equals(CASE)) {
+ pathCount++;
+
+ if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
+ ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
+ f_serviceDetailsMissing = true;
+ }
+ }
+ }
+ }
+
+ // Report any errors
+ if (nl != null && pathCount < 1) {
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_SWITCH_ONE_OR_MORE_PATHS",
+ new String[]{})));
+ }
+
+ if (f_serviceDetailsMissing) {
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_PATH_SERVICE_DETAILS_MISSING",
+ new String[]{})));
+ }
+ }
+
+ /**
+ * This method converts the ESB action into an equivalent
+ * behavioural description for conformance checking.
+ *
+ * @param activities The list of activities that will contain
+ * the converted action(s)
+ * @param context The conversion context
+ */
+ @Override
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context) {
+
+ org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
+
+ If choice=new If();
+ activities.add(choice);
+
+ for (int i=0; i < nl.getLength(); i++) {
+
+ org.w3c.dom.Node n=nl.item(i);
+
+ if (n instanceof org.w3c.dom.Element &&
+ n.getNodeName().equals(CASE)) {
+ String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
+ String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
+
+ // Conditional block with no expression - i.e. the
+ // expression is non-observable, as the path will be
+ // selected based on the next message that arrives
+ ConditionalBlock block=new ConditionalBlock();
+ choice.getConditionalBlocks().add(block);
+
+ ESBService service=getService().getModel().getService(category, name);
+
+ if (service != null) {
+ service.convert(block.getContents(), context);
+ }
+ }
+ }
+ }
+
+ /**
+ * This method sets the conversation type property.
+ *
+ * @param name The conversation type
+ */
+ public void setConversationType(String type) {
+
+ org.w3c.dom.Element prop=getPropertyElement(CONVERSATION_TYPE);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, type);
+ }
+ }
+
+ /**
+ * This method adds a path to the switch action.
+ *
+ * @param category The service category
+ * @param name The service name
+ * @param messageTypes The set of interactions
+ * @param position The position
+ * @return Whether the path is added
+ */
+ public void addCase(String category, String name,
+ java.util.Set<Interaction> messageTypes, int position) {
+ boolean f_associatePath=false;
+ boolean f_eventBased=false;
+ String eventDescription="TODO: Path triggered by internal event";
+ org.w3c.dom.Element paths=getPropertyElement(PATHS);
+
+ org.w3c.dom.Element path=
+ getAction().getOwnerDocument().createElement(CASE);
+ path.setAttribute(SERVICE_CATEGORY, category);
+ path.setAttribute(SERVICE_NAME, name);
+
+ if (messageTypes != null && messageTypes.size() > 0) {
+ java.util.Iterator<Interaction> iter=messageTypes.iterator();
+ boolean f_onlySend=true;
+ String sendEventTypes=null;
+
+ while (iter.hasNext()) {
+ Interaction interaction=iter.next();
+
+ if (InteractionUtil.isSend(interaction) == false) {
+ f_onlySend = false;
+
+ //TODO: Only deals with single type for now
+
+ // Only associate message type for requests
+ if (//interaction.getReplyToLabel() == null &&
+ interaction.getMessageSignature().getTypes().size()==1) {
+ org.w3c.dom.Element mt=
+ getAction().getOwnerDocument().createElement(MESSAGE_ELEMENT);
+
+ mt.setAttribute(TYPE_ATTR,
+ InteractionUtil.getTypeString(
+ interaction.getMessageSignature().
+ getTypes().get(0)));
+
+ path.appendChild(mt);
+
+ f_associatePath = true;
+ }
+ } else if (interaction.getMessageSignature().getTypes().size()==1) {
+ if (sendEventTypes == null) {
+ sendEventTypes = InteractionUtil.getTypeString(
+ interaction.getMessageSignature().
+ getTypes().get(0));
+ } else {
+ sendEventTypes += ", "+InteractionUtil.getTypeString(
+ interaction.getMessageSignature().
+ getTypes().get(0));
+ }
+ }
+ }
+
+ if (f_onlySend) {
+ // Associate the path, even though it has no associated
+ // receive interactions, as it represents a path triggered by
+ // a different stimulus. Need this to enable the
+ // conformance checking to understand that it is a
+ // valid path, that needs to be handled.
+ f_associatePath = true;
+
+ f_eventBased = true;
+
+ eventDescription="Event trigger to send "+
+ sendEventTypes+" message type(s)";
+ }
+ } else {
+ // Associate the path, even though it has no associated
+ // interactions, as it represents a path triggered by
+ // a different stimulus. Need this to enable the
+ // conformance checking to understand that it is a
+ // valid path, that needs to be handled.
+ f_associatePath = true;
+
+ f_eventBased = true;
+ }
+
+ if (f_eventBased) {
+ org.w3c.dom.Element mt=
+ getAction().getOwnerDocument().createElement(EVENT_ELEMENT);
+
+ mt.setAttribute(DESCRIPTION_ATTR, eventDescription);
+
+ path.appendChild(mt);
+ }
+
+ //if (f_associatePath) {
+ paths.appendChild(path);
+ //}
+ }
+
+ /**
+ * This method returns the number of cases associated with
+ * the switch.
+ *
+ * @return The number of cases
+ */
+ public int getNumberOfCases() {
+ int ret=0;
+
+ org.w3c.dom.NodeList nl=getAction().getElementsByTagName(CASE);
+
+ ret = nl.getLength();
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the DOM element associated with the
+ * specified case.
+ *
+ * @param index The index of the required route
+ * @return The case element, or null if not found
+ */
+ public org.w3c.dom.Element getCaseElement(int index) {
+ org.w3c.dom.Element ret=null;
+
+ org.w3c.dom.NodeList nl=getAction().getElementsByTagName(CASE);
+
+ if (index >= 0 && index < nl.getLength() &&
+ nl.item(index) instanceof org.w3c.dom.Element) {
+ ret = (org.w3c.dom.Element)nl.item(index);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the service category of the case
+ * associated with the supplied index.
+ *
+ * @param index The index
+ * @return The service category
+ */
+ public String getCaseServiceCategory(int index) {
+ String ret=null;
+ org.w3c.dom.Element caseElem=getCaseElement(index);
+
+ if (caseElem != null) {
+ ret = caseElem.getAttribute(SERVICE_CATEGORY);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the service name of the case
+ * associated with the supplied index.
+ *
+ * @param index The index
+ * @return The service name
+ */
+ public String getCaseServiceName(int index) {
+ String ret=null;
+ org.w3c.dom.Element caseElem=getCaseElement(index);
+
+ if (caseElem != null) {
+ ret = caseElem.getAttribute(SERVICE_NAME);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the DOM element associated with the
+ * specified service category and name.
+ *
+ * @param category The service category
+ * @param name The service name
+ * @return The case element, or null if not found
+ */
+ public org.w3c.dom.Element getCaseElement(String category,
+ String name) {
+ org.w3c.dom.Element ret=null;
+
+ org.w3c.dom.NodeList nl=getAction().getElementsByTagName(CASE);
+
+ for (int i=0; ret == null && i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element) {
+ ret = (org.w3c.dom.Element)nl.item(i);
+
+ if (ret.getAttribute(SERVICE_CATEGORY).equals(category) == false ||
+ ret.getAttribute(SERVICE_NAME).equals(name) == false) {
+ ret = null;
+ }
+ }
+ }
+
+ return(ret);
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/UnsupportedAction.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/UnsupportedAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/UnsupportedAction.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/UnsupportedAction.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
+
+/**
+ * This class represents an unsupported (or custom) action within
+ * the conversation based ESB service descriptor.
+ *
+ * @author gary
+ */
+public class UnsupportedAction extends AbstractESBAction {
+
+ private static final long serialVersionUID = 61328489127442228L;
+
+ /**
+ * The constructor for the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param action The XML configuration details for the action
+ */
+ public UnsupportedAction(ESBService service,
+ org.w3c.dom.Element action) {
+ super(service, action);
+ }
+
+ /**
+ * This method determines whether the action is related to a behavioural
+ * session.
+ *
+ * @return Whether the action is session based
+ */
+ public boolean isSessionBased() {
+ return(false);
+ }
+
+ /**
+ * This method validates the ESB action and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ @Override
+ public void validate(ModelListener l) {
+ // Don't validate unsupported actions
+ }
+
+ /**
+ * This method converts the ESB action into an equivalent
+ * behavioural description for conformance checking.
+ *
+ * @param activities The list of activities that will contain
+ * the converted action(s)
+ * @param context The conversion context
+ */
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context) {
+ }
+
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/AbstractStatelessESBModelChangeRule.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/AbstractStatelessESBModelChangeRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,173 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.*;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+
+/**
+ * This is the abstract stateless ESB model change rule.
+ */
+public abstract class AbstractStatelessESBModelChangeRule extends AbstractModelChangeRule {
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context) and inserted
+ * model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object being inserted
+ * @param ref The optional reference model object
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isInsertSupported(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ boolean ret=false;
+
+ if ((context.getParent() instanceof ESBService ||
+ (ref != null && ref.getSource().getObject()
+ instanceof AbstractESBAction &&
+ ((AbstractESBAction)ref.getSource().getObject()).getService() != null)) &&
+ model instanceof ESBLanguageModel &&
+ ((ESBLanguageModel)model).isStateless()) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the ESB service associated with the
+ * optional model object reference or the context.
+ *
+ * @param context The context
+ * @param ref The optional model object
+ * @return The ESB service, or null if not found
+ */
+ protected ESBService getESBService(ModelChangeContext context,
+ ModelObject ref) {
+ ESBService ret=(ESBService)context.getParent();
+
+ if (ref != null && ref.getSource().getObject() instanceof AbstractESBAction) {
+ ret = ((AbstractESBAction)ref.getSource().getObject()).getService();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines the position of the supplied
+ * model object within the supplied service.
+ *
+ * @param service The service
+ * @param ref The optional model object
+ * @return The position, or -1 if not found
+ */
+ protected int getPosition(ESBService service, ModelObject ref) {
+ int ret=-1;
+
+ // Check if reference model object provided, and if so,
+ // if it has a position within the service
+ if (ref != null && ref.getSource().getObject() instanceof ESBAction) {
+ ret = service.getActions().indexOf((ESBAction)
+ ref.getSource().getObject());
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context)
+ * and deleted model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object to be removed
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isDeleteSupported(ModelChangeContext context,
+ Model model, ModelObject mobj) {
+ boolean ret=false;
+
+ if (mobj.getSource().getObject() instanceof AbstractESBAction &&
+ (context.getParent() instanceof ESBService ||
+ ((AbstractESBAction)mobj.getSource().getObject()).getService() != null) &&
+ model instanceof ESBLanguageModel &&
+ ((ESBLanguageModel)model).isStateless()) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method removes the supplied model object from the
+ * supplied model. The model object representation must
+ * contain the necessary model specific to remove the
+ * object from the underlying model representation.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param mobj The model object to be deleted
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean delete(ModelChangeContext context,
+ Model model, ModelObject mobj) {
+ boolean ret=false;
+ ESBService service=getESBService(context, mobj);
+ ESBAction action=(ESBAction)mobj.getSource().getObject();
+
+ if (action != null && service != null) {
+ ret = service.getActions().remove(action);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context)
+ * and modified model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param fromObj The source model object
+ * @param toObj The model object to be updated
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isUpdateSupported(ModelChangeContext context,
+ Model model, ModelObject fromObj, ModelObject toObj) {
+ boolean ret=false;
+
+ if (context.getParent() instanceof ESBService &&
+ model instanceof ESBLanguageModel &&
+ ((ESBLanguageModel)model).isStateless()) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,579 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.AbstractInteractionMessageAction;
+import org.jboss.savara.tools.jbossesb.model.actions.ReceiveMessageAction;
+import org.jboss.savara.tools.jbossesb.model.actions.SendMessageAction;
+import org.jboss.savara.tools.jbossesb.model.actions.SwitchAction;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.RegistryInfo;
+
+/**
+ * This is the model change rule for the Conversation Interaction.
+ */
+(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE)
+public class ConversationInteractionModelChangeRule extends AbstractStatelessESBModelChangeRule {
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context) and inserted
+ * model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object being inserted
+ * @param ref The optional reference model object
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isInsertSupported(ModelChangeContext context,
+ Model model, ModelObject mobj,
+ ModelObject ref) {
+ boolean ret=false;
+
+ if (mobj instanceof ConversationInteraction &&
+ super.isInsertSupported(context, model, mobj, ref)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method adds a new model object, within a
+ * parent model object, with the details supplied in
+ * another model object. The supplied model object
+ * will usually be from a different model representation
+ * (e.g. due to a merge), so the details will be
+ * copied and placed in the representation associated
+ * with the supplied model and parent model object.<p>
+ * <p>
+ * If a reference model object is supplied, then the
+ * insertion will occur relative to it. If the reference
+ * object is a block, then it means that the insertion
+ * should occur at the end of the block. Otherwise the
+ * new model object should be inserted before the
+ * reference object, within the containing block.<p>
+ * <p>
+ * If the reference object is not supplied, then the
+ * new model object should be inserted at the end of
+ * the behaviour associated with the parent in the model
+ * change context.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param mobj The model object details to be inserted
+ * @param ref The optional reference model object
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean insert(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ ESBLanguageModel esbModel=(ESBLanguageModel)model;
+ ConversationInteraction interaction=(ConversationInteraction)mobj;
+
+ // Check if send or receive
+ if (InteractionUtil.isSend(interaction)) {
+
+ // Send
+ insertSend(context, esbModel, interaction, ref);
+
+ } else {
+ // Receive
+ insertReceive(context, esbModel, interaction, ref);
+ }
+
+ return(true);
+ }
+
+ protected void insertSend(ModelChangeContext context,
+ ESBLanguageModel esbModel, ConversationInteraction interaction,
+ ModelObject ref) {
+ ESBService service=getESBService(context, ref);
+
+ SendMessageAction action=
+ new SendMessageAction(service);
+
+ if (interaction.getMessageSignature().getOperation() != null) {
+ action.setOperation(interaction.getMessageSignature().getOperation());
+ }
+
+ setMessageType(action, interaction);
+
+ boolean f_subsequentInitiator=false;
+ boolean f_moveActions=false;
+
+ // Check if reference model object provided, and if so,
+ // if it has a position within the service
+ int pos=getPosition(service, ref);
+
+ // Check if subsequent action(s) are initiators
+ if (pos != -1) {
+ for (int i=pos; f_subsequentInitiator == false &&
+ i < service.getActions().size(); i++) {
+ f_subsequentInitiator =
+ service.getActions().get(i).isInitiator();
+ }
+ }
+
+ // Move actions if a subsequent initiator has been found
+ f_moveActions = f_subsequentInitiator;
+
+ service.addAction(action, pos);
+
+ if (((ESBService)context.getParent()).getFirstSessionBasedAction() == action &&
+ interaction.getEnclosingDefinition() instanceof Conversation) {
+ action.setBusinessObjectType(ConversationUtil.getBusinessObjectType(
+ ((Conversation)interaction.getEnclosingDefinition())));
+ }
+
+ if (interaction.getReplyToLabel() != null) {
+
+ if (interaction.getToRole() != null) {
+ action.setClientEPR(interaction.getToRole().getName());
+ } else {
+ action.setClientEPR("client");
+ }
+ } else {
+ action.setDestination("", "");
+ }
+
+ if (interaction.getRequestLabel() != null) {
+ ESBService gw=esbModel.getGatewayService();
+
+ action.setResponseDestination(gw.getCategory(),
+ interaction.getRequestLabel());
+ }
+
+ /* IS REQUIRED??
+ if (interaction.getRequestLabel() != null) {
+
+ // Create new ESB service
+ ESBService respService=esbModel.createService(
+ service.getCategory(),
+ esbModel.getUniqueServiceName(service.getCategory(),
+ service.getName()));
+
+ esbModel.addService(respService);
+
+ action.setResponseDestination(respService.getCategory(),
+ respService.getName());
+
+ context.setParent(respService);
+
+ // Clear the sub-sequent initiator flag, as
+ // subsequent actions will be moved to new service
+ // anyway
+ f_subsequentInitiator = false;
+
+ } else if (interaction.getReplyToLabel() != null) {
+
+ if (interaction.getToRole() != null) {
+ action.setClientEPR(interaction.getToRole().getName());
+ } else {
+ action.setClientEPR("client");
+ }
+ }
+
+ // Check if subsequent initiator found, requiring
+ // a new service
+ if (f_subsequentInitiator) {
+
+ ESBService extraService=esbModel.createService(
+ service.getCategory(),
+ esbModel.getUniqueServiceName(service.getCategory(),
+ service.getName()));
+
+ esbModel.addService(extraService);
+
+ // Add schedule action
+ ScheduleStateAction schedule=
+ new ScheduleStateAction(service);
+
+ schedule.setDestination(extraService.getCategory(),
+ extraService.getName(), false);
+
+ service.addAction(schedule, pos+1);
+
+ // Move pointer on, as now additional 'schedule' action
+ pos++;
+
+ context.setParent(extraService);
+ }
+
+ // Check if existing actions need to be moved
+ if (f_moveActions) {
+ for (int i=pos+1; i < service.getActions().size();) {
+ ESBService extraService=(ESBService)context.getParent();
+
+ ESBAction act=service.getActions().get(i);
+ service.getActions().remove(i);
+
+ extraService.addAction(act, -1);
+ }
+ }
+
+ // If not reply, then include the target service
+ // details
+ if (interaction.getReplyToLabel() == null &&
+ interaction.getToRole() != null &&
+ interaction.getToRole().getName() != null &&
+ interaction.getToRole().getName().length() > 0) {
+ String roleName=Character.toLowerCase(
+ interaction.getToRole().getName().charAt(0))+
+ interaction.getToRole().getName().substring(1);
+
+ action.setDestinationExpression(
+ InteractionUtil.getRoleServiceCategoryProperty(roleName),
+ InteractionUtil.getRoleServiceNameProperty(roleName));
+ }
+
+ if (interaction.getEnclosingDefinition() instanceof Conversation &&
+ interaction.getEnclosingDefinition().getModel()
+ instanceof ConversationModel) {
+
+ java.util.List<Identity> ids=((Conversation)
+ interaction.getEnclosingDefinition()).getIdentities();
+
+ java.util.List<IdentityLocator> locators=
+ ((ConversationModel)interaction.getEnclosingDefinition().
+ getModel()).getIdentityLocators();
+
+ IdentityUtil.defineIdentities(action.getPropertyElement(
+ SendMessageAction.IDENTITIES),
+ interaction.getMessageSignature(), ids, locators);
+ }
+ */
+ }
+
+ protected void insertReceive(ModelChangeContext context,
+ ESBLanguageModel esbModel, ConversationInteraction interaction,
+ ModelObject ref) {
+ ESBService service=getESBService(context, ref);
+ ESBService endService=service;
+
+ int endPos=-1;
+ boolean f_subsequentInitiator=false;
+
+ // Check if reference model object provided, and if so,
+ // if it has a position within the service
+ int pos=getPosition(service, ref);
+
+ // Check if subsequent action(s) are initiators
+ if (pos != -1) {
+ for (int i=pos; f_subsequentInitiator == false &&
+ i < service.getActions().size(); i++) {
+ f_subsequentInitiator =
+ service.getActions().get(i).isInitiator();
+ }
+ }
+
+ endPos = pos;
+
+ // Check if receive needs to be placed in new service
+ // descriptor - i.e. if insert at end, but current service
+ // already has service based actions, or reference object
+ // provided, but is not first position
+
+ /* IS THIS REQUIRED??
+ if (shouldScheduleNewService(service, (pos == -1 ?
+ service.getActions().size() : pos))) {
+
+ // Already has activities, so need to separate
+ // into another service descriptor
+ ESBService recvService=esbModel.createService(
+ service.getCategory(),
+ esbModel.getUniqueServiceName(service.getCategory(),
+ service.getName()));
+
+ esbModel.addService(recvService);
+
+ // Add schedule action
+ ScheduleStateAction schedule=
+ new ScheduleStateAction(service);
+
+ schedule.setDestination(recvService.getCategory(),
+ recvService.getName(), false);
+
+ service.addAction(schedule, pos);
+
+ context.setParent(recvService);
+
+ endService = recvService;
+ endPos = 0;
+ }
+ */
+
+ ReceiveMessageAction action=
+ new ReceiveMessageAction(endService);
+
+ if (interaction.getMessageSignature().getOperation() != null) {
+ action.setOperation(interaction.getMessageSignature().getOperation());
+ }
+
+ setMessageType(action, interaction);
+
+ endService.addAction(action, endPos);
+
+ if (endService.getFirstSessionBasedAction() == action &&
+ interaction.getEnclosingDefinition() instanceof Conversation) {
+ action.setBusinessObjectType(ConversationUtil.getBusinessObjectType(
+ ((Conversation)interaction.getEnclosingDefinition())));
+ }
+
+ // Check if subsequent initiator found, requiring
+ // a new service
+ /* IS STILL REQUIRED?
+ if (f_subsequentInitiator) {
+
+ ESBService extraService=esbModel.createService(
+ service.getCategory(),
+ esbModel.getUniqueServiceName(endService.getCategory(),
+ endService.getName()));
+
+ esbModel.addService(extraService);
+
+ // Add schedule action
+ ScheduleStateAction schedule=
+ new ScheduleStateAction(endService);
+
+ schedule.setDestination(extraService.getCategory(),
+ extraService.getName(), false);
+
+ endService.addAction(schedule, endPos+1);
+
+ // Move pointer on, as now additional 'schedule' action
+ pos++;
+
+ context.setParent(extraService);
+
+ endService = extraService;
+ endPos = -1;
+ }
+
+ // Check if existing actions need to be moved
+ if (pos != -1 && service != endService) {
+ for (int i=pos+1; i < service.getActions().size();) {
+ ESBAction act=service.getActions().get(i);
+ service.getActions().remove(i);
+
+ endService.addAction(act, -1);
+ }
+ }
+
+ // If not a response, then add to the gateway
+ if (interaction.getReplyToLabel() == null) {
+ ESBService gwService=esbModel.getGatewayService();
+
+ if (gwService != null) {
+ ESBAction gwAction=gwService.getGatewayAction();
+
+ if (gwAction instanceof MessageRouterAction) {
+ MessageRouterAction mra=(MessageRouterAction)
+ gwAction;
+
+ java.util.List<MessageSignature> mtypes=
+ new java.util.Vector<MessageSignature>();
+ mtypes.add(interaction.getMessageSignature());
+
+ mra.addRoute(endService.getCategory(),
+ endService.getName(),
+ service.isRoot(), mtypes);
+ }
+ }
+
+ // Set client EPR
+ if (interaction.getFromRole() != null) {
+ action.setClientEPR(interaction.getFromRole().getName());
+ } else {
+ action.setClientEPR("client");
+ }
+ }
+
+ if (interaction.getEnclosingDefinition() instanceof Conversation &&
+ interaction.getEnclosingDefinition().getModel()
+ instanceof ConversationModel) {
+
+ java.util.List<Identity> ids=((Conversation)
+ interaction.getEnclosingDefinition()).getIdentities();
+
+ java.util.List<IdentityLocator> locators=
+ ((ConversationModel)interaction.getEnclosingDefinition().
+ getModel()).getIdentityLocators();
+
+ IdentityUtil.defineIdentities(action.getPropertyElement(
+ SendMessageAction.IDENTITIES),
+ interaction.getMessageSignature(), ids, locators);
+ }
+ */
+ }
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context)
+ * and modified model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param fromObj The source model object
+ * @param toObj The model object to be updated
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isUpdateSupported(ModelChangeContext context,
+ Model model, ModelObject fromObj, ModelObject toObj) {
+ boolean ret=false;
+
+ if (fromObj instanceof ConversationInteraction &&
+ toObj instanceof ConversationInteraction &&
+ super.isUpdateSupported(context, model, fromObj, toObj)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method modifies an existing model object, within a
+ * parent model object, with the details supplied in
+ * another model object.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param fromObj The source model object
+ * @param toObj The model object to be updated
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean update(ModelChangeContext context,
+ Model model, ModelObject fromObj, ModelObject toObj) {
+ boolean ret=false;
+ ESBLanguageModel esbModel=(ESBLanguageModel)model;
+ ConversationInteraction fromInteraction=(ConversationInteraction)fromObj;
+ ConversationInteraction toInteraction=(ConversationInteraction)toObj;
+ ESBService service=(ESBService)context.getParent();
+
+ // Get action from 'toInteraction'
+ if (toInteraction.getSource().getObject() instanceof
+ AbstractInteractionMessageAction) {
+ AbstractInteractionMessageAction ma=
+ (AbstractInteractionMessageAction)
+ toInteraction.getSource().getObject();
+
+ String origMesgType=ma.getMessageType();
+
+ // Set message type
+ setMessageType(ma, fromInteraction);
+
+ // Update message type in router if appropriate
+ if (InteractionUtil.isSend(fromInteraction) == false &&
+ fromInteraction.getReplyToLabel() == null) {
+ updateRouterMessageType(esbModel, service,
+ origMesgType, ma);
+ }
+
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ protected void updateRouterMessageType(ESBLanguageModel esbModel,
+ ESBService service, String origMesgType,
+ AbstractInteractionMessageAction ma) {
+ ESBService gwService=esbModel.getGatewayService();
+
+ if (gwService != null) {
+ ESBAction gwAction=gwService.getGatewayAction();
+
+ if (gwAction instanceof SwitchAction) {
+ SwitchAction mra=(SwitchAction)
+ gwAction;
+
+ org.w3c.dom.Element route=
+ mra.getCaseElement(service.getCategory(),
+ service.getName());
+
+ if (route != null) {
+ org.w3c.dom.NodeList nl=
+ route.getElementsByTagName(SwitchAction.MESSAGE_ELEMENT);
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element) {
+ org.w3c.dom.Element mesg=
+ (org.w3c.dom.Element)nl.item(i);
+
+ if (mesg.getAttribute(SwitchAction.TYPE_ATTR).
+ equals(origMesgType)) {
+ mesg.setAttribute(SwitchAction.TYPE_ATTR,
+ ma.getMessageType());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected void setMessageType(AbstractInteractionMessageAction action,
+ ConversationInteraction interaction) {
+
+ if (interaction.getMessageSignature().getTypes().size() == 1) {
+ TypeReference ref=interaction.getMessageSignature().getTypes().get(0);
+
+ // TODO: Search for an implementation associated with
+ // the type reference, so that the type can be
+ // abstract - possibly have the required message type
+ // notation as part of the context, so that if multiple
+ // implementations found, then can select e.g. XML or
+ // Java as message type representation.
+ String mtype=InteractionUtil.getTypeString(ref);
+
+ action.setMessageType(mtype);
+ }
+ }
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context)
+ * and deleted model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object to be removed
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isDeleteSupported(ModelChangeContext context,
+ Model model, ModelObject mobj) {
+ boolean ret=false;
+
+ if (mobj instanceof ConversationInteraction &&
+ super.isDeleteSupported(context, model, mobj)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationModelChangeRule.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/ConversationModelChangeRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,184 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.RegistryInfo;
+
+/**
+ * This is the model change rule for the Conversation.
+ */
+(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE)
+public class ConversationModelChangeRule extends AbstractModelChangeRule {
+
+ private static final String NAME_SUFFIX = "_main";
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context) and
+ * model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object causing the change
+ * @param ref The optional reference model object
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isInsertSupported(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ boolean ret=false;
+
+ if (mobj instanceof Conversation &&
+ model instanceof ESBLanguageModel &&
+ ((ESBLanguageModel)model).isStateless()) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method adds a new model object, within a
+ * parent model object, with the details supplied in
+ * another model object. The supplied model object
+ * will usually be from a different model representation
+ * (e.g. due to a merge), so the details will be
+ * copied and placed in the representation associated
+ * with the supplied model and parent model object.<p>
+ * <p>
+ * If a reference model object is supplied, then the
+ * insertion will occur relative to it. If the reference
+ * object is a block, then it means that the insertion
+ * should occur at the end of the block. Otherwise the
+ * new model object should be inserted before the
+ * reference object, within the containing block.<p>
+ * <p>
+ * If the reference object is not supplied, then the
+ * new model object should be inserted at the end of
+ * the behaviour associated with the parent in the model
+ * change context.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param mobj The model object details to be inserted
+ * @param ref The optional reference model object
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean insert(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ ESBLanguageModel esbModel=(ESBLanguageModel)model;
+ Conversation conv=(Conversation)mobj;
+
+ String namespace=((Model)conv.getModel()).
+ getNamespace().getName();
+
+ String category=ConversationUtil.getServiceCategory(conv);
+
+ String name=ConversationUtil.getServiceName(conv);
+
+ String sdname="";
+
+ // Check if root conversation
+ if (conv.getParent() instanceof Model) {
+
+ // Register gateway service
+ DefaultESBService gateway=new DefaultESBService(esbModel,
+ category, name);
+
+ esbModel.addService(gateway);
+
+ /*
+ MessageRouterAction mra=new MessageRouterAction(gateway);
+
+ // Construct service description name
+ if (namespace != null) {
+ sdname = "{"+namespace+"}";
+ }
+
+ sdname += conv.getModelName().getName()+"-"+
+ conv.getModelName().getLocatedRole().getName();
+
+ mra.setServiceDescriptionName(sdname);
+
+ gateway.addAction(mra, -1);
+
+ esbModel.addService(gateway);
+
+ name += NAME_SUFFIX;
+
+ String ctype=null;
+
+ // Check if conversation has a 'conforms to' reference
+ if (conv.getConformsTo().size() > 0) {
+ // Set conversation type based on first 'conforms to'
+ // reference
+ ConformanceReference cref=conv.getConformsTo().get(0);
+
+ ctype = cref.getNamespace()+"."+
+ cref.getLocalpart()+"@"+
+ cref.getLocatedRole();
+ } else {
+ // Set conversation type based on conversation
+ // namespace and name
+ ctype = namespace+"."+
+ conv.getModelName().getName()+"@"+
+ conv.getModelName().getLocatedRole().getName();
+ }
+
+ if (ctype != null) {
+ mra.setConversationType(ctype);
+ }
+ */
+
+ // Process the activities within the conversation
+ java.util.List<Activity> acts=conv.getBlock().getContents();
+
+ context.setParent(gateway);
+
+ for (int i=0; i < acts.size(); i++) {
+ context.insert(model, acts.get(i), null);
+ }
+ }
+
+ /*
+ // Create new ESB service
+ ESBService service=esbModel.createService(category, name);
+
+ esbModel.addService(service);
+
+ // Create 'CreateSession' activity
+ // Process the activities within the conversation
+ java.util.List<Activity> acts=conv.getBlock().getContents();
+
+ context.setParent(service);
+
+ for (int i=0; i < acts.size(); i++) {
+ context.insert(model, acts.get(i), null);
+ }
+ */
+
+ return(true);
+ }
+
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/IfModelChangeRule.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,381 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import java.util.logging.Logger;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.IfAction;
+import org.jboss.savara.tools.jbossesb.model.actions.SwitchAction;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+import org.scribble.model.analysis.*;
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.*;
+
+/**
+ * This is the model change rule for the If grouping construct.
+ */
+(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE)
+public class IfModelChangeRule extends AbstractStatelessESBModelChangeRule {
+
+ private static final String NAME_SUFFIX = "_main";
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context) and inserted
+ * model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object being inserted
+ * @param ref The optional reference model object
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isInsertSupported(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ boolean ret=false;
+
+ if (mobj instanceof If &&
+ super.isInsertSupported(context, model, mobj, ref)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method adds a new model object, within a
+ * parent model object, with the details supplied in
+ * another model object. The supplied model object
+ * will usually be from a different model representation
+ * (e.g. due to a merge), so the details will be
+ * copied and placed in the representation associated
+ * with the supplied model and parent model object.<p>
+ * <p>
+ * If a reference model object is supplied, then the
+ * insertion will occur relative to it. If the reference
+ * object is a block, then it means that the insertion
+ * should occur at the end of the block. Otherwise the
+ * new model object should be inserted before the
+ * reference object, within the containing block.<p>
+ * <p>
+ * If the reference object is not supplied, then the
+ * new model object should be inserted at the end of
+ * the behaviour associated with the parent in the model
+ * change context.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param mobj The model object details to be inserted
+ * @param ref The optional reference model object
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean insert(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ ESBLanguageModel esbModel=(ESBLanguageModel)model;
+ ESBService service=getESBService(context, ref);
+ If ifElem=(If)mobj;
+
+ int pos=getPosition(service, ref);
+
+ // Check if should be an 'if' or a 'switch' action
+
+ if (ifElem.getRoles().contains(context.getRole())) {
+
+ insertIf(context, model, service, ifElem, pos);
+ } else {
+ insertSwitch(context, model, service, ifElem, pos);
+ }
+
+ return(true);
+ }
+
+ protected void insertIf(ModelChangeContext context,
+ Model model, ESBService service,
+ If ifElem, int pos) {
+ ESBLanguageModel esbModel=(ESBLanguageModel)model;
+
+ // If action, because the role is a decision maker
+ IfAction ifAction=new IfAction(service);
+
+ service.addAction(ifAction, pos);
+
+ for (int i=0; i < ifElem.getConditionalBlocks().size(); i++) {
+ ConditionalBlock cb=ifElem.getConditionalBlocks().get(i);
+
+ ESBService subService=
+ esbModel.createService(service.getCategory(),
+ esbModel.getUniqueServiceName(service.getCategory(),
+ service.getName()));
+
+ esbModel.addService(subService);
+
+ context.setParent(subService);
+
+ for (int j=0; j < cb.getContents().size(); j++) {
+ context.insert(model, cb.getContents().get(j), null);
+ }
+
+ boolean immediate=false;
+
+ ifAction.addPath((i==0 ? IfAction.IF : IfAction.ELSEIF),
+ subService.getCategory(), subService.getName(),
+ immediate, null, i);
+ }
+
+ if (ifElem.getElseBlock() != null) {
+
+ ESBService subService=
+ esbModel.createService(service.getCategory(),
+ esbModel.getUniqueServiceName(service.getCategory(),
+ service.getName()));
+
+ esbModel.addService(subService);
+
+ context.setParent(subService);
+
+ for (int j=0; j < ifElem.getElseBlock().getContents().size(); j++) {
+ context.insert(model,
+ ifElem.getElseBlock().getContents().get(j), null);
+ }
+
+ boolean immediate=false;
+
+ ifAction.addPath(IfAction.ELSE,
+ subService.getCategory(), subService.getName(),
+ immediate, null, -1);
+ }
+ }
+
+ protected void insertSwitch(ModelChangeContext context,
+ Model model, ESBService service,
+ If ifElem, int pos) {
+ ESBLanguageModel esbModel=(ESBLanguageModel)model;
+ java.util.Map<String,java.util.List<ESBService>> replyServices=
+ new java.util.Hashtable<String,java.util.List<ESBService>>();
+ java.util.Map<ESBService,java.util.Set<Interaction>> replyServiceMTypes=
+ new java.util.Hashtable<ESBService,java.util.Set<Interaction>>();
+
+ // Switch action, as role is a decision observer
+ SwitchAction switchAction=new SwitchAction(service);
+
+ if (ifElem.getParent() != null &&
+ ifElem.getParent().getParent() instanceof Conversation &&
+ ((Conversation)ifElem.getParent().getParent()).isStateless()) {
+ Conversation conv=(Conversation)ifElem.getParent().getParent();
+
+ String namespace=((Model)conv.getModel()).
+ getNamespace().getName();
+
+ String name=ConversationUtil.getServiceName(conv);
+
+ String sdname="";
+
+ // Construct service description name
+ if (namespace != null) {
+ sdname = "{"+namespace+"}";
+ }
+
+ sdname += conv.getLocatedName().getName()+"-"+
+ conv.getLocatedName().getRole().getName();
+
+ switchAction.setServiceDescriptionName(sdname);
+
+ name += NAME_SUFFIX;
+
+ String ctype=null;
+
+ // Check if conversation has a 'conforms to' reference
+ if (conv.getConformsTo().size() > 0) {
+ // Set conversation type based on first 'conforms to'
+ // reference
+ ConformanceReference cref=conv.getConformsTo().get(0);
+
+ ctype = cref.getNamespace()+"."+
+ cref.getLocalpart()+"@"+
+ cref.getLocatedRole();
+ } else {
+ // Set conversation type based on conversation
+ // namespace and name
+ ctype = namespace+"."+
+ conv.getLocatedName().getName()+"@"+
+ conv.getLocatedName().getRole().getName();
+ }
+
+ if (ctype != null) {
+ switchAction.setConversationType(ctype);
+ }
+ }
+
+ service.addAction(switchAction, pos);
+
+ // Get lookahead analyser
+ LookaheadAnalyser la=(LookaheadAnalyser)
+ RegistryFactory.getRegistry().getExtension(
+ LookaheadAnalyser.class, null);
+
+ if (la == null) {
+ logger.severe("Failed to find lookahead analyser");
+ }
+
+ for (int i=0; i < ifElem.getConditionalBlocks().size(); i++) {
+ ConditionalBlock cb=ifElem.getConditionalBlocks().get(i);
+
+ java.util.Set<Interaction> interactions=null;
+ String replyLabel=null;
+
+ if (la != null) {
+ interactions = la.getInteractions(cb);
+
+ replyLabel = getReplyLabel(interactions);
+ }
+
+ ESBService subService=
+ esbModel.createService(service.getCategory(),
+ esbModel.getUniqueServiceName(service.getCategory(),
+ service.getName()));
+
+ esbModel.addService(subService);
+
+ context.setParent(subService);
+
+ for (int j=0; j < cb.getContents().size(); j++) {
+ context.insert(model, cb.getContents().get(j), null);
+ }
+
+ if (replyLabel != null) {
+ java.util.List<ESBService> services=
+ replyServices.get(replyLabel);
+
+ if (services == null) {
+ services = new java.util.Vector<ESBService>();
+ replyServices.put(replyLabel, services);
+ }
+
+ services.add(subService);
+
+ replyServiceMTypes.put(subService, interactions);
+ } else {
+ switchAction.addCase(subService.getCategory(),
+ subService.getName(), interactions, i);
+ }
+ }
+
+ if (ifElem.getElseBlock() != null) {
+
+ ESBService subService=
+ esbModel.createService(service.getCategory(),
+ esbModel.getUniqueServiceName(service.getCategory(),
+ service.getName()));
+
+ esbModel.addService(subService);
+
+ context.setParent(subService);
+
+ for (int j=0; j < ifElem.getElseBlock().getContents().size(); j++) {
+ context.insert(model,
+ ifElem.getElseBlock().getContents().get(j), null);
+ }
+
+ java.util.Set<Interaction> interactions=null;
+ String replyLabel=null;
+
+ if (la != null) {
+ interactions = la.getInteractions(ifElem.getElseBlock());
+
+ replyLabel = getReplyLabel(interactions);
+ }
+
+ if (replyLabel != null) {
+ java.util.List<ESBService> services=
+ replyServices.get(replyLabel);
+
+ if (services == null) {
+ services = new java.util.Vector<ESBService>();
+ replyServices.put(replyLabel, services);
+ }
+
+ services.add(subService);
+
+ replyServiceMTypes.put(subService, interactions);
+ } else {
+ switchAction.addCase(subService.getCategory(),
+ subService.getName(), interactions, -1);
+ }
+ }
+
+ java.util.Iterator<String> replyLabels=replyServices.keySet().iterator();
+
+ while (replyLabels.hasNext()) {
+ String replyLabel=replyLabels.next();
+
+ java.util.List<ESBService> services=replyServices.get(replyLabel);
+
+ if (services.size() == 1) {
+ ESBService serv=services.get(0);
+
+ serv.setName(replyLabel);
+ } else {
+ ESBService subService=
+ esbModel.createService(service.getCategory(),
+ replyLabel);
+
+ esbModel.addService(subService);
+
+ SwitchAction subSwitchAction=
+ new SwitchAction(subService);
+
+ subService.addAction(subSwitchAction, -1);
+
+ for (int i=0; i < services.size(); i++) {
+ ESBService serv=services.get(i);
+
+ subSwitchAction.addCase(serv.getCategory(),
+ serv.getName(),
+ replyServiceMTypes.get(serv), -1);
+ }
+ }
+ }
+ }
+
+ protected String getReplyLabel(java.util.Set<Interaction> interactions) {
+ String ret=null;
+
+ if (interactions != null) {
+ java.util.Iterator<Interaction> iter=
+ interactions.iterator();
+
+ while (ret == null && iter.hasNext()) {
+ Interaction interaction=iter.next();
+
+ if (InteractionUtil.isSend(interaction) == false) {
+ ret = interaction.getReplyToLabel();
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model.change");
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/LanguageToConversationModelChangeRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.RegistryInfo;
+
+/**
+ * This is the model change rule for the Language Model to
+ * Conversation Model.
+ */
+(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE)
+public class LanguageToConversationModelChangeRule extends AbstractModelChangeRule {
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context) and inserted
+ * model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param mobj The model object being inserted
+ * @param ref The optional reference model object
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isInsertSupported(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ boolean ret=false;
+
+ if (mobj instanceof ConversationModel &&
+ model instanceof ESBLanguageModel &&
+ ((ESBLanguageModel)model).isStateless()) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method adds a new model object, within a
+ * parent model object, with the details supplied in
+ * another model object. The supplied model object
+ * will usually be from a different model representation
+ * (e.g. due to a merge), so the details will be
+ * copied and placed in the representation associated
+ * with the supplied model and parent model object.<p>
+ * <p>
+ * If a reference model object is supplied, then the
+ * insertion will occur relative to it. If the reference
+ * object is a block, then it means that the insertion
+ * should occur at the end of the block. Otherwise the
+ * new model object should be inserted before the
+ * reference object, within the containing block.<p>
+ * <p>
+ * If the reference object is not supplied, then the
+ * new model object should be inserted at the end of
+ * the behaviour associated with the parent in the model
+ * change context.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param mobj The model object details to be inserted
+ * @param ref The optional reference model object
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean insert(ModelChangeContext context,
+ Model model, ModelObject mobj, ModelObject ref) {
+ ConversationModel cm=(ConversationModel)mobj;
+
+ if (cm.getConversation() != null) {
+ context.insert(model, cm.getConversation(), null);
+ }
+
+ return(true);
+ }
+
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/TypeReferenceModelChangeRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,174 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.AbstractInteractionMessageAction;
+import org.jboss.savara.tools.jbossesb.model.actions.SwitchAction;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.RegistryInfo;
+
+/**
+ * This is the model change rule for the Type Reference.
+ */
+(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE)
+public class TypeReferenceModelChangeRule extends AbstractModelChangeRule {
+
+ /**
+ * This method determines whether the rule is appropriate
+ * for the supplied type of model, parent (in the context)
+ * and modified model object.
+ *
+ * @param context The context
+ * @param model The model
+ * @param fromObj The source model object
+ * @param toObj The model object to be updated
+ * @return Whether the rule supports the supplied information
+ */
+ @Override
+ public boolean isUpdateSupported(ModelChangeContext context,
+ Model model, ModelObject fromObj, ModelObject toObj) {
+ boolean ret=false;
+
+ if (fromObj instanceof TypeReference &&
+ toObj instanceof TypeReference &&
+ model instanceof ESBLanguageModel &&
+ ((ESBLanguageModel)model).isStateless() == true) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method modifies an existing model object, within a
+ * parent model object, with the details supplied in
+ * another model object.
+ *
+ * @param context The context
+ * @param model The model being changed
+ * @param fromObj The source model object
+ * @param toObj The model object to be updated
+ * @return Whether the change has been applied
+ */
+ @Override
+ public boolean update(ModelChangeContext context,
+ Model model, ModelObject fromObj, ModelObject toObj) {
+ boolean ret=false;
+ ESBLanguageModel esbModel=(ESBLanguageModel)model;
+ TypeReference fromTypeRef=(TypeReference)fromObj;
+ TypeReference toTypeRef=(TypeReference)toObj;
+ ConversationInteraction toInteraction=null;
+ ConversationInteraction fromInteraction=null;
+
+ if (toTypeRef != null && toTypeRef.getParent() instanceof MessageSignature &&
+ toTypeRef.getParent().getParent() instanceof ConversationInteraction) {
+ toInteraction = (ConversationInteraction)toTypeRef.getParent().getParent();
+ }
+
+ if (fromTypeRef != null && fromTypeRef.getParent() instanceof MessageSignature &&
+ fromTypeRef.getParent().getParent() instanceof ConversationInteraction) {
+ fromInteraction = (ConversationInteraction)fromTypeRef.getParent().getParent();
+ }
+
+ // Get action from 'toInteraction'
+ if (toInteraction != null &&
+ toInteraction.getSource().getObject() instanceof
+ AbstractInteractionMessageAction) {
+ AbstractInteractionMessageAction ma=
+ (AbstractInteractionMessageAction)
+ toInteraction.getSource().getObject();
+
+ ESBService service = ma.getService();
+
+ String origMesgType=ma.getMessageType();
+
+ // Set message type
+ setMessageType(ma, fromInteraction);
+
+ // Update message type in router if appropriate
+ if (InteractionUtil.isSend(fromInteraction) == false &&
+ fromInteraction.getReplyToLabel() == null) {
+ updateRouterMessageType(esbModel, service,
+ origMesgType, ma);
+ }
+
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ protected void updateRouterMessageType(ESBLanguageModel esbModel,
+ ESBService service, String origMesgType,
+ AbstractInteractionMessageAction ma) {
+ ESBService gwService=esbModel.getGatewayService();
+
+ if (gwService != null) {
+ ESBAction gwAction=gwService.getGatewayAction();
+
+ if (gwAction instanceof SwitchAction) {
+ SwitchAction mra=(SwitchAction)
+ gwAction;
+
+ org.w3c.dom.Element route=
+ mra.getCaseElement(service.getCategory(),
+ service.getName());
+
+ if (route != null) {
+ org.w3c.dom.NodeList nl=
+ route.getElementsByTagName(SwitchAction.MESSAGE_ELEMENT);
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element) {
+ org.w3c.dom.Element mesg=
+ (org.w3c.dom.Element)nl.item(i);
+
+ if (mesg.getAttribute(SwitchAction.TYPE_ATTR).
+ equals(origMesgType)) {
+ mesg.setAttribute(SwitchAction.TYPE_ATTR,
+ ma.getMessageType());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected void setMessageType(AbstractInteractionMessageAction action,
+ ConversationInteraction interaction) {
+
+ if (interaction.getMessageSignature().getTypes().size() == 1) {
+ TypeReference ref=interaction.getMessageSignature().getTypes().get(0);
+
+ // TODO: Search for an implementation associated with
+ // the type reference, so that the type can be
+ // abstract - possibly have the required message type
+ // notation as part of the context, so that if multiple
+ // implementations found, then can select e.g. XML or
+ // Java as message type representation.
+ String mtype=InteractionUtil.getTypeString(ref);
+
+ action.setMessageType(mtype);
+ }
+ }
+}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/PropertyUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/PropertyUtil.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/PropertyUtil.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -131,5 +131,5 @@
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.model.util");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBModelParserRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBModelParserRule.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBModelParserRule.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -107,5 +107,5 @@
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.parser");
+ private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.parser");
}
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java 2009-08-21 10:10:51 UTC (rev 793)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -21,7 +21,6 @@
import org.jboss.savara.tools.jbossesb.model.DefaultESBLanguageModel;
import org.jboss.savara.tools.jbossesb.model.DefaultESBService;
-import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
public class DefaultESBServiceTest extends TestCase {
@@ -37,7 +36,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.Messages"),
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
"_NOT_SPECIFIED_SESSION_CLASS",
new String[]{}));
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/IfActionTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/IfActionTest.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,632 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import junit.framework.TestCase;
+
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.IfAction;
+import org.scribble.model.*;
+import org.scribble.conversation.model.*;
+
+public class IfActionTest extends TestCase {
+
+ public void testValidatePathsSpecified() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ IfAction action=new IfAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_PROPERTY",
+ new String[]{"paths"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateServiceNotFound() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{"cat1","name1"}));
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{"cat2","name2"}));
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{"cat3","name3"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateNoPathsContent() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat3");
+ other2.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_IF_ORDER_WRONG",
+ new String[]{}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateOnlyOneIf() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" /><if service-category=\"cat3\" " +
+ "service-name=\"name3\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_IF_ORDER_WRONG",
+ new String[]{}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateOutOfOrderElse() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_IF_ORDER_WRONG",
+ new String[]{}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateMissingServiceDetails() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><elseif " +
+ "service-name=\"name2\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_PATH_SERVICE_DETAILS_MISSING",
+ new String[]{}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ /*
+ public void testValidateImmediateIf() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" immediate=\"fred\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.stateful.actions.Messages"),
+ "_BOOLEAN",
+ new String[]{IfAction.IMMEDIATE}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateImmediateElseIf() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" immediate=\"fred\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.stateful.actions.Messages"),
+ "_BOOLEAN",
+ new String[]{IfAction.IMMEDIATE}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateImmediateElse() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" immediate=\"fred\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.stateful.actions.Messages"),
+ "_BOOLEAN",
+ new String[]{IfAction.IMMEDIATE}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+ */
+
+ public void testConvert() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestActivity act1=new TestActivity();
+ other1.getContents().add(act1);
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestActivity act2=new TestActivity();
+ other2.getContents().add(act2);
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestActivity act3=new TestActivity();
+ other3.getContents().add(act3);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, null);
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof If) == false) {
+ fail("Expecting an 'If' activity");
+ }
+
+ If ifAction=(If)act;
+
+ if (ifAction.getConditionalBlocks().size() != 2) {
+ fail("Expecting two conditional blocks: "+ifAction.getConditionalBlocks().size());
+ }
+
+ if (ifAction.getConditionalBlocks().get(0).getContents().size() != 1 ||
+ ifAction.getConditionalBlocks().get(0).getContents().get(0) != act1) {
+ fail("First conditional block should have 1 activity = act1");
+ }
+
+ if (ifAction.getConditionalBlocks().get(1).getContents().size() != 1 ||
+ ifAction.getConditionalBlocks().get(1).getContents().get(0) != act2) {
+ fail("Second conditional block should have 1 activity = act2");
+ }
+
+ if (ifAction.getElseBlock() == null) {
+ fail("Else block not defined");
+ }
+
+ if (ifAction.getElseBlock().getContents().size() != 1 ||
+ ifAction.getElseBlock().getContents().get(0) != act3) {
+ fail("Else block should have 1 activity = act3");
+ }
+ }
+
+ public void testConvertNotExcludingEmptyPaths() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><if service-category=\"cat1\" " +
+ "service-name=\"name1\" /><elseif service-category=\"cat2\" " +
+ "service-name=\"name2\" /><else service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ IfAction action=new IfAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, null);
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof If) == false) {
+ fail("Expecting an 'If' activity");
+ }
+
+ If ifAction=(If)act;
+
+ if (ifAction.getConditionalBlocks().size() != 2) {
+ fail("Expecting two conditional blocks: "+ifAction.getConditionalBlocks().size());
+ }
+
+ if (ifAction.getConditionalBlocks().get(0).getContents().size() != 0) {
+ fail("First conditional block should be empty");
+ }
+
+ if (ifAction.getConditionalBlocks().get(1).getContents().size() != 0) {
+ fail("Second conditional block should be empty");
+ }
+
+ if (ifAction.getElseBlock() == null) {
+ fail("Else block not defined");
+ }
+
+ if (ifAction.getElseBlock().getContents().size() != 0) {
+ fail("Else block should have be empty");
+ }
+ }
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ IfAction action=new IfAction(service, null);
+
+ if (action.isSessionType() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ IfAction action=new IfAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ReceiveMessageActionTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ReceiveMessageActionTest.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,287 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.scribble.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.ReceiveMessageAction;
+
+import junit.framework.TestCase;
+
+public class ReceiveMessageActionTest extends TestCase {
+
+ public void testValidateNoMessageType() {
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("identities", "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_PROPERTY",
+ new String[]{"messageType"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateNoIdentities() {
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_PROPERTY",
+ new String[]{"identities"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testConvertRoles() {
+ TestESBService service=new TestESBService();
+
+ String ns="MessageTypeNS";
+ String lp="MessageType";
+ String role="Buyer";
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "{"+ns+"}"+lp);
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, new DefaultConversionContext(role));
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof Interaction) == false) {
+ fail("Expecting an 'Interaction' activity");
+ }
+
+ Interaction interaction=(Interaction)act;
+
+ if (interaction.getToRole() == null) {
+ fail("'To' role is null");
+ }
+
+ if (interaction.getToRole().getName().equals(role) == false) {
+ fail("'To' role should be '"+role+"', but found: "+interaction.getToRole().getName());
+ }
+
+ if (interaction.getFromRole() != null) {
+ fail("'From' role should be null");
+ }
+ }
+
+ public void testConvertMessageBased() {
+ TestESBService service=new TestESBService();
+
+ String ns="MessageTypeNS";
+ String lp="MessageType";
+ String role="Buyer";
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "{"+ns+"}"+lp);
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, new DefaultConversionContext(role));
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof Interaction) == false) {
+ fail("Expecting an 'Interaction' activity");
+ }
+
+ Interaction interaction=(Interaction)act;
+
+ if (interaction.getMessageSignature() == null) {
+ fail("Message signature is null");
+ }
+
+ if (interaction.getMessageSignature().getOperation() != null) {
+ fail("Operation should be null");
+ }
+
+ if (interaction.getMessageSignature().getTypes().size() != 1) {
+ fail("Only one type expected, but got: "+interaction.getMessageSignature().getTypes().size());
+ }
+
+ TypeReference ref=interaction.getMessageSignature().getTypes().get(0);
+
+ if (ref.getNamespace() == null ||
+ ref.getNamespace().equals(ns) == false) {
+ fail("Namespace should be '"+ns+"', but found: "+ref.getNamespace());
+ }
+
+ if (ref.getLocalpart() == null ||
+ ref.getLocalpart().equals(lp) == false) {
+ fail("Local type should be '"+lp+"', but found: "+ref.getLocalpart());
+ }
+ }
+
+ public void testConvertRPCBased() {
+ TestESBService service=new TestESBService();
+
+ String ns="MessageTypeNS";
+ String lp="MessageType";
+ String opname="op";
+ String role="Buyer";
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("operation", opname);
+ props.put("messageType", "{"+ns+"}"+lp);
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, new DefaultConversionContext(role));
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof Interaction) == false) {
+ fail("Expecting an 'Interaction' activity");
+ }
+
+ Interaction interaction=(Interaction)act;
+
+ if (interaction.getMessageSignature() == null) {
+ fail("Message signature is null");
+ }
+
+ if (interaction.getMessageSignature().getOperation() == null) {
+ fail("Operation should not be null");
+ }
+
+ if (interaction.getMessageSignature().getOperation().equals(opname) == false) {
+ fail("Operation expected '"+opname+"', but got: "+
+ interaction.getMessageSignature().getOperation());
+ }
+
+ if (interaction.getMessageSignature().getTypes().size() != 1) {
+ fail("Only one type expected, but got: "+interaction.getMessageSignature().getTypes().size());
+ }
+
+ TypeReference ref=interaction.getMessageSignature().getTypes().get(0);
+
+ if (ref.getNamespace() == null ||
+ ref.getNamespace().equals(ns) == false) {
+ fail("Namespace should be '"+ns+"', but found: "+ref.getNamespace());
+ }
+
+ if (ref.getLocalpart() == null ||
+ ref.getLocalpart().equals(lp) == false) {
+ fail("Local type should be '"+lp+"', but found: "+ref.getLocalpart());
+ }
+ }
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, null);
+
+ if (action.isSessionType() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SendMessageActionTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SendMessageActionTest.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,363 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.jboss.savara.tools.jbossesb.model.DefaultConversionContext;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.SendMessageAction;
+import org.scribble.model.Activity;
+import org.scribble.model.Interaction;
+import org.scribble.model.TypeReference;
+
+import junit.framework.TestCase;
+
+public class SendMessageActionTest extends TestCase {
+
+ public void testValidateNoMessageType() {
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("identities", "");
+ props.put("serviceCategory", "");
+ props.put("serviceName", "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ SendMessageAction action=new SendMessageAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_PROPERTY",
+ new String[]{"messageType"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateNoIdentities() {
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "");
+ props.put("clientRole", "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ SendMessageAction action=new SendMessageAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_PROPERTY",
+ new String[]{"identities"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateNoDestination() {
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "");
+ props.put("identities", "");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ SendMessageAction action=new SendMessageAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_REQ_RESP_EPR",
+ new String[]{}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateResponseService() {
+ TestESBService service=new TestESBService();
+ service.setRoot(true);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "");
+ props.put("identities", "");
+ props.put("serviceCategory", "cat1");
+ props.put("serviceName", "name1");
+ props.put("responseServiceCategory", "cat2");
+ props.put("responseServiceName", "name2");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ SendMessageAction action=new SendMessageAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{"cat2", "name2"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testConvertRoles() {
+ TestESBService service=new TestESBService();
+
+ String ns="MessageTypeNS";
+ String lp="MessageType";
+ String role="Buyer";
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "{"+ns+"}"+lp);
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ SendMessageAction action=new SendMessageAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, new DefaultConversionContext(role));
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof Interaction) == false) {
+ fail("Expecting an 'Interaction' activity");
+ }
+
+ Interaction interaction=(Interaction)act;
+
+ if (interaction.getFromRole() == null) {
+ fail("'From' role is null");
+ }
+
+ if (interaction.getFromRole().getName().equals(role) == false) {
+ fail("'From' role should be '"+role+"', but found: "+interaction.getFromRole().getName());
+ }
+
+ if (interaction.getToRole() != null) {
+ fail("'To' role should be null");
+ }
+ }
+
+ public void testConvertMessageBased() {
+ TestESBService service=new TestESBService();
+
+ String ns="MessageTypeNS";
+ String lp="MessageType";
+ String role="Buyer";
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("messageType", "{"+ns+"}"+lp);
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ SendMessageAction action=new SendMessageAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, new DefaultConversionContext(role));
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof Interaction) == false) {
+ fail("Expecting an 'Interaction' activity");
+ }
+
+ Interaction interaction=(Interaction)act;
+
+ if (interaction.getMessageSignature() == null) {
+ fail("Message signature is null");
+ }
+
+ if (interaction.getMessageSignature().getOperation() != null) {
+ fail("Operation should be null");
+ }
+
+ if (interaction.getMessageSignature().getTypes().size() != 1) {
+ fail("Only one type expected, but got: "+interaction.getMessageSignature().getTypes().size());
+ }
+
+ TypeReference ref=interaction.getMessageSignature().getTypes().get(0);
+
+ if (ref.getNamespace() == null ||
+ ref.getNamespace().equals(ns) == false) {
+ fail("Namespace should be '"+ns+"', but found: "+ref.getNamespace());
+ }
+
+ if (ref.getLocalpart() == null ||
+ ref.getLocalpart().equals(lp) == false) {
+ fail("Local type should be '"+lp+"', but found: "+ref.getLocalpart());
+ }
+ }
+
+ public void testConvertRPCBased() {
+ TestESBService service=new TestESBService();
+
+ String ns="MessageTypeNS";
+ String lp="MessageType";
+ String opname="op";
+ String role="Buyer";
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("operation", opname);
+ props.put("messageType", "{"+ns+"}"+lp);
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ SendMessageAction action=new SendMessageAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, new DefaultConversionContext(role));
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof Interaction) == false) {
+ fail("Expecting an 'Interaction' activity");
+ }
+
+ Interaction interaction=(Interaction)act;
+
+ if (interaction.getMessageSignature() == null) {
+ fail("Message signature is null");
+ }
+
+ if (interaction.getMessageSignature().getOperation() == null) {
+ fail("Operation should not be null");
+ }
+
+ if (interaction.getMessageSignature().getOperation().equals(opname) == false) {
+ fail("Operation expected '"+opname+"', but got: "+
+ interaction.getMessageSignature().getOperation());
+ }
+
+ if (interaction.getMessageSignature().getTypes().size() != 1) {
+ fail("Only one type expected, but got: "+interaction.getMessageSignature().getTypes().size());
+ }
+
+ TypeReference ref=interaction.getMessageSignature().getTypes().get(0);
+
+ if (ref.getNamespace() == null ||
+ ref.getNamespace().equals(ns) == false) {
+ fail("Namespace should be '"+ns+"', but found: "+ref.getNamespace());
+ }
+
+ if (ref.getLocalpart() == null ||
+ ref.getLocalpart().equals(lp) == false) {
+ fail("Local type should be '"+lp+"', but found: "+ref.getLocalpart());
+ }
+ }
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ SendMessageAction action=new SendMessageAction(service, null);
+
+ if (action.isSessionType() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ SendMessageAction action=new SendMessageAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SwitchActionTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/SwitchActionTest.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,382 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.actions;
+
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.SwitchAction;
+import org.scribble.conversation.model.If;
+import org.scribble.model.Activity;
+
+import junit.framework.TestCase;
+
+public class SwitchActionTest extends TestCase {
+
+ public void testValidatePathsSpecified() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ SwitchAction action=new SwitchAction(service, elem);
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_PROPERTY",
+ new String[]{"paths"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateServiceNotFound() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><case service-category=\"cat1\" " +
+ "service-name=\"name1\" /><case service-category=\"cat2\" " +
+ "service-name=\"name2\" /><case service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
+ service.setModel(model);
+
+ SwitchAction action=new SwitchAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{"cat1","name1"}));
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{"cat2","name2"}));
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{"cat3","name3"}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateLessThanOnePath() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat3");
+ other2.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(service);
+
+ service.setModel(model);
+
+ SwitchAction action=new SwitchAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.actions.Messages"),
+ "_SWITCH_ONE_OR_MORE_PATHS",
+ new String[]{}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateMissingServiceDetails() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><case service-category=\"cat1\" " +
+ "service-name=\"name1\" /><case " +
+ "service-name=\"name2\" /><case service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ SwitchAction action=new SwitchAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.tools.jbossesb.model.stateful.actions.Messages"),
+ "_PATH_SERVICE_DETAILS_MISSING",
+ new String[]{}));
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testConvert() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><case service-category=\"cat1\" " +
+ "service-name=\"name1\" /><case service-category=\"cat2\" " +
+ "service-name=\"name2\" /><case service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestActivity act1=new TestActivity();
+ other1.getContents().add(act1);
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestActivity act2=new TestActivity();
+ other2.getContents().add(act2);
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestActivity act3=new TestActivity();
+ other3.getContents().add(act3);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ SwitchAction action=new SwitchAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, null);
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof If) == false) {
+ fail("Expecting an 'If' activity");
+ }
+
+ If ifAction=(If)act;
+
+ if (ifAction.getConditionalBlocks().size() != 3) {
+ fail("Expecting three conditional blocks: "+ifAction.getConditionalBlocks().size());
+ }
+
+ if (ifAction.getConditionalBlocks().get(0).getContents().size() != 1 ||
+ ifAction.getConditionalBlocks().get(0).getContents().get(0) != act1) {
+ fail("First conditional block should have 1 activity = act1");
+ }
+
+ if (ifAction.getConditionalBlocks().get(1).getContents().size() != 1 ||
+ ifAction.getConditionalBlocks().get(1).getContents().get(0) != act2) {
+ fail("Second conditional block should have 1 activity = act2");
+ }
+
+ if (ifAction.getConditionalBlocks().get(2).getContents().size() != 1 ||
+ ifAction.getConditionalBlocks().get(2).getContents().get(0) != act3) {
+ fail("Third conditional block should have 1 activity = act3");
+ }
+
+ if (ifAction.getElseBlock() != null) {
+ fail("Else block should not be defined");
+ }
+ }
+
+ public void testConvertNotExcludingEmptyPaths() {
+ TestESBService service=new TestESBService();
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put("paths", "<property><case service-category=\"cat1\" " +
+ "service-name=\"name1\" /><case service-category=\"cat2\" " +
+ "service-name=\"name2\" /><case service-category=\"cat3\" " +
+ "service-name=\"name3\" /></property>");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, null, props);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+
+ TestActivity act1=new TestActivity();
+ other1.getContents().add(act1);
+
+ TestESBService other2=new TestESBService();
+ other2.setCategory("cat2");
+ other2.setName("name2");
+
+ TestESBService other3=new TestESBService();
+ other3.setCategory("cat3");
+ other3.setName("name3");
+
+ TestActivity act3=new TestActivity();
+ other3.getContents().add(act3);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(other2);
+ model.addService(other3);
+ model.addService(service);
+
+ service.setModel(model);
+
+ SwitchAction action=new SwitchAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+
+ action.convert(activities, null);
+
+ if (activities.size() != 1) {
+ fail("Expecting one activity, but got: "+activities.size());
+ }
+
+ Activity act=activities.get(0);
+
+ if ((act instanceof If) == false) {
+ fail("Expecting an 'If' activity");
+ }
+
+ If ifAction=(If)act;
+
+ if (ifAction.getConditionalBlocks().size() != 3) {
+ fail("Expecting three conditional blocks: "+ifAction.getConditionalBlocks().size());
+ }
+
+ if (ifAction.getConditionalBlocks().get(0).getContents().size() != 1 ||
+ ifAction.getConditionalBlocks().get(0).getContents().get(0) != act1) {
+ fail("First conditional block should have 1 activity = act1");
+ }
+
+ if (ifAction.getConditionalBlocks().get(1).getContents().size() != 0) {
+ fail("Second conditional block should be empty");
+ }
+
+ if (ifAction.getConditionalBlocks().get(2).getContents().size() != 1 ||
+ ifAction.getConditionalBlocks().get(2).getContents().get(0) != act3) {
+ fail("Third conditional block should have 1 activity = act3");
+ }
+
+ if (ifAction.getElseBlock() != null) {
+ fail("Else block should not be defined");
+ }
+ }
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ SwitchAction action=new SwitchAction(service, null);
+
+ if (action.isSessionType() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ SwitchAction action=new SwitchAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,1850 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import junit.framework.TestCase;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.ConversationInteractionModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+import org.scribble.conversation.model.*;
+
+public class ConversationInteractionModelChangeRuleTest extends TestCase {
+
+ /*
+ public void testInsertFirstReceiveAction() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setToRole(role);
+ conv.getBlock().getContents().add(mobj);
+
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp");
+
+ msig.getTypes().add(ref);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 1) {
+ fail("One service expected: "+model.getServices().size());
+ }
+
+ ReceiveMessageAction action=(ReceiveMessageAction)service.getActions().get(0);
+
+ String mtype=InteractionUtil.getTypeString(ref);
+
+ if (action.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+action.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ if (mra.getNumberOfCases() != 1) {
+ fail("One route expected: "+mra.getNumberOfCases());
+ }
+ }
+
+ public void testInsertFirstReceiveAfterCreateSessionAction() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ // Add 'create session' action
+ TestESBAction act=new TestESBAction();
+ act.setCreateSession(true);
+ service.addAction(act, -1);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setToRole(role);
+ conv.getBlock().getContents().add(mobj);
+
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp");
+
+ msig.getTypes().add(ref);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof TestESBAction) == false) {
+ fail("Action was not TestESBAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ReceiveMessageAction) == false) {
+ fail("Action was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 1) {
+ fail("One service expected: "+model.getServices().size());
+ }
+
+ ReceiveMessageAction action=(ReceiveMessageAction)service.getActions().get(1);
+
+ String mtype=InteractionUtil.getTypeString(ref);
+
+ if (action.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+action.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ if (mra.getNumberOfCases() != 1) {
+ fail("One route expected: "+mra.getNumberOfCases());
+ }
+ }
+
+ public void testInsertSecondReceiveAction() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj1=new ConversationInteraction();
+ mobj1.setToRole(role);
+ conv.getBlock().getContents().add(mobj1);
+
+ MessageSignature msig1=new MessageSignature();
+ mobj1.setMessageSignature(msig1);
+
+ TypeReference ref1=new TypeReference();
+ ref1.setNamespace("ns");
+ ref1.setLocalpart("lp1");
+
+ msig1.getTypes().add(ref1);
+
+ if (rule.insert(context, model, mobj1, null) == false) {
+ fail("Failed to insert 1");
+ }
+
+ ConversationInteraction mobj2=new ConversationInteraction();
+ mobj2.setToRole(role);
+ conv.getBlock().getContents().add(mobj2);
+
+ MessageSignature msig2=new MessageSignature();
+ mobj2.setMessageSignature(msig2);
+
+ TypeReference ref2=new TypeReference();
+ ref2.setNamespace("ns");
+ ref2.setLocalpart("lp2");
+
+ msig2.getTypes().add(ref2);
+
+ // Once first interaction associated with service it
+ // will become session based
+ service.setSessionBased(true);
+
+ if (rule.insert(context, model, mobj2, null) == false) {
+ fail("Failed to insert 2");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two services expected: "+model.getServices().size());
+ }
+
+ ESBService newService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+ while (newService == null && iter.hasNext()) {
+ ESBService s=iter.next();
+
+ if (s != service) {
+ newService = s;
+ }
+ }
+
+ if (newService == null) {
+ fail("Other service not found");
+ }
+
+ // Check schedule details
+ ScheduleStateAction schedule=(ScheduleStateAction)
+ service.getActions().get(1);
+
+ if (newService.getCategory().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)) == false) {
+ fail("Schedule service category '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)+
+ "' invalid, expecting: "+
+ service.getCategory());
+ }
+
+ if (newService.getName().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)) == false) {
+ fail("Schedule service name '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)+
+ "' invalid, expecting: "+
+ service.getName());
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.IMMEDIATE) != null) {
+ fail("Schedule should not be immediate");
+ }
+
+ if (newService.getActions().size() != 1) {
+ fail("Expecting 1 action: "+newService.getActions().size());
+ }
+
+ if ((newService.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action was not ReceiveMessageAction: "+newService.getActions().get(0));
+ }
+
+ ReceiveMessageAction action=(ReceiveMessageAction)newService.getActions().get(0);
+
+ String mtype=InteractionUtil.getTypeString(ref2);
+
+ if (action.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+action.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ if (mra.getNumberOfCases() != 2) {
+ fail("Two routes expected: "+mra.getNumberOfCases());
+ }
+ }
+
+
+ public void testInsertMiddleReceiveBetweenTwoReceives() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj1=new ConversationInteraction();
+ mobj1.setToRole(role);
+ conv.getBlock().getContents().add(mobj1);
+
+ MessageSignature msig1=new MessageSignature();
+ mobj1.setMessageSignature(msig1);
+
+ TypeReference ref1=new TypeReference();
+ ref1.setNamespace("ns");
+ ref1.setLocalpart("lp1");
+
+ msig1.getTypes().add(ref1);
+
+ if (rule.insert(context, model, mobj1, null) == false) {
+ fail("Failed to insert 1");
+ }
+
+ ConversationInteraction mobj2=new ConversationInteraction();
+ mobj2.setToRole(role);
+ conv.getBlock().getContents().add(mobj2);
+
+ MessageSignature msig2=new MessageSignature();
+ mobj2.setMessageSignature(msig2);
+
+ TypeReference ref2=new TypeReference();
+ ref2.setNamespace("ns");
+ ref2.setLocalpart("lp2");
+
+ msig2.getTypes().add(ref2);
+
+ // Once first interaction associated with service it
+ // will become session based
+ service.setSessionBased(true);
+
+ if (rule.insert(context, model, mobj2, null) == false) {
+ fail("Failed to insert 2");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two services expected: "+model.getServices().size());
+ }
+
+ ESBService newService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+ while (newService == null && iter.hasNext()) {
+ ESBService s=iter.next();
+
+ if (s != service) {
+ newService = s;
+ }
+ }
+
+ if (newService == null) {
+ fail("Other service not found");
+ }
+
+ ((TestESBService)newService).setSessionBased(true);
+
+ // Check schedule details
+ ScheduleStateAction schedule=(ScheduleStateAction)
+ service.getActions().get(1);
+
+ if (newService.getCategory().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)) == false) {
+ fail("Schedule service category '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)+
+ "' invalid, expecting: "+
+ service.getCategory());
+ }
+
+ if (newService.getName().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)) == false) {
+ fail("Schedule service name '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)+
+ "' invalid, expecting: "+
+ service.getName());
+ }
+
+ // Check actions
+ if (newService.getActions().size() != 1) {
+ fail("Expecting 1 action: "+newService.getActions().size());
+ }
+
+ if ((newService.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+newService.getActions().get(0));
+ }
+
+ ReceiveMessageAction recv2=(ReceiveMessageAction)
+ newService.getActions().get(0);
+
+
+ String mtype=InteractionUtil.getTypeString(ref2);
+
+ if (recv2.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+recv2.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ java.util.List<Activity> acts=new java.util.Vector<Activity>();
+
+ DefaultConversionContext convContext=new DefaultConversionContext(role.getName());
+ recv2.convert(acts, convContext);
+
+ if (acts.size() != 1) {
+ fail("Expecting 1 activity: "+acts.size());
+ }
+
+ // Now second service identified, add new receive
+ // action to ensure that third service inserted in the
+ // middle
+ ConversationInteraction mobj3=new ConversationInteraction();
+ mobj3.setToRole(role);
+ conv.getBlock().getContents().add(mobj3);
+
+ MessageSignature msig3=new MessageSignature();
+ mobj3.setMessageSignature(msig3);
+
+ TypeReference ref3=new TypeReference();
+ ref3.setNamespace("ns");
+ ref3.setLocalpart("lp3");
+
+ msig3.getTypes().add(ref3);
+
+ // Insert into position 1, which should be after first
+ // receive
+
+ // TODO: Need to pass representation of last interaction
+ if (rule.insert(context, model, mobj3, acts.get(0)) == false) {
+ fail("Failed to insert 3");
+ }
+
+ // Re-Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 3) {
+ fail("Three services expected: "+model.getServices().size());
+ }
+
+ // TODO: Need to check if new service has been inserted
+ // in the middle of the previously inserted interactions
+
+ // Check actions
+ if (newService.getActions().size() != 2) {
+ fail("Now Expecting 2 action: "+newService.getActions().size());
+ }
+
+ if ((newService.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+newService.getActions().get(0));
+ }
+
+ if ((newService.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+newService.getActions().get(1));
+ }
+
+ ScheduleStateAction ssa=(ScheduleStateAction)newService.getActions().get(1);
+
+ ESBService newService2=model.getService(ssa.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY),ssa.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME));
+
+ if (newService2 == null) {
+ fail("Failed to find final service");
+ }
+
+ if (newService2.getActions().size() != 1) {
+ fail("Only expecting one action: "+newService2.getActions().size());
+ }
+
+ ReceiveMessageAction recv4=(ReceiveMessageAction)
+ newService2.getActions().get(0);
+
+ String mtype4=InteractionUtil.getTypeString(ref2);
+
+ if (recv4.getPropertyValue("messageType").equals(mtype4)==false) {
+ fail("Message type '"+recv4.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype4);
+ }
+
+
+ ReceiveMessageAction recv3=(ReceiveMessageAction)
+ newService.getActions().get(0);
+
+ String mtype3=InteractionUtil.getTypeString(ref3);
+
+ if (recv3.getPropertyValue("messageType").equals(mtype3)==false) {
+ fail("Message type '"+recv3.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype3);
+ }
+ }
+
+ public void testInsertMiddleSendBetweenTwoReceives() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj1=new ConversationInteraction();
+ mobj1.setToRole(role);
+ conv.getBlock().getContents().add(mobj1);
+
+ MessageSignature msig1=new MessageSignature();
+ mobj1.setMessageSignature(msig1);
+
+ TypeReference ref1=new TypeReference();
+ ref1.setNamespace("ns");
+ ref1.setLocalpart("lp1");
+
+ msig1.getTypes().add(ref1);
+
+ if (rule.insert(context, model, mobj1, null) == false) {
+ fail("Failed to insert 1");
+ }
+
+ ConversationInteraction mobj2=new ConversationInteraction();
+ mobj2.setToRole(role);
+ conv.getBlock().getContents().add(mobj2);
+
+ MessageSignature msig2=new MessageSignature();
+ mobj2.setMessageSignature(msig2);
+
+ TypeReference ref2=new TypeReference();
+ ref2.setNamespace("ns");
+ ref2.setLocalpart("lp2");
+
+ msig2.getTypes().add(ref2);
+
+ // Once first interaction associated with service it
+ // will become session based
+ service.setSessionBased(true);
+
+ if (rule.insert(context, model, mobj2, null) == false) {
+ fail("Failed to insert 2");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two services expected: "+model.getServices().size());
+ }
+
+ ESBService newService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+ while (newService == null && iter.hasNext()) {
+ ESBService s=iter.next();
+
+ if (s != service) {
+ newService = s;
+ }
+ }
+
+ if (newService == null) {
+ fail("Other service not found");
+ }
+
+ ((TestESBService)newService).setSessionBased(true);
+
+ // Check schedule details
+ ScheduleStateAction schedule=(ScheduleStateAction)
+ service.getActions().get(1);
+
+ if (newService.getCategory().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)) == false) {
+ fail("Schedule service category '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)+
+ "' invalid, expecting: "+
+ service.getCategory());
+ }
+
+ if (newService.getName().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)) == false) {
+ fail("Schedule service name '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)+
+ "' invalid, expecting: "+
+ service.getName());
+ }
+
+ // Check actions
+ if (newService.getActions().size() != 1) {
+ fail("Expecting 1 action: "+newService.getActions().size());
+ }
+
+ if ((newService.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+newService.getActions().get(0));
+ }
+
+ ReceiveMessageAction recv2=(ReceiveMessageAction)
+ newService.getActions().get(0);
+
+
+ String mtype=InteractionUtil.getTypeString(ref2);
+
+ if (recv2.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+recv2.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ java.util.List<Activity> acts=new java.util.Vector<Activity>();
+
+ DefaultConversionContext convContext=new DefaultConversionContext(role.getName());
+ recv2.convert(acts, convContext);
+
+ if (acts.size() != 1) {
+ fail("Expecting 1 activity: "+acts.size());
+ }
+
+ // Now second service identified, add new receive
+ // action to ensure that third service inserted in the
+ // middle
+ ConversationInteraction mobj3=new ConversationInteraction();
+ mobj3.setFromRole(role);
+ conv.getBlock().getContents().add(mobj3);
+
+ MessageSignature msig3=new MessageSignature();
+ mobj3.setMessageSignature(msig3);
+
+ TypeReference ref3=new TypeReference();
+ ref3.setNamespace("ns");
+ ref3.setLocalpart("lp3");
+
+ msig3.getTypes().add(ref3);
+
+ // Insert into position 1, which should be after first
+ // receive
+
+ // TODO: Need to pass representation of last interaction
+ if (rule.insert(context, model, mobj3, acts.get(0)) == false) {
+ fail("Failed to insert 3");
+ }
+
+ // Re-Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 3) {
+ fail("Three services expected: "+model.getServices().size());
+ }
+
+ // TODO: Need to check if new service has been inserted
+ // in the middle of the previously inserted interactions
+
+ // Check actions
+ if (newService.getActions().size() != 2) {
+ fail("Now Expecting 2 action: "+newService.getActions().size());
+ }
+
+ if ((newService.getActions().get(0) instanceof SendMessageAction) == false) {
+ fail("Action 1 was not SendMessageAction: "+newService.getActions().get(0));
+ }
+
+ if ((newService.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+newService.getActions().get(1));
+ }
+
+ ScheduleStateAction ssa=(ScheduleStateAction)newService.getActions().get(1);
+
+ ESBService newService2=model.getService(ssa.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY),ssa.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME));
+
+ if (newService2 == null) {
+ fail("Failed to find final service");
+ }
+
+ if (newService2.getActions().size() != 1) {
+ fail("Only expecting one action: "+newService2.getActions().size());
+ }
+
+ if ((newService2.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Expecting ReceiveMessageAction, but got: "+newService2.getActions().get(0));
+ }
+
+ ReceiveMessageAction recv4=(ReceiveMessageAction)
+ newService2.getActions().get(0);
+
+ String mtype4=InteractionUtil.getTypeString(ref2);
+
+ if (recv4.getPropertyValue("messageType").equals(mtype4)==false) {
+ fail("Message type '"+recv4.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype4);
+ }
+
+
+ SendMessageAction send3=(SendMessageAction)
+ newService.getActions().get(0);
+
+ String mtype3=InteractionUtil.getTypeString(ref3);
+
+ if (send3.getPropertyValue("messageType").equals(mtype3)==false) {
+ fail("Message type '"+send3.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype3);
+ }
+ }
+
+ public void testInsertMiddleReceiveBetweenTwoSends() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj1=new ConversationInteraction();
+ mobj1.setFromRole(role);
+ conv.getBlock().getContents().add(mobj1);
+
+ MessageSignature msig1=new MessageSignature();
+ mobj1.setMessageSignature(msig1);
+
+ TypeReference ref1=new TypeReference();
+ ref1.setNamespace("ns");
+ ref1.setLocalpart("lp1");
+
+ msig1.getTypes().add(ref1);
+
+ if (rule.insert(context, model, mobj1, null) == false) {
+ fail("Failed to insert 1");
+ }
+
+ ConversationInteraction mobj2=new ConversationInteraction();
+ mobj2.setFromRole(role);
+ conv.getBlock().getContents().add(mobj2);
+
+ MessageSignature msig2=new MessageSignature();
+ mobj2.setMessageSignature(msig2);
+
+ TypeReference ref2=new TypeReference();
+ ref2.setNamespace("ns");
+ ref2.setLocalpart("lp2");
+
+ msig2.getTypes().add(ref2);
+
+ // Once first interaction associated with service it
+ // will become session based
+ service.setSessionBased(true);
+
+ if (rule.insert(context, model, mobj2, null) == false) {
+ fail("Failed to insert 2");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SendMessageAction) == false) {
+ fail("Action 1 was not SendMessageAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof SendMessageAction) == false) {
+ fail("Action 2 was not SendMessageAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 1) {
+ fail("One service expected: "+model.getServices().size());
+ }
+
+ SendMessageAction send2=(SendMessageAction)
+ service.getActions().get(1);
+
+
+ String mtype=InteractionUtil.getTypeString(ref2);
+
+ if (send2.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+send2.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ java.util.List<Activity> acts=new java.util.Vector<Activity>();
+
+ DefaultConversionContext convContext=new DefaultConversionContext(role.getName());
+ send2.convert(acts, convContext);
+
+ if (acts.size() != 1) {
+ fail("Expecting 1 activity: "+acts.size());
+ }
+
+ // Now second service identified, add new receive
+ // action to ensure that third service inserted in the
+ // middle
+ ConversationInteraction mobj3=new ConversationInteraction();
+ mobj3.setToRole(role);
+ conv.getBlock().getContents().add(mobj3);
+
+ MessageSignature msig3=new MessageSignature();
+ mobj3.setMessageSignature(msig3);
+
+ TypeReference ref3=new TypeReference();
+ ref3.setNamespace("ns");
+ ref3.setLocalpart("lp3");
+
+ msig3.getTypes().add(ref3);
+
+ // Insert into position 1, which should be after first
+ // send
+
+ // TODO: Need to pass representation of last interaction
+ if (rule.insert(context, model, mobj3, acts.get(0)) == false) {
+ fail("Failed to insert 3");
+ }
+
+ // Re-Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SendMessageAction) == false) {
+ fail("Action 1 was not SendMessageAction: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two services expected: "+model.getServices().size());
+ }
+
+ ESBService newService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+ while (newService == null && iter.hasNext()) {
+ ESBService s=iter.next();
+
+ if (s != service) {
+ newService = s;
+ }
+ }
+
+ // Check actions
+ if (newService.getActions().size() != 2) {
+ fail("Now Expecting 2 action: "+newService.getActions().size());
+ }
+
+ if ((newService.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+newService.getActions().get(0));
+ }
+
+ if ((newService.getActions().get(1) instanceof SendMessageAction) == false) {
+ fail("Action 2 was not SendMessageAction: "+newService.getActions().get(1));
+ }
+
+ ScheduleStateAction schedule=(ScheduleStateAction)
+ service.getActions().get(1);
+
+ if (newService.getCategory().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)) == false) {
+ fail("Schedule service category '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)+
+ "' invalid, expecting: "+
+ service.getCategory());
+ }
+
+ if (newService.getName().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)) == false) {
+ fail("Schedule service name '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)+
+ "' invalid, expecting: "+
+ service.getName());
+ }
+
+ ReceiveMessageAction recv3=(ReceiveMessageAction)
+ newService.getActions().get(0);
+
+ String mtype3=InteractionUtil.getTypeString(ref3);
+
+ if (recv3.getPropertyValue("messageType").equals(mtype3)==false) {
+ fail("Message type '"+recv3.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype3);
+ }
+ }
+
+ public void testInsertReceiveRequestAction() {
+ String fromRoleName="role1";
+ String toRoleName="role2";
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role fromRole=new Role();
+ fromRole.setName(fromRoleName);
+
+ Role toRole=new Role();
+ toRole.setName(toRoleName);
+
+ context.setRole(toRole);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(toRole);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setFromRole(fromRole);
+ mobj.setToRole(toRole);
+ conv.getBlock().getContents().add(mobj);
+
+ mobj.setRequestLabel("reqLabel");
+
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp");
+
+ msig.getTypes().add(ref);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 1) {
+ fail("One service expected: "+model.getServices().size());
+ }
+
+ ReceiveMessageAction action=(ReceiveMessageAction)service.getActions().get(0);
+
+ if (action.getPropertyValue(ReceiveMessageAction.CLIENT_EPR).equals(fromRoleName) == false) {
+ fail("Client EPR '"+action.getPropertyValue(ReceiveMessageAction.CLIENT_EPR)+
+ "' invalid, expecting: "+fromRoleName);
+ }
+ }
+
+ public void testInsertFirstSendAction() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setFromRole(role);
+ conv.getBlock().getContents().add(mobj);
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp");
+
+ msig.getTypes().add(ref);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SendMessageAction) == false) {
+ fail("Action was not SendMessageAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 1) {
+ fail("One service expected: "+model.getServices().size());
+ }
+
+ SendMessageAction action=(SendMessageAction)service.getActions().get(0);
+
+ String mtype=InteractionUtil.getTypeString(ref);
+
+ if (action.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+action.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+ }
+
+ public void testInsertSendRequestAction() {
+ String roleName="role1";
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName(roleName);
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setFromRole(role);
+ conv.getBlock().getContents().add(mobj);
+
+ mobj.setRequestLabel("reqLabel");
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp");
+
+ msig.getTypes().add(ref);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SendMessageAction) == false) {
+ fail("Action was not SendMessageAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two service expected: "+model.getServices().size());
+ }
+
+ SendMessageAction action=(SendMessageAction)service.getActions().get(0);
+
+ ESBService newService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+ while (newService == null && iter.hasNext()) {
+ ESBService s=iter.next();
+
+ if (s != service) {
+ newService = s;
+ }
+ }
+
+ if (newService == null) {
+ fail("Other service not found");
+ }
+
+ if (newService.getCategory().equals(action.getPropertyValue(
+ SendMessageAction.RESPONSE_SERVICE_CATEGORY)) == false) {
+ fail("Schedule service category '"+
+ action.getPropertyValue(
+ SendMessageAction.RESPONSE_SERVICE_CATEGORY)+
+ "' invalid, expecting: "+
+ newService.getCategory());
+ }
+
+ if (newService.getName().equals(action.getPropertyValue(
+ SendMessageAction.RESPONSE_SERVICE_NAME)) == false) {
+ fail("Schedule service name '"+
+ action.getPropertyValue(
+ SendMessageAction.RESPONSE_SERVICE_NAME)+
+ "' invalid, expecting: "+
+ newService.getName());
+ }
+ }
+
+ public void testInsertSendNotReplyAction() {
+ String fromRoleName="role1";
+ String toRoleName="role2";
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role fromRole=new Role();
+ fromRole.setName(fromRoleName);
+
+ Role toRole=new Role();
+ toRole.setName(toRoleName);
+
+ context.setRole(fromRole);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(fromRole);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setFromRole(fromRole);
+ mobj.setToRole(toRole);
+ conv.getBlock().getContents().add(mobj);
+
+ mobj.setRequestLabel("reqLabel");
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp");
+
+ msig.getTypes().add(ref);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SendMessageAction) == false) {
+ fail("Action was not SendMessageAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two service expected: "+model.getServices().size());
+ }
+
+ SendMessageAction action=(SendMessageAction)service.getActions().get(0);
+
+ if (action.getPropertyValue(SendMessageAction.SERVICE_CATEGORY_EXPRESSION).
+ equals(InteractionUtil.getRoleServiceCategoryProperty(toRoleName)) == false) {
+ fail("Service category expression '"+
+ action.getPropertyValue(SendMessageAction.SERVICE_CATEGORY_EXPRESSION)+
+ "' invalid, expecting: "+
+ InteractionUtil.getRoleServiceCategoryProperty(toRoleName));
+ }
+
+ if (action.getPropertyValue(SendMessageAction.SERVICE_NAME_EXPRESSION).
+ equals(InteractionUtil.getRoleServiceNameProperty(toRoleName)) == false) {
+ fail("Service name expression '"+
+ action.getPropertyValue(SendMessageAction.SERVICE_NAME_EXPRESSION)+
+ "' invalid, expecting: "+
+ InteractionUtil.getRoleServiceNameProperty(toRoleName));
+ }
+ }
+
+ public void testInsertSendReplyAction() {
+ String fromRoleName="role1";
+ String toRoleName="role2";
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role fromRole=new Role();
+ fromRole.setName(fromRoleName);
+
+ Role toRole=new Role();
+ toRole.setName(toRoleName);
+
+ context.setRole(fromRole);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(fromRole);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setFromRole(fromRole);
+ mobj.setToRole(toRole);
+ conv.getBlock().getContents().add(mobj);
+
+ mobj.setReplyToLabel("replyLabel");
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp");
+
+ msig.getTypes().add(ref);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SendMessageAction) == false) {
+ fail("Action was not SendMessageAction: "+service.getActions().get(0));
+ }
+
+ SendMessageAction action=(SendMessageAction)service.getActions().get(0);
+
+ if (action.getPropertyValue(SendMessageAction.CLIENT_EPR).equals(toRoleName) == false) {
+ fail("Client EPR '"+action.getPropertyValue(SendMessageAction.CLIENT_EPR)+
+ "' invalid, expecting: "+toRoleName);
+ }
+ }
+
+ public void testChangeFirstReceiveAction() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj=new ConversationInteraction();
+ mobj.setToRole(role);
+ conv.getBlock().getContents().add(mobj);
+
+
+ MessageSignature msig=new MessageSignature();
+ mobj.setMessageSignature(msig);
+
+ TypeReference ref=new TypeReference();
+ ref.setNamespace("ns");
+ ref.setLocalpart("lp1");
+
+ msig.getTypes().add(ref);
+
+ // Create ReceiveMessageAction
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action was not ReceiveMessageAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 1) {
+ fail("One service expected: "+model.getServices().size());
+ }
+
+ ReceiveMessageAction action=(ReceiveMessageAction)service.getActions().get(0);
+
+ java.util.List<Activity> activities=new java.util.Vector<Activity>();
+ action.convert(activities, new DefaultConversionContext(null));
+
+ if (activities.size() != 1) {
+ fail("Expecting single interaction activity from ReceiveMessageAction: "+activities.size());
+ }
+
+ if ((activities.get(0) instanceof ConversationInteraction) == false) {
+ fail("Not conversation interaction");
+ }
+
+ ConversationInteraction recvci=(ConversationInteraction)activities.get(0);
+
+ String mtype=InteractionUtil.getTypeString(ref);
+
+ if (action.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+action.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ // Change local part
+ ref.setLocalpart("lp2");
+
+ if (rule.update(context, model, mobj, recvci) == false) {
+ fail("Failed to update");
+ }
+
+ // Re-check the message type, to make sure has been updated
+ mtype = InteractionUtil.getTypeString(ref);
+
+ if (action.getPropertyValue("messageType").equals(mtype)==false) {
+ fail("Message type '"+action.getPropertyValue("messageType")+
+ "' invalid, expecting: "+mtype);
+ }
+
+ if (mra.getNumberOfCases() != 1) {
+ fail("One route expected: "+mra.getNumberOfCases());
+ }
+
+ org.w3c.dom.Element route=mra.getRouteElement(0);
+
+ org.w3c.dom.NodeList mesgs=route.getElementsByTagName(SwitchAction.MESSAGE_ELEMENT);
+
+ if (mesgs.getLength() != 1) {
+ fail("Too many route message elements: "+mesgs.getLength());
+ }
+
+ org.w3c.dom.Element mesg=(org.w3c.dom.Element)mesgs.item(0);
+
+ if (mesg.getAttribute(SwitchAction.TYPE_ATTR).equals(mtype) == false) {
+ fail("Route message type has not been updated");
+ }
+ }
+
+ public void testDeleteMiddleReceiveBetweenTwoActions() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setInitiator(true);
+ act1.setSessionBased(true);
+ service.addAction(act1, -1);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj1=new ConversationInteraction();
+ mobj1.setToRole(role);
+ conv.getBlock().getContents().add(mobj1);
+
+ MessageSignature msig1=new MessageSignature();
+ mobj1.setMessageSignature(msig1);
+
+ TypeReference ref1=new TypeReference();
+ ref1.setNamespace("ns");
+ ref1.setLocalpart("lp1");
+
+ msig1.getTypes().add(ref1);
+
+ if (rule.insert(context, model, mobj1, null) == false) {
+ fail("Failed to insert 1");
+ }
+
+ // Once first interaction associated with service it
+ // will become session based
+ service.setSessionBased(true);
+
+ TestESBAction act2=new TestESBAction();
+ ((ESBService)context.getParent()).addAction(act2, -1);
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if (service.getActions().get(0) != act1) {
+ fail("Action 1 was not test ESB action: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two services expected: "+model.getServices().size());
+ }
+
+ ESBService newService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+ while (newService == null && iter.hasNext()) {
+ ESBService s=iter.next();
+
+ if (s != service) {
+ newService = s;
+ }
+ }
+
+ if (newService == null) {
+ fail("Other service not found");
+ }
+
+ ((TestESBService)newService).setSessionBased(true);
+
+ // Check schedule details
+ ScheduleStateAction schedule=(ScheduleStateAction)
+ service.getActions().get(1);
+
+ if (newService.getCategory().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)) == false) {
+ fail("Schedule service category '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_CATEGORY)+
+ "' invalid, expecting: "+
+ service.getCategory());
+ }
+
+ if (newService.getName().equals(schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)) == false) {
+ fail("Schedule service name '"+
+ schedule.getPropertyValue(
+ ScheduleStateAction.SERVICE_NAME)+
+ "' invalid, expecting: "+
+ service.getName());
+ }
+
+ // Check actions
+ if (newService.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+newService.getActions().size());
+ }
+
+ if ((newService.getActions().get(0) instanceof ReceiveMessageAction) == false) {
+ fail("Action 1 was not ReceiveMessageAction: "+newService.getActions().get(0));
+ }
+
+ if (newService.getActions().get(1) != act2) {
+ fail("Action 2 was not 2nd test ESB action: "+newService.getActions().get(1));
+ }
+
+ ReceiveMessageAction recv=(ReceiveMessageAction)
+ newService.getActions().get(0);
+
+
+ java.util.List<Activity> acts=new java.util.Vector<Activity>();
+
+ DefaultConversionContext convContext=new DefaultConversionContext(role.getName());
+ recv.convert(acts, convContext);
+
+ if (acts.size() != 1) {
+ fail("Expecting 1 activity: "+acts.size());
+ }
+
+ // TODO: Need to pass representation of last interaction
+ if (rule.delete(context, model, acts.get(0)) == false) {
+ fail("Failed to delete receive");
+ }
+
+ // Re-Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if (service.getActions().get(0) != act1) {
+ fail("Action 1 was not test ESB action: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action 2 was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 2) {
+ fail("Two services expected: "+model.getServices().size());
+ }
+
+ // TODO: Need to check if new service has been inserted
+ // in the middle of the previously inserted interactions
+
+ // Check actions
+ if (newService.getActions().size() != 1) {
+ fail("Now Expecting 1 action: "+newService.getActions().size());
+ }
+
+ if (newService.getActions().get(0) != act2) {
+ fail("Action 1 was not 2nd test ESB action: "+newService.getActions().get(0));
+ }
+ }
+
+ public void testDeleteMiddleSendBetweenTwoActions() {
+ ConversationInteractionModelChangeRule rule=new ConversationInteractionModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setInitiator(true);
+ act1.setSessionBased(true);
+ service.addAction(act1, -1);
+
+ // Add gateway service
+ TestESBService gwservice=(TestESBService)
+ model.createService("testcategory", "gateway");
+ gwservice.setGateway(true);
+
+ SwitchAction mra=new SwitchAction(gwservice);
+ gwservice.setGatewayAction(mra);
+
+ model.setGatewayService(gwservice);
+
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ Conversation conv=new Conversation();
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
+
+ ConversationInteraction mobj1=new ConversationInteraction();
+ mobj1.setFromRole(role);
+ conv.getBlock().getContents().add(mobj1);
+
+ MessageSignature msig1=new MessageSignature();
+ mobj1.setMessageSignature(msig1);
+
+ TypeReference ref1=new TypeReference();
+ ref1.setNamespace("ns");
+ ref1.setLocalpart("lp1");
+
+ msig1.getTypes().add(ref1);
+
+ if (rule.insert(context, model, mobj1, null) == false) {
+ fail("Failed to insert 1");
+ }
+
+ // Once first interaction associated with service it
+ // will become session based
+ service.setSessionBased(true);
+
+ TestESBAction act2=new TestESBAction();
+ ((ESBService)context.getParent()).addAction(act2, -1);
+
+ // Check actions
+ if (service.getActions().size() != 3) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if (service.getActions().get(0) != act1) {
+ fail("Action 1 was not test ESB action: "+service.getActions().get(0));
+ }
+
+ if ((service.getActions().get(1) instanceof SendMessageAction) == false) {
+ fail("Action 2 was not SendMessageAction: "+service.getActions().get(1));
+ }
+
+ if (service.getActions().get(2) != act2) {
+ fail("Action 3 was not 2nd test ESB action: "+service.getActions().get(2));
+ }
+
+ if (model.getServices().size() != 1) {
+ fail("One service expected: "+model.getServices().size());
+ }
+
+
+ SendMessageAction send=(SendMessageAction)
+ service.getActions().get(1);
+
+ java.util.List<Activity> acts=new java.util.Vector<Activity>();
+
+ DefaultConversionContext convContext=new DefaultConversionContext(role.getName());
+ send.convert(acts, convContext);
+
+ if (acts.size() != 1) {
+ fail("Expecting 1 activity: "+acts.size());
+ }
+
+ // TODO: Need to pass representation of last interaction
+ if (rule.delete(context, model, acts.get(0)) == false) {
+ fail("Failed to delete send");
+ }
+
+ // Re-Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if (service.getActions().get(0) != act1) {
+ fail("Action 1 was not test ESB action: "+service.getActions().get(0));
+ }
+
+ if (service.getActions().get(1) != act2) {
+ fail("Action 2 was not 2nd test ESB action: "+service.getActions().get(1));
+ }
+ }
+
+ */
+}
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRuleTest.java (from rev 784, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/IfModelChangeRuleTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRuleTest.java (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/IfModelChangeRuleTest.java 2009-08-21 21:09:21 UTC (rev 794)
@@ -0,0 +1,1071 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model.change;
+
+import junit.framework.TestCase;
+
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.IfModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.actions.*;
+import org.scribble.model.*;
+import org.scribble.model.change.*;
+import org.scribble.conversation.model.*;
+
+public class IfModelChangeRuleTest extends TestCase {
+
+ public void testInsertIfAction() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ If mobj=new If();
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ mobj.getRoles().add(role);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof IfAction) == false) {
+ fail("Action was not IfAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 3) {
+ fail("Three services expected: "+model.getServices().size());
+ }
+
+ ESBService ifService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while (ifService == null && iter.hasNext()) {
+ ifService = iter.next();
+ if (ifService == service) {
+ ifService = null;
+ }
+ }
+
+ IfAction action=(IfAction)service.getActions().get(0);
+
+ org.w3c.dom.NodeList paths=action.getPropertyChildNodes("paths");
+
+ if (paths.getLength() != 1) {
+ fail("Only one path child expected: "+paths.getLength());
+ }
+
+ org.w3c.dom.Element elem=(org.w3c.dom.Element)paths.item(0);
+
+ if (elem.getNodeName().equals("if") == false) {
+ fail("If expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(ifService.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+ifService.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(ifService.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+ifService.getName());
+ }
+ }
+
+ public void testInsertIfActionWithSubsequentActions() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestESBAction act1=new TestESBAction();
+ service.addAction(act1, -1);
+
+ ModelObject ref=new ModelObject() {};
+ ref.getSource().setObject(act1);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ If mobj=new If();
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ mobj.getRoles().add(role);
+
+ if (rule.insert(context, model, mobj, ref) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof IfAction) == false) {
+ fail("Action was not IfAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 3) {
+ fail("Three services expected: "+model.getServices().size());
+ }
+
+ ESBService ifService=null;
+ ESBService join=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while ((ifService == null || join == null) && iter.hasNext()) {
+ ESBService s = iter.next();
+ if (s != service) {
+ if (ifService == null) {
+ ifService = s;
+ } else if (join == null) {
+ join = s;
+ }
+ }
+ }
+
+ if (join.getActions().size() != 1) {
+ fail("Join service does not have 1 action: "+join.getActions().size());
+ }
+
+ if (join.getActions().get(0) != act1) {
+ fail("Join action is not test ESB action");
+ }
+ }
+
+ public void testInsertIfActionWithPrecedingActions() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestESBAction act1=new TestESBAction();
+ service.addAction(act1, -1);
+
+ TestESBAction act2=new TestESBAction();
+ service.addAction(act2, -1);
+
+ ModelObject ref=new ModelObject() {};
+ ref.getSource().setObject(act2);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ If mobj=new If();
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ mobj.getRoles().add(role);
+
+ if (rule.insert(context, model, mobj, ref) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 actions: "+service.getActions().size());
+ }
+
+ if (service.getActions().get(0) != act1) {
+ fail("Action 1 was not test ESB action");
+ }
+
+ if ((service.getActions().get(1) instanceof IfAction) == false) {
+ fail("Action 2 was not IfAction: "+service.getActions().get(1));
+ }
+
+ if (model.getServices().size() != 3) {
+ fail("Three services expected: "+model.getServices().size());
+ }
+
+ ESBService ifService=null;
+ ESBService join=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while ((ifService == null || join == null) && iter.hasNext()) {
+ ESBService s = iter.next();
+ if (s != service) {
+ if (ifService == null) {
+ ifService = s;
+ } else if (join == null) {
+ join = s;
+ }
+ }
+ }
+
+ if (join.getActions().size() != 1) {
+ fail("Join service does not have 1 action: "+join.getActions().size());
+ }
+
+ if (join.getActions().get(0) != act2) {
+ fail("Join action is not test ESB action");
+ }
+ }
+
+/*
+ public void testInsertIfElseIfAction() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ If mobj=new If();
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ ConditionalBlock cb2=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb2);
+
+ ConditionalBlock cb3=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb3);
+
+ mobj.getRoles().add(role);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof IfAction) == false) {
+ fail("Action was not IfAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 5) {
+ fail("Five services expected: "+model.getServices().size());
+ }
+
+ ESBService ifService=null;
+ ESBService elseIfService1=null;
+ ESBService elseIfService2=null;
+ ESBService join=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while ((ifService == null || elseIfService1 == null ||
+ elseIfService2 == null || join==null) && iter.hasNext()) {
+ ESBService serv = iter.next();
+ if (serv.getName().endsWith("__0")) {
+ join = serv;
+ }
+ if (serv.getName().endsWith("__1")) {
+ ifService = serv;
+ }
+ if (serv.getName().endsWith("__2")) {
+ elseIfService1 = serv;
+ }
+ if (serv.getName().endsWith("__3")) {
+ elseIfService2 = serv;
+ }
+ }
+
+ IfAction action=(IfAction)service.getActions().get(0);
+
+ org.w3c.dom.NodeList paths=action.getPropertyChildNodes("paths");
+
+ if (paths.getLength() != 3) {
+ fail("Three path children expected: "+paths.getLength());
+ }
+
+ org.w3c.dom.Element elem=(org.w3c.dom.Element)paths.item(0);
+
+ if (elem.getNodeName().equals("if") == false) {
+ fail("If expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(ifService.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+ifService.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(ifService.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+ifService.getName());
+ }
+
+ if (ifService.getActions().size() != 1) {
+ fail("Path(1) does not have 1 action: "+ifService.getActions().size());
+ }
+
+ if ((ifService.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+ifService.getActions().get(0));
+ }
+
+ ScheduleStateAction schedule=(ScheduleStateAction)ifService.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+
+ elem=(org.w3c.dom.Element)paths.item(1);
+
+ if (elem.getNodeName().equals("elseif") == false) {
+ fail("ElseIf expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(elseIfService1.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+elseIfService1.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(elseIfService1.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+elseIfService1.getName());
+ }
+
+ if (elseIfService1.getActions().size() != 1) {
+ fail("Path(2) does not have 1 action: "+elseIfService1.getActions().size());
+ }
+
+ if ((elseIfService1.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+elseIfService1.getActions().get(0));
+ }
+
+ schedule=(ScheduleStateAction)elseIfService1.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+
+ elem=(org.w3c.dom.Element)paths.item(2);
+
+ if (elem.getNodeName().equals("elseif") == false) {
+ fail("ElseIf(2) expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(elseIfService2.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+elseIfService2.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(elseIfService2.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+elseIfService2.getName());
+ }
+
+ if (elseIfService2.getActions().size() != 1) {
+ fail("Path(3) does not have 1 action: "+elseIfService2.getActions().size());
+ }
+
+ if ((elseIfService2.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+elseIfService2.getActions().get(0));
+ }
+
+ schedule=(ScheduleStateAction)elseIfService2.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+ }
+
+ public void testInsertIfElseAction() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role=new Role();
+ role.setName("role1");
+
+ context.setRole(role);
+
+ If mobj=new If();
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ Block b1=new Block();
+ mobj.setElseBlock(b1);
+
+ mobj.getRoles().add(role);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof IfAction) == false) {
+ fail("Action was not IfAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 4) {
+ fail("Four services expected: "+model.getServices().size());
+ }
+
+ ESBService ifService=null;
+ ESBService elseService=null;
+ ESBService join=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while ((ifService == null || elseService == null ||
+ join == null) && iter.hasNext()) {
+ ESBService serv = iter.next();
+ if (serv.getName().endsWith("__0")) {
+ join = serv;
+ }
+ if (serv.getName().endsWith("__1")) {
+ ifService = serv;
+ }
+ if (serv.getName().endsWith("__2")) {
+ elseService = serv;
+ }
+ }
+
+ IfAction action=(IfAction)service.getActions().get(0);
+
+ org.w3c.dom.NodeList paths=action.getPropertyChildNodes("paths");
+
+ if (paths.getLength() != 2) {
+ fail("Three path children expected: "+paths.getLength());
+ }
+
+ org.w3c.dom.Element elem=(org.w3c.dom.Element)paths.item(0);
+
+ if (elem.getNodeName().equals("if") == false) {
+ fail("If expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(ifService.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+ifService.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(ifService.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+ifService.getName());
+ }
+
+ if (ifService.getActions().size() != 1) {
+ fail("Path(1) does not have 1 action: "+ifService.getActions().size());
+ }
+
+ if ((ifService.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+ifService.getActions().get(0));
+ }
+
+ ScheduleStateAction schedule=(ScheduleStateAction)ifService.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+
+ elem=(org.w3c.dom.Element)paths.item(1);
+
+ if (elem.getNodeName().equals("else") == false) {
+ fail("Else expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(elseService.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+elseService.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(elseService.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+elseService.getName());
+ }
+
+ if (elseService.getActions().size() != 1) {
+ fail("Path(2) does not have 1 action: "+elseService.getActions().size());
+ }
+
+ if ((elseService.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+elseService.getActions().get(0));
+ }
+
+ schedule=(ScheduleStateAction)ifService.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+
+ }
+
+ public void testInsertSwitchAction() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ org.scribble.extensions.TestSingleExtensionRegistry reg=
+ new org.scribble.extensions.TestSingleExtensionRegistry(null);
+ org.scribble.extensions.RegistryFactory.setRegistry(reg);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role1=new Role();
+ role1.setName("role1");
+
+ Role role2=new Role();
+ role2.setName("role2");
+
+ context.setRole(role1);
+
+ If mobj=new If();
+
+ mobj.getRoles().add(role2);
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SwitchAction) == false) {
+ fail("Action was not SwitchAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 3) {
+ fail("Three services expected: "+model.getServices().size());
+ }
+
+ ESBService switchService=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while (switchService == null && iter.hasNext()) {
+ switchService = iter.next();
+ if (switchService == service) {
+ switchService = null;
+ }
+ }
+
+ SwitchAction action=(SwitchAction)service.getActions().get(0);
+
+ org.w3c.dom.NodeList paths=action.getPropertyChildNodes("paths");
+
+ if (paths.getLength() != 1) {
+ fail("Only one path child expected: "+paths.getLength());
+ }
+
+ org.w3c.dom.Element elem=(org.w3c.dom.Element)paths.item(0);
+
+ if (elem.getNodeName().equals("case") == false) {
+ fail("Switch expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(switchService.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+switchService.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(switchService.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+switchService.getName());
+ }
+ }
+
+ public void testInsertSwitchMultipleCaseAction() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ org.scribble.extensions.TestSingleExtensionRegistry reg=
+ new org.scribble.extensions.TestSingleExtensionRegistry(null);
+ org.scribble.extensions.RegistryFactory.setRegistry(reg);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role1=new Role();
+ role1.setName("role1");
+
+ Role role2=new Role();
+ role2.setName("role2");
+
+ context.setRole(role1);
+
+ If mobj=new If();
+
+ mobj.getRoles().add(role2);
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ ConditionalBlock cb2=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb2);
+
+ Block b1=new Block();
+ mobj.setElseBlock(b1);
+
+ if (rule.insert(context, model, mobj, null) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SwitchAction) == false) {
+ fail("Action was not SwitchAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 5) {
+ fail("Five services expected: "+model.getServices().size());
+ }
+
+ ESBService join=null;
+ ESBService caseService1=null;
+ ESBService caseService2=null;
+ ESBService caseService3=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while ((caseService1 == null || caseService2 == null ||
+ caseService3 == null || join == null) && iter.hasNext()) {
+ ESBService serv = iter.next();
+ if (serv.getName().endsWith("__0")) {
+ join = serv;
+ }
+ if (serv.getName().endsWith("__1")) {
+ caseService1 = serv;
+ }
+ if (serv.getName().endsWith("__2")) {
+ caseService2 = serv;
+ }
+ if (serv.getName().endsWith("__3")) {
+ caseService3 = serv;
+ }
+ }
+
+ SwitchAction action=(SwitchAction)service.getActions().get(0);
+
+ org.w3c.dom.NodeList paths=action.getPropertyChildNodes("paths");
+
+ if (paths.getLength() != 3) {
+ fail("Three path children expected: "+paths.getLength());
+ }
+
+ org.w3c.dom.Element elem=(org.w3c.dom.Element)paths.item(0);
+
+ if (elem.getNodeName().equals("case") == false) {
+ fail("If expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(caseService1.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+caseService1.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(caseService1.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+caseService1.getName());
+ }
+
+ if (caseService1.getActions().size() != 1) {
+ fail("Path(1) does not have 1 action: "+caseService1.getActions().size());
+ }
+
+ if ((caseService1.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+caseService1.getActions().get(0));
+ }
+
+ ScheduleStateAction schedule=(ScheduleStateAction)caseService1.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+
+ elem=(org.w3c.dom.Element)paths.item(1);
+
+ if (elem.getNodeName().equals("case") == false) {
+ fail("Else expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(caseService2.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+caseService2.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(caseService2.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+caseService2.getName());
+ }
+
+ if (caseService2.getActions().size() != 1) {
+ fail("Path(2) does not have 1 action: "+caseService2.getActions().size());
+ }
+
+ if ((caseService2.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+caseService2.getActions().get(0));
+ }
+
+ schedule=(ScheduleStateAction)caseService2.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+
+ elem=(org.w3c.dom.Element)paths.item(2);
+
+ if (elem.getNodeName().equals("case") == false) {
+ fail("Else expected but got: "+elem.getNodeName());
+ }
+
+ if (elem.getAttribute("service-category").equals(caseService3.getCategory()) == false) {
+ fail("Service category '"+elem.getAttribute("service-category")+
+ "' not expected: "+caseService3.getCategory());
+ }
+
+ if (elem.getAttribute("service-name").equals(caseService3.getName()) == false) {
+ fail("Service name '"+elem.getAttribute("service-name")+
+ "' not expected: "+caseService3.getName());
+ }
+
+ if (caseService3.getActions().size() != 1) {
+ fail("Path(3) does not have 1 action: "+caseService3.getActions().size());
+ }
+
+ if ((caseService3.getActions().get(0) instanceof ScheduleStateAction) == false) {
+ fail("Action not schedule state: "+caseService3.getActions().get(0));
+ }
+
+ schedule=(ScheduleStateAction)caseService3.getActions().get(0);
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY).
+ equals(join.getCategory()) == false) {
+ fail("Schedule cateogry is not join '"+join.getCategory()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY));
+ }
+
+ if (schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME).
+ equals(join.getName()) == false) {
+ fail("Schedule name is not join '"+join.getName()+"': "+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+ }
+ }
+
+ public void testInsertSwitchActionWithSubsequentActions() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ org.scribble.extensions.TestSingleExtensionRegistry reg=
+ new org.scribble.extensions.TestSingleExtensionRegistry(null);
+ org.scribble.extensions.RegistryFactory.setRegistry(reg);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestESBAction act1=new TestESBAction();
+ service.addAction(act1, -1);
+
+ ModelObject ref=new ModelObject() {};
+ ref.getSource().setObject(act1);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role1=new Role();
+ role1.setName("role1");
+
+ Role role2=new Role();
+ role2.setName("role2");
+
+ context.setRole(role1);
+
+ If mobj=new If();
+
+ mobj.getRoles().add(role2);
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ if (rule.insert(context, model, mobj, ref) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((service.getActions().get(0) instanceof SwitchAction) == false) {
+ fail("Action was not SwitchAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 3) {
+ fail("Three services expected: "+model.getServices().size());
+ }
+
+ ESBService switchService=null;
+ ESBService join=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while ((switchService == null || join == null) && iter.hasNext()) {
+ ESBService s = iter.next();
+ if (s != service) {
+ if (switchService == null) {
+ switchService = s;
+ } else if (join == null) {
+ join = s;
+ }
+ }
+ }
+
+ if (join.getActions().size() != 1) {
+ fail("Join service does not have 1 action: "+join.getActions().size());
+ }
+
+ if (join.getActions().get(0) != act1) {
+ fail("Join action is not test ESB action");
+ }
+ }
+
+ public void testInsertSwitchActionWithPrecedingActions() {
+ IfModelChangeRule rule=new IfModelChangeRule();
+
+ org.scribble.extensions.TestSingleExtensionRegistry reg=
+ new org.scribble.extensions.TestSingleExtensionRegistry(null);
+ org.scribble.extensions.RegistryFactory.setRegistry(reg);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+
+ TestESBService service=(TestESBService)
+ model.createService("testcategory", "testname");
+
+ model.addService(service);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setInitiator(true);
+ act1.setSessionBased(true);
+ service.addAction(act1, -1);
+
+ TestESBAction act2=new TestESBAction();
+ service.addAction(act2, -1);
+
+ ModelObject ref=new ModelObject() {};
+ ref.getSource().setObject(act2);
+
+ TestModelChangeContext context=new TestModelChangeContext();
+ context.setParent(service);
+
+ Role role1=new Role();
+ role1.setName("role1");
+
+ Role role2=new Role();
+ role2.setName("role2");
+
+ context.setRole(role1);
+
+ If mobj=new If();
+
+ mobj.getRoles().add(role2);
+
+ ConditionalBlock cb1=new ConditionalBlock();
+ mobj.getConditionalBlocks().add(cb1);
+
+ if (rule.insert(context, model, mobj, ref) == false) {
+ fail("Failed to insert");
+ }
+
+ // Check actions
+ if (service.getActions().size() != 2) {
+ fail("Expecting 2 action: "+service.getActions().size());
+ }
+
+ if (service.getActions().get(0) != act1) {
+ fail("First action not test ESB action");
+ }
+
+ if ((service.getActions().get(1) instanceof ScheduleStateAction) == false) {
+ fail("Action was not ScheduleStateAction: "+service.getActions().get(1));
+ }
+
+ ScheduleStateAction schedule=(ScheduleStateAction)service.getActions().get(1);
+
+ ESBService addedService=model.getService(
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY),
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME));
+
+ if (addedService == null) {
+ fail("Failed to find service '"+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_CATEGORY)+"' '"+
+ schedule.getPropertyValue(ScheduleStateAction.SERVICE_NAME)+"'");
+ }
+
+ if (addedService.getActions().size() != 1) {
+ fail("Expecting 1 action: "+service.getActions().size());
+ }
+
+ if ((addedService.getActions().get(0) instanceof SwitchAction) == false) {
+ fail("Action was not SwitchAction: "+service.getActions().get(0));
+ }
+
+ if (model.getServices().size() != 4) {
+ fail("Four services expected: "+model.getServices().size());
+ }
+
+ ESBService join=null;
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while (join == null && iter.hasNext()) {
+ ESBService serv = iter.next();
+ if (serv.getName().endsWith("__0")) {
+ join = serv;
+ }
+ }
+
+ if (join.getActions().size() != 1) {
+ fail("Join service does not have 1 action: "+join.getActions().size());
+ }
+
+ if (join.getActions().get(0) != act2) {
+ fail("Join action is not test ESB action");
+ }
+ }
+*/
+}
14 years, 8 months
- 1
- 0
Overlord SVN: r793 - in cdl/trunk/samples/jbossesb: brokerage/broker/src and 23 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-21 06:10:51 -0400 (Fri, 21 Aug 2009)
New Revision: 793
Added:
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/
cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/
cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java
Removed:
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/samples/
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/samples/
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/
Modified:
cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml
cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
Log:
* SOAG-114
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
<artifactId>jbossesb-broker</artifactId>
- <packaging>jboss-esb</packaging>
+ <packaging>jar</packaging>
<name>Savara::Samples::Broker</name>
<url>http://www.jboss.org/overlord</url>
@@ -18,13 +18,11 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.savara.runtime</groupId>
- <artifactId>jbossesb</artifactId>
- <version>${project.version}</version>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -32,26 +30,25 @@
<build>
<finalName>broker</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!--Deploy esb artifact to JBoss AS/ESB -->
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <!--copy file="target/broker-stateless.esb" todir="${deploy.dir}" overwrite="true" /-->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>esb</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>broker.esb</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/scripts/esb-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.savara.jbossesb.EPRStore;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStore {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryStore {
+
+ private static int counter = 0;
+
+ public static void increaseCounter() {
+ counter = counter + 1;
+ }
+
+ public static void decreaseCounter() {
+ counter = counter - 1;
+ }
+
+ public static int getCounter() {
+ return counter;
+ }
+
+ public static void reset() {
+ counter = 0;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import java.io.Serializable;
+
+
+
+public class Quote implements Serializable {
+
+ private static final long serialVersionUID = 3234324947672128469L;
+
+ private String value;
+
+ private String serviceDescription;
+
+ public String getServiceDescription() {
+ return serviceDescription;
+ }
+
+ public void setServiceDescription(String serviceDescription) {
+ this.serviceDescription = serviceDescription;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+public class ResetMemoryStoreAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(ResetMemoryStoreAction.class);
+
+ private ConfigTree config;
+
+ public ResetMemoryStoreAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+ MemoryStore.reset();
+ logger.info("Reseting the memory store counter to 0");
+ return(message);
+ }
+
+}
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.jbossesb.Decision;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class SendReqForQuoteDecision implements Decision {
+
+ private final int DEFAULT = 1;
+
+ private Logger logger = Logger.getLogger(SendReqForQuoteDecision.class);
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.overlord.jbossesb.Decision#executeDecision(org.jboss.soa.esb.message.Message)
+ */
+ public boolean executeDecision(Message message) {
+ if (DEFAULT > MemoryStore.getCounter()) {
+ logger.info("The decision is true");
+ return true;
+ }
+ logger.info("The decision is false");
+ return false;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetCreditCheckRequestMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetCreditCheckRequestMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>");
+
+ logger.info("Updated credit check request message: "+message.getBody().get());
+
+ return(message);
+ }
+
+}
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetOrderConfirmRequestAction extends AbstractActionLifecycle {
+
+ public static Logger logger = Logger.getLogger(SetOrderConfirmRequestAction.class);
+
+ private ConfigTree config;
+
+ public SetOrderConfirmRequestAction(ConfigTree config){
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+
+ message.getBody().add("<orderConfirmed id=\"" + idValue +"\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\" quoteValue=\"10\">" +
+ "</orderConfirmed>");
+
+ logger.info(message.getBody().get());
+
+ return message;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetOrderRejectMessageAction extends AbstractActionLifecycle {
+
+ public static Logger logger = Logger.getLogger(SetOrderRejectMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetOrderRejectMessageAction(ConfigTree config){
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+
+ message.getBody().add("<orderRejected id=\"" + idValue + "\">Credit Card is invalid!</orderRejected>");
+
+ logger.info(message.getBody().get());
+
+ return message;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ *
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class SetQuoteAction extends AbstractActionLifecycle {
+
+ private Logger logger = Logger.getLogger(SetQuoteAction.class);
+
+ private ConfigTree config;
+
+ public SetQuoteAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String quoteValue = node.getTextContent();
+ String desc = node.getAttributes().getNamedItem("supplierDesc").getNodeValue();
+
+ List<Quote> quotes = (List<Quote>)message.getProperties().getProperty("quotes");
+ if (quotes == null) {
+ quotes = new ArrayList<Quote>();
+ }
+
+ Quote quote = new Quote();
+ quote.setServiceDescription(desc);
+ quote.setValue(quoteValue);
+
+ quotes.add(quote);
+
+ message.getProperties().setProperty("quotes", quotes);
+
+ MemoryStore.increaseCounter();
+
+ logger.info("set quote message :[" + node + "]");
+
+ return message;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetQuotesListAction extends AbstractActionLifecycle {
+
+ private Logger logger = Logger.getLogger(SetQuotesListAction.class);
+
+ private ConfigTree config;
+
+ public SetQuotesListAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+
+ List<Quote> quotes = (List<Quote>)message.getProperties().getProperty("quotes");
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+
+ StringBuffer sbuffer = new StringBuffer();
+ sbuffer.append("<quoteList id=\"" + idValue + "\">");
+
+ for(Quote quote : quotes) {
+ sbuffer.append("<quote supplierDesc=\"" + quote.getServiceDescription() + "\">");
+ sbuffer.append(quote.getValue());
+ sbuffer.append("</quote>");
+ }
+
+ sbuffer.append("</quoteList>");
+
+ message.getBody().add(sbuffer.toString());
+
+ logger.info("set quote list message :[" + sbuffer.toString() + "]");
+
+ return message;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetRequestQuoteMessageAction extends AbstractActionLifecycle {
+
+ public static Logger logger = Logger.getLogger(SetRequestQuoteMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetRequestQuoteMessageAction(ConfigTree config){
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+
+ String serviceDescription = (String)message.getProperties().getProperty("serviceDescriptionName");
+
+ message.getBody().add("<requestForQuote id=\"" + idValue +"\" supplierDesc=\"" + serviceDescription+ "\" ></requestForQuote>");
+
+ logger.info("Set 'requestForQuote' : " + message.getBody().get());
+
+ return message;
+ }
+
+}
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -1,17 +1,18 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_checkCredit</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3</depends>
+ <depends>jboss.esb:deployment=savara-runtime-jbossesb.esb</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_checkCredit</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker_reply</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11</depends>
</jbossesb-deployment>
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 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -2,229 +2,225 @@
<providers>
<jms-provider connection-factory="ConnectionFactory" jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory" name="JBossMQ">
<jms-bus busid="busId1">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId2">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId3">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId4">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId5">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId6">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId7">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId8">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId9">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId10">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId11">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId12">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId13">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId14">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_checkCredit" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_checkCredit" dest-type="QUEUE"/>
</jms-bus>
</jms-provider>
</providers>
- <services>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker">
+ <services>
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker">
<listeners>
- <jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker"/>
+ <jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_Broker_action_1" process="process">
- <property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-Broker"/>
- <property name="conversationType" value="overlord.cdl.samples.LoanBroker@Broker"/>
+ <property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-Broker"/>
+ <property name="conversationType" value="savara.samples.LoanBroker@Broker"/>
<property name="paths">
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__1">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__1">
<message type="enquiry"/>
</case>
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__7">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__7">
<event description="Event trigger to send quoteList message type(s)"/>
</case>
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__8">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__8">
<message type="buy"/>
</case>
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__12">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__12">
<message type="cancel"/>
</case>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__1">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__1">
<listeners>
- <jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__1"/>
+ <jms-listener busidref="busId2" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__1"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__1_action_1" process="process">
<property name="operation" value="makeEnquiry"/>
<property name="messageType" value="enquiry"/>
<property name="clientRole" value="Buyer"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
- <action class="org.jboss.savara.samples.jbossesb.loan.broker.ResetMemoryStoreAction" name="resetMemoryStore" process="process">
+ <action class="org.jboss.savara.examples.broker.ResetMemoryStoreAction" name="resetMemoryStore" process="process">
</action>
<action class="org.jboss.savara.jbossesb.actions.IfAction" name="ESBBrokerProcess_Broker__1_action_2" process="process">
<property name="paths">
- <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__2" decision-class="org.jboss.savara.samples.jbossesb.loan.broker.SendReqForQuoteDecision"/>
- <else service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__3"/>
+ <if service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__2" decision-class="org.jboss.savara.examples.broker.SendReqForQuoteDecision"/>
+ <else service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__3"/>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__2">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__2">
<listeners>
- <jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__2"/>
+ <jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__2"/>
</listeners>
- <actions mep="OneWay">
- <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
- </action>
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__2_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
- <property name="serviceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+ <property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="serviceName" value="ESBBrokerProcess_SupplierQuoteEngine"/>
- <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+ <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="responseServiceName" value="getQuote"/>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__3">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__3">
<listeners>
- <jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__3"/>
+ <jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__3"/>
</listeners>
- <actions mep="OneWay">
- <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-13" process="process">
+ <actions>
+ <action class="org.jboss.savara.examples.broker.SetRequestQuoteMessageAction" name="b-13" process="process">
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="getQuote">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="getQuote">
<listeners>
- <jms-listener busidref="busId5" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__4"/>
+ <jms-listener busidref="busId5" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__4"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__4_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="quote"/>
</action>
- <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetQuoteAction" name="b-2" process="process">
+ <action class="org.jboss.savara.examples.broker.SetQuoteAction" name="b-2" process="process">
</action>
<action class="org.jboss.savara.jbossesb.actions.IfAction" name="ESBBrokerProcess_Broker__4_action_2" process="process">
<property name="paths">
- <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__5" decision-class="org.jboss.savara.samples.jbossesb.loan.broker.SendReqForQuoteDecision"/>
- <else service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__7"/>
+ <if service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__5" decision-class="org.jboss.savara.examples.broker.SendReqForQuoteDecision"/>
+ <else service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__6"/>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__5">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__5">
<listeners>
- <jms-listener busidref="busId6" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__5"/>
+ <jms-listener busidref="busId6" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__5"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__5_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
- <property name="serviceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+ <property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="serviceName" value="ESBBrokerProcess_SupplierQuoteEngine"/>
- <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+ <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="responseServiceName" value="getQuote"/>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__6">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__6">
<listeners>
- <jms-listener busidref="busId7" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__6"/>
+ <jms-listener busidref="busId7" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__6"/>
</listeners>
<actions mep="OneWay">
- <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
+ <action class="org.jboss.savara.examples.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__7">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__7">
<listeners>
- <jms-listener busidref="busId8" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__7"/>
+ <jms-listener busidref="busId8" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__7"/>
</listeners>
- <actions mep="OneWay">
- <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetQuotesListAction" name="b-3" process="process">
- </action>
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__7_action_1" process="process">
<property name="operation" value="makeEnquiry"/>
<property name="messageType" value="quoteList"/>
<property name="clientRole" value="Buyer"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__8">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__8">
<listeners>
- <jms-listener busidref="busId9" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__8"/>
+ <jms-listener busidref="busId9" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__8"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__8_action_1" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="buy"/>
<property name="clientRole" value="Buyer"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
- <action name="creditCheck-Request" class="org.jboss.savara.samples.jbossesb.loan.broker.SetCreditCheckRequestMessageAction" >
+ <action name="creditCheck-Request" class="org.jboss.savara.examples.broker.SetCreditCheckRequestMessageAction" >
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__8_action_2" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
- <property name="serviceCategory" value="org.pi4soa.purchase.purchasegoods"/>
+ <property name="serviceCategory" value="org.jboss.savara.examples.purchasegoods"/>
<property name="serviceName" value="PurchaseGoodsProcess_CreditAgency"/>
- <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+ <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="responseServiceName" value="checkCredit"/>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__9">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__9">
<listeners>
- <jms-listener busidref="busId10" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__9"/>
+ <jms-listener busidref="busId10" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__9"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__9_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckOk"/>
</action>
- <action name="set-orderConfirm" class="org.jboss.savara.samples.jbossesb.loan.broker.SetOrderConfirmRequestAction">
+ <action name="set-orderConfirm" class="org.jboss.savara.examples.broker.SetOrderConfirmRequestAction">
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__9_action_2" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="orderConfirmed"/>
- <property name="serviceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+ <property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="serviceName" value="ESBBrokerProcess_SupplierTxnProcessor"/>
- <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+ <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="responseServiceName" value="confirm"/>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="confirm">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="confirm">
<listeners>
- <jms-listener busidref="busId11" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__10"/>
+ <jms-listener busidref="busId11" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__10"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__10_action_1" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="bookingReference"/>
@@ -233,55 +229,54 @@
<property name="operation" value="buy"/>
<property name="messageType" value="bookingReference"/>
<property name="clientRole" value="Buyer"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__11">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__11">
<listeners>
- <jms-listener busidref="busId12" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__11"/>
+ <jms-listener busidref="busId12" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__11"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__11_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
</action>
- <action name="set-orderRejected" class="org.jboss.savara.samples.jbossesb.loan.broker.SetOrderRejectMessageAction"></action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__11_action_2" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="orderRejected"/>
- <property name="clientRole" value="Buyer"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+ <property name="clientRole" value="Buyer"/>
+ <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__12">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__12">
<listeners>
- <jms-listener busidref="busId13" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__12"/>
+ <jms-listener busidref="busId13" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__12"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__12_action_1" process="process">
<property name="operation" value="cancel"/>
<property name="messageType" value="cancel"/>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="checkCredit">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="checkCredit">
<listeners>
- <jms-listener busidref="busId14" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-checkCredit"/>
+ <jms-listener busidref="busId14" maxThreads="1" name="org.jboss.savara.examples.esbbroker-checkCredit"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="checkCredit_action_1" process="process">
<property name="paths">
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__9">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__9">
<message type="CreditCheckOk"/>
</case>
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__11">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__11">
<message type="CreditCheckInvalid"/>
</case>
</property>
</action>
</actions>
- </service>
+ </service>
</services>
</jbossesb>
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -1,91 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_checkCredit"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_checkCredit"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker_reply"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker_reply"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -1,90 +1,90 @@
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_checkCredit">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker_reply">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
- </depends>
+ </depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_checkCredit">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker_reply">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>esb</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>jbmq-queue-service.xml</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2009-08-21 10:10:51 UTC (rev 793)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Cp1252"?>
-<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.3" targetNamespace="http://www.pi4soa.org/ESBBroker">
+<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.3" targetNamespace="http://www.jboss.org/savara/examples">
<typeDefinitions>
- <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/>
+ <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.jboss.org/savara/examples"/>
<nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
<informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/>
<informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/>
@@ -33,13 +33,13 @@
<relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/>
<relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/>
<participantTypes description="This is the participant type Broker" name="Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0">
- <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Broker" name="conversationType"/>
+ <semanticAnnotations annotation="savara.samples.LoanBroker@Broker" name="conversationType"/>
</participantTypes>
<participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1">
- <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Buyer" name="conversationType"/>
+ <semanticAnnotations annotation="savara.samples.LoanBroker@Buyer" name="conversationType"/>
</participantTypes>
<participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.2">
- <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/>
+ <semanticAnnotations annotation="savara.samples.Common@CreditAgency" name="conversationType"/>
</participantTypes>
<participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3">
<semanticAnnotations annotation="" name="conversationType"/>
@@ -51,7 +51,7 @@
<choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
<enclosedChoreographies name="CompleteTransaction">
<participantDefinitions name="SupplierTxnProcessor" roleTypes="//@typeDefinitions/(a)roleTypes.3">
- <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="conversationType"/>
+ <semanticAnnotations annotation="savara.samples.LoanBroker@SupplierTxnProcessor" name="conversationType"/>
</participantDefinitions>
<variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" free="true" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/>
<variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.1"/>
@@ -87,7 +87,7 @@
</enclosedChoreographies>
<enclosedChoreographies name="RequestForQuote">
<participantDefinitions name="SupplierQuoteEngine" roleTypes="//@typeDefinitions/(a)roleTypes.3">
- <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="conversationType"/>
+ <semanticAnnotations annotation="savara.samples.LoanBroker@SupplierQuoteEngine" name="conversationType"/>
</participantDefinitions>
<variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/>
<activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.1/(a)participantDefinitions.0">
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
<artifactId>jbossesb-supplier</artifactId>
- <packaging>jboss-esb</packaging>
+ <packaging>jar</packaging>
<name>Savara::Samples::Supplier</name>
<url>http://www.jboss.org/overlord</url>
@@ -18,13 +18,11 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.savara.runtime</groupId>
- <artifactId>jbossesb</artifactId>
- <version>${project.version}</version>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<scope>provided</scope>
</dependency>
@@ -33,25 +31,25 @@
<build>
<finalName>supplier</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!--Deploy esb artifact to JBoss AS/ESB -->
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <!--copy file="target/supplier-stateless.esb" todir="${deploy.dir}" overwrite="true" /-->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>esb</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>supplier.esb</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/scripts/esb-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.supplier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.savara.jbossesb.EPRStore;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStore {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,43 @@
+package org.jboss.savara.examples.supplier;
+
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetOrderConfirmResponseAction extends AbstractActionLifecycle {
+
+ private Logger logger = Logger.getLogger(SetOrderConfirmResponseAction.class);
+
+ private ConfigTree config;
+
+ public SetOrderConfirmResponseAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ String quoteValue = node.getAttributes().getNamedItem("quoteValue").getNodeValue();
+
+ String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1";
+ String confirmation = "The quote of " + quoteValue + " has been confirmed.";
+
+ String body = "<bookingReference id=\"" + idValue + "\" supplierDesc = \""
+ + supplierDesc+ "\">"+confirmation +"</bookingReference>";
+
+ message.getBody().add(body);
+
+ logger.info("set 'bookingReference' of [" + body + "]");
+ return message;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,39 @@
+package org.jboss.savara.examples.supplier;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetQuoteMessageAction extends AbstractActionLifecycle {
+
+ private Logger logger = Logger.getLogger(SetQuoteMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetQuoteMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1";
+
+ String body = "<quote id=\"" + idValue + "\" supplierDesc = \""
+ + supplierDesc+ "\">10</quote>";
+
+ message.getBody().add(body);
+
+ logger.info("set 'quote' of [" + body + "]");
+ return message;
+ }
+
+}
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -1,7 +1,9 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine</depends>
- <depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1</depends>
+ <depends>jboss.esb:deployment=savara-runtime-jbossesb.esb</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply</depends>
+ <depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1</depends>
</jbossesb-deployment>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -2,91 +2,91 @@
<providers>
<jms-provider connection-factory="ConnectionFactory" jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory" name="JBossMQ">
<jms-bus busid="busId1">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId2">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId3">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId4">
- <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1" dest-type="QUEUE"/>
</jms-bus>
</jms-provider>
</providers>
<services>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor">
<listeners>
- <jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierTxnProcessor"/>
+ <jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierTxnProcessor"/>
</listeners>
- <actions mep="OneWay">
- <action class="org.jboss.soa.overlord.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_SupplierTxnProcessor_action_1" process="process">
- <property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-SupplierTxnProcessor"/>
- <property name="conversationType" value="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor"/>
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actionsSwitchAction" name="ESBBrokerProcess_SupplierTxnProcessor_action_1" process="process">
+ <property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-SupplierTxnProcessor"/>
+ <property name="conversationType" value="savara.samples.LoanBroker@SupplierTxnProcessor"/>
<property name="paths">
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_SupplierTxnProcessor__1">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_SupplierTxnProcessor__1">
<message type="orderConfirmed"/>
</case>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor__1">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor__1">
<listeners>
- <jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierTxnProcessor__1"/>
+ <jms-listener busidref="busId2" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierTxnProcessor__1"/>
</listeners>
- <actions mep="OneWay">
- <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actionsReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="orderConfirmed"/>
<property name="clientRole" value="Broker" />
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
- <action class="org.jboss.savara.samples.jbossesb.supplier.SetOrderConfirmResponseAction" name="su-1">
+ <action class="org.jboss.savara.examples.supplier.SetOrderConfirmResponseAction" name="su-1">
</action>
- <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_2" process="process">
+ <action class="org.jboss.savara.jbossesb.actionsSendMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_2" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="bookingReference"/>
<property name="clientRole" value="Broker"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine">
<listeners>
- <jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierQuoteEngine"/>
+ <jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierQuoteEngine"/>
</listeners>
- <actions mep="OneWay">
- <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_SupplierQuoteEngine_action_1" process="process">
- <property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-SupplierQuoteEngine"/>
- <property name="conversationType" value="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine"/>
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actionsSwitchAction" name="ESBBrokerProcess_SupplierQuoteEngine_action_1" process="process">
+ <property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-SupplierQuoteEngine"/>
+ <property name="conversationType" value="savara.samples.LoanBroker@SupplierQuoteEngine"/>
<property name="paths">
- <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_SupplierQuoteEngine__1">
+ <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_SupplierQuoteEngine__1">
<message type="requestForQuote"/>
</case>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine__1">
+ <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine__1">
<listeners>
- <jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierQuoteEngine__1"/>
+ <jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierQuoteEngine__1"/>
</listeners>
- <actions mep="OneWay">
- <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actionsReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
- <property name="clientRole" value="Broker"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />
+ <property name="clientRole" value="Broker" />
+ <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
- <action class="org.jboss.savara.samples.jbossesb.supplier.SetQuoteMessageAction" name="su1-2">
- </action>
- <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_2" process="process">
+ <action class="org.jboss.savara.examples.supplier.SetQuoteMessageAction" name="su1-2">
+ </action>
+ <action class="org.jboss.savara.jbossesb.actionsSendMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_2" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="quote"/>
<property name="clientRole" value="Broker"/>
- <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
</actions>
</service>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -1,36 +1,36 @@
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply">
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1">
+ name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>esb</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>jbmq-queue-service.xml</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -39,7 +39,7 @@
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
try {
- storeInvoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_Store");
+ storeInvoker = new ServiceInvoker("org.jboss.savara.examples.purchasegoods", "PurchaseGoodsProcess_Store");
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Failed to create ServiceInvoker", e);
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,5 @@
+package org.jboss.savara.examples.purchasegoods;
+
+
+public class PurchaseGoodsProcess {
+}
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -52,7 +52,7 @@
Message message = getRequestMessage(creditCheckRequest);
try {
- ServiceInvoker invoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_CreditAgency");
+ ServiceInvoker invoker = new ServiceInvoker("org.jboss.savara.examples.purchasegoods", "PurchaseGoodsProcess_CreditAgency");
Message response = invoker.deliverSync(message, 20000);
PurchaseDetailsType result = getConvertedResponse(response);
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 10:10:51 UTC (rev 793)
@@ -23,7 +23,7 @@
</providers>
<services>
- <service category="org.jboss.overlord.examples" name="CreditAgencyService" description="WS Frontend speaks natively to the ESB">
+ <service category="org.jboss.savara.examples" name="CreditAgencyService" description="WS Frontend speaks natively to the ESB">
<listeners>
<jbr-listener name="Http-Gateway" busidref="Http-1" is-gateway="true"/>
<jms-listener name="WS-ESBListener" busidref="ws-esb-busId"/>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -20,7 +20,7 @@
package org.jboss.savara.examples.store;
import org.apache.log4j.Logger;
-import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -20,7 +20,7 @@
package org.jboss.savara.examples.store;
import org.apache.log4j.Logger;
-import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java 2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java 2009-08-21 10:10:51 UTC (rev 793)
@@ -20,7 +20,7 @@
package org.jboss.savara.examples.store;
import org.apache.log4j.Logger;
-import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
14 years, 8 months
- 1
- 0
Overlord SVN: r792 - in cdl/trunk/samples/jbossesb/purchasing: store and 12 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-21 03:55:37 -0400 (Fri, 21 Aug 2009)
New Revision: 792
Added:
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/purchasegoods/
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/purchasegoods/store/
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/purchasegoods/store/PurchaseGoodsProcess.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/MemoryEPRStorage.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/scripts/
cdl/trunk/samples/jbossesb/purchasing/store/src/scripts/esb-assembly.xml
Removed:
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/
Modified:
cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbmq-queue-service.xml
Log:
* SOAG-114, package renaming.
Modified: cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2009-08-21 06:29:19 UTC (rev 791)
+++ cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2009-08-21 07:55:37 UTC (rev 792)
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="Cp1252"?>
-<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for PurchaseGoods" name="PurchaseGoods" author="gary" version="0.1" targetNamespace="http://www.pi4soa.org/purchase">
- <typeDefinitions>
- <nameSpaces description="Target Namespace for PurchaseGoods" prefix="tns" uRI="http://www.pi4soa.org/purchase"/>
- <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
- <nameSpaces prefix="pur" uRI="java:com.acme.purchasing"/>
- <informationTypes description="This is the information type BuyConfirmed" name="BuyConfirmed" elementName="BuyConfirmed"/>
- <informationTypes description="This is the information type BuyFailed" name="BuyFailed" elementName="BuyFailed"/>
- <informationTypes description="This is the information type BuyRequest" name="BuyRequest" typeName="" elementName="BuyRequest"/>
- <informationTypes description="This is the information type CreditCheckInvalid" name="CreditCheckInvalid" elementName="CreditCheckInvalid"/>
- <informationTypes description="This is the information type CreditCheckOk" name="CreditCheckOk" elementName="CreditCheckOk"/>
- <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" elementName="CreditCheckRequest"/>
- <informationTypes description="This is the information type IDType" name="IDType" typeName="xsd:string"/>
- <informationTypes description="This is the information type URITokenType" name="URITokenType" typeName="xsd:anyURI"/>
- <tokens description="This is the token ID" name="ID" informationType="//@typeDefinitions/(a)informationTypes.6"/>
- <tokens description="This is the token URIToken" name="URIToken" informationType="//@typeDefinitions/(a)informationTypes.7"/>
- <tokenLocators description="This is the token locator BuyFailedIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.1" query="//@id" name="BuyFailedIDLocator"/>
- <tokenLocators description="This is the token locator BuyRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.2" query="//@id" name="BuyRequestIDLocator"/>
- <tokenLocators description="This is the token locator BuyResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.0" query="//@id" name="BuyResponseIDLocator"/>
- <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.3" query="//@id" name="CreditCheckInvalidIDLocator"/>
- <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.5" query="//@id" name="CreditCheckRequestIDLocator"/>
- <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.4" query="//@id" name="CreditCheckResponseIDLocator"/>
- <roleTypes description="This is the role type Buyer" name="Buyer">
- <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/>
- </roleTypes>
- <roleTypes description="This is the role type CreditAgency" name="CreditAgency">
- <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/>
- </roleTypes>
- <roleTypes description="This is the role type Store" name="Store">
- <behaviors description="This is the behavior StoreBehavior" name="StoreBehavior"/>
- </roleTypes>
- <relationshipTypes description="Relationship between Buyer and Store" name="BuyerToStoreRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
- <relationshipTypes description="Relationship between Store and CreditAgency" name="StoreToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.1"/>
- <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.0">
- <semanticAnnotations annotation="overlord.cdl.samples.Purchasing@Buyer" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.1">
- <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/(a)roleTypes.2">
- <semanticAnnotations annotation="overlord.cdl.samples.Purchasing@Store" name="conversationType"/>
- </participantTypes>
- <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.1">
- <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/>
- </channelTypes>
- <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.2">
- <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/>
- </channelTypes>
- </typeDefinitions>
- <choreographies description="Choreography flow for the PurchaseGoods process" name="PurchaseGoodsProcess" root="true">
- <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.0"/>
- <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.1"/>
- <variableDefinitions description="This is the variable buy" name="buy" type="//@typeDefinitions/(a)informationTypes.2"/>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequestExchange" type="//@typeDefinitions/(a)informationTypes.5"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Choice" description="Is credit ok?">
- <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Valid">
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckOk" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckOk" name="CreditCheckOkRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyConfirmed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyConfirmed" name="BuyConfirmedRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/>
- </activities>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Invalid">
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.3" action="Respond" faultName="CreditCheckFailed"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.1" action="Respond" faultName="BuyFailed"/>
- </activities>
- </activities>
- </activities>
- </choreographies>
-</org.pi4soa.cdl:Package>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for PurchaseGoods" name="PurchaseGoods" author="gary" version="0.1" targetNamespace="http://www.jboss.org/savara/examples">
+ <typeDefinitions>
+ <nameSpaces description="Target Namespace for PurchaseGoods" prefix="tns" uRI="http://www.jboss.org/savara/examples"/>
+ <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
+ <nameSpaces prefix="pur" uRI="java:org.jboss.savara.examples.purchasing"/>
+ <informationTypes description="This is the information type BuyConfirmed" name="BuyConfirmed" elementName="BuyConfirmed"/>
+ <informationTypes description="This is the information type BuyFailed" name="BuyFailed" elementName="BuyFailed"/>
+ <informationTypes description="This is the information type BuyRequest" name="BuyRequest" typeName="" elementName="BuyRequest"/>
+ <informationTypes description="This is the information type CreditCheckInvalid" name="CreditCheckInvalid" elementName="CreditCheckInvalid"/>
+ <informationTypes description="This is the information type CreditCheckOk" name="CreditCheckOk" elementName="CreditCheckOk"/>
+ <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" elementName="CreditCheckRequest"/>
+ <informationTypes description="This is the information type IDType" name="IDType" typeName="xsd:string"/>
+ <informationTypes description="This is the information type URITokenType" name="URITokenType" typeName="xsd:anyURI"/>
+ <tokens description="This is the token ID" name="ID" informationType="//@typeDefinitions/(a)informationTypes.6"/>
+ <tokens description="This is the token URIToken" name="URIToken" informationType="//@typeDefinitions/(a)informationTypes.7"/>
+ <tokenLocators description="This is the token locator BuyFailedIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.1" query="//@id" name="BuyFailedIDLocator"/>
+ <tokenLocators description="This is the token locator BuyRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.2" query="//@id" name="BuyRequestIDLocator"/>
+ <tokenLocators description="This is the token locator BuyResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.0" query="//@id" name="BuyResponseIDLocator"/>
+ <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.3" query="//@id" name="CreditCheckInvalidIDLocator"/>
+ <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.5" query="//@id" name="CreditCheckRequestIDLocator"/>
+ <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.4" query="//@id" name="CreditCheckResponseIDLocator"/>
+ <roleTypes description="This is the role type Buyer" name="Buyer">
+ <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/>
+ </roleTypes>
+ <roleTypes description="This is the role type CreditAgency" name="CreditAgency">
+ <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/>
+ </roleTypes>
+ <roleTypes description="This is the role type Store" name="Store">
+ <behaviors description="This is the behavior StoreBehavior" name="StoreBehavior"/>
+ </roleTypes>
+ <relationshipTypes description="Relationship between Buyer and Store" name="BuyerToStoreRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
+ <relationshipTypes description="Relationship between Store and CreditAgency" name="StoreToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.1"/>
+ <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.0">
+ <semanticAnnotations annotation="savara.samples.Purchasing@Buyer" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.1">
+ <semanticAnnotations annotation="savara.samples.Common@CreditAgency" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/(a)roleTypes.2">
+ <semanticAnnotations annotation="savara.samples.Purchasing@Store" name="conversationType"/>
+ </participantTypes>
+ <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.1">
+ <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.2">
+ <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ </typeDefinitions>
+ <choreographies description="Choreography flow for the PurchaseGoods process" name="PurchaseGoodsProcess" root="true">
+ <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.0"/>
+ <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.1"/>
+ <variableDefinitions description="This is the variable buy" name="buy" type="//@typeDefinitions/(a)informationTypes.2"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequestExchange" type="//@typeDefinitions/(a)informationTypes.5"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Choice" description="Is credit ok?">
+ <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Valid">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckOk" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckOk" name="CreditCheckOkRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyConfirmed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyConfirmed" name="BuyConfirmedRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Invalid">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.3" action="Respond" faultName="CreditCheckFailed"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.1" action="Respond" faultName="BuyFailed"/>
+ </activities>
+ </activities>
+ </activities>
+ </choreographies>
+</org.pi4soa.cdl:Package>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-08-21 06:29:19 UTC (rev 791)
+++ cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-08-21 07:55:37 UTC (rev 792)
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
<artifactId>jbossesb-purchasing</artifactId>
- <packaging>jboss-esb</packaging>
+ <packaging>jar</packaging>
<name>Savara::Samples::Purchasing</name>
- <url>http://www.jboss.org/overlord</url>
+ <url>http://www.jboss.org/savara</url>
<parent>
<groupId>org.jboss.savara</groupId>
@@ -18,13 +18,11 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.savara.runtime</groupId>
- <artifactId>jbossesb</artifactId>
- <version>${project.version}</version>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -32,24 +30,25 @@
<build>
<finalName>purchasing</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <!--copy file="target/purchasing-stateless.esb" todir="${deploy.dir}" overwrite="true" /-->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>esb</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>store.esb</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/scripts/esb-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/purchasegoods/store/PurchaseGoodsProcess.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/purchasegoods/store/PurchaseGoodsProcess.java (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/purchasegoods/store/PurchaseGoodsProcess.java 2009-08-21 07:55:37 UTC (rev 792)
@@ -0,0 +1,12 @@
+package org.jboss.savara.examples.purchasegoods.store;
+
+
+public class PurchaseGoodsProcess {
+ public String getCreditAgencyServiceCategory() {
+ return null;
+ }
+
+ public String getCreditAgencyServiceName() {
+ return null;
+ }
+}
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/MemoryEPRStorage.java 2009-08-21 07:55:37 UTC (rev 792)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.store;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.savara.jbossesb.EPRStore;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStore {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java 2009-08-21 07:55:37 UTC (rev 792)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.store;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/*
+ * @author gary
+ */
+public class SetBuyFailedMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetBuyFailedMessageAction.class);
+
+ private ConfigTree config=null;
+
+ public SetBuyFailedMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+
+ message.getBody().add("<BuyFailed id=\"" + idValue +"\"></BuyFailed>");
+
+ logger.info("Updated buy message: " + message.getBody().get());
+
+ return(message);
+ }
+
+}
+
+
Added: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java 2009-08-21 07:55:37 UTC (rev 792)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.store;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+public class SetBuyResponseMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetBuyResponseMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetBuyResponseMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ message.getBody().add("<BuyConfirmed id=\"" + idValue +"\"></BuyConfirmed>");
+
+ logger.info("Updated buy message: " + message.getBody().get());
+
+ return(message);
+ }
+
+
+}
+
+
Added: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java 2009-08-21 07:55:37 UTC (rev 792)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.store;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetCreditCheckRequestMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetCreditCheckRequestMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>");
+
+ logger.info("Updated credit check request message: " + message.getBody().get());
+
+ return(message);
+ }
+
+}
+
+
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml 2009-08-21 06:29:19 UTC (rev 791)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml 2009-08-21 07:55:37 UTC (rev 792)
@@ -1,8 +1,9 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
- <depends>org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__3</depends>
- <depends>org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__2</depends>
- <depends>org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__1</depends>
- <depends>org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store</depends>
- <depends>org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_checkCredit</depends>
+ <depends>jboss.esb:deployment=savara-runtime-jbossesb.esb</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_checkCredit</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__2</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__1</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__3</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store_reply</depends>
</jbossesb-deployment>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 06:29:19 UTC (rev 791)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 07:55:37 UTC (rev 792)
@@ -2,110 +2,109 @@
<providers>
<jms-provider connection-factory="ConnectionFactory" jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory" name="JBossMQ">
<jms-bus busid="busId1">
- <jms-message-filter dest-name="queue/org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId2">
- <jms-message-filter dest-name="queue/org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__1" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__1" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId3">
- <jms-message-filter dest-name="queue/org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__2" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__2" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId4">
- <jms-message-filter dest-name="queue/org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__3" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__3" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId5">
- <jms-message-filter dest-name="queue/org_pi4soa_purchase_purchasegoods_checkCredit" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_checkCredit" dest-type="QUEUE"/>
</jms-bus>
</jms-provider>
</providers>
<services>
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_Store" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_Store">
<listeners>
- <jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store"/>
+ <jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_Store"/>
</listeners>
- <actions mep="OneWay">
- <action name="s1" process="process" class="org.jboss.savara.jbossesb.actions.SwitchAction">
- <property name="serviceDescriptionName" value="{org.pi4soa.purchase.purchasegoods}PurchaseGoodsProcess-Store"/>
- <property name="conversationType" value="overlord.cdl.samples.Purchasing@Store"/>
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="PurchaseGoodsProcess_Store_action_1" process="process">
+ <property name="serviceDescriptionName" value="{org.jboss.savara.examples.purchasegoods}PurchaseGoodsProcess-Store"/>
+ <property name="conversationType" value="savara.samples.Purchasing@Store"/>
<property name="paths">
- <case service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_Store__1">
+ <case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_Store__1">
<message type="BuyRequest"/>
</case>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_Store__1" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_Store__1">
<listeners>
- <jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store__1"/>
+ <jms-listener busidref="busId2" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_Store__1"/>
</listeners>
- <actions mep="OneWay">
- <action name="s2" process="process" class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction">
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_Store__1_action_1" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="BuyRequest"/>
- <property name="clientRole" value="Buyer" />
- <property name="eprStore" value="com.acme.services.broker.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.store.MemoryEPRStorage" />
</action>
- <action name="s3" process="process" class="com.acme.services.broker.SetCreditCheckRequestMessageAction">
+ <action name="s3" process="process" class="org.jboss.savara.examples.store.SetCreditCheckRequestMessageAction">
</action>
- <action name="s4" process="process" class="org.jboss.savara.jbossesb.actions.SendMessageAction">
+ <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_Store__1_action_2" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
- <property name="serviceCategory" value="org.pi4soa.purchase.purchasegoods"/>
- <property name="serviceName" value="PurchaseGoodsProcess_CreditAgency"/>
- <property name="responseServiceCategory" value="org.pi4soa.purchase.purchasegoods"/>
+ <property name="serviceCategory" value="org.jboss.savara.examples.purchasegoods"/>
+ <property name="serviceName" value=PurchaseGoodsProcess_CreditAgency""/>
+ <property name="responseServiceCategory" value="org.jboss.savara.examples.purchasegoods"/>
<property name="responseServiceName" value="checkCredit"/>
</action>
</actions>
</service>
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_Store__2" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_Store__2">
<listeners>
- <jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store__2"/>
+ <jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_Store__2"/>
</listeners>
- <actions mep="OneWay">
- <action name="s5" process="process" class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction">
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_Store__2_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckOk"/>
+ <property name="messageType" value="CreditCheckOk"/>
</action>
- <action name="purchasing-success" class="com.acme.services.broker.SetBuyResponseMessageAction">
+ <action name="purchasing-success" class="org.jboss.savara.examples.store.SetBuyResponseMessageAction">
</action>
- <action name="s6" process="process" class="org.jboss.savara.jbossesb.actions.SendMessageAction">
+ <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_Store__2_action_2" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="BuyConfirmed"/>
<property name="clientRole" value="Buyer"/>
- <property name="eprStore" value="com.acme.services.broker.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.store.MemoryEPRStorage" />
</action>
</actions>
</service>
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_Store__3" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_Store__3">
<listeners>
- <jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store__3"/>
+ <jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_Store__3"/>
</listeners>
- <actions mep="OneWay">
- <action name="s7" process="process" class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction">
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_Store__3_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
</action>
- <action name="purchasing-failed" class="com.acme.services.broker.SetBuyFailedMessageAction"></action>
- <action name="s8" process="process" class="org.jboss.savara.jbossesb.actions.SendMessageAction">
+ <action name="purchasing-failed" class="org.jboss.savara.examples.store.SetBuyFailedMessageAction"></action>
+ <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_Store__3_action_2" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="BuyFailed"/>
<property name="clientRole" value="Buyer"/>
- <property name="eprStore" value="com.acme.services.broker.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.savara.examples.store.MemoryEPRStorage" />
</action>
</actions>
</service>
- <service category="org.pi4soa.purchase.purchasegoods" name="checkCredit" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="checkCredit">
<listeners>
- <jms-listener busidref="busId5" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-checkCredit"/>
+ <jms-listener busidref="busId5" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-checkCredit"/>
</listeners>
- <actions mep="OneWay">
- <action name="s9" process="process" class="org.jboss.savara.jbossesb.actions.SwitchAction">
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="checkCredit_action_1" process="process">
<property name="paths">
- <case service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_Store__2">
+ <case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_Store__2">
<message type="CreditCheckOk"/>
</case>
- <case service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_Store__3">
+ <case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_Store__3">
<message type="CreditCheckInvalid"/>
</case>
</property>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbm-queue-service.xml 2009-08-21 06:29:19 UTC (rev 791)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbm-queue-service.xml 2009-08-21 07:55:37 UTC (rev 792)
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__3"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__1"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__2"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__2"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__1"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__3"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store_reply"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store_reply"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_checkCredit"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_checkCredit"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbmq-queue-service.xml 2009-08-21 06:29:19 UTC (rev 791)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/jbmq-queue-service.xml 2009-08-21 07:55:37 UTC (rev 792)
@@ -1,38 +1,39 @@
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__3">
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_checkCredit">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__2">
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__2">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store__1">
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__1">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store">
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_PurchaseGoodsProcess_Store_reply">
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store_reply">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="org.pi4soa.purchase.purchasegoods.destination:service=Queue,name=org_pi4soa_purchase_purchasegoods_checkCredit">
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_Store__3">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
</server>
+
Added: cdl/trunk/samples/jbossesb/purchasing/store/src/scripts/esb-assembly.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/scripts/esb-assembly.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/scripts/esb-assembly.xml 2009-08-21 07:55:37 UTC (rev 792)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>esb</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>jbmq-queue-service.xml</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
14 years, 8 months
- 1
- 0
Overlord SVN: r791 - in cdl/trunk/samples/jbossesb/common/creditAgency: src/main/java/org/jboss and 8 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-21 02:29:19 -0400 (Fri, 21 Aug 2009)
New Revision: 791
Added:
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/CreditAgencyDecision.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/MemoryEPRStorage.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckInvalidMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckResponseMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditCheckInvalid.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/ObjectFactory.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/PurchaseDetailsType.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/package-info.java
Removed:
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/
Modified:
cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbmq-queue-service.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml
Log:
* SOAG-114, refactor package name.
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-21 03:20:54 UTC (rev 790)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-21 06:29:19 UTC (rev 791)
@@ -21,8 +21,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.savara.runtime</groupId>
- <artifactId>savara-jbossesb</artifactId>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/CreditAgencyDecision.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/CreditAgencyDecision.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/CreditAgencyDecision.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.creditAgency;
+
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.savara.jbossesb.Decision;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class CreditAgencyDecision implements Decision {
+
+ /*
+ * @see org.jboss.soa.overlord.jbossesb.Decision#executeDecision(org.jboss.soa.esb.message.Message)
+ *
+ * return true if amount is less than 500.
+ *
+ */
+ public boolean executeDecision(Message message) {
+ try {
+ String xmlMsg = (String)message.getBody().get();
+ Node node = XMLUtils.getNode(xmlMsg);
+ NodeList nodeList = node.getChildNodes();
+ for (int i =0; i < nodeList.getLength(); i++) {
+ if ("amount".equals(nodeList.item(i).getNodeName())) {
+ String value = nodeList.item(i).getTextContent();
+ if (500 >= Integer.valueOf(value).intValue()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/MemoryEPRStorage.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.creditAgency;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.savara.jbossesb.EPRStore;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStore {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckInvalidMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckInvalidMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.creditAgency;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class SetCreditCheckInvalidMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetCreditCheckInvalidMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetCreditCheckInvalidMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+ StringBuffer sbuffer = new StringBuffer();
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ sbuffer.append("<CreditCheckInvalid id=\"" + idValue +"\">");
+
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</CreditCheckInvalid>");
+
+ message.getBody().add(sbuffer.toString());
+
+ logger.info("Updated credit message: " + message.getBody().get());
+
+ return(message);
+ }
+
+}
+
+
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckResponseMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/creditAgency/SetCreditCheckResponseMessageAction.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.creditAgency;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class SetCreditCheckResponseMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetCreditCheckResponseMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetCreditCheckResponseMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+ StringBuffer sbuffer = new StringBuffer();
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ sbuffer.append("<CreditCheckOk id=\"" + idValue +"\">");
+
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</CreditCheckOk>");
+
+ message.getBody().add(sbuffer.toString());
+
+ logger.info("Updated credit message: "+message.getBody().get() +"' by thread of " + Thread.currentThread().getName());
+
+ return(message);
+ }
+
+
+}
+
+
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.wsdl;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.savara.examples.xsd.PurchaseDetailsType;
+import org.jboss.savara.internal.jbossesb.utils.MessageUtil;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+@WebService(name="creditAgencyPT", targetNamespace="http://www.jboss.org/savara/examples/wsdl")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class CreditAgencyService {
+
+ @WebMethod
+ @WebResult(name = "CreditCheckOk", partName = "CreditCheckOk")
+ public PurchaseDetailsType checkCredit(@WebParam(name = "CreditCheckRequest", partName = "CreditCheckRequest")
+ PurchaseDetailsType creditCheckRequest) throws CreditCheckInvalid {
+
+ Message message = getRequestMessage(creditCheckRequest);
+
+ try {
+ ServiceInvoker invoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_CreditAgency");
+ Message response = invoker.deliverSync(message, 20000);
+
+ PurchaseDetailsType result = getConvertedResponse(response);
+
+ String messageType = MessageUtil.getMessageType(response.getBody().get());
+ if ("CreditCheckInvalid".equalsIgnoreCase(messageType)) {
+ throw new CreditCheckInvalid("org.jboss.savara.examples.wsdl.CreditCheckFailed", result);
+ }
+ return result;
+ } catch (Exception e) {
+ throw new CreditCheckInvalid("org.jboss.savara.examples.wsdl.CreditCheckFailed", creditCheckRequest);
+ }
+
+ }
+
+ private PurchaseDetailsType getConvertedResponse(Message response) throws Exception {
+ Node node = XMLUtils.getNode((String)response.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ String amountNo = null;
+ String accountNo = null;
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ amountNo = list.item(i).getTextContent();
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ accountNo = list.item(i).getTextContent();
+ }
+ }
+
+ PurchaseDetailsType result = new PurchaseDetailsType();
+ result.setId(Integer.valueOf(idValue));
+ result.setAccount(Integer.valueOf(accountNo));
+ result.setAmount(Integer.valueOf(amountNo));
+ return result;
+ }
+
+ private Message getRequestMessage(PurchaseDetailsType creditCheckRequest) {
+ Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ StringBuffer sbuffer = new StringBuffer();
+ sbuffer.append("<CreditCheckRequest id=\"" + creditCheckRequest.getId() +"\">");
+ sbuffer.append("<account>" + creditCheckRequest.getAccount() + "</account>");
+ sbuffer.append("<amount>" + creditCheckRequest.getAmount() + "</amount>");
+ sbuffer.append("</CreditCheckRequest>");
+ message.getBody().add(sbuffer.toString());
+ return message;
+ }
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditCheckInvalid.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditCheckInvalid.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditCheckInvalid.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,56 @@
+
+package org.jboss.savara.examples.wsdl;
+
+import javax.xml.ws.WebFault;
+
+import org.jboss.savara.examples.xsd.PurchaseDetailsType;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.7-hudson-48-
+ * Generated source version: 2.1
+ *
+ */
+@WebFault(name = "CreditCheckInvalid", targetNamespace = "http://www.jboss.org/savara/examples/xsd")
+public class CreditCheckInvalid
+ extends Exception
+{
+
+ /**
+ * Java type that goes as soapenv:Fault detail element.
+ *
+ */
+ private PurchaseDetailsType faultInfo;
+
+ /**
+ *
+ * @param faultInfo
+ * @param message
+ */
+ public CreditCheckInvalid(String message, PurchaseDetailsType faultInfo) {
+ super(message);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ *
+ * @param faultInfo
+ * @param message
+ * @param cause
+ */
+ public CreditCheckInvalid(String message, PurchaseDetailsType faultInfo, Throwable cause) {
+ super(message, cause);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ *
+ * @return
+ * returns fault bean: org.jboss.overlord.examples.xsd.PurchaseDetailsType
+ */
+ public PurchaseDetailsType getFaultInfo() {
+ return faultInfo;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/ObjectFactory.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/ObjectFactory.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/ObjectFactory.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,53 @@
+
+package org.jboss.savara.examples.xsd;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.overlord.examples.xsd package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _CreditCheckInvalid_QNAME = new QName("http://www.jboss.org/savara/examples/xsd", "CreditCheckInvalid");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.savara.examples.xsd
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link PurchaseDetailsType }
+ *
+ */
+ public PurchaseDetailsType createPurchaseDetailsType() {
+ return new PurchaseDetailsType();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link PurchaseDetailsType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/savara/examples/xsd", name = "CreditCheckInvalid")
+ public JAXBElement<PurchaseDetailsType> createCreditCheckInvalid(PurchaseDetailsType value) {
+ return new JAXBElement<PurchaseDetailsType>(_CreditCheckInvalid_QNAME, PurchaseDetailsType.class, null, value);
+ }
+
+}
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/PurchaseDetailsType.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/PurchaseDetailsType.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/PurchaseDetailsType.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,99 @@
+
+package org.jboss.savara.examples.xsd;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for PurchaseDetailsType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="PurchaseDetailsType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="account" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * <element name="amount" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}int" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PurchaseDetailsType", propOrder = {
+ "account",
+ "amount"
+})
+public class PurchaseDetailsType {
+
+ protected int account;
+ protected int amount;
+ @XmlAttribute
+ protected Integer id;
+
+ /**
+ * Gets the value of the account property.
+ *
+ */
+ public int getAccount() {
+ return account;
+ }
+
+ /**
+ * Sets the value of the account property.
+ *
+ */
+ public void setAccount(int value) {
+ this.account = value;
+ }
+
+ /**
+ * Gets the value of the amount property.
+ *
+ */
+ public int getAmount() {
+ return amount;
+ }
+
+ /**
+ * Sets the value of the amount property.
+ *
+ */
+ public void setAmount(int value) {
+ this.amount = value;
+ }
+
+ /**
+ * Gets the value of the id property.
+ *
+ * @return
+ * possible object is
+ * {@link Integer }
+ *
+ */
+ public Integer getId() {
+ return id;
+ }
+
+ /**
+ * Sets the value of the id property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Integer }
+ *
+ */
+ public void setId(Integer value) {
+ this.id = value;
+ }
+
+}
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/package-info.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/package-info.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/xsd/package-info.java 2009-08-21 06:29:19 UTC (rev 791)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/savara/examples/xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.jboss.savara.examples.xsd;
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml 2009-08-21 03:20:54 UTC (rev 790)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml 2009-08-21 06:29:19 UTC (rev 791)
@@ -1,9 +1,10 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=savara-runtime.esb</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency1</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency2</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency3</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency</depends>
- <depends>jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency_reply</depends>
+ <depends>jboss.esb:deployment=savara-runtime-jbossesb.esb</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__3</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__2</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__1</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency_reply</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__ws</depends>
+ <depends>org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__ws_reply</depends>
</jbossesb-deployment>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 03:20:54 UTC (rev 790)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-21 06:29:19 UTC (rev 791)
@@ -2,19 +2,19 @@
<providers>
<jms-provider connection-factory="ConnectionFactory" jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory" name="JBossMQ">
<jms-bus busid="busId1">
- <jms-message-filter dest-name="queue/esb-stateless-creditAgency" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId2">
- <jms-message-filter dest-name="queue/esb-stateless-creditAgency1" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__1" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId3">
- <jms-message-filter dest-name="queue/esb-stateless-creditAgency2" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__2" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="busId4">
- <jms-message-filter dest-name="queue/esb-stateless-creditAgency3" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__3" dest-type="QUEUE"/>
</jms-bus>
<jms-bus busid="ws-esb-busId">
- <jms-message-filter dest-name="queue/ws-esb-creditAgency" dest-type="QUEUE"/>
+ <jms-message-filter dest-name="queue/org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__ws" dest-type="QUEUE"/>
</jms-bus>
</jms-provider>
<jbr-provider name="JBR-Http" protocol="http" host="localhost">
@@ -34,50 +34,50 @@
</action>
</actions>
</service>
-
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_CreditAgency" description="">
+
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_CreditAgency">
<listeners>
- <jms-listener busidref="busId1" maxThreads="1" name="esb-stateless-creditAgency"/>
+ <jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_CreditAgency"/>
</listeners>
- <actions mep="OneWay">
- <action name="c1" process="process" class="org.jboss.savara.jbossesb.actions.SwitchAction">
- <property name="serviceDescriptionName" value="{org.pi4soa.purchase.purchasegoods}PurchaseGoodsProcess-CreditAgency"/>
- <property name="conversationType" value="overlord.cdl.samples.Common@CreditAgency"/>
+ <actions>
+ <action class="org.jboss.soa.overlord.jbossesb.actions.stateless.SwitchAction" name="PurchaseGoodsProcess_CreditAgency_action_1" process="process">
+ <property name="serviceDescriptionName" value="{org.jboss.savara.examples.purchasegoods}PurchaseGoodsProcess-CreditAgency"/>
+ <property name="conversationType" value="savara.samples.Common@CreditAgency"/>
<property name="paths">
- <case service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__1">
+ <case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__1">
<message type="CreditCheckRequest"/>
</case>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_CreditAgency__1" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_CreditAgency__1">
<listeners>
- <jms-listener busidref="busId2" maxThreads="1" name="esb-stateless-creditAgency1"/>
+ <jms-listener busidref="busId2" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_CreditAgency__1"/>
</listeners>
- <actions mep="OneWay">
- <action name="c2" process="process" class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction">
+ <actions>
+ <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_CreditAgency__1_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
<property name="clientRole" value="Store" />
<property name="eprStore" value="org.jboss.overlord.examples.creditAgency.MemoryEPRStorage" />
</action>
- <action name="c3" process="process" class="org.jboss.savara.jbossesb.actions.IfAction">
+ <action class="org.jboss.savara.jbossesb.actions.IfAction" name="PurchaseGoodsProcess_CreditAgency__1_action_2" process="process">
<property name="paths">
- <if service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__2" decision-class="org.jboss.overlord.examples.creditAgency.CreditAgencyDecision"/>
- <else service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__3"/>
+ <if service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__2" decision-class="org.jboss.overlord.examples.creditAgency.CreditAgencyDecision"/>
+ <elseif service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__3"/>
</property>
</action>
</actions>
</service>
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_CreditAgency__2" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_CreditAgency__2">
<listeners>
- <jms-listener busidref="busId3" maxThreads="1" name="esb-stateless-creditAgency2"/>
+ <jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_CreditAgency__2"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action name="custom-1" process="process" class="org.jboss.overlord.examples.creditAgency.SetCreditCheckResponseMessageAction">
</action>
- <action name="c4" process="process" class="org.jboss.savara.jbossesb.actions.SendMessageAction">
+ <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_CreditAgency__2_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckOk"/>
<property name="clientRole" value="Store"/>
@@ -85,14 +85,14 @@
</action>
</actions>
</service>
- <service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_CreditAgency__3" description="">
+ <service category="org.jboss.savara.examples.purchasegoods" description="" name="PurchaseGoodsProcess_CreditAgency__3">
<listeners>
- <jms-listener busidref="busId4" maxThreads="1" name="esb-stateless-creditAgency3"/>
+ <jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.purchasegoods-PurchaseGoodsProcess_CreditAgency__3"/>
</listeners>
- <actions mep="OneWay">
+ <actions>
<action name="custom-2" process="process" class="org.jboss.overlord.examples.creditAgency.SetCreditCheckInvalidMessageAction">
</action>
- <action name="c5" process="process" class="org.jboss.savara.jbossesb.actions.SendMessageAction">
+ <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_CreditAgency__3_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
<property name="clientRole" value="Store"/>
@@ -100,5 +100,6 @@
</action>
</actions>
</service>
+
</services>
</jbossesb>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml 2009-08-21 03:20:54 UTC (rev 790)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml 2009-08-21 06:29:19 UTC (rev 791)
@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__3"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency_reply"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__2"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency1"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__1"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency2"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency3"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency_reply"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__ws"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency_reply"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__ws_reply"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbmq-queue-service.xml 2009-08-21 03:20:54 UTC (rev 790)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbmq-queue-service.xml 2009-08-21 06:29:19 UTC (rev 791)
@@ -1,33 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
<server>
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency_reply">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency1">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency2">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency3">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__3">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__2">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency__1">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.jboss.savara.examples.purchasegoods.destination:service=Queue,name=org_jboss_savara_examples_purchasegoods_PurchaseGoodsProcess_CreditAgency">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
</server>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml 2009-08-21 03:20:54 UTC (rev 790)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml 2009-08-21 06:29:19 UTC (rev 791)
@@ -7,7 +7,7 @@
<servlet>
<servlet-name>CreditAgencyService</servlet-name>
- <servlet-class>org.jboss.overlord.examples.wsdl.CreditAgencyService</servlet-class>
+ <servlet-class>org.jboss.savara.examples.wsdl.CreditAgencyService</servlet-class>
</servlet>
<servlet-mapping>
14 years, 8 months
- 1
- 0
Overlord SVN: r790 - in cdl/trunk/samples/jbossesb/client: src and 5 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-20 23:20:54 -0400 (Thu, 20 Aug 2009)
New Revision: 790
Added:
cdl/trunk/samples/jbossesb/client/src/org/
cdl/trunk/samples/jbossesb/client/src/org/jboss/
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BrokerClient.java
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/WSBuyerClient.java
Removed:
cdl/trunk/samples/jbossesb/client/src/com/
Modified:
cdl/trunk/samples/jbossesb/client/build.xml
Log:
* update the example's client package name.
Modified: cdl/trunk/samples/jbossesb/client/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/client/build.xml 2009-08-20 21:32:47 UTC (rev 789)
+++ cdl/trunk/samples/jbossesb/client/build.xml 2009-08-21 03:20:54 UTC (rev 790)
@@ -39,7 +39,7 @@
</target>
<target name="runPurchasingClient" depends="compile">
- <java fork="yes" classname="com.acme.services.buyer.BuyerClient">
+ <java fork="yes" classname="org.jboss.savara.examples.client.BuyerClient">
<classpath refid="project.classpath" />
<classpath location="${classes.dir}" />
</java>
@@ -47,7 +47,7 @@
</target>
<target name="runBrokerageClient" depends="compile">
- <java fork="yes" classname="com.acme.services.buyer.BrokerClient">
+ <java fork="yes" classname="org.jboss.savara.examples.client.BrokerClient">
<classpath refid="project.classpath" />
<classpath location="${classes.dir}" />
</java>
Added: cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BrokerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BrokerClient.java (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BrokerClient.java 2009-08-21 03:20:54 UTC (rev 790)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.client;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class BrokerClient {
+
+ private static Logger logger = Logger.getLogger(BrokerClient.class);
+
+ private ServiceInvoker brokerInvoker;
+
+ public BrokerClient() {
+
+ System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
+
+ try {
+ brokerInvoker = new ServiceInvoker("org.pi4soa.esbbroker.esbbroker", "ESBBrokerProcess_Broker");
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to create ServiceInvoker", e);
+ }
+ }
+
+ public void run() {
+
+ String id = "20";
+
+ String quoteReq="<enquiry id=\"" + id +"\" ></enquiry>";
+
+ Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ mesg.getBody().add(quoteReq);
+ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
+
+ try {
+ System.out.println("=========================================");
+ System.out.println("Request: " + mesg.getBody().get());
+ Message reply=brokerInvoker.deliverSync(mesg, 50000);
+ System.out.println("Reply: "+reply.getBody().get());
+
+ Thread.sleep(5000);//Waiting...
+
+ System.out.println("Sending Buy request to Broker...");
+ String buyReq = "<buy id=\"" + id + "\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\" quoteValue=\"10\"></buy>";
+ mesg.getBody().add(buyReq);
+
+ System.out.println("Request: " + mesg.getBody().get());
+ reply = brokerInvoker.deliverSync(mesg, 50000);
+ System.out.println("Reply: " + reply.getBody().get());
+ System.out.println("=========================================");
+ } catch (Exception e) {
+ logger.error(e);
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+ BrokerClient client=new BrokerClient();
+ client.run();
+ }
+}
Added: cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java 2009-08-21 03:20:54 UTC (rev 790)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.client;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+
+/**
+ * @author gary
+ */
+public class BuyerClient {
+
+ private static Logger logger = Logger.getLogger(BuyerClient.class);
+
+ private ServiceInvoker storeInvoker;
+
+ public BuyerClient() {
+
+ System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
+
+ try {
+ storeInvoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_Store");
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("Failed to create ServiceInvoker", e);
+ }
+ }
+
+ public void run() {
+
+ String buyReq="<BuyRequest id=\"5\" ></BuyRequest>";
+
+ Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ mesg.getBody().add(buyReq);
+ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
+
+ try {
+ System.out.println("=========================================");
+ System.out.println("Request: "+mesg.getBody().get());
+ Message reply=storeInvoker.deliverSync(mesg, 20000);
+
+ if (reply != null) {
+ System.out.println("Reply: "+reply.getBody().get());
+ } else {
+ System.err.println("NO REPLY");
+ }
+ System.out.println("=========================================");
+ } catch (Exception e) {
+ logger.error(e);
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+ BuyerClient client=new BuyerClient();
+
+ client.run();
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/WSBuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/WSBuyerClient.java (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/WSBuyerClient.java 2009-08-21 03:20:54 UTC (rev 790)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.client;
+
+import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvokerLocator;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class WSBuyerClient {
+
+ public void sendMessageToJBRListener(String protocol, int port, String message) throws Throwable {
+ String locatorURI = protocol + "://localhost:" + port;
+ InvokerLocator locator = new InvokerLocator(locatorURI);
+ System.out.println("Calling JBoss Remoting Listener using locator URI: " + locatorURI);
+
+ Client remotingClient = null;
+ try {
+ remotingClient = new Client(locator);
+ remotingClient.connect();
+
+ // Deliver the message to the listener...
+ Object response = remotingClient.invoke(message);
+ System.out.println("JBR Class: " + response.getClass().getName());
+ System.out.println("Response from JBoss Remoting Listener '" + locatorURI + "' was '" + response + "'.");
+ } finally {
+ if(remotingClient != null) {
+ remotingClient.disconnect();
+ }
+ }
+ }
+
+ private static String getMessage(String messageNum) {
+ String msg = new String(StreamUtils.readStream(WSBuyerClient.class.getResourceAsStream("/soap_message_" + messageNum + ".xml")));
+ return msg;
+ }
+
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) throws Throwable{
+ WSBuyerClient client = new WSBuyerClient();
+ String msg = getMessage("01");
+ System.out.println(msg);
+ client.sendMessageToJBRListener("http", 8765, msg);
+ }
+
+}
14 years, 8 months
- 1
- 0