summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-11-12 14:07:24 (EST)
committer Sven Rottstock2012-11-14 07:15:22 (EST)
commitc7617eb3b8cb2dc6eb0f61fa9a435fd2c70e7581 (patch)
tree686cee0a9f2c7666632085ca567550332ea615b9
parent97a7e137c5d5efeb169618e7f10a0117d4c45d94 (diff)
downloadorg.eclipse.stardust.ide-c7617eb3b8cb2dc6eb0f61fa9a435fd2c70e7581.zip
org.eclipse.stardust.ide-c7617eb3b8cb2dc6eb0f61fa9a435fd2c70e7581.tar.gz
org.eclipse.stardust.ide-c7617eb3b8cb2dc6eb0f61fa9a435fd2c70e7581.tar.bz2
Fix for CotextTypes.
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@60795 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java114
1 files changed, 63 insertions, 51 deletions
diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java
index cec17ac..8d26bf5 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/defaults/DefaultTypesInitializer.java
@@ -10,56 +10,58 @@
*******************************************************************************/
package org.eclipse.stardust.model.xpdl.builder.defaults;
-import static org.eclipse.stardust.engine.api.model.PredefinedConstants.PRIMITIVE_DATA;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.stardust.engine.api.model.PredefinedConstants;
-import org.eclipse.stardust.engine.core.extensions.triggers.manual.ManualTriggerValidator;
-import org.eclipse.stardust.engine.core.pojo.app.PlainJavaAccessPointProvider;
-import org.eclipse.stardust.engine.core.pojo.app.PlainJavaApplicationInstance;
-import org.eclipse.stardust.engine.core.pojo.app.PlainJavaValidator;
-import org.eclipse.stardust.engine.core.pojo.data.JavaBeanAccessPathEvaluator;
-import org.eclipse.stardust.engine.core.pojo.data.PrimitiveAccessPathEvaluator;
-import org.eclipse.stardust.engine.core.pojo.data.PrimitiveValidator;
-import org.eclipse.stardust.engine.core.pojo.data.SerializableValidator;
-import org.eclipse.stardust.engine.core.spi.extensions.model.AccessPointProvider;
-import org.eclipse.stardust.engine.core.spi.extensions.model.ApplicationValidator;
-import org.eclipse.stardust.engine.core.spi.extensions.model.DataValidator;
-import org.eclipse.stardust.engine.core.spi.extensions.model.ExtendedDataValidator;
-import org.eclipse.stardust.engine.core.spi.extensions.model.TriggerValidator;
-import org.eclipse.stardust.engine.core.spi.extensions.runtime.AccessPathEvaluator;
-import org.eclipse.stardust.engine.core.spi.extensions.runtime.ApplicationInstance;
-import org.eclipse.stardust.engine.core.spi.extensions.runtime.DataFilterExtension;
-import org.eclipse.stardust.engine.core.spi.extensions.runtime.DataLoader;
-import org.eclipse.stardust.engine.core.spi.extensions.runtime.ExtendedAccessPathEvaluator;
-import org.eclipse.stardust.engine.core.spi.extensions.runtime.StatelessApplicationInstance;
-import org.eclipse.stardust.engine.core.struct.spi.StructuredDataFilterExtension;
-import org.eclipse.stardust.engine.core.struct.spi.StructuredDataLoader;
-import org.eclipse.stardust.engine.core.struct.spi.StructuredDataXMLValidator;
-import org.eclipse.stardust.engine.core.struct.spi.StructuredDataXPathEvaluator;
-import org.eclipse.stardust.engine.extensions.ejb.SessionBeanValidator;
-import org.eclipse.stardust.engine.extensions.ejb.app.SessionBeanAccessPointProvider;
-import org.eclipse.stardust.engine.extensions.ejb.app.SessionBeanApplicationInstance;
-import org.eclipse.stardust.engine.extensions.ejb.data.EntityBeanEvaluator;
-import org.eclipse.stardust.engine.extensions.ejb.data.EntityBeanValidator;
-import org.eclipse.stardust.engine.extensions.jaxws.app.WebserviceApplicationInstance;
-import org.eclipse.stardust.engine.extensions.jaxws.app.WebserviceApplicationValidator;
-import org.eclipse.stardust.engine.extensions.jms.app.JMSApplicationInstance;
-import org.eclipse.stardust.engine.extensions.jms.app.JMSValidator;
-import org.eclipse.stardust.engine.extensions.xml.data.XMLValidator;
-import org.eclipse.stardust.engine.extensions.xml.data.XPathEvaluator;
-import org.eclipse.stardust.model.xpdl.builder.model.BpmPackageBuilder;
-import org.eclipse.stardust.model.xpdl.builder.spi.ModelInitializer;
-import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;
-import org.eclipse.stardust.model.xpdl.carnot.ApplicationContextTypeType;
-import org.eclipse.stardust.model.xpdl.carnot.ApplicationTypeType;
-import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage;
-import org.eclipse.stardust.model.xpdl.carnot.DataTypeType;
-import org.eclipse.stardust.model.xpdl.carnot.ModelType;
-import org.eclipse.stardust.model.xpdl.carnot.TriggerTypeType;
-import org.eclipse.stardust.model.xpdl.carnot.util.AttributeUtil;
-import org.eclipse.stardust.model.xpdl.carnot.util.CarnotConstants;
+import static org.eclipse.stardust.engine.api.model.PredefinedConstants.PRIMITIVE_DATA;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.stardust.engine.api.model.PredefinedConstants;
+import org.eclipse.stardust.engine.core.extensions.triggers.manual.ManualTriggerValidator;
+import org.eclipse.stardust.engine.core.pojo.app.PlainJavaAccessPointProvider;
+import org.eclipse.stardust.engine.core.pojo.app.PlainJavaApplicationInstance;
+import org.eclipse.stardust.engine.core.pojo.app.PlainJavaValidator;
+import org.eclipse.stardust.engine.core.pojo.data.JavaBeanAccessPathEvaluator;
+import org.eclipse.stardust.engine.core.pojo.data.PrimitiveAccessPathEvaluator;
+import org.eclipse.stardust.engine.core.pojo.data.PrimitiveValidator;
+import org.eclipse.stardust.engine.core.pojo.data.SerializableValidator;
+import org.eclipse.stardust.engine.core.spi.extensions.model.AccessPointProvider;
+import org.eclipse.stardust.engine.core.spi.extensions.model.ApplicationValidator;
+import org.eclipse.stardust.engine.core.spi.extensions.model.DataValidator;
+import org.eclipse.stardust.engine.core.spi.extensions.model.ExtendedDataValidator;
+import org.eclipse.stardust.engine.core.spi.extensions.model.TriggerValidator;
+import org.eclipse.stardust.engine.core.spi.extensions.runtime.AccessPathEvaluator;
+import org.eclipse.stardust.engine.core.spi.extensions.runtime.ApplicationInstance;
+import org.eclipse.stardust.engine.core.spi.extensions.runtime.DataFilterExtension;
+import org.eclipse.stardust.engine.core.spi.extensions.runtime.DataLoader;
+import org.eclipse.stardust.engine.core.spi.extensions.runtime.ExtendedAccessPathEvaluator;
+import org.eclipse.stardust.engine.core.spi.extensions.runtime.StatelessApplicationInstance;
+import org.eclipse.stardust.engine.core.struct.spi.StructuredDataFilterExtension;
+import org.eclipse.stardust.engine.core.struct.spi.StructuredDataLoader;
+import org.eclipse.stardust.engine.core.struct.spi.StructuredDataXMLValidator;
+import org.eclipse.stardust.engine.core.struct.spi.StructuredDataXPathEvaluator;
+import org.eclipse.stardust.engine.extensions.dms.data.VfsDocumentListAccessPathEvaluator;
+import org.eclipse.stardust.engine.extensions.dms.data.VfsDocumentListValidator;
+import org.eclipse.stardust.engine.extensions.ejb.SessionBeanValidator;
+import org.eclipse.stardust.engine.extensions.ejb.app.SessionBeanAccessPointProvider;
+import org.eclipse.stardust.engine.extensions.ejb.app.SessionBeanApplicationInstance;
+import org.eclipse.stardust.engine.extensions.ejb.data.EntityBeanEvaluator;
+import org.eclipse.stardust.engine.extensions.ejb.data.EntityBeanValidator;
+import org.eclipse.stardust.engine.extensions.jaxws.app.WebserviceApplicationInstance;
+import org.eclipse.stardust.engine.extensions.jaxws.app.WebserviceApplicationValidator;
+import org.eclipse.stardust.engine.extensions.jms.app.JMSApplicationInstance;
+import org.eclipse.stardust.engine.extensions.jms.app.JMSValidator;
+import org.eclipse.stardust.engine.extensions.xml.data.XMLValidator;
+import org.eclipse.stardust.engine.extensions.xml.data.XPathEvaluator;
+import org.eclipse.stardust.model.xpdl.builder.model.BpmPackageBuilder;
+import org.eclipse.stardust.model.xpdl.builder.spi.ModelInitializer;
+import org.eclipse.stardust.model.xpdl.builder.utils.XpdlModelUtils;
+import org.eclipse.stardust.model.xpdl.carnot.ApplicationContextTypeType;
+import org.eclipse.stardust.model.xpdl.carnot.ApplicationTypeType;
+import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage;
+import org.eclipse.stardust.model.xpdl.carnot.DataTypeType;
+import org.eclipse.stardust.model.xpdl.carnot.ModelType;
+import org.eclipse.stardust.model.xpdl.carnot.TriggerTypeType;
+import org.eclipse.stardust.model.xpdl.carnot.util.AttributeUtil;
+import org.eclipse.stardust.model.xpdl.carnot.util.CarnotConstants;
@@ -94,6 +96,10 @@ public class DefaultTypesInitializer implements ModelInitializer
initializeDataType(model, PredefinedConstants.STRUCTURED_DATA, "Structured Data",
StructuredDataXPathEvaluator.class, StructuredDataXMLValidator.class,
+ StructuredDataFilterExtension.class, StructuredDataLoader.class);
+
+ initializeDataType(model, "dmsDocumentList", "Document List",
+ VfsDocumentListAccessPathEvaluator.class, VfsDocumentListValidator.class,
StructuredDataFilterExtension.class, StructuredDataLoader.class);
}
@@ -126,6 +132,9 @@ public class DefaultTypesInitializer implements ModelInitializer
initializeInteractionContextType(model, PredefinedConstants.EXTERNALWEBAPP_CONTEXT,
"External Web Application", true, false);
+
+ initializeInteractionContextType(model, PredefinedConstants.APPLICATION_CONTEXT,
+ "Noninteractive Application Context", true, false);
// TODO
}
@@ -235,7 +244,10 @@ public class DefaultTypesInitializer implements ModelInitializer
typeDef.setIsPredefined(true);
typeDef.setHasApplicationPath(hasApplicationPath);
- typeDef.setHasMappingId(hasMappingId);
+ typeDef.setHasMappingId(hasMappingId);
+
+ long maxElementOid = XpdlModelUtils.getMaxUsedOid(model);
+ typeDef.setElementOid(++maxElementOid);
model.getApplicationContextType().add(typeDef);
}