change SchemaExtensionType to SchemaType

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java

@@ -59,7 +59,7 @@ public enum PageTypes {
     REPORT("reports", GuiStyleConstants.CLASS_REPORT_ICON, PageReports.class, PageReport.class, ReportType.COMPLEX_TYPE),
     SIMULATION_RESULT("simulationResults", GuiStyleConstants.CLASS_SIMULATION_RESULT, PageSimulationResults.class, PageSimulationResult.class, SimulationResultType.COMPLEX_TYPE),
     MARK("marks", GuiStyleConstants.CLASS_MARK, PageMarks.class, PageMark.class, MarkType.COMPLEX_TYPE),
-    SCHEMA("schemas", GuiStyleConstants.CLASS_ICON_RESOURCE_SCHEMA, PageSchemas.class, PageSchema.class, SchemaExtensionType.COMPLEX_TYPE);
+    SCHEMA("schemas", GuiStyleConstants.CLASS_ICON_RESOURCE_SCHEMA, PageSchemas.class, PageSchema.class, SchemaType.COMPLEX_TYPE);
 
     private String identifier;
     private String icon;

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/AssignmentHolderBasicPanel.java

@@ -28,7 +28,7 @@
         defaultPanel = true,
         display = @PanelDisplay(label = "pageAdminFocus.basic", icon = GuiStyleConstants.CLASS_CIRCLE_FULL, order = 10))
 //@PanelInstance(identifier = "basic",
-//        applicableForType = SchemaExtensionType.class,
+//        applicableForType = SchemaType.class,
 //        defaultPanel = true,
 //        display = @PanelDisplay(label = "pageAdminFocus.basic", icon = GuiStyleConstants.CLASS_CIRCLE_FULL, order = 10))
 public class AssignmentHolderBasicPanel<AH extends AssignmentHolderType> extends AbstractObjectMainPanel<AH, ObjectDetailsModels<AH>> {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/schema/PageSchema.java

@@ -17,7 +17,7 @@
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.web.component.ObjectSummaryPanel;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaExtensionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaType;
 
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -35,7 +35,7 @@
                         label = "PageUser.auth.user.label",
                         description = "PageUser.auth.user.description")
         })
