[overlord-commits] Overlord SVN: r224 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src: java/org/jboss/tools/overlord/jbossesb/model and 3 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Thu Aug 7 11:10:03 EDT 2008
Author: objectiser
Date: 2008-08-07 11:10:02 -0400 (Thu, 07 Aug 2008)
New Revision: 224
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java
Log:
Fixed various issues related to the conversation type and service description name. Now does conformance checking between model and generated ESB configuration.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/dialogs/GenerateDialog.java 2008-08-07 11:31:06 UTC (rev 223)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/dialogs/GenerateDialog.java 2008-08-07 15:10:02 UTC (rev 224)
@@ -405,23 +405,6 @@
final IJavaProject jproj=createJavaProject(projectName);
if (jproj != null && esbConfig != null) {
- // Store ESB configuration
- IPath esbConfigPath=jproj.getPath().append(
- new Path(getSelectedBuildSystem().getESBConfigFilePath()));
-
- IFile esbConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(esbConfigPath);
- createParentFolder(esbConfigFile);
- esbConfigFile.create(null, true,
- new org.eclipse.core.runtime.NullProgressMonitor());
-
- String config=getText(esbConfig);
-
- if (config != null) {
- esbConfigFile.setContents(new java.io.ByteArrayInputStream(
- config.getBytes()), true, false,
- new org.eclipse.core.runtime.NullProgressMonitor());
- }
-
// Generate business object types for
// local conversation model
localcm.visit(new Visitor() {
@@ -442,6 +425,23 @@
}
});
+ // Store ESB configuration
+ IPath esbConfigPath=jproj.getPath().append(
+ new Path(getSelectedBuildSystem().getESBConfigFilePath()));
+
+ IFile esbConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(esbConfigPath);
+ createParentFolder(esbConfigFile);
+ esbConfigFile.create(null, true,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+
+ String config=getText(esbConfig);
+
+ if (config != null) {
+ esbConfigFile.setContents(new java.io.ByteArrayInputStream(
+ config.getBytes()), true, false,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+ }
+
generateBuildConfigurationFile(jproj);
generateDeploymentFile(jproj, model);
@@ -729,8 +729,7 @@
method=ast.newMethodDeclaration();
method.setName(ast.newSimpleName(methodName));
- method.setReturnType2(ast.newSimpleType(
- ast.newName("void")));
+ method.setReturnType2(ast.newPrimitiveType(PrimitiveType.VOID));
SingleVariableDeclaration svd=ast.newSingleVariableDeclaration();
svd.setName(ast.newSimpleName("value"));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-08-07 11:31:06 UTC (rev 223)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-08-07 15:10:02 UTC (rev 224)
@@ -45,7 +45,7 @@
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_NAME_PROPERTY = "serviceName";
+ 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";
@@ -476,14 +476,14 @@
*
* @return The service description name
*/
- public String getServiceName() {
+ public String getServiceDescriptionName() {
String ret=null;
ESBAction action=getFirstSessionBasedAction();
if (action != null) {
if (action.isCreateSession() || (action.getActionClass() != null &&
action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
- ret = action.getPropertyValue(SERVICE_NAME_PROPERTY);
+ ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
if (ret == null) {
String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
@@ -632,7 +632,7 @@
ret.derivedFrom(this);
ModelName modelName=new ModelName();
- modelName.setName(getServiceName());
+ modelName.setName(getServiceDescriptionName());
ret.setModelName(modelName);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-08-07 11:31:06 UTC (rev 223)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-08-07 15:10:02 UTC (rev 224)
@@ -139,7 +139,7 @@
*
* @return The service description name
*/
- public String getServiceName();
+ public String getServiceDescriptionName();
/**
* This method returns the conversation type associated with the
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-08-07 11:31:06 UTC (rev 223)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-08-07 15:10:02 UTC (rev 224)
@@ -30,17 +30,13 @@
public abstract class AbstractESBAction extends ModelObject
implements ESBAction {
- public static final String SERVICE_DESCRIPTION_NAME = "serviceDescriptionName";
public static final String IDENTITIES = "identities";
- public static final String SESSION = "session";
public static final String ACTION_ELEMENT = "action";
public static final String VALUE_ATTR = "value";
public static final String NAME_ATTR = "name";
public static final String PROPERTY_ELEMENT = "property";
public static final String CLASS_PROPERTY = "class";
- protected static final String BUSINESS_OBJECT_TYPE_PROPERTY = SESSION;
-
/**
* The constructor for initializing the action based on
* an existing DOM element.
@@ -189,7 +185,7 @@
}
}
- String session=getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+ String session=getPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
if (session != null) {
// Validate that the business object type exists
@@ -309,9 +305,9 @@
*/
protected java.util.List<String> getOptionalProperties() {
java.util.List<String> ret=new java.util.Vector<String>();
- ret.add(SESSION);
+ ret.add(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
ret.add(IDENTITIES);
- ret.add(SERVICE_DESCRIPTION_NAME);
+ ret.add(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
return(ret);
}
@@ -456,7 +452,8 @@
*/
public void setServiceDescriptionName(String name) {
- org.w3c.dom.Element prop=getPropertyElement(SERVICE_DESCRIPTION_NAME);
+ org.w3c.dom.Element prop=getPropertyElement(
+ DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
if (prop != null) {
prop.setAttribute(VALUE_ATTR, name);
@@ -470,7 +467,8 @@
*/
public void setBusinessObjectType(String type) {
- org.w3c.dom.Element prop=getPropertyElement(BUSINESS_OBJECT_TYPE_PROPERTY);
+ org.w3c.dom.Element prop=getPropertyElement(
+ DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
if (prop != null) {
prop.setAttribute(VALUE_ATTR, type);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationModelChangeRule.java 2008-08-07 11:31:06 UTC (rev 223)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationModelChangeRule.java 2008-08-07 15:10:02 UTC (rev 224)
@@ -125,11 +125,28 @@
if (conv.getParent() instanceof Model) {
csa.setRoot(true);
- // Set conversation type
- String ctype=namespace+"."+
- conv.getModelName().getName()+"@"+
- conv.getModelName().getLocatedRole().getName();
- csa.setConversationType(ctype);
+ 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) {
+ csa.setConversationType(ctype);
+ }
}
csa.setServiceDescriptionName(sdname);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java 2008-08-07 11:31:06 UTC (rev 223)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java 2008-08-07 15:10:02 UTC (rev 224)
@@ -171,13 +171,13 @@
TestESBAction act1=new TestESBAction();
act1.setSessionBased(true);
act1.setCreateSession(true);
- act1.setPropertyValue(DefaultESBService.SERVICE_NAME_PROPERTY,
+ act1.setPropertyValue(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY,
name);
service.getActions().add(act1);
- if (service.getServiceName().equals(name) == false) {
- fail("Service name '"+service.getServiceName()+
+ if (service.getServiceDescriptionName().equals(name) == false) {
+ fail("Service name '"+service.getServiceDescriptionName()+
"' invalid, expecting: "+name);
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java 2008-08-07 11:31:06 UTC (rev 223)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java 2008-08-07 15:10:02 UTC (rev 224)
@@ -95,7 +95,7 @@
return null;
}
- public String getServiceName() {
+ public String getServiceDescriptionName() {
// TODO Auto-generated method stub
return null;
}
More information about the overlord-commits
mailing list