Commit e16bb1d1 authored by Francesco Chicchiricco's avatar Francesco Chicchiricco
Browse files

Various cleanings

parent a438a2d5
......@@ -26,7 +26,7 @@ limitations under the License.
<CPlainAttr id="56db89b9-119e-4923-a16e-f42823b90c66"
owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="password.cipher.algorithm"/>
<CPlainAttrValue id="870323e8-8db6-4a64-b512-15f9fa094905"
attribute_id="56db89b9-119e-4923-a16e-f42823b90c66" stringValue="SHA1"/>
attribute_id="56db89b9-119e-4923-a16e-f42823b90c66" stringValue="AES"/>
<!-- notificationjob.cronExpression:
+ not existing: NotificationJob runs according to NotificationJob.DEFAULT_CRON_EXP
......@@ -499,25 +499,6 @@ we are happy to inform you that the password request was execute successfully fo
<ANYTEMPLATEREALM ID="5d326683-4291-490c-b266-834291690ccd" TEMPLATE="{&quot;@class&quot;:&quot;org.apache.syncope.common.lib.to.UserTO&quot;,&quot;creator&quot;:null,&quot;creationDate&quot;:null,&quot;lastModifier&quot;:null,&quot;lastChangeDate&quot;:null,&quot;key&quot;:null,&quot;type&quot;:&quot;USER&quot;,&quot;realm&quot;:&quot;/&quot;,&quot;status&quot;:null,&quot;password&quot;:null,&quot;token&quot;:null,&quot;tokenExpireTime&quot;:null,&quot;username&quot;:null,&quot;lastLoginDate&quot;:null,&quot;changePwdDate&quot;:null,&quot;failedLogins&quot;:null,&quot;securityQuestion&quot;:null,&quot;securityAnswer&quot;:null,&quot;mustChangePassword&quot;:false,&quot;auxClasses&quot;:[],&quot;plainAttrs&quot;:[{&quot;schema&quot;:&quot;email&quot;,&quot;readonly&quot;:false,&quot;values&quot;:[]},{&quot;schema&quot;:&quot;firstname&quot;,&quot;readonly&quot;:false,&quot;values&quot;:[]},{&quot;schema&quot;:&quot;lastname&quot;,&quot;readonly&quot;:false,&quot;values&quot;:[]}],&quot;derAttrs&quot;:[],&quot;virAttrs&quot;:[],&quot;resources&quot;:[&quot;Federation Server&quot;],&quot;roles&quot;:[],&quot;dynRoles&quot;:[],&quot;relationships&quot;:[],&quot;memberships&quot;:[],&quot;dynGroups&quot;:[]}" REALM_ID="ea696a4f-e77a-4ef1-be67-8f8093bc8686" ANYTYPE_ID="USER"/>
<ANYTEMPLATEREALM ID="bc8ac07e-3292-4ec9-8ac0-7e3292fec955" TEMPLATE="{&quot;@class&quot;:&quot;org.apache.syncope.common.lib.to.GroupTO&quot;,&quot;creator&quot;:null,&quot;creationDate&quot;:null,&quot;lastModifier&quot;:null,&quot;lastChangeDate&quot;:null,&quot;key&quot;:null,&quot;type&quot;:&quot;GROUP&quot;,&quot;realm&quot;:&quot;/&quot;,&quot;status&quot;:null,&quot;name&quot;:null,&quot;userOwner&quot;:null,&quot;groupOwner&quot;:null,&quot;udynMembershipCond&quot;:null,&quot;adynMembershipConds&quot;:{},&quot;auxClasses&quot;:[],&quot;plainAttrs&quot;:[],&quot;derAttrs&quot;:[],&quot;virAttrs&quot;:[],&quot;resources&quot;:[&quot;Federation Server&quot;],&quot;typeExtensions&quot;:[]}" REALM_ID="ea696a4f-e77a-4ef1-be67-8f8093bc8686" ANYTYPE_ID="GROUP"/>
<ConnInstance id="5aa5b8be-7521-481a-9651-c557aea078c1"
bundleName="connid-security-filter"
connectorName="eu.chorevolution.idm.connid.securityfilter.SecurityFilterConnector"
displayName="Security Filter"
jsonConf="[{&quot;schema&quot;:{&quot;name&quot;:&quot;sampleProperty&quot;,&quot;displayName&quot;:&quot;sampleProperty&quot;,&quot;helpMessage&quot;:&quot;sampleProperty&quot;,&quot;type&quot;:&quot;java.lang.String&quot;,&quot;required&quot;:false,&quot;order&quot;:1,&quot;confidential&quot;:false,&quot;defaultValues&quot;:[&quot;SAMPLE VALUE&quot;]},&quot;overridable&quot;:false,&quot;values&quot;:[&quot;SAMPLE VALUE&quot;]}]"
location="${connid.location}"
version="${connid.securityfilter.version}"/>
<ConnInstance_capabilities conninstance_id="5aa5b8be-7521-481a-9651-c557aea078c1" capability="UPDATE"/>
<ConnInstance_capabilities conninstance_id="5aa5b8be-7521-481a-9651-c557aea078c1" capability="SEARCH"/>
<ExternalResource id="Security Filter" CREATETRACELEVEL="ALL" DELETETRACELEVEL="ALL" ENFORCEMANDATORYCONDITION="0" jsonConf="[]" OVERRIDECAPABILITIES="0" PROPAGATIONPRIORITY="0" PROVISIONINGTRACELEVEL="ALL" RANDOMPWDIFNOTPROVIDED="0" UPDATETRACELEVEL="ALL" CONNECTOR_ID="5aa5b8be-7521-481a-9651-c557aea078c1"/>
<ExternalResource_CAPOVERRIDE RESOURCE_ID="Security Filter" CAPABILITYOVERRIDE="UPDATE"/>
<ExternalResource_CAPOVERRIDE RESOURCE_ID="Security Filter" CAPABILITYOVERRIDE="SEARCH"/>
<Provision id="c698d0ed-b248-4118-98d0-edb2486118e8" objectClass="SERVICE" anyType_id="SERVICE" resource_id="Security Filter"/>
<Provision_AnyTypeClass provision_id="c698d0ed-b248-4118-98d0-edb2486118e8" anyTypeClass_id="Deployed"/>
<Mapping id="6d928ac0-4aec-44d0-928a-c04aecf4d0c2" provision_id="c698d0ed-b248-4118-98d0-edb2486118e8"/>
<MappingItem id="0eafb762-5be3-489b-afb7-625be3c89bcf" connObjectKey="1" extAttrName="Endpoint" intAttrName="Endpoint" mandatoryCondition="true" password="0" purpose="PROPAGATION" mapping_id="6d928ac0-4aec-44d0-928a-c04aecf4d0c2"/>
<SyncopeSchema id="firstname"/>
<PlainSchema id="firstname" type="String" anyTypeClass_id="BaseUser"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
......@@ -597,20 +578,14 @@ we are happy to inform you that the password request was execute successfully fo
<PlainSchema id="Endpoint" mandatoryCondition="false"
multivalue="0" readonly="0" type="String" uniqueConstraint="1" anyTypeClass_id="Deployed"/>
<SyncopeSchema id="sharedUsername"/>
<PlainSchema id="sharedUsername" mandatoryCondition="false"
<SyncopeSchema id="serviceUsername"/>
<PlainSchema id="serviceUsername" mandatoryCondition="false"
multivalue="0" readonly="0" type="String" uniqueConstraint="0" anyTypeClass_id="Deployed"/>
<SyncopeSchema id="sharedPassword"/>
<PlainSchema id="sharedPassword" cipherAlgorithm="AES" secretKey="password" type="Encrypted" mandatoryCondition="false"
<SyncopeSchema id="servicePassword"/>
<PlainSchema id="servicePassword" cipherAlgorithm="AES" secretKey="skjajsjsjljkdsa6633" type="Encrypted" mandatoryCondition="false"
multivalue="0" readonly="0" uniqueConstraint="0" anyTypeClass_id="Deployed"/>
<SyncopeSchema id="securityContext"/>
<VirSchema id="securityContext" extAttrName="securityContext" readonly="0" provision_id="c698d0ed-b248-4118-98d0-edb2486118e8" anyTypeClass_id="Deployed"/>
<SyncopeSchema id="runningStatus"/>
<VirSchema id="runningStatus" extAttrName="runningStatus" readonly="0" provision_id="c698d0ed-b248-4118-98d0-edb2486118e8" anyTypeClass_id="Deployed"/>
<SyncopeSchema id="enactmentEngineBaseURL"/>
<PlainSchema id="enactmentEngineBaseURL" mandatoryCondition="true"
multivalue="0" readonly="0" type="String" uniqueConstraint="0" anyTypeClass_id="Enactment Engine"/>
......
......@@ -26,7 +26,7 @@ limitations under the License.
<CPlainAttr id="56db89b9-119e-4923-a16e-f42823b90c66"
owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="password.cipher.algorithm"/>
<CPlainAttrValue id="870323e8-8db6-4a64-b512-15f9fa094905"
attribute_id="56db89b9-119e-4923-a16e-f42823b90c66" stringValue="SHA1"/>
attribute_id="56db89b9-119e-4923-a16e-f42823b90c66" stringValue="AES"/>
 
