Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint …

…into post-3.7-fixes
Evolveum · Jan 10, 2018 · 98da921 · 98da921
2 parents feebd98 + 96069f5
commit 98da921
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties
@@ -147,6 +147,15 @@ ConnectorOperationalStatus.poolConfigWaitTimeout=Wait timeout
 ConnectorOperationalStatus.poolConfigMinEvictableIdleTime=Minimum evictable idle time
 ConnectorOperationalStatus.poolStatusNumIdle=Number of idle connectors
 ConnectorOperationalStatus.poolStatusNumActive=Number of active connectors
+AbstractConstructionType.description=Description
+AbstractConstructionType.strength=Strength
+AbstractConstructionType.strength.help=Strength of the construction defines how aggressively will the construction be applied.
+ConstructionType.kind=Kind
+ConstructionType.kind.help=Kind of resource object that should be created on the resource.
+ConstructionType.intent=Intent
+ConstructionType.intent.help=Intent of resource object that should be created on the resource.
+ConstructionType.auxiliaryObjectClass=Auxiliary object class
+ConstructionType.auxiliaryObjectClass.help=The reference to additional type definitions for this object. These auxiliary object classes will be added to the resource object when the construction is provisioned.
 FocusType.activation=Activation
 FocusType.assignment=Assignments
 FocusType.inducement=Inducements

diff --git a/infra/schema/src/main/resources/localization/schema_en.properties b/infra/schema/src/main/resources/localization/schema_en.properties
@@ -147,6 +147,15 @@ ConnectorOperationalStatus.poolConfigWaitTimeout=Wait timeout
 ConnectorOperationalStatus.poolConfigMinEvictableIdleTime=Minimum evictable idle time
 ConnectorOperationalStatus.poolStatusNumIdle=Number of idle connectors
 ConnectorOperationalStatus.poolStatusNumActive=Number of active connectors
+AbstractConstructionType.description=Description
+AbstractConstructionType.strength=Strength
+AbstractConstructionType.strength.help=Strength of the construction defines how aggressively will the construction be applied.
+ConstructionType.kind=Kind
+ConstructionType.kind.help=Kind of resource object that should be created on the resource.
+ConstructionType.intent=Intent
+ConstructionType.intent.help=Intent of resource object that should be created on the resource.
+ConstructionType.auxiliaryObjectClass=Auxiliary object class
+ConstructionType.auxiliaryObjectClass.help=The reference to additional type definitions for this object. These auxiliary object classes will be added to the resource object when the construction is provisioned.
 FocusType.activation=Activation
 FocusType.assignment=Assignments
 FocusType.inducement=Inducements

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
@@ -2799,7 +2799,11 @@
                                 </p>
                             </xsd:documentation>
                             <xsd:appinfo>
-		                    	<a:displayName>UserType.nickname</a:displayName>
+		                    	AbstractConstructionType.description=Description
+AbstractConstructionType.strength=Strength
+AbstractConstructionType.strength.help=Strength of the construction defines how aggressively will the construction be applied.
+ConstructionType.kind=Kind
+ConstructionType.kind.help=Kind of resource object that should be created on the resource.
 		                    	<a:displayOrder>140</a:displayOrder>
 		                    </xsd:appinfo>
                         </xsd:annotation>
@@ -10958,7 +10962,13 @@
 		   </xsd:appinfo>
 	   </xsd:annotation>
         <xsd:sequence>
-            <xsd:element ref="tns:description" minOccurs="0" maxOccurs="1"/>
+           <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1">
+           		<xsd:annotation>
+                   <xsd:appinfo>
+					<a:displayName>AbstractConstructionType.description</a:displayName>
+                   </xsd:appinfo>
+               </xsd:annotation>
+           </xsd:element>
            <xsd:element name="strength" type="tns:ConstructionStrengthType" minOccurs="0" maxOccurs="1" default="strong">
                <xsd:annotation>
                    <xsd:documentation>
@@ -10970,6 +10980,8 @@
                    </xsd:documentation>
                    <xsd:appinfo>
 					<a:since>3.5</a:since>
+					<a:displayName>AbstractConstructionType.strength</a:displayName>
+					<a:help>AbstractConstructionType.strength.help</a:help>
                    </xsd:appinfo>
                </xsd:annotation>
            </xsd:element>
@@ -11020,6 +11032,10 @@
 
 					                 This element is optional. If not specified defaults to account kind.
 					             </xsd:documentation>
+					             <xsd:appinfo>
+					             	<a:displayName>ConstructionType.kind</a:displayName>
+					             	<a:help>ConstructionType.kind.help</a:help>
+					             </xsd:appinfo>
 					         </xsd:annotation>
 					     </xsd:element>
 					 </xsd:choice>
@@ -11035,6 +11051,10 @@
 					                 This element is optional. If not specified then the definition
 					                 marked as default in the resource definition should be used.
 					             </xsd:documentation>
+					             <xsd:appinfo>
+					             	<a:displayName>ConstructionType.intent</a:displayName>
+					             	<a:help>ConstructionType.intent.help</a:help>
+					             </xsd:appinfo>
 					         </xsd:annotation>
 					     </xsd:element>
 					 </xsd:choice>
@@ -11058,6 +11078,10 @@
 					            point to object class definition (complex type definition in resource schema) and
 					            this definition should be marked as auxiliary.
 					        </xsd:documentation>
+				             <xsd:appinfo>
+				             	<a:displayName>ConstructionType.auxiliaryObjectClass</a:displayName>
+				             	<a:help>ConstructionType.auxiliaryObjectClass.help</a:help>
+				             </xsd:appinfo>
 					    </xsd:annotation>
 					</xsd:element>
 			   </xsd:sequence>