From 57185f8fd32fa4de68f8249c6cbf3bd009285e40 Mon Sep 17 00:00:00 2001 From: yurem Date: Wed, 16 Jul 2014 09:07:41 +0300 Subject: [PATCH] Sync with SVN --- oxGwt/pom.xml | 2 +- oxLdap-annotations/pom.xml | 2 +- oxLdap/pom.xml | 2 +- .../persistence/AbstractEntryManager.java | 7 +++-- oxSaml/pom.xml | 4 +-- oxService/pom.xml | 2 +- .../oxtrust/ApplicationConfiguration.java | 28 +------------------ .../oxtrust/ApplicationConfigurationFile.java | 12 -------- oxUtil/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 14 insertions(+), 49 deletions(-) diff --git a/oxGwt/pom.xml b/oxGwt/pom.xml index 450fb05c..3f20dd1c 100644 --- a/oxGwt/pom.xml +++ b/oxGwt/pom.xml @@ -7,7 +7,7 @@ org.xdi oxCore - 1.2.0.Final + 1.3.0.Final diff --git a/oxLdap-annotations/pom.xml b/oxLdap-annotations/pom.xml index 19698645..836adbbc 100644 --- a/oxLdap-annotations/pom.xml +++ b/oxLdap-annotations/pom.xml @@ -7,7 +7,7 @@ org.xdi oxCore - 1.2.0.Final + 1.3.0.Final diff --git a/oxLdap/pom.xml b/oxLdap/pom.xml index c3da3779..5c956a30 100644 --- a/oxLdap/pom.xml +++ b/oxLdap/pom.xml @@ -12,7 +12,7 @@ org.xdi oxCore - 1.2.0.Final + 1.3.0.Final diff --git a/oxLdap/src/main/java/org/gluu/site/ldap/persistence/AbstractEntryManager.java b/oxLdap/src/main/java/org/gluu/site/ldap/persistence/AbstractEntryManager.java index 9cb27d24..8b595d18 100644 --- a/oxLdap/src/main/java/org/gluu/site/ldap/persistence/AbstractEntryManager.java +++ b/oxLdap/src/main/java/org/gluu/site/ldap/persistence/AbstractEntryManager.java @@ -232,8 +232,11 @@ private T merge(T entry, boolean isSchemaUpdate, AttributeModificationType s // Add entry attribute or change schema AttributeModificationType modType = isSchemaUpdate ? schemaModificationType : AttributeModificationType.ADD; if (AttributeModificationType.ADD.equals(modType)) { - attributeDataModifications - .add(new AttributeDataModification(AttributeModificationType.ADD, attributeToPersist)); + String[] attributeToPersistValues = attributeToPersist.getValues(); + if (!(ArrayHelper.isEmpty(attributeToPersistValues) || ((attributeToPersistValues.length == 1) && StringHelper.isEmpty(attributeToPersistValues[0])))) { + attributeDataModifications + .add(new AttributeDataModification(AttributeModificationType.ADD, attributeToPersist)); + } } else { attributeDataModifications.add(new AttributeDataModification(AttributeModificationType.REMOVE, null, attributeToPersist)); diff --git a/oxSaml/pom.xml b/oxSaml/pom.xml index fdaba4fb..f8200014 100644 --- a/oxSaml/pom.xml +++ b/oxSaml/pom.xml @@ -6,12 +6,12 @@ oxSaml oxSaml jar - 1.2.0.Final + 1.3.0.Final org.xdi oxCore - 1.2.0.Final + 1.3.0.Final diff --git a/oxService/pom.xml b/oxService/pom.xml index 6d5347db..45ead89e 100644 --- a/oxService/pom.xml +++ b/oxService/pom.xml @@ -7,7 +7,7 @@ org.xdi oxCore - 1.2.0.Final + 1.3.0.Final diff --git a/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfiguration.java b/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfiguration.java index 147c4b8d..5d4df237 100644 --- a/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfiguration.java +++ b/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfiguration.java @@ -131,13 +131,11 @@ private boolean ignoreValidation; private String umaIssuer; - private String umaUserId; - private String umaUserPassword; private String umaClientId; private String umaClientPassword; - private String umaRedirectUri; private String umaResourceId; private String umaScope; + private String cssLocation; private String jsLocation; @@ -749,22 +747,6 @@ public void setUmaIssuer(String umaIssuer) { this.umaIssuer = umaIssuer; } - public String getUmaUserId() { - return umaUserId; - } - - public void setUmaUserId(String umaUserId) { - this.umaUserId = umaUserId; - } - - public String getUmaUserPassword() { - return umaUserPassword; - } - - public void setUmaUserPassword(String umaUserPassword) { - this.umaUserPassword = umaUserPassword; - } - public String getUmaClientId() { return umaClientId; } @@ -781,14 +763,6 @@ public void setUmaClientPassword(String umaClientPassword) { this.umaClientPassword = umaClientPassword; } - public String getUmaRedirectUri() { - return umaRedirectUri; - } - - public void setUmaRedirectUri(String umaRedirectUri) { - this.umaRedirectUri = umaRedirectUri; - } - public String getUmaResourceId() { return umaResourceId; } diff --git a/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfigurationFile.java b/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfigurationFile.java index 18251de5..46920a62 100644 --- a/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfigurationFile.java +++ b/oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfigurationFile.java @@ -328,14 +328,6 @@ public String getUmaIssuer() { return applicationConfiguration.getString("uma.issuer"); } - public String getUmaUserId() { - return applicationConfiguration.getString("uma.user_id"); - } - - public String getUmaUserPassword() { - return applicationConfiguration.getString("uma.user_password"); - } - public String getUmaClientId() { return applicationConfiguration.getString("uma.client_id"); } @@ -343,10 +335,6 @@ public String getUmaClientId() { public String getUmaClientPassword() { return applicationConfiguration.getString("uma.client_password"); } - - public String getUmaRedirectUri() { - return applicationConfiguration.getString("uma.redirect_uri"); - } public String getUmaResourceId() { return applicationConfiguration.getString("uma.resource_id"); diff --git a/oxUtil/pom.xml b/oxUtil/pom.xml index 005d0f0c..1c6e57d5 100644 --- a/oxUtil/pom.xml +++ b/oxUtil/pom.xml @@ -7,7 +7,7 @@ org.xdi oxCore - 1.2.0.Final + 1.3.0.Final diff --git a/pom.xml b/pom.xml index 0abb852f..2a0913ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.xdi oxCore pom - 1.2.0.Final + 1.3.0.Final oxCore http://ox.gluu.org