Sync with SVN

oxGwt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.1.0.Final</version>
+        <version>1.2.0.Final</version>
     </parent>
 
     <prerequisites>

oxLdap-annotations/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.1.0.Final</version>
+        <version>1.2.0.Final</version>
     </parent>
 
     <prerequisites>

oxLdap/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.1.0.Final</version>
+        <version>1.2.0.Final</version>
     </parent>
 
     <prerequisites>

oxLdap/src/main/java/org/gluu/site/ldap/LDAPConnectionProvider.java

@@ -26,14 +26,21 @@ public class LDAPConnectionProvider {
 
 	private static final Logger log = Logger.getLogger(LDAPConnectionProvider.class);
 
-	public static final String bindPassword = "bindPassword";
 	private static final int DEFAULT_SUPPORTED_LDAP_VERSION = 2;
 
 	private LDAPConnectionPool connectionPool;
 	private ResultCode creationResultCode;
 
 	private int supportedLDAPVersion = DEFAULT_SUPPORTED_LDAP_VERSION;
 
+	private String[] servers;
+	private String[] addresses;
+	private int[] ports;
+
+	private String bindDn;
+	private String bindPassword;
+	private boolean useSSL;
+
 	@SuppressWarnings("unused")
 	private LDAPConnectionProvider() {}
 
@@ -59,34 +66,38 @@ public LDAPConnectionProvider(Properties props) {
 	 */
 	public void init(Properties props) throws NumberFormatException, LDAPException, GeneralSecurityException {
 		String serverProp = props.getProperty("servers");
-		String[] servers = serverProp.split(",");
-		String[] addresses = new String[servers.length];
-		int[] ports = new int[servers.length];
-		for (int i = 0; i < servers.length; i++) {
-			String str = servers[i];
-			addresses[i] = str.substring(0, str.indexOf(":")).trim();
-			ports[i] = Integer.parseInt(str.substring(str.indexOf(":") + 1, str.length()));
+		this.servers = serverProp.split(",");
+		this.addresses = new String[this.servers.length];
+		this.ports = new int[this.servers.length];
+		for (int i = 0; i < this.servers.length; i++) {
+			String str = this.servers[i];
+			this.addresses[i] = str.substring(0, str.indexOf(":")).trim();
+			this.ports[i] = Integer.parseInt(str.substring(str.indexOf(":") + 1, str.length()));
 		}
 
 		BindRequest bindRequest = null;
 		if (StringHelper.isEmpty(props.getProperty("bindDN"))) {
+			this.bindDn = null;
+			this.bindPassword = null;
 			bindRequest = new SimpleBindRequest();
 		} else {
-			bindRequest = new SimpleBindRequest(props.getProperty("bindDN"), props.getProperty(bindPassword));
+			this.bindDn = props.getProperty("bindDN");
+			this.bindPassword = props.getProperty("bindPassword");
+			bindRequest = new SimpleBindRequest(this.bindDn, this.bindPassword);
 		}
 
 		LDAPConnectionOptions connectionOptions = new LDAPConnectionOptions();
 		connectionOptions.setConnectTimeoutMillis(100 * 1000);
 		connectionOptions.setAutoReconnect(true);
 
-		boolean useSSL = Boolean.valueOf(props.getProperty("useSSL"));
+		this.useSSL = Boolean.valueOf(props.getProperty("useSSL")).booleanValue();
 
 		FailoverServerSet failoverSet;
-		if (useSSL) {
+		if (this.useSSL) {
 			SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());
-			failoverSet = new FailoverServerSet(addresses, ports, sslUtil.createSSLSocketFactory(), connectionOptions);
+			failoverSet = new FailoverServerSet(this.addresses, this.ports, sslUtil.createSSLSocketFactory(), connectionOptions);
 		} else {
-			failoverSet = new FailoverServerSet(addresses, ports, connectionOptions);
+			failoverSet = new FailoverServerSet(this.addresses, this.ports, connectionOptions);
 		}
 
 		connectionPool = new LDAPConnectionPool(failoverSet, bindRequest, Integer.parseInt(props.getProperty("maxconnections")));
@@ -212,4 +223,28 @@ public void setCreationResultCode(ResultCode creationResultCode) {
 		this.creationResultCode = creationResultCode;
 	}
 
+	public String[] getServers() {
+		return servers;
+	}
+
+	public String[] getAddresses() {
+		return addresses;
+	}
+
+	public int[] getPorts() {
+		return ports;
+	}
+
+	public String getBindDn() {
+		return bindDn;
+	}
+
+	public String getBindPassword() {
+		return bindPassword;
+	}
+
+	public boolean isUseSSL() {
+		return useSSL;
+	}
+
 }

oxSaml/pom.xml

@@ -6,12 +6,12 @@
 	<artifactId>oxSaml</artifactId>
 	<name>oxSaml</name>
 	<packaging>jar</packaging>
-	<version>1.1.0.Final</version>
+	<version>1.2.0.Final</version>
 
 	<parent>
 		<groupId>org.xdi</groupId>
 		<artifactId>oxCore</artifactId>
-		<version>1.1.0.Final</version>
+		<version>1.2.0.Final</version>
 	</parent>
 
 	<prerequisites>

oxSaml/src/main/java/org/xdi/saml/AuthRequest.java → oxSaml/src/main/java/org/gluu/saml/AuthRequest.java

@@ -1,4 +1,4 @@
-package org.xdi.saml;
+package org.gluu.saml;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

oxSaml/src/main/java/org/xdi/saml/Response.java → oxSaml/src/main/java/org/gluu/saml/Response.java

@@ -1,4 +1,4 @@
-package org.xdi.saml;
+package org.gluu.saml;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

oxSaml/src/main/java/org/xdi/saml/SamlConfiguration.java → oxSaml/src/main/java/org/gluu/saml/SamlConfiguration.java

@@ -1,4 +1,4 @@
-package org.xdi.saml;
+package org.gluu.saml;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;

oxService/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.1.0.Final</version>
+        <version>1.2.0.Final</version>
     </parent>
 
     <prerequisites>

oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfiguration.java

@@ -2,13 +2,15 @@
 
 import java.io.Serializable;
 
+import lombok.Data;
+
 /**
  * oxTrust configuration
  * 
  * @author Yuriy Movchan
  * @version 0.1, 05/15/2013
  */
-public final class ApplicationConfiguration implements Serializable {
+public final @Data class ApplicationConfiguration implements Serializable {
 
 	private static final long serialVersionUID = -8991383390239617013L;
 
@@ -81,16 +83,10 @@ public final class ApplicationConfiguration implements Serializable {
 	private String idpLdapServer;
 	private String idpBindDn;
 	private String idpBindPassword;
+	private String idpUserFields;
 
 	private String gluuSpCert;
 
-	private String vdsLdapProtocol;
-	private String vdsBindDn;
-	private String vdsLdapServer;
-	private String vdsBindPassword;
-	private String vdsFilter;
-	private String vdsUserField;
-
 	private String mysqlUrl;
 	private String mysqlUser;
 	private String mysqlPassword;
@@ -142,6 +138,8 @@ public final class ApplicationConfiguration implements Serializable {
 	private String umaRedirectUri;
 	private String umaResourceId;
 	private String umaScope;
+	private String cssLocation;
+	private String jsLocation;
 
 	public String getBaseDN() {
 		return baseDN;
@@ -503,60 +501,20 @@ public void setIdpBindPassword(String idpBindPassword) {
 		this.idpBindPassword = idpBindPassword;
 	}
 
-	public String getGluuSpCert() {
-		return gluuSpCert;
-	}
-
-	public void setGluuSpCert(String gluuSpCert) {
-		this.gluuSpCert = gluuSpCert;
-	}
-
-	public String getVdsLdapProtocol() {
-		return vdsLdapProtocol;
-	}
-
-	public void setVdsLdapProtocol(String vdsLdapProtocol) {
-		this.vdsLdapProtocol = vdsLdapProtocol;
-	}
-
-	public String getVdsBindDn() {
-		return vdsBindDn;
-	}
-
-	public void setVdsBindDn(String vdsBindDn) {
-		this.vdsBindDn = vdsBindDn;
-	}
-
-	public String getVdsLdapServer() {
-		return vdsLdapServer;
-	}
-
-	public void setVdsLdapServer(String vdsLdapServer) {
-		this.vdsLdapServer = vdsLdapServer;
-	}
-
-	public String getVdsBindPassword() {
-		return vdsBindPassword;
+	public String getIdpUserFields() {
+		return idpUserFields;
 	}
 
-	public void setVdsBindPassword(String vdsBindPassword) {
-		this.vdsBindPassword = vdsBindPassword;
+	public void setIdpUserFields(String idpUserFields) {
+		this.idpUserFields = idpUserFields;
 	}
 
-	public String getVdsFilter() {
-		return vdsFilter;
-	}
-
-	public void setVdsFilter(String vdsFilter) {
-		this.vdsFilter = vdsFilter;
-	}
-
-	public String getVdsUserField() {
-		return vdsUserField;
+	public String getGluuSpCert() {
+		return gluuSpCert;
 	}
 
-	public void setVdsUserField(String vdsUserField) {
-		this.vdsUserField = vdsUserField;
+	public void setGluuSpCert(String gluuSpCert) {
+		this.gluuSpCert = gluuSpCert;
 	}
 
 	public String getMysqlUrl() {

oxService/src/main/java/org/xdi/config/oxtrust/ApplicationConfigurationFile.java

@@ -180,6 +180,10 @@ public String getIdpBindPassword() {
 		return applicationConfiguration.getString("idp.bindPassword");
 	}
 
+	public String getIdpUserFields() {
+		return applicationConfiguration.getString("idp.user.fields");
+	}
+
 	public String getGluuSpCert() {
 		return applicationConfiguration.getString("gluuSP.securityCert");
 	}
@@ -188,30 +192,6 @@ public String getApplianceUrl() {
 		return applicationConfiguration.getString("appliance.url");
 	}
 
-	public String getVdsLdapProtocol() {
-		return "true".equalsIgnoreCase(applicationConfiguration.getString("vds.useSSL")) ? "ldaps" : "ldap";
-	}
-
-	public String getVdsBindDn() {
-		return applicationConfiguration.getString("vds.bindDN");
-	}
-
-	public String getVdsLdapServer() {
-		return applicationConfiguration.getString("vds.ldap.server");
-	}
-
-	public String getVdsBindPassword() {
-		return applicationConfiguration.getString("vds.bindPassword");
-	}
-
-	public String getVdsFilter() {
-		return applicationConfiguration.getString("vds.test.filter");
-	}
-
-	public String getVdsUserField() {
-		return applicationConfiguration.getString("vds.userField");
-	}
-
 	public String getMysqlUrl() {
 		return applicationConfiguration.getString("mysql.url");
 	}
@@ -375,5 +355,12 @@ public String getUmaResourceId() {
 	public String getUmaScope() {
 		return applicationConfiguration.getString("uma.scope");
 	}
-
+
+	public String getCssLocation() {
+		return applicationConfiguration.getString("cssLocation");
+	}
+
+	public String getJsLocation() {
+		return applicationConfiguration.getString("jsLocation");
+	}
 }

oxService/src/main/java/org/xdi/model/GluuAttribute.java

@@ -1,7 +1,6 @@
 package org.xdi.model;
 
 import java.io.Serializable;
-import java.util.Arrays;
 
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
@@ -31,7 +30,22 @@
 
 	@LdapAttribute(ignoreDuringUpdate = true)
 	private String inum;
-
+
+	@LdapAttribute(name = "oxAttributeType")
+	private String type;
+
+	@LdapAttribute
+	private String lifetime;
+
+	@LdapAttribute(name = "oxSourceAttribute")
+	private String sourceAttribute;
+
+	@LdapAttribute
+	private String salt;
+
+	@LdapAttribute(name = "oxNameIdType")
+	private String nameIdType;	
+
 	@NotNull
 	@Pattern(regexp = "^[a-zA-Z_]+$", message = "Name should contain only letters and underscores")
 	@Size(min = 1, max = 30, message = "Length of the Name should be between 1 and 30")

oxUtil/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.xdi</groupId>
         <artifactId>oxCore</artifactId>
-        <version>1.1.0.Final</version>
+        <version>1.2.0.Final</version>
     </parent>
 
     <prerequisites>

pom.xml

@@ -3,7 +3,7 @@
     <groupId>org.xdi</groupId>
     <artifactId>oxCore</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.0.Final</version>
+    <version>1.2.0.Final</version>
     <name>oxCore</name>
     <url>http://ox.gluu.org</url>