Removed almost all legacy dynamic variables-based code; almost all 'e…

…xternalization' stuff. All process variables potentially over 4000 chars are gone. Everything is in the task. Tests are broken now.
Evolveum · Mar 10, 2016 · c4b6d8c · c4b6d8c
1 parent dbb73f9
commit c4b6d8c
Show file tree

Hide file tree

Showing 71 changed files with 1,943 additions and 2,907 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
@@ -153,11 +153,11 @@ private void registerBuiltinSchemas(SchemaRegistry schemaRegistry) throws Schema
 
         schemaRegistry.registerPrismSchemaResource("xml/ns/public/model/workflow/extension-3.xsd", "wf");
 
-        schemaRegistry.registerPrismSchemaResource("xml/ns/public/model/workflow/common-forms-3.xsd", "wfcf",
-                com.evolveum.midpoint.xml.ns.model.workflow.common_forms_3.ObjectFactory.class.getPackage());
-
-        schemaRegistry.registerPrismSchemaResource("xml/ns/public/model/workflow/process-instance-state-3.xsd", "wfpis",
-                com.evolveum.midpoint.xml.ns.model.workflow.process_instance_state_3.ObjectFactory.class.getPackage());
+//        schemaRegistry.registerPrismSchemaResource("xml/ns/public/model/workflow/common-forms-3.xsd", "wfcf",
+//                com.evolveum.midpoint.xml.ns.model.workflow.common_forms_3.ObjectFactory.class.getPackage());
+//
+//        schemaRegistry.registerPrismSchemaResource("xml/ns/public/model/workflow/process-instance-state-3.xsd", "wfpis",
+//                com.evolveum.midpoint.xml.ns.model.workflow.process_instance_state_3.ObjectFactory.class.getPackage());
 
         schemaRegistry.registerPrismSchemaResource("xml/ns/public/model/scripting/scripting-3.xsd", "s",
                 com.evolveum.midpoint.xml.ns._public.model.scripting_3.ObjectFactory.class.getPackage());

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
@@ -407,4 +407,11 @@ public static Objectable getObjectFromReference(ObjectReferenceType ref) {
 		}
 		return ref.asReferenceValue().getObject().asObjectable();
 	}
+
+	public static PrismObject<?> getPrismObjectFromReference(ObjectReferenceType ref) {
+		if (ref == null) {
+			return null;
+		}
+		return ref.asReferenceValue().getObject();
+	}
 }
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
@@ -709,6 +709,13 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="processName" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Name of the process definition, e.g. "ItemApproval".
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
             <xsd:element name="processInstanceName" type="xsd:string">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -812,6 +819,13 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="processInterface" type="xsd:string" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Contains name of class that provides an interface between wf process and midPoint ("process interface bean").
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
             <xsd:element name="processorSpecificState" type="tns:WfProcessorSpecificStateType">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -951,7 +965,7 @@
         <xsd:complexContent>
             <xsd:extension base="tns:WfProcessSpecificStateType">
                 <xsd:sequence>
-                    <xsd:element name="approvalRequest" type="tns:ItemApprovalRequestType"/>
+                    <xsd:element name="approvalSchema" type="tns:ApprovalSchemaType"/>
                     <xsd:element name="decisions" type="c:DecisionType" minOccurs="0" maxOccurs="unbounded"/>
                 </xsd:sequence>
             </xsd:extension>

diff --git a/infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd b/infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd