Sync with SVN

GluuFederation · Jul 16, 2014 · 57185f8 · 57185f8
1 parent bb73b97
commit 57185f8
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 49 deletions.
diff --git a/oxGwt/pom.xml b/oxGwt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.2.0.Final</version>
+        <version>1.3.0.Final</version>
     </parent>
 
     <prerequisites>

diff --git a/oxLdap-annotations/pom.xml b/oxLdap-annotations/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.2.0.Final</version>
+        <version>1.3.0.Final</version>
     </parent>
 
     <prerequisites>

diff --git a/oxLdap/pom.xml b/oxLdap/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.2.0.Final</version>
+        <version>1.3.0.Final</version>
     </parent>
 
     <prerequisites>

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
@@ -232,8 +232,11 @@ private <T> 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
@@ -6,12 +6,12 @@
 	<artifactId>oxSaml</artifactId>
 	<name>oxSaml</name>
 	<packaging>jar</packaging>
-	<version>1.2.0.Final</version>
+	<version>1.3.0.Final</version>
 
 	<parent>
 		<groupId>org.xdi</groupId>
 		<artifactId>oxCore</artifactId>
-		<version>1.2.0.Final</version>
+		<version>1.3.0.Final</version>
 	</parent>
 
 	<prerequisites>

diff --git a/oxService/pom.xml b/oxService/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.2.0.Final</version>
+        <version>1.3.0.Final</version>
     </parent>
 
     <prerequisites>

diff --git 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
@@ -328,25 +328,13 @@ 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");
 	}
 
 	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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.2.0.Final</version>
+        <version>1.3.0.Final</version>
     </parent>
 
     <prerequisites>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.xdi</groupId>
     <artifactId>oxCore</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.0.Final</version>
+    <version>1.3.0.Final</version>
     <name>oxCore</name>
     <url>http://ox.gluu.org</url>