Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 6, 2016 · e24f990 · e24f990
2 parents 016d9b7 + 80a0604
commit e24f990
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 83 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java b/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
@@ -28,6 +28,7 @@
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -223,13 +224,15 @@ public void onClick(AjaxRequestTarget target) {
 			public File getObject() {
 				String home = getPageBase().getMidpointConfiguration().getMidpointHome();
 				File f = new File(home, "result");
-				DataOutputStream dos;
+				DataOutputStream dos = null;
 				try {
 					dos = new DataOutputStream(new FileOutputStream(f));
 
 					dos.writeBytes(OperationResultPanel.this.getModel().getObject().getXml());
 				} catch (IOException e) {
 					LOGGER.error("Could not download result: {}", e.getMessage(), e);
+				} finally {
+					IOUtils.closeQuietly(dos);
 				}
 
 				return f;

diff --git a/.../java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java b/.../java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
@@ -239,7 +239,7 @@ public ObjectFilter getObject() {
                 ObjectFilter archivedRolesFilter = EqualFilter.createEqual(path, RoleType.class,
                         getPageBase().getPrismContext(), null, ActivationStatusType.ARCHIVED);
                 ObjectFilter filter = isRequestableFilter && authorizedRolesFilter != null ?
-                        AndFilter.createAnd(authorizedRolesFilter, archivedRolesFilter) :
+                        AndFilter.createAnd(authorizedRolesFilter, new NotFilter(archivedRolesFilter)) :
                         new NotFilter(archivedRolesFilter);
                 return filter;
             }

diff --git a/...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java b/...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
@@ -15,70 +15,20 @@
  */
 package com.evolveum.midpoint.web.component.objectdetails;
 
-import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition;
-import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.*;
-import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.prism.query.*;
-import com.evolveum.midpoint.schema.constants.SchemaConstants;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.exception.SystemException;
-import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDto;
 import com.evolveum.midpoint.web.component.assignment.AssignmentTablePanel;
-import com.evolveum.midpoint.web.component.data.TablePanel;
-import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
 import com.evolveum.midpoint.web.component.form.Form;
-import com.evolveum.midpoint.web.component.menu.cog.InlineMenu;
-import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
-import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.component.prism.*;
-import com.evolveum.midpoint.web.component.util.ObjectWrapperUtil;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.PageAdminFocus;
-import com.evolveum.midpoint.web.page.admin.server.PageTasks;
-import com.evolveum.midpoint.web.page.admin.server.dto.TaskDto;
-import com.evolveum.midpoint.web.page.admin.server.dto.TaskDtoProvider;
-import com.evolveum.midpoint.web.page.admin.server.dto.TaskDtoProviderOptions;
 import com.evolveum.midpoint.web.page.admin.users.component.*;
-import com.evolveum.midpoint.web.page.admin.users.dto.FocusSubwrapperDto;
-import com.evolveum.midpoint.web.page.admin.users.dto.SimpleUserResourceProvider;
-import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
-import com.evolveum.midpoint.web.resource.img.ImgResources;
-import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.*;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.util.string.StringValue;
-
-import javax.xml.namespace.QName;
-
-import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html b/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
@@ -18,8 +18,6 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 
-    <div wicket:id="confirmDeletePopup" />
-
     <div class="box">
         <div class="box-body no-padding">
             <a class="btn btn-primary btn-sm" wicket:id="addNewStage" style="margin-left: 10px; margin-top: 10px; margin-bottom: 10px" />

diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java b/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.TabbedPanel;
 import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
+import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.certification.dto.StageDefinitionDto;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationStageDefinitionType;
@@ -54,8 +55,6 @@ public class DefinitionStagesPanel extends BasePanel<List<StageDefinitionDto>> {
     private static final String ID_DELETE_STAGE = "deleteStage";
     private static final String DEFAULT_STAGE_NAME_PREFIX = "Stage ";
 
-	private static final String DIALOG_CONFIRM_DELETE = "confirmDeletePopup";
-
 	private TabbedPanel<ITab> tabPanel;
 	private PageCertDefinition parentPage;
 
@@ -120,28 +119,25 @@ public void onSubmit(AjaxRequestTarget target, Form form) {
 		delete.add(visibleIfMoreTabs);
 		add(delete);
 
-		add(new ConfirmationDialog(DIALOG_CONFIRM_DELETE,
-				createStringResource("DefinitionStagesPanel.confirmDelete"),
-				new AbstractReadOnlyModel<String>() {
-					@Override
-					public String getObject() {
-						StageDefinitionDto dto = getModelObject().get(tabPanel.getSelectedTab());
-						return getString("DefinitionStagesPanel.confirmDeleteText", dto.getName());
-					}
-				}) {
-			@Override
-			public void yesPerformed(AjaxRequestTarget target) {
-				close(target);
-				deleteConfirmedPerformed(target);
-			}
-		});
-
         setOutputMarkupId(true);
     }
 
 	private void deletePerformed(AjaxRequestTarget target) {
-		ModalWindow dialog = (ModalWindow) get(DIALOG_CONFIRM_DELETE);
-		dialog.show(target);
+        ConfirmationPanel dialog = new ConfirmationPanel(getPageBase().getMainPopupBodyId(), new AbstractReadOnlyModel<String>() {
+                    @Override
+                    public String getObject() {
+                        StageDefinitionDto dto = getModelObject().get(tabPanel.getSelectedTab());
+                        return getString("DefinitionStagesPanel.confirmDeleteText", dto.getName());
+                    }
+                }){
+            @Override
+            public void yesPerformed(AjaxRequestTarget target) {
+                getPageBase().hideMainPopup(target);
+                deleteConfirmedPerformed(target);
+            }
+        };
+        getPageBase().showMainPopup(dialog, createStringResource("DefinitionStagesPanel.confirmDelete"), target);
+
 	}
 
 	private void addPerformed(AjaxRequestTarget target) {

diff --git a/...in/java/com/evolveum/midpoint/web/page/admin/configuration/component/AceEditorDialog.java b/...in/java/com/evolveum/midpoint/web/page/admin/configuration/component/AceEditorDialog.java
@@ -26,10 +26,7 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.AceEditor;
-import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
-import com.evolveum.midpoint.web.page.admin.reports.component.AceEditorPanel;
 
 public class AceEditorDialog extends SimplePanel<String> {
 

diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -127,7 +127,11 @@
 			<artifactId>security-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
 		</dependency>
-
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
@@ -49,6 +49,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ScriptingExpressionType;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.Validate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -1531,12 +1532,13 @@ public void importFromResource(String shadowOid, Task task, OperationResult pare
 	@Override
 	public void importObjectsFromFile(File input, ImportOptionsType options, Task task,
 			OperationResult parentResult) throws FileNotFoundException {
-		 OperationResult result = parentResult.createSubresult(IMPORT_OBJECTS_FROM_FILE);
-		 FileInputStream fis;
-		 try {
+		OperationResult result = parentResult.createSubresult(IMPORT_OBJECTS_FROM_FILE);
+		FileInputStream fis = null;
+		try {
 			fis = new FileInputStream(input);
 		} catch (FileNotFoundException e) {
-			String msg = "Error reading from file "+input+": "+e.getMessage();
+			IOUtils.closeQuietly(fis);
+			String msg = "Error reading from file " + input + ": " + e.getMessage();
 			result.recordFatalError(msg, e);
 			throw e;
 		}
@@ -1549,7 +1551,7 @@ public void importObjectsFromFile(File input, ImportOptionsType options, Task ta
 			try {
 				fis.close();
 			} catch (IOException e) {
-				LOGGER.error("Error closing file "+input+": "+e.getMessage(), e);
+				LOGGER.error("Error closing file " + input + ": " + e.getMessage(), e);
 			}
 		}
 		result.computeStatus();