[jboss-svn-commits] JBL Code SVN: r20403 - in labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login: resources and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 10 09:22:18 EDT 2008
Author: szimano
Date: 2008-06-10 09:22:18 -0400 (Tue, 10 Jun 2008)
New Revision: 20403
Added:
labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml.sample
Removed:
labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml
Modified:
labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/pom.xml
labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsAuthenticationProvider.java
Log:
cs-nukes integration pass outside and sampled
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/pom.xml 2008-06-10 13:11:24 UTC (rev 20402)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/pom.xml 2008-06-10 13:22:18 UTC (rev 20403)
@@ -83,6 +83,7 @@
<resourcesFolder>resources</resourcesFolder>
<fileFinalName>ROOT.war/WEB-INF/lib/${project.build.finalName}.${project.packaging}</fileFinalName>
<labsDeploy>false</labsDeploy>
+ <excludes>.+sample</excludes>
</configuration>
</execution>
</executions>
Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml 2008-06-10 13:11:24 UTC (rev 20402)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml 2008-06-10 13:22:18 UTC (rev 20403)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-<bean id="labsAuthProvider" class="org.jboss.labs.clearspace.LabsAuthenticationProvider">
- <property name="userService" ref="userServiceImpl" />
- <property name="userManager" ref="userManagerImpl" />
- <property name="userDetailsService" ref="jiveUserDetailsService"/>
- <property name="jiveAuthProvider" ref="authenticationProvider" />
-</bean>
-
-<bean id="authenticationManager"
- class="org.acegisecurity.providers.ProviderManager">
- <property name="providers">
- <list>
- <ref bean="labsAuthProvider"/>
- <ref bean="daoAuthenticationProvider" />
- <ref bean="rememberMeAuthenticationProvider"/>
- </list>
- </property>
-</bean>
-</beans>
Copied: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml.sample (from rev 20401, labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml.sample (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/resources/spring.xml.sample 2008-06-10 13:22:18 UTC (rev 20403)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+<bean id="labsAuthProvider" class="org.jboss.labs.clearspace.LabsAuthenticationProvider">
+ <property name="userManager" ref="userManagerImpl" />
+ <property name="userDetailsService" ref="jiveUserDetailsService"/>
+ <property name="jiveAuthProvider" ref="authenticationProvider" />
+ <property name="dbUserName" value="" />
+ <property name="dbPass" value="" />
+ <property name="dbUrl" value="" />
+</bean>
+
+<bean id="authenticationManager"
+ class="org.acegisecurity.providers.ProviderManager">
+ <property name="providers">
+ <list>
+ <ref bean="labsAuthProvider"/>
+ <ref bean="daoAuthenticationProvider" />
+ <ref bean="rememberMeAuthenticationProvider"/>
+ </list>
+ </property>
+</bean>
+</beans>
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsAuthenticationProvider.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsAuthenticationProvider.java 2008-06-10 13:11:24 UTC (rev 20402)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsAuthenticationProvider.java 2008-06-10 13:22:18 UTC (rev 20403)
@@ -13,26 +13,25 @@
import org.acegisecurity.Authentication;
import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
import org.acegisecurity.providers.AuthenticationProvider;
import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
import org.acegisecurity.userdetails.UserDetails;
import org.acegisecurity.userdetails.UserDetailsService;
import com.jivesoftware.base.UserManager;
-import com.jivesoftware.base.UserNotFoundException;
import com.jivesoftware.base.UserTemplate;
import com.jivesoftware.community.aaa.JiveUserDetails;
import com.jivesoftware.community.aaa.authz.SystemExecutor;
-import com.jivesoftware.community.webservices.UserService;
public class LabsAuthenticationProvider implements AuthenticationProvider {
-
- private UserService userService;
-
+
private UserManager userManager;
private UserDetailsService userDetailsService;
+
+ private String dbUserName = "portal";
+ private String dbPass = "portalpassword";
+ private String dbUrl = "jdbc:mysql://localhost:3306/nukes3";
protected com.jivesoftware.base.aaa.AuthenticationProvider jiveAuthProvider;
@@ -171,11 +170,8 @@
}
private Connection getConnection() throws Exception {
- String userName = "portal";
- String pass = "portalpassword";
- String url = "jdbc:mysql://localhost:3306/nukes3";
Class.forName("com.mysql.jdbc.Driver").newInstance();
- return DriverManager.getConnection(url, userName, pass);
+ return DriverManager.getConnection(dbUrl, dbUserName, dbPass);
}
/**
@@ -224,11 +220,6 @@
}
}
- public void setUserService(UserService userService) {
- // this.userService = userService;
-
- }
-
public void setUserManager(UserManager userManager) {
this.userManager = userManager;
}
@@ -242,4 +233,16 @@
this.jiveAuthProvider = jiveAuthProvider;
}
+ public void setDbUserName(String dbUserName) {
+ this.dbUserName = dbUserName;
+ }
+
+ public void setDbPass(String dbPass) {
+ this.dbPass = dbPass;
+ }
+
+ public void setDbUrl(String dbUrl) {
+ this.dbUrl = dbUrl;
+ }
+
}
More information about the jboss-svn-commits
mailing list