[Carbon-dev] svn commit r22507 - in trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon: internal user user/mgt user/service
dimuthul at wso2.com
dimuthul at wso2.com
Thu Oct 16 21:15:35 PDT 2008
Author: dimuthul
Date: Thu Oct 16 21:15:35 2008
New Revision: 22507
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=22507
Log:
Building user manager.
Added:
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/mgt/UserMgtConfigurationContext.java
Removed:
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/UserMgtConfigurationContext.java
Modified:
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/internal/Activator.java
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/service/UserMgtServiceImpl.java
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/internal/Activator.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/internal/Activator.java?rev=22507&r1=22506&r2=22507&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/internal/Activator.java (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/internal/Activator.java Thu Oct 16 21:15:35 2008
@@ -8,8 +8,6 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-import org.wso2.carbon.registry.service.RegistryService;
-import org.wso2.carbon.user.UserMgtConfigurationContext;
import org.wso2.carbon.user.UserMgtCoreConstants;
import org.wso2.carbon.user.UserStoreException;
import org.wso2.carbon.user.dbcreators.DBCreatorFactory;
@@ -17,15 +15,13 @@
import org.wso2.carbon.user.def.DefaultRealm;
import org.wso2.carbon.user.hybrid.HybridRealm;
import org.wso2.carbon.user.mgt.UMDatabaseManager;
+import org.wso2.carbon.user.mgt.UserMgtConfigurationContext;
import org.wso2.carbon.utils.ServerConfiguration;
public class Activator implements BundleActivator {
public void start(BundleContext bc) throws Exception {
- ServiceReference ref = bc.getServiceReference(RegistryService.class.getName());
- ServiceTracker tracker = new ServiceTracker(bc, ref, null);
- Registry registry = (Registry) tracker.getService();
-
+
ServerConfiguration config = ServerConfiguration.getInstance();
String url = config.getFirstProperty(UserMgtCoreConstants.ServerConfig.URL);
Deleted: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/UserMgtConfigurationContext.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=22506
Added: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/mgt/UserMgtConfigurationContext.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/mgt/UserMgtConfigurationContext.java?pathrev=22507
==============================================================================
--- (empty file)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/mgt/UserMgtConfigurationContext.java Thu Oct 16 21:15:35 2008
@@ -0,0 +1,47 @@
+package org.wso2.carbon.user.mgt;
+
+import javax.sql.DataSource;
+
+import org.osgi.framework.BundleContext;
+
+public class UserMgtConfigurationContext {
+
+ private static BundleContext bundleContext = null;
+ private static String connectionURL = null;
+ private static String connectionName = null;
+ private static String connectionPass = null;
+ private static String driverName = null;
+
+
+ public static void init(BundleContext bc, String url, String username, String password, String driver){
+ bundleContext = bc;
+ connectionURL = url;
+ connectionName = username;
+ connectionPass = password;
+ driverName =driver;
+ }
+
+ public static BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
+ public static String getConnectionURL() {
+ return connectionURL;
+ }
+
+
+ public static String getConnectionName() {
+ return connectionName;
+ }
+
+ public static String getConnectionPass() {
+ return connectionPass;
+ }
+
+ public static String getDriverName() {
+ return driverName;
+ }
+
+
+
+}
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/service/UserMgtServiceImpl.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/service/UserMgtServiceImpl.java?rev=22507&r1=22506&r2=22507&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/service/UserMgtServiceImpl.java (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt/src/main/java/org/wso2/carbon/user/service/UserMgtServiceImpl.java Thu Oct 16 21:15:35 2008
@@ -10,13 +10,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.user.AccessControlAdmin;
-import org.wso2.carbon.user.UserMgtConfigurationContext;
import org.wso2.carbon.user.UserRealm;
import org.wso2.carbon.user.UserStoreAdmin;
+import org.wso2.carbon.user.UserStoreException;
import org.wso2.carbon.user.UserStoreReader;
import org.wso2.carbon.user.def.DefaultRealm;
import org.wso2.carbon.user.def.DefaultRealmConfig;
import org.wso2.carbon.user.mgt.UMDatabaseManager;
+import org.wso2.carbon.user.mgt.UserMgtConfigurationContext;
public class UserMgtServiceImpl{
@@ -168,7 +169,7 @@
}
- private UserRealm getDefaultRealm(){
+ private UserRealm getDefaultRealm() throws UserStoreException{
UserRealm defRealm = new DefaultRealm();
DefaultRealmConfig config = new DefaultRealmConfig();
BasicDataSource dataSource = new BasicDataSource();
@@ -191,31 +192,38 @@
}
private UserRealm getHybridRealm(){
- DataSource dataSource = this.getDataSource();
- UMDatabaseManager manager = new UMDatabaseManager(dataSource);
-
- Map<String, String> map = manager.getExternalStoreProperties();
- //instantiate the
-
- String realmName = map.get("RealmType");
-
- Class clazz = Class.forName(realmName);
- UserRealm realm = (UserRealm)clazz.newInstance();
-
- Object config = realm.getRealmConfiguration();
- Class configClass = config.getClass();
-
- Method[] meths = configClass.getMethods();
- for(Method method : meths){
- String methname = method.getName();
- String name = methname.substring(3);
- String value = map.get(name);
- if(value != null){
- method.invoke(value);
+ UserRealm realm = null;
+ try {
+ DataSource dataSource = this.getDataSource();
+ UMDatabaseManager manager = new UMDatabaseManager(dataSource);
+
+ Map<String, String> map = manager.getExternalStoreProperties();
+ //instantiate the
+
+ String realmName = map.get("RealmType");
+
+ Class clazz = Class.forName(realmName);
+ realm = (UserRealm)clazz.newInstance();
+
+ Object config = realm.getRealmConfiguration();
+ Class configClass = config.getClass();
+
+ Method[] meths = configClass.getMethods();
+ for(Method method : meths){
+ String methname = method.getName();
+ String name = methname.substring(3);
+ String value = map.get(name);
+ if(value != null){
+ method.invoke(value);
+ }
}
- }
+
+ realm.init(config);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
- realm.init(config);
return realm;
}
More information about the Carbon-dev
mailing list