<!-- notificationjob.cronExpression:
+ not existing: NotificationJob runs according to NotificationJob.DEFAULT_CRON_EXP
......@@ -499,25 +499,6 @@ we are happy to inform you that the password request was execute successfully fo
<ANYTEMPLATEREALM ID="5d326683-4291-490c-b266-834291690ccd" TEMPLATE="{&quot;@class&quot;:&quot;org.apache.syncope.common.lib.to.UserTO&quot;,&quot;creator&quot;:null,&quot;creationDate&quot;:null,&quot;lastModifier&quot;:null,&quot;lastChangeDate&quot;:null,&quot;key&quot;:null,&quot;type&quot;:&quot;USER&quot;,&quot;realm&quot;:&quot;/&quot;,&quot;status&quot;:null,&quot;password&quot;:null,&quot;token&quot;:null,&quot;tokenExpireTime&quot;:null,&quot;username&quot;:null,&quot;lastLoginDate&quot;:null,&quot;changePwdDate&quot;:null,&quot;failedLogins&quot;:null,&quot;securityQuestion&quot;:null,&quot;securityAnswer&quot;:null,&quot;mustChangePassword&quot;:false,&quot;auxClasses&quot;:[],&quot;plainAttrs&quot;:[{&quot;schema&quot;:&quot;email&quot;,&quot;readonly&quot;:false,&quot;values&quot;:[]},{&quot;schema&quot;:&quot;firstname&quot;,&quot;readonly&quot;:false,&quot;values&quot;:[]},{&quot;schema&quot;:&quot;lastname&quot;,&quot;readonly&quot;:false,&quot;values&quot;:[]}],&quot;derAttrs&quot;:[],&quot;virAttrs&quot;:[],&quot;resources&quot;:[&quot;Federation Server&quot;],&quot;roles&quot;:[],&quot;dynRoles&quot;:[],&quot;relationships&quot;:[],&quot;memberships&quot;:[],&quot;dynGroups&quot;:[]}" REALM_ID="ea696a4f-e77a-4ef1-be67-8f8093bc8686" ANYTYPE_ID="USER"/>
<ANYTEMPLATEREALM ID="bc8ac07e-3292-4ec9-8ac0-7e3292fec955" TEMPLATE="{&quot;@class&quot;:&quot;org.apache.syncope.common.lib.to.GroupTO&quot;,&quot;creator&quot;:null,&quot;creationDate&quot;:null,&quot;lastModifier&quot;:null,&quot;lastChangeDate&quot;:null,&quot;key&quot;:null,&quot;type&quot;:&quot;GROUP&quot;,&quot;realm&quot;:&quot;/&quot;,&quot;status&quot;:null,&quot;name&quot;:null,&quot;userOwner&quot;:null,&quot;groupOwner&quot;:null,&quot;udynMembershipCond&quot;:null,&quot;adynMembershipConds&quot;:{},&quot;auxClasses&quot;:[],&quot;plainAttrs&quot;:[],&quot;derAttrs&quot;:[],&quot;virAttrs&quot;:[],&quot;resources&quot;:[&quot;Federation Server&quot;],&quot;typeExtensions&quot;:[]}" REALM_ID="ea696a4f-e77a-4ef1-be67-8f8093bc8686" ANYTYPE_ID="GROUP"/>
<ConnInstance id="5aa5b8be-7521-481a-9651-c557aea078c1"
bundleName="connid-security-filter"
connectorName="eu.chorevolution.idm.connid.securityfilter.SecurityFilterConnector"
displayName="Security Filter"
jsonConf="[{&quot;schema&quot;:{&quot;name&quot;:&quot;sampleProperty&quot;,&quot;displayName&quot;:&quot;sampleProperty&quot;,&quot;helpMessage&quot;:&quot;sampleProperty&quot;,&quot;type&quot;:&quot;java.lang.String&quot;,&quot;required&quot;:false,&quot;order&quot;:1,&quot;confidential&quot;:false,&quot;defaultValues&quot;:[&quot;SAMPLE VALUE&quot;]},&quot;overridable&quot;:false,&quot;values&quot;:[&quot;SAMPLE VALUE&quot;]}]"
location="${connid.location}"
version="${connid.securityfilter.version}"/>
<ConnInstance_capabilities conninstance_id="5aa5b8be-7521-481a-9651-c557aea078c1" capability="UPDATE"/>
<ConnInstance_capabilities conninstance_id="5aa5b8be-7521-481a-9651-c557aea078c1" capability="SEARCH"/>
<ExternalResource id="Security Filter" CREATETRACELEVEL="ALL" DELETETRACELEVEL="ALL" ENFORCEMANDATORYCONDITION="0" jsonConf="[]" OVERRIDECAPABILITIES="0" PROPAGATIONPRIORITY="0" PROVISIONINGTRACELEVEL="ALL" RANDOMPWDIFNOTPROVIDED="0" UPDATETRACELEVEL="ALL" CONNECTOR_ID="5aa5b8be-7521-481a-9651-c557aea078c1"/>
<ExternalResource_CAPOVERRIDE RESOURCE_ID="Security Filter" CAPABILITYOVERRIDE="UPDATE"/>
<ExternalResource_CAPOVERRIDE RESOURCE_ID="Security Filter" CAPABILITYOVERRIDE="SEARCH"/>
<Provision id="c698d0ed-b248-4118-98d0-edb2486118e8" objectClass="SERVICE" anyType_id="SERVICE" resource_id="Security Filter"/>
<Provision_AnyTypeClass provision_id="c698d0ed-b248-4118-98d0-edb2486118e8" anyTypeClass_id="Deployed"/>
<Mapping id="6d928ac0-4aec-44d0-928a-c04aecf4d0c2" provision_id="c698d0ed-b248-4118-98d0-edb2486118e8"/>
<MappingItem id="0eafb762-5be3-489b-afb7-625be3c89bcf" connObjectKey="1" extAttrName="Endpoint" intAttrName="Endpoint" mandatoryCondition="true" password="0" purpose="PROPAGATION" mapping_id="6d928ac0-4aec-44d0-928a-c04aecf4d0c2"/>
<SyncopeSchema id="firstname"/>
<PlainSchema id="firstname" type="String" anyTypeClass_id="BaseUser"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
......@@ -598,20 +579,14 @@ we are happy to inform you that the password request was execute successfully fo
<PlainSchema id="Endpoint" mandatoryCondition="false"
multivalue="0" readonly="0" type="String" uniqueConstraint="1" anyTypeClass_id="Deployed"/>
 