-public class PageSchema extends AbstractPageObjectDetails<SchemaExtensionType, SchemaDetailsModel> {
+public class PageSchema extends AbstractPageObjectDetails<SchemaType, SchemaDetailsModel> {
 
         private static final long serialVersionUID = 1L;
 
@@ -44,17 +44,17 @@ public PageSchema() {
         }
 
     @Override
-    protected SchemaDetailsModel createObjectDetailsModels(PrismObject<SchemaExtensionType> object) {
+    protected SchemaDetailsModel createObjectDetailsModels(PrismObject<SchemaType> object) {
         return new SchemaDetailsModel(createPrismObjectModel(object), this);
     }
 
     @Override
-    public Class<SchemaExtensionType> getType() {
-        return SchemaExtensionType.class;
+    public Class<SchemaType> getType() {
+        return SchemaType.class;
     }
 
     @Override
-    protected Panel createSummaryPanel(String id, IModel<SchemaExtensionType> summaryModel) {
+    protected Panel createSummaryPanel(String id, IModel<SchemaType> summaryModel) {
         return new ObjectSummaryPanel<>(id, summaryModel, getSummaryPanelSpecification()) {
 
             @Override

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/schema/PageSchemas.java

@@ -22,7 +22,7 @@
 import com.evolveum.midpoint.web.page.admin.PageAdmin;
 import com.evolveum.midpoint.web.page.admin.users.PageUsers;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaExtensionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 import org.apache.wicket.markup.html.form.Form;
@@ -60,7 +60,7 @@ private void initLayout() {
         Form mainForm = new MidpointForm(ID_MAIN_FORM);
         add(mainForm);
 
-        MainObjectListPanel<SchemaExtensionType> table = new MainObjectListPanel<>(ID_TABLE, SchemaExtensionType.class) {
+        MainObjectListPanel<SchemaType> table = new MainObjectListPanel<>(ID_TABLE, SchemaType.class) {
 
             @Override
             protected UserProfileStorage.TableId getTableId() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/schema/SchemaDetailsModel.java

@@ -19,16 +19,16 @@
 import com.evolveum.midpoint.gui.impl.page.admin.schema.dto.DefinitionDto;
 import com.evolveum.midpoint.gui.impl.page.admin.schema.dto.DefinitionsModel;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaExtensionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaType;
 
 import org.apache.wicket.model.PropertyModel;
 
-public class SchemaDetailsModel extends ObjectDetailsModels<SchemaExtensionType> {
+public class SchemaDetailsModel extends ObjectDetailsModels<SchemaType> {
 
     private final PrismSchemaModel prismSchemaModel;
     private DefinitionsModel<DefinitionDto> schemaModel;
 
-    public SchemaDetailsModel(LoadableDetachableModel<PrismObject<SchemaExtensionType>> prismObjectModel, ModelServiceLocator serviceLocator) {
+    public SchemaDetailsModel(LoadableDetachableModel<PrismObject<SchemaType>> prismObjectModel, ModelServiceLocator serviceLocator) {
         super(prismObjectModel, serviceLocator);
 
         this.prismSchemaModel = new PrismSchemaModel(getObjectWrapperModel());

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/schema/component/SchemaPanel.java

@@ -41,7 +41,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaExtensionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaType;
 
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
@@ -55,9 +55,9 @@
 
 @PanelType(name = "schemaPanel")
 @PanelInstance(identifier = "schemaPanel",
-        applicableForType = SchemaExtensionType.class,
+        applicableForType = SchemaType.class,
         display = @PanelDisplay(label = "SchemaPanel.title", icon = GuiStyleConstants.CLASS_CIRCLE_FULL, order = 25))
-public class SchemaPanel<T extends DefinitionDto> extends AbstractObjectMainPanel<SchemaExtensionType, SchemaDetailsModel> {
+public class SchemaPanel<T extends DefinitionDto> extends AbstractObjectMainPanel<SchemaType, SchemaDetailsModel> {
 
     private static final String ID_DEFS = "defs";
     private static final String ID_FORM = "form";
@@ -121,7 +121,7 @@ public void onClick(AjaxRequestTarget target) {
                 }
                 Element newXsdSchema = DOMUtil.getFirstChildElement(newXsdSchemaDoc);
 
-                SchemaExtensionType extensionType = new SchemaExtensionType();
+                SchemaType extensionType = new SchemaType();
                 SchemaDefinitionType newDef = new SchemaDefinitionType();
                 newDef.setSchema(newXsdSchema);
                 extensionType.setDefinition(newDef);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/schema/dto/PrismSchemaModel.java

@@ -14,22 +14,22 @@
 import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyValueWrapper;
 import com.evolveum.midpoint.gui.impl.prism.wrapper.SchemaPropertyWrapperImpl;
 import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaExtensionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaType;
 import com.evolveum.prism.xml.ns._public.types_3.SchemaDefinitionType;
 
 public class PrismSchemaModel implements IModel<SchemaPropertyWrapperImpl> {
 
-    private final IModel<PrismObjectWrapper<SchemaExtensionType>> schemaType;
+    private final IModel<PrismObjectWrapper<SchemaType>> schemaType;
 
-    public PrismSchemaModel(IModel<PrismObjectWrapper<SchemaExtensionType>> schemaType) {
+    public PrismSchemaModel(IModel<PrismObjectWrapper<SchemaType>> schemaType) {
         this.schemaType = schemaType;
     }
 
     @Override
     public SchemaPropertyWrapperImpl getObject() {
         PrismPropertyWrapper<SchemaDefinitionType> property;
         try {
-            property = schemaType.getObject().findProperty(SchemaExtensionType.F_DEFINITION);
+            property = schemaType.getObject().findProperty(SchemaType.F_DEFINITION);
             PrismPropertyValueWrapper<SchemaDefinitionType> valueWrapper = property.getValue();
             return (SchemaPropertyWrapperImpl) valueWrapper;
         } catch (SchemaException e) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/DetailsPageUtil.java

@@ -100,7 +100,7 @@ public final class DetailsPageUtil {
         DetailsPageUtil.OBJECT_DETAILS_PAGE_MAP.put(RoleAnalysisSessionType.class, PageRoleAnalysisSession.class);
         DetailsPageUtil.OBJECT_DETAILS_PAGE_MAP.put(RoleAnalysisClusterType.class, PageRoleAnalysisCluster.class);
 
-        DetailsPageUtil.OBJECT_DETAILS_PAGE_MAP.put(SchemaExtensionType.class, PageSchema.class);
+        DetailsPageUtil.OBJECT_DETAILS_PAGE_MAP.put(SchemaType.class, PageSchema.class);
 
     }
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/init/SchemaCache.java

@@ -33,7 +33,7 @@
 import com.evolveum.midpoint.schema.ResultHandler;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaExtensionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SingleCacheStateInformationType;
 import com.evolveum.prism.xml.ns._public.types_3.SchemaDefinitionType;
 
@@ -68,9 +68,9 @@ public void init() {
         Map<QName, ComplexTypeDefinition> dbExtensions = new HashMap<>();
 
         //TODO cleanup
-        ResultHandler<SchemaExtensionType> handler = (object, parentResult) -> {
+        ResultHandler<SchemaType> handler = (object, parentResult) -> {
             try {
-                SchemaExtensionType schemaType = object.asObjectable();
+                SchemaType schemaType = object.asObjectable();
                 QName extensionForType = schemaType.getType();
 
                 SchemaDefinitionType def = schemaType.getDefinition();
@@ -89,7 +89,7 @@ public void init() {
 
         OperationResult result = new OperationResult("initExtensionFromDB");
         try {
-            repositoryService.searchObjectsIterative(SchemaExtensionType.class, null, handler, null, true, result);
+            repositoryService.searchObjectsIterative(SchemaType.class, null, handler, null, true, result);
         } catch (SchemaException e) {
             throw new RuntimeException(e);
         }
@@ -121,7 +121,7 @@ private ComplexTypeDefinition detectExtensionSchemas(PrismSchema schema, Map<QNa
     }
 
     private static final Collection<Class<?>> INVALIDATION_RELATED_CLASSES = Arrays.asList(
-            SchemaExtensionType.class
+            SchemaType.class
     );
 
     @Override

infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java

@@ -125,7 +125,7 @@ public enum ObjectTypes {
             ObjectManager.MODEL, "simulationResults"),
 
     SCHEMA(
-            SchemaExtensionType.COMPLEX_TYPE, SchemaConstantsGenerated.C_SCHEMA_EXTENSION, SchemaExtensionType.class,
+            SchemaType.COMPLEX_TYPE, SchemaConstantsGenerated.C_SCHEMA, SchemaType.class,
             ObjectManager.MODEL, "schemaExtensions"),
 
     // this should be at end, because otherwise it presents itself as entry for all subtypes of ObjectType

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -21178,7 +21178,7 @@
         </xsd:sequence>
     </xsd:complexType>
 
-    <xsd:complexType name="SchemaExtensionType">
+    <xsd:complexType name="SchemaType">
         <xsd:annotation>
             <xsd:documentation>
                 Schema definition type. Replacement for extension schema defined in midPoint.home
@@ -21210,7 +21210,7 @@
             </xsd:extension>
         </xsd:complexContent>
     </xsd:complexType>
-    <xsd:element name="schemaExtension" type="tns:SchemaExtensionType" substitutionGroup="c:object"/>
+    <xsd:element name="schema" type="tns:SchemaType" substitutionGroup="c:object"/>
 
 
 </xsd:schema>

infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd

@@ -175,7 +175,7 @@
                             </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
-                    <xsd:element ref="tns:schema" minOccurs="0">
+                    <xsd:element name="schema" type="tns:XmlSchemaType" minOccurs="0">
                         <xsd:annotation>
                             <xsd:documentation>
                                 Schema for resource objects.
@@ -454,7 +454,7 @@
         </xsd:sequence>
         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
-    <xsd:element name="schema" type="tns:XmlSchemaType"/>
+    <xsd:element name="xmlSchema" type="tns:XmlSchemaType"/>
 
     <xsd:complexType name="CachingMetadataType">
         <xsd:annotation>
@@ -4269,7 +4269,7 @@
                             </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
-                    <xsd:element ref="tns:schema" minOccurs="0">
+                    <xsd:element name="schema" type="tns:XmlSchemaType" minOccurs="0">
                         <xsd:annotation>
                             <xsd:documentation>
                                 Connector configuration schema.

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryBeanConfig.java

@@ -199,7 +199,7 @@ public SqaleRepoContext sqlRepoContext(
                 .register(SimulationResultType.COMPLEX_TYPE, QSimulationResultMapping.initSimulationResultMapping(repositoryContext))
                 .register(SimulationResultProcessedObjectType.COMPLEX_TYPE, QProcessedObjectMapping.initProcessedResultMapping(repositoryContext))
                 .register(MarkType.COMPLEX_TYPE, QMarkMapping.init(repositoryContext))
-                .register(SchemaExtensionType.COMPLEX_TYPE, QSchemaMapping.init(repositoryContext))
+                .register(SchemaType.COMPLEX_TYPE, QSchemaMapping.init(repositoryContext))
                 .register(QAffectedObjectsMapping.init(repositoryContext))
                 .seal();
 

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/MObjectType.java

@@ -82,7 +82,7 @@ public enum MObjectType {
     ROLE(QRole.class, RoleType.class),
     ROLE_ANALYSIS_CLUSTER(QClusterData.class, RoleAnalysisClusterType.class),
     ROLE_ANALYSIS_SESSION(QSessionData.class, RoleAnalysisSessionType.class),
-    SCHEMA(QSchema.class, SchemaExtensionType.class),
+    SCHEMA(QSchema.class, SchemaType.class),
     SECURITY_POLICY(QSecurityPolicy.class, SecurityPolicyType.class),
     SEQUENCE(QSequence.class, SequenceType.class),
     SERVICE(QService.class, ServiceType.class),

repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/schema/QSchemaMapping.java

@@ -8,20 +8,21 @@
 
 import java.util.Objects;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaType;
+
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.repo.sqale.SqaleRepoContext;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObjectMapping;
 import com.evolveum.midpoint.repo.sqale.qmodel.tag.QMark;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MarkType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SchemaExtensionType;
 
 /**
  * Mapping between {@link QMark} and {@link MarkType}.
  */
 public class QSchemaMapping
-        extends QObjectMapping<SchemaExtensionType, QSchema, MObject> {
+        extends QObjectMapping<SchemaType, QSchema, MObject> {
 
     public static final String DEFAULT_ALIAS_NAME = "schema";
     private static QSchemaMapping instance;
@@ -41,7 +42,7 @@ public static QSchemaMapping getInstance() {
 
     private QSchemaMapping(@NotNull SqaleRepoContext repositoryContext) {
         super(QSchema.TABLE_NAME, DEFAULT_ALIAS_NAME,
-                SchemaExtensionType.class, QSchema.class, repositoryContext);
+                SchemaType.class, QSchema.class, repositoryContext);
     }
 
     @Override