[CRV-300] Now storing both chorSpec and enriched chorSpec

core/src/main/resources/domains/MasterContent.xml

@@ -584,6 +584,10 @@ we are happy to inform you that the password request was execute successfully fo
   <PlainSchema id="chorSpec" mandatoryCondition="true" mimeType="application/xml"
                multivalue="0" readonly="0" type="Binary" uniqueConstraint="0" anyTypeClass_id="Choreography"/>
 
+  <SyncopeSchema id="enactedChorSpec"/>
+  <PlainSchema id="enactedChorSpec" mandatoryCondition="false" mimeType="application/xml"
+               multivalue="0" readonly="0" type="Binary" uniqueConstraint="0" anyTypeClass_id="Choreography"/>
+
   <SyncopeSchema id="diagram"/>
   <PlainSchema id="diagram" mandatoryCondition="false" mimeType="application/xml"
                multivalue="0" readonly="0" type="Binary" uniqueConstraint="0" anyTypeClass_id="Choreography"/>

core/src/test/resources/domains/MasterContent.xml

@@ -584,7 +584,11 @@ we are happy to inform you that the password request was execute successfully fo
   <SyncopeSchema id="chorSpec"/>
   <PlainSchema id="chorSpec" mandatoryCondition="true" mimeType="application/xml"
                multivalue="0" readonly="0" type="Binary" uniqueConstraint="0" anyTypeClass_id="Choreography"/>
-  
+
+  <SyncopeSchema id="enactedChorSpec"/>
+  <PlainSchema id="enactedChorSpec" mandatoryCondition="false" mimeType="application/xml"
+               multivalue="0" readonly="0" type="Binary" uniqueConstraint="0" anyTypeClass_id="Choreography"/>
+
   <SyncopeSchema id="description"/>
   <PlainSchema id="description" mandatoryCondition="false"
                multivalue="0" readonly="0" type="String" uniqueConstraint="0" anyTypeClass_id="Choreography"/>

ext/choreography/logic/src/main/java/org/apache/syncope/core/logic/ChoreographyLogic.java

@@ -594,7 +594,7 @@ public class ChoreographyLogic extends AbstractLogic<AbstractBaseBean> {
                             build()).build());
                 }
                 choreographyPatch.getPlainAttrs().add(new AttrPatch.Builder().attrTO(
-                        new AttrTO.Builder().schema("chorSpec").value(Base64Utility.encode(chorSpecXML)).build()).
+                        new AttrTO.Builder().schema("enactedChorSpec").value(Base64Utility.encode(chorSpecXML)).build()).
                         build());
 
                 // 2. process the chorSpec
@@ -633,7 +633,7 @@ public class ChoreographyLogic extends AbstractLogic<AbstractBaseBean> {
                             build()).build());
                 }
                 choreographyPatch.getPlainAttrs().add(new AttrPatch.Builder().attrTO(
-                        new AttrTO.Builder().schema("chorSpec").value(Base64Utility.encode(chorSpecXML)).build()).
+                        new AttrTO.Builder().schema("enactedChorSpec").value(Base64Utility.encode(chorSpecXML)).build()).
                         build());
 
                 choreography = groupLogic.update(choreographyPatch, false).getEntity();