<SyncopeSchema id="sharedUsername"/>
<PlainSchema id="sharedUsername" mandatoryCondition="false"
<SyncopeSchema id="serviceUsername"/>
<PlainSchema id="serviceUsername" mandatoryCondition="false"
multivalue="0" readonly="0" type="String" uniqueConstraint="0" anyTypeClass_id="Deployed"/>
 
<SyncopeSchema id="sharedPassword"/>
<PlainSchema id="sharedPassword" cipherAlgorithm="AES" secretKey="password" type="Encrypted" mandatoryCondition="false"
<SyncopeSchema id="servicePassword"/>
<PlainSchema id="servicePassword" cipherAlgorithm="AES" secretKey="skjajsjsjljkdsa6633" type="Encrypted" mandatoryCondition="false"
multivalue="0" readonly="0" uniqueConstraint="0" anyTypeClass_id="Deployed"/>
 
<SyncopeSchema id="securityContext"/>
<VirSchema id="securityContext" extAttrName="securityContext" readonly="0" provision_id="c698d0ed-b248-4118-98d0-edb2486118e8" anyTypeClass_id="Deployed"/>
<SyncopeSchema id="runningStatus"/>
<VirSchema id="runningStatus" extAttrName="runningStatus" readonly="0" provision_id="c698d0ed-b248-4118-98d0-edb2486118e8" anyTypeClass_id="Deployed"/>
<SyncopeSchema id="enactmentEngineBaseURL"/>
<PlainSchema id="enactmentEngineBaseURL" mandatoryCondition="true"
multivalue="0" readonly="0" type="String" uniqueConstraint="0" anyTypeClass_id="Enactment Engine"/>
......@@ -135,16 +135,10 @@ public class ChoreographyLogic extends AbstractTransactionalLogic<AbstractBaseBe
}
}
} catch (Exception e) {
LOG.error("While enacting on {}", enactmentEngineKey, e);
if (e instanceof WebApplicationException) {
throw WebApplicationException.class.cast(e);
} else {
throw new WebApplicationException("While enacting on " + enactmentEngineKey, e);
}
throw new RuntimeException("While enacting on " + enactmentEngineKey, e);
}
if (StringUtils.isEmpty(generatedChoreographyId)) {
throw new WebApplicationException("Could not extract the generated choreography id", response);
throw new RuntimeException("Could not extract the generated choreography id");
}
return generatedChoreographyId;
......@@ -173,13 +167,7 @@ public class ChoreographyLogic extends AbstractTransactionalLogic<AbstractBaseBe
throw new WebApplicationException(response);
}
} catch (Exception e) {
LOG.error("While deleting {}", enactmentEngineKey, e);
if (e instanceof WebApplicationException) {
throw WebApplicationException.class.cast(e);
} else {
throw new WebApplicationException("While deleting " + enactmentEngineKey, e);
}
throw new RuntimeException("While deleting " + enactmentEngineKey, e);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment