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

Evolveum · May 25, 2016 · 566755e · 566755e
2 parents d95f0b5 + c8048c5
commit 566755e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 36 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
@@ -362,7 +362,6 @@ public void onClick(AjaxRequestTarget target) {
 	private void userDetailsPerformed(AjaxRequestTarget target, String oid) {
 		PageParameters parameters = new PageParameters();
 		parameters.add(OnePageParameterEncoder.PARAMETER, oid);
-		getSessionStorage().setPreviousPageInstance(new PageUsers(false));
 		setResponsePage(PageUser.class, parameters);
 	}
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
@@ -32,17 +32,6 @@ public class SessionStorage implements Serializable {
 
     private List<Breadcrumb> breadcrumbs;
 
-    /**
-     * place to store "previous page" for back button
-     */
-    private Class<? extends WebPage> previousPage;
-
-    private Page previousPageInstance;
-    /**
-     * place to store "previous page" parameters for back button
-     */
-    private PageParameters previousPageParams;
-
     /**
      * place to store information in session for various pages
      */
@@ -63,30 +52,6 @@ public class SessionStorage implements Serializable {
     * */
     private UserProfileStorage userProfile;
 
-    public Class<? extends WebPage> getPreviousPage() {
-        return previousPage;
-    }
-
-    public void setPreviousPage(Class<? extends WebPage> previousPage) {
-        this.previousPage = previousPage;
-    }
-
-    public void setPreviousPageInstance(Page previousPage) {
-        this.previousPageInstance = previousPage;
-    }
-
-    public Page getPreviousPageInstance() {
-		return previousPageInstance;
-	}
-
-    public PageParameters getPreviousPageParams() {
-        return previousPageParams;
-    }
-
-    public void setPreviousPageParams(PageParameters previousPageParams) {
-        this.previousPageParams = previousPageParams;
-    }
-
     public Map<String, PageStorage> getPageStorageMap() {
 		return pageStorageMap;
 	}

diff --git a/...sioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfOpenDj.java b/...sioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfOpenDj.java
@@ -211,12 +211,14 @@ public void test010ConnectorSchemaSanity() throws Exception {
 		PrismAsserts.assertDefinition(propHost, new QName(ProvisioningTestUtil.CONNECTOR_LDAP_NS,"host"), DOMUtil.XSD_STRING, 1, 1);
 		assertEquals("Wrong property 'host' display name", "Host", propHost.getDisplayName());
 		assertEquals("Wrong property 'host' help", "The name or IP address of the LDAP server host.", propHost.getHelp());
+		assertEquals("Wrong property 'host' display order", (Integer)1, propHost.getDisplayOrder()); // MID-2642
 
 		PrismPropertyDefinition<String> propPort = configurationPropertiesDefinition.findPropertyDefinition(new QName(ProvisioningTestUtil.CONNECTOR_LDAP_NS,"port"));
 		assertNotNull("No definition for configuration property 'port' in connector schema", propPort);
 		PrismAsserts.assertDefinition(propPort, new QName(ProvisioningTestUtil.CONNECTOR_LDAP_NS,"port"), DOMUtil.XSD_INT, 0, 1);
 		assertEquals("Wrong property 'port' display name", "Port number", propPort.getDisplayName());
 		assertEquals("Wrong property 'port' help", "LDAP server port number.", propPort.getHelp());
+		assertEquals("Wrong property 'port' display order", (Integer)2, propPort.getDisplayOrder()); // MID-2642
 	}
 
 

diff --git a/repo/repo-sql-impl-test/sql-procedures/mysql.sql b/repo/repo-sql-impl-test/sql-procedures/mysql.sql
@@ -56,6 +56,7 @@ DETERMINISTIC
     DELETE FROM m_org;
     DELETE FROM m_org_closure;
     DELETE FROM m_role;
+    DELETE FROM m_service;
     DELETE FROM m_abstract_role;
     DELETE FROM m_system_configuration;
     DELETE FROM m_generic_object;

diff --git a/repo/repo-sql-impl-test/sql-procedures/postgresql.sql b/repo/repo-sql-impl-test/sql-procedures/postgresql.sql
@@ -49,6 +49,7 @@ BEGIN
     TRUNCATE TABLE m_org_closure RESTART IDENTITY CASCADE;
     TRUNCATE TABLE m_org RESTART IDENTITY CASCADE;
     TRUNCATE TABLE m_role RESTART IDENTITY CASCADE;
+    TRUNCATE TABLE m_service RESTART IDENTITY CASCADE;
     TRUNCATE TABLE m_abstract_role RESTART IDENTITY CASCADE;
     TRUNCATE TABLE m_system_configuration RESTART IDENTITY CASCADE;
     TRUNCATE TABLE m_generic_object RESTART IDENTITY CASCADE;

diff --git a/repo/repo-sql-impl-test/sql-procedures/sqlserver.sql b/repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
@@ -60,6 +60,7 @@ AS
     DELETE FROM m_org_closure;
     DELETE FROM m_org;
     DELETE FROM m_role;
+    DELETE FROM m_service;
     DELETE FROM m_abstract_role;
     DELETE FROM m_system_configuration;
     DELETE FROM m_generic_object;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
@@ -233,6 +233,12 @@ public int logOperationAttempt(String oid, String operation, int attempt, Runtim
 	}
 
 	private boolean isExceptionRelatedToSerialization(Exception ex) {
+		boolean rv = isExceptionRelatedToSerializationInternal(ex);
+		LOGGER.trace("Considering if exception {} is related to serialization: returning {}", ex, rv, ex);
+		return rv;
+	}
+
+	private boolean isExceptionRelatedToSerializationInternal(Exception ex) {
 
 		if (ex instanceof SerializationRelatedException
 				|| ex instanceof PessimisticLockException