Merge with midpoint

Evolveum · Mar 2, 2015 · c31bc18 · c31bc18
1 parent deae28e
commit c31bc18
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
@@ -269,13 +269,15 @@ private void savePerformed(AjaxRequestTarget target) {
                     CredentialsType.F_PASSWORD, PasswordType.F_VALUE);
             SchemaRegistry registry = getPrismContext().getSchemaRegistry();
             Collection<ObjectDelta<? extends ObjectType>> deltas = new ArrayList<ObjectDelta<? extends ObjectType>>();
+
+
             for (PasswordAccountDto accDto : accounts) {
                 PrismObjectDefinition objDef = accDto.isMidpoint() ?
                         registry.findObjectDefinitionByCompileTimeClass(UserType.class) :
                         registry.findObjectDefinitionByCompileTimeClass(ShadowType.class);
 
-                PropertyDelta delta = PropertyDelta.createModificationReplaceProperty(valuePath, objDef, password);
-
+                PropertyDelta delta = PropertyDelta.createModificationReplaceProperty(valuePath, objDef, password,password);
+                
                 Class<? extends ObjectType> type = accDto.isMidpoint() ? UserType.class : ShadowType.class;
 
                 deltas.add(ObjectDelta.createModifyDelta(accDto.getOid(), delta, type, getPrismContext()));

diff --git a/infra/schema/.gitignore b/infra/schema/.gitignore
@@ -23,3 +23,4 @@
 /target
 /target/
 /target/
+/bin
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
@@ -7618,7 +7618,7 @@
                                 TODO: better documentation
                             </xsd:documentation>
                             <xsd:appinfo>
-                    			<a:objectReferenceTargetType>tns:ValuePolicyType</a:objectReferenceTargetType>
+                    			<a:objectReferenceTargetType>tns:SecurityPolicyType</a:objectReferenceTargetType>
                     		</xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
@@ -10332,5 +10332,4 @@
     </xsd:complexType>
     <xsd:element name="decisionType" type="tns:DecisionType" />
 
-</xsd:schema>
-
+</xsd:schema>
diff --git a/.../ModelClientSample/ModelClientSample/Service References/midpointModelService/common-3.xsd b/.../ModelClientSample/ModelClientSample/Service References/midpointModelService/common-3.xsd
@@ -6664,7 +6664,7 @@
                                 TODO: better documentation
                             </xsd:documentation>
               <xsd:appinfo>
-                <a:objectReferenceTargetType>tns:ValuePolicyType</a:objectReferenceTargetType>
+                <a:objectReferenceTargetType>tns:SecurityPolicyType</a:objectReferenceTargetType>
               </xsd:appinfo>
             </xsd:annotation>
           </xsd:element>