[jboss-svn-commits] JBL Code SVN: r34769 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk: src/changes and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 18 03:40:39 EDT 2010
Author: lkrzyzanek
Date: 2010-08-18 03:40:39 -0400 (Wed, 18 Aug 2010)
New Revision: 34769
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/pom.xml
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
Log:
Upgraded to work with Nukes in Mysql5
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/pom.xml 2010-08-18 00:49:26 UTC (rev 34768)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/pom.xml 2010-08-18 07:40:39 UTC (rev 34769)
@@ -7,7 +7,7 @@
<artifactId>nukesauthentication</artifactId>
<name>SBS plugin: Nukes authentication provider (Login/Register)</name>
<description>Plugin integrates Nukes accounts with SBS</description>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0</version>
<parent>
<groupId>org.jboss.labs</groupId>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml 2010-08-18 00:49:26 UTC (rev 34768)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml 2010-08-18 07:40:39 UTC (rev 34769)
@@ -10,6 +10,13 @@
<body>
+ <release version="1.1.0" date="2010-08-18"
+ description="Upgraded to work with Nukes in Mysql5">
+ <action type="update" dev="lkrzyzan" date="2010-08-18">
+ <fixes issue="ORG-658" />
+ </action>
+ </release>
+
<release version="1.0.0" date="2010-08-03" description="Initial version" />
</body>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java 2010-08-18 00:49:26 UTC (rev 34768)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java 2010-08-18 07:40:39 UTC (rev 34769)
@@ -36,22 +36,32 @@
*/
public class DbNukesUserDAOImpl extends SimpleJdbcDaoSupport implements NukesUserDAO {
- private static final String SELECT_USER_BY_USERNAME = "SELECT * FROM nuke_users WHERE pn_uname = ?";
+ private static final String DATABASE_NAME = "nukes";
+ private static final String SELECT_USER_BY_USERNAME = "SELECT * FROM " + DATABASE_NAME
+ + ".nuke_users WHERE pn_uname = ?";
+
/** Select users by defined e-mail. Match is case insensitive */
- private static final String SELECT_USERS_BY_EMAIL = "SELECT * FROM nuke_users WHERE LOWER(pn_email) = LOWER(?)";
+ private static final String SELECT_USERS_BY_EMAIL = "SELECT * FROM " + DATABASE_NAME
+ + ".nuke_users WHERE LOWER(pn_email) = LOWER(?)";
- private static final String UPDATE_PASSWORD = "UPDATE nuke_users SET pn_pass = ? WHERE pn_uname = ?";
+ private static final String UPDATE_PASSWORD = "UPDATE " + DATABASE_NAME
+ + ".nuke_users SET pn_pass = ? WHERE pn_uname = ?";
- private static final String UPDATE_LAST_LOGGEDIN = "UPDATE nuke_users SET pn_last_visit = ? WHERE pn_uname = ?";
+ private static final String UPDATE_LAST_LOGGEDIN = "UPDATE " + DATABASE_NAME
+ + ".nuke_users SET pn_last_visit = ? WHERE pn_uname = ?";
- private static final String UPDATE_USER = "UPDATE nuke_users SET"
+ private static final String UPDATE_USER = "UPDATE "
+ + DATABASE_NAME
+ + ".nuke_users SET"
+ " pn_email = ?, pn_fname = ?, pn_lname = ?, pn_name = ?, pn_phone = ?, pn_femail = ?, pn_user_icq = ?"
+ ", pn_user_aim = ?, pn_user_yim = ?, pn_user_msnm = ?, pn_user_occ = ?, pn_user_intrest = ?, pn_cname = ?, pn_title = ?"
+ ", pn_companysize = ?, pn_url = ?, pn_bio = ?, pn_usertype = ?, pn_globally_disabled = ?"
+ " WHERE pn_uname = ?";
- private static final String INSERT_USER = "INSERT INTO nuke_users "
+ private static final String INSERT_USER = "INSERT INTO "
+ + DATABASE_NAME
+ + ".nuke_users "
+ " (pn_uname, pn_pass, pn_user_regdate, pn_user_viewemail, pn_email, pn_last_visit, pn_fname, pn_lname, pn_name, pn_phone, pn_femail, pn_user_icq"
+ ", pn_user_aim, pn_user_yim, pn_user_msnm, pn_user_occ, pn_user_intrest, pn_cname, pn_title"
+ ", pn_companysize, pn_url, pn_bio, pn_usertype, pn_globally_disabled, pn_timezone_offset, pn_user_avatar, pn_user_from, pn_user_sig"
@@ -202,20 +212,22 @@
@Override
public void updateResetToken(String username, String token, Long timestamp) {
getSimpleJdbcTemplate().update(
- "UPDATE nuke_users SET pn_pass_reset_token = ?, pn_pass_reset_timestamp = ? WHERE pn_uname = ?", token,
+ "UPDATE " + DATABASE_NAME
+ + ".nuke_users SET pn_pass_reset_token = ?, pn_pass_reset_timestamp = ? WHERE pn_uname = ?", token,
timestamp, username);
}
@Override
public void updateResetTokenLastSent(String username, Long lastSent) {
- getSimpleJdbcTemplate().update("UPDATE nuke_users SET pn_pass_reset_last_sent = ? WHERE pn_uname = ?", lastSent,
+ getSimpleJdbcTemplate().update(
+ "UPDATE " + DATABASE_NAME + ".nuke_users SET pn_pass_reset_last_sent = ? WHERE pn_uname = ?", lastSent,
username);
}
@Override
public void removeResetToken(String username) {
getSimpleJdbcTemplate().update(
- "UPDATE nuke_users "
+ "UPDATE " + DATABASE_NAME + ".nuke_users "
+ "SET pn_pass_reset_token = null, pn_pass_reset_timestamp = null, pn_pass_reset_last_sent = null "
+ "WHERE pn_uname = ?", username);
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml 2010-08-18 00:49:26 UTC (rev 34768)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml 2010-08-18 07:40:39 UTC (rev 34769)
@@ -8,10 +8,8 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
- <!--
- Filter chain that is processed right after the
- httpSessionContextIntegrationFilter has been processed
- -->
+ <!-- Filter chain that is processed right after the httpSessionContextIntegrationFilter
+ has been processed -->
<bean id="pluginPostSessionContextFilterChain"
class="org.jboss.labs.sbs.plugin.nukesauth.filter.NukesSyncFilter">
<property name="nukesAccountManager" ref="nukesAccountManager" />
@@ -43,7 +41,9 @@
<bean id="nukesUserDAO"
class="org.jboss.labs.sbs.plugin.nukesauth.dao.DbNukesUserDAOImpl">
- <property name="dataSource" ref="nukesUsersDataSource" />
+ <property name="dataSource">
+ <util:property-path path="dataSourceFactory.dataSource" />
+ </property>
</bean>
<bean id="syncUserWithNukesListener"
More information about the jboss-svn-commits
mailing list