Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Aug 27, 2018 · 77a7c93 · 77a7c93
2 parents 59b10ac + e009ece
commit 77a7c93
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -4174,3 +4174,4 @@ transition.details=Transition
 ref.details=Reference
 ShowEmptyButton.showMore=Show empty fields
 ShowEmptyButton.showLess=Hide empty fields
+TaskExecutionGroupConstraintType.details.newValue=New secondary execution group definition
diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties
@@ -1024,6 +1024,25 @@ WfConfigurationType.executionTasks=Execution tasks
 WfConfigurationType.approverCommentsFormatting=Approver comments formatting
 WfConfigurationType.primaryChangeProcessor=Primary change processor
 WfConfigurationType.generalChangeProcessor=General change processor
+WfExecutionTasksConfigurationType.serialization=Serialization
+WfExecutionTasksConfigurationType.executionConstraints=Execution constraints
+TaskExecutionConstraintsType.group=Execution group
+TaskExecutionConstraintsType.groupTaskLimit=Task limit for the execution group
+TaskExecutionConstraintsType.secondaryGroup=Secondary execution group
+TaskExecutionConstraintsType.retryAfter=Retry after
+WfExecutionTasksSerializationType.enabled=Enabled
+WfExecutionTasksSerializationType.scope=Serialization scope
+WfExecutionTasksSerializationType.retryAfter=Retry after
+WfExecutionTasksSerializationType.groupPrefix=Execution group prefix
+WfExecutionTasksSerializationScopeType.OPERATION=Operation
+WfExecutionTasksSerializationScopeType.OBJECT=Object
+WfExecutionTasksSerializationScopeType.TARGET=Target
+WfExecutionTasksSerializationScopeType.GLOBAL=Global
+TaskExecutionGroupConstraintType.group=Group name
+TaskExecutionGroupConstraintType.groupTaskLimit=Group task limit
+WfChangeProcessorConfigurationType.enabled=Enabled
+PcpAspectConfigurationType.approverExpression=Approver expression
+PcpAspectConfigurationType.automaticallyApproved=Automatically approved
 WfProcessSpecificationType.ref=Reference
 WfProcessSpecificationType.name=Name
 WfProcessSpecificationType.order=Order

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
@@ -41,6 +41,8 @@
     <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/query-3"/>
 
     <xsd:include schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-core-3" />
+    <xsd:include schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-case-management-3" />
+    <xsd:include schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-workflows-3" />
 
     <xsd:complexType name="AbstractAccessCertificationDefinitionType" abstract="true">
         <xsd:annotation>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -2712,6 +2712,10 @@
 						complex parameters. But for now, their only parameter is the (clusterwide) member tasks limit.
 						They are also referenced from NodeType when specifying execution limitations for them.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>TaskExecutionConstraintsType.group</a:displayName>
+						<a:displayOrder>100</a:displayOrder>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="groupTaskLimit" type="xsd:int" minOccurs="0">
@@ -2720,6 +2724,10 @@
 						Number of tasks within the group that can be executed at once (clusterwide). Default is "unlimited".
 						This parameter will be moved into separate task group object in a later version of midPoint.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>TaskExecutionConstraintsType.groupTaskLimit</a:displayName>
+						<a:displayOrder>110</a:displayOrder>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="secondaryGroup" type="tns:TaskExecutionGroupConstraintType" minOccurs="0" maxOccurs="unbounded">
@@ -2728,6 +2736,8 @@
 						TODO
 					</xsd:documentation>
 					<xsd:appinfo>
+						<a:displayName>TaskExecutionConstraintsType.secondaryGroup</a:displayName>
+						<a:displayOrder>120</a:displayOrder>
 						<a:since>3.7.1</a:since>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -2762,6 +2772,10 @@
 					<xsd:documentation>
 						In what time to retry after clusterwide execution constraints are not met. The default is 1 minute.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>TaskExecutionConstraintsType.retryAfter</a:displayName>
+						<a:displayOrder>130</a:displayOrder>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
@@ -2784,6 +2798,10 @@
 					<xsd:documentation>
 						TODO
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>TaskExecutionGroupConstraintType.group</a:displayName>
+						<a:displayOrder>100</a:displayOrder>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="groupTaskLimit" type="xsd:int" minOccurs="0">
@@ -2792,6 +2810,10 @@
 						Number of tasks within the group that can be executed at once (clusterwide). Default is "unlimited".
 						This parameter will be moved into separate task group object in a later version of midPoint.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>TaskExecutionGroupConstraintType.groupTaskLimit</a:displayName>
+						<a:displayOrder>110</a:displayOrder>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>