Author: dimuthul
Date: Wed Dec 5 03:21:08 2007
New Revision: 10545
Log:
Adding user manager changes.
Modified:
trunk/commons/usermanager/modules/annotation-configs/pom.xml
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/jdbc/JDBCRealmConfig.java
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/ldap/LDAPRealmConfig.java
trunk/commons/usermanager/modules/configs/pom.xml
trunk/commons/usermanager/modules/core/pom.xml
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
trunk/commons/usermanager/pom.xml
Modified: trunk/commons/usermanager/modules/annotation-configs/pom.xml
==============================================================================
--- trunk/commons/usermanager/modules/annotation-configs/pom.xml
(original)
+++ trunk/commons/usermanager/modules/annotation-configs/pom.xml Wed Dec
5 03:21:08 2007
@@ -37,7 +37,32 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory</artifactId>
+ <version>${naming.factory}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory-dbcp</artifactId>
+ <version>${naming.factory.dbcp}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>${naming.resources}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+
+ </dependencies>
Modified:
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/jdbc/JDBCRealmConfig.java
==============================================================================
---
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/jdbc/JDBCRealmConfig.java
(original)
+++
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/jdbc/JDBCRealmConfig.java
Wed Dec 5 03:21:08 2007
@@ -100,11 +100,11 @@
}
}
- @RealmConfigParameterInfo(isRequired = true, getHelpText = "eg:
jdbc:derby:home/identity/database/USER_DB")
+ @RealmConfigParameterInfo(isRequired = true, getHelpText = "e.g.
jdbc:derby:home/identity/database/USER_DB")
public void setConnectionURL(String connectionURL) {
this.connectionURL = connectionURL.trim();
}
- @RealmConfigParameterInfo(isRequired = false, getHelpText = "Username of
the connection, if tehre is one")
+ @RealmConfigParameterInfo(isRequired = false, getHelpText = "Username of
the connection, if there is one")
public void setConnectionUserName(String connectionName) {
this.connectionUserName = connectionName.trim();
}
@@ -112,7 +112,7 @@
public void setConnectionPassword(String connectionPassword) {
this.connectionPassword = connectionPassword.trim();
}
- @RealmConfigParameterInfo(isRequired = true, getHelpText = "Name of the
users table. eg: user_table")
+ @RealmConfigParameterInfo(isRequired = true, getHelpText = "Name of the
users table - e.g. user_table")
public void setUserTable(String userTable) {
this.userTable = userTable.trim();
}
@@ -124,11 +124,11 @@
public void setUserCredentialColumn(String userCredentialCol) {
this.userCredentialColumn = userCredentialCol.trim();
}
- @RealmConfigParameterInfo(isRequired = false, getHelpText = "Driver name.
The default is 'org.apache.derby.jdbc.EmbeddedDriver'")
+ @RealmConfigParameterInfo(isRequired = false, getHelpText = "Driver name -
e.g. org.apache.derby.jdbc.EmbeddedDriver")
public void setDriverName(String driverName) {
this.driverName = driverName.trim();
}
- @RealmConfigParameterInfo(isRequired = false, getHelpText = "Comma
seperated columns in the user table, from where the application will read user
attributes. eg: email, age")
+ @RealmConfigParameterInfo(isRequired = false, getHelpText = "Comma
separated columns in the user table - e.g. email, age")
public void setColumnNames(String columnNames) {
this.columnNames = columnNames.trim();
}
Modified:
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/ldap/LDAPRealmConfig.java
==============================================================================
---
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/ldap/LDAPRealmConfig.java
(original)
+++
trunk/commons/usermanager/modules/annotation-configs/src/main/java/org/wso2/usermanager/custom/ldap/LDAPRealmConfig.java
Wed Dec 5 03:21:08 2007
@@ -71,12 +71,12 @@
return userContextName;
}
- @RealmConfigParameterInfo(isRequired = true, getHelpText = "eg:
ldap://localhost:389";)
+ @RealmConfigParameterInfo(isRequired = true, getHelpText = "e.g.
ldap://localhost:389";)
public void setConnectionUrl(String connectionUrl) {
this.connectionUrl = connectionUrl.trim();
}
- @RealmConfigParameterInfo(isRequired = true, getHelpText = "eg:
cn=root,dc=wso2,dc=com")
+ @RealmConfigParameterInfo(isRequired = true, getHelpText = "e.g.
cn=root,dc=wso2,dc=com")
public void setConnectionName(String connectionName) {
this.connectionName = connectionName.trim();
}
@@ -86,17 +86,17 @@
this.connectionPass = connectionPass.trim();
}
- @RealmConfigParameterInfo(isRequired = true, getHelpText = "eg:
uid={0},dc=wso2,dc=com")
+ @RealmConfigParameterInfo(isRequired = true, getHelpText = "e.g.
uid={0},dc=wso2,dc=com")
public void setUserPattern(String userPattern) {
this.userPattern = userPattern.trim();
}
- @RealmConfigParameterInfo(isRequired = false, getHelpText = "Comma
seperated attribute Ids, from where the application will read user attributes.
eg: email, age")
+ @RealmConfigParameterInfo(isRequired = false, getHelpText = "Comma
separated attribute Ids - e.g. email, age")
public void setAttributeIds(String attributeIds){
this.attributeIds = attributeIds.trim();
}
- @RealmConfigParameterInfo(isRequired = false, getHelpText = "Directory
where users reside. eg: dc=wso2,dc=com")
+ @RealmConfigParameterInfo(isRequired = false, getHelpText = "Directory
where users reside - e.g. dc=wso2,dc=com")
public void setUserContextName(String userContextName) {
this.userContextName = userContextName.trim();
}
Modified: trunk/commons/usermanager/modules/configs/pom.xml
==============================================================================
--- trunk/commons/usermanager/modules/configs/pom.xml (original)
+++ trunk/commons/usermanager/modules/configs/pom.xml Wed Dec 5 03:21:08 2007
@@ -40,7 +40,32 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory</artifactId>
+ <version>${naming.factory}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory-dbcp</artifactId>
+ <version>${naming.factory.dbcp}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>${naming.resources}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ </dependencies>
Modified: trunk/commons/usermanager/modules/core/pom.xml
==============================================================================
--- trunk/commons/usermanager/modules/core/pom.xml (original)
+++ trunk/commons/usermanager/modules/core/pom.xml Wed Dec 5 03:21:08 2007
@@ -49,6 +49,28 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory</artifactId>
+ <version>${naming.factory}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory-dbcp</artifactId>
+ <version>${naming.factory.dbcp}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>${naming.resources}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security</artifactId>
+ <version>1.0.2</version>
+ </dependency>
<dependency>
<groupId>org.wso2.commons.usermanager</groupId>
Modified:
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
==============================================================================
---
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
(original)
+++
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
Wed Dec 5 03:21:08 2007
@@ -40,7 +40,7 @@
public static final String DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
public static final String PROTOCOL = "jdbc:derby:";
-
+ public static final String CONF_STRING = "confirmation";
private static PreparedStatement addUserStmt = null;
private static PreparedStatement getUserByConfStmt = null;
private static PreparedStatement deleteUserStmt = null;
@@ -141,6 +141,9 @@
byte[] temp = new byte[16];
random.nextBytes(temp);
String confString = Base64.encode(temp);
+ confString = confString.replaceAll("/", "a");
+ confString = confString.replaceAll("\\+", "b");
+ confString = confString.replaceAll("=", "c");
confString = confString.trim();
//TODO check whether user is there
String epr = config.getRegistrationServiceEPR();
@@ -149,7 +152,7 @@
addUserStmt.setString(2, emailAddress);
addUserStmt.setString(3, password);
addUserStmt.setString(4, confString);
-
+
addUserStmt.executeUpdate();
if(properties != null){
@@ -175,6 +178,8 @@
protected void sendEmail(String confString, String emailAddr, String epr)
throws UserManagerException{
+ //TODO :: Use a java thread here
+
Properties props = new Properties();
props.put(EmailVerifierConfig.HOST, config.getHost());
props.put(EmailVerifierConfig.PORT,
Integer.toString(config.getPort()));
@@ -258,7 +263,7 @@
}
private String getResponseMessage(String confString, String epr) {
- return "Please point your browser to : " + epr +"?confirmation="
+confString;
+ return "Please point your browser to : " + epr +"?"+CONF_STRING+"="
+confString;
}
Modified: trunk/commons/usermanager/pom.xml
==============================================================================
--- trunk/commons/usermanager/pom.xml (original)
+++ trunk/commons/usermanager/pom.xml Wed Dec 5 03:21:08 2007
@@ -72,25 +72,6 @@
<version>${log4j.version}</version>
</dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-factory</artifactId>
- <version>${naming.factory}</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-factory-dbcp</artifactId>
- <version>${naming.factory.dbcp}</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-resources</artifactId>
- <version>${naming.resources}</version>
- </dependency>
-
-
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -98,18 +79,6 @@
</dependency>
<dependency>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security</artifactId>
- <version>1.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javamail.version}</version>
- </dependency>
-
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javamail.version}</version>
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
