Skip to content

Commit

Permalink
Finished the impl of the ConfigurationListener.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ieb
ieb committed Apr 2, 2009
1 parent a1be3be commit d915170
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .../configuration/ConfigutationListener.java → .../configuration/ConfigurationListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* Listens for configuration changes.
*/
public interface ConfigutationListener {
public interface ConfigurationListener {
/**
* @param config the new configuration
*/
Expand Down
4 changes: 2 additions & 2 deletions .../kernel/src/main/java/org/sakaiproject/kernel/api/configuration/ConfigurationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public interface ConfigurationService {
/**
* @param listener the listener to add.
*/
void addListener(ConfigutationListener listener);
void addListener(ConfigurationListener listener);

/**
* @param listener the listener to remove.
*/
void removeListener(ConfigutationListener listener);
void removeListener(ConfigurationListener listener);
}
85 changes: 56 additions & 29 deletions ...ndles/kernel/src/main/java/org/sakaiproject/kernel/api/configuration/KernelConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@

package org.sakaiproject.kernel.api.configuration;

import com.google.common.base.ReferenceType;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.ReferenceMap;
import com.google.common.collect.ImmutableMap.Builder;

import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;

import java.util.Dictionary;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;

/**
Expand All @@ -42,43 +46,52 @@
*/
public class KernelConstants implements ConfigurationService, ManagedService {


/**
*
* @scr.property value="/userenv" type="String"
* name="JCR User Environment Base Path"
* description="The location of system private data in the repo, read only, one time configuration per repository."
* @scr.property value="/userenv" type="String" name="JCR User Environment Base Path"
* description="The location of system private data in the repo, read only, one time configuration per repository."
*/
public static final String JCR_USERENV_BASE = "jcruserenv.base";
/**
* list of templates in the form type=path;type=path;
* @scr.property value="jcruserenv.templates=student=/configuration/defaults/usertypes/userenv-student.json;researcher=/configuration/defaults/usertypes/userenv-researcher.json;"
* type="String"
*
* @scr.property value="jcruserenv.templates=student=/configuration/defaults/usertypes/userenv-student.json;researcher=/configuration/defaults/usertypes/userenv-researcher.json;"
* type="String"
*/
public static final String JCR_USERENV_TEMPLATES = "jcruserenv.templates";
/**
* The default template for a user
* @scr.property value="/configuration/defaults/usertypes/userenv-default.json" type="String"
*
* @scr.property value="/configuration/defaults/usertypes/userenv-default.json"
* type="String"
*/
public static final String JCR_DEFAULT_TEMPLATE = "jcruserenv.templates.default";
/**
* list of profile templates in the form type=path;type=path;
* @scr.property value="/configuration/defaults/usertypes/profile-student.json;researcher=/configuration/defaults/usertypes/profile-researcher.json;" type="String"
*
* @scr.property value="/configuration/defaults/usertypes/profile-student.json;researcher=/configuration/defaults/usertypes/profile-researcher.json;"
* type="String"
*/
public static final String JCR_PROFILE_TEMPLATES = "jcrprofile.templates";
/**
* The default template for a user
* @scr.property value="/configuration/defaults/usertypes/profile-default.json" type="String"
*
* @scr.property value="/configuration/defaults/usertypes/profile-default.json"
* type="String"
*/
public static final String JCR_PROFILE_DEFAUT_TEMPLATES = "jcrprofile.templates.default";
/**
* The template locations for site creation.
* @scr.property value="project=/configuration/defaults/sitetypes/project-site.json;course=/configuration/defaults/sitetypes/course-site.json;" type="String"
*
* @scr.property value="project=/configuration/defaults/sitetypes/project-site.json;course=/configuration/defaults/sitetypes/course-site.json;"
* type="String"
*/
public static final String JCR_SITE_TEMPLATES = "jcrsite.templates";
/**
* Default site template.
* @scr.property value="/configuration/defaults/sitetypes/default-site.json" type="String"
*
* @scr.property value="/configuration/defaults/sitetypes/default-site.json"
* type="String"
*/
public static final String JCR_SITE_DEFAULT_TEMPLATE = "jcrsite.templates.default";

Expand All @@ -97,19 +110,24 @@ public class KernelConstants implements ConfigurationService, ManagedService {
/**
* Setting: The time to live of User Env objects the local cache, this should be set in
* the kernel properties file.
*
* @scr.property value="600000" type="String"
*/
public static final String TTL = "userenvironment.ttl";

/**
* This controls whether anonymous account creation is enabled. I also enables the ability to
* to check for the existence of eids in the system anonymously....without being superuser.
* This controls whether anonymous account creation is enabled. I also enables the
* ability to to check for the existence of eids in the system anonymously....without
* being superuser.
*
* @scr.property value="true" type="String"
*/
public static final String PROP_ANON_ACCOUNTING = "rest.user.anonymous.account.creation";
/**
* Control over the JPA Entity Manager scope, can be THREAD if its really stable
* although this means the filter must commit, or REQUEST, then the standard filter manages commits
* Control over the JPA Entity Manager scope, can be THREAD if its really stable
* although this means the filter must commit, or REQUEST, then the standard filter
* manages commits
*
* @scr.property value="REQUEST" type="String"
*/
public static final String ENTITY_MANAGER_SCOPE = "jpa.entitymanager.scope";
Expand Down Expand Up @@ -167,13 +185,13 @@ public class KernelConstants implements ConfigurationService, ManagedService {
*/
public static final String SESSION_COOKIE = "http.global.cookiename";


/**
* @scr.property value="" type="String"
*/
public static final String SUBJECT_PROVIDER_REGISTRY = "subjectstatement.provider";
/**
* The name of the registry used for this type of service.
*
* @scr.property value="" type="String"
*/
public static final String AUTHENTICATION_PROVIDER_REGISTRY = "authentication.provider.registry";
Expand All @@ -183,15 +201,11 @@ public class KernelConstants implements ConfigurationService, ManagedService {
public static final String MANAGER_PROVIDER_REGISTRY = "authentication.manager.provider.registry";
/**
* The name of the registry used for this type of service.
*
* @scr.property value="" type="String"
*/
public static final String USER_PROVIDER_REGISTRY = "user.provider.registry";






// constant properties
/**
* Name of the groupdef file.
Expand Down Expand Up @@ -230,11 +244,12 @@ public class KernelConstants implements ConfigurationService, ManagedService {
*/
public static final String MESSAGES = "messages";


/**
* The configuration map
*/
private ImmutableMap<String, String> configMap;
private Map<String, ConfigurationListener> listeners = new ReferenceMap<String, ConfigurationListener>(
ReferenceType.STRONG, ReferenceType.WEAK);

/**
* {@inheritDoc}
Expand All @@ -246,9 +261,20 @@ public void updated(Dictionary config) throws ConfigurationException {
Builder<String, String> builder = ImmutableMap.builder();
for (Enumeration<?> e = config.keys(); e.hasMoreElements();) {
String k = (String) e.nextElement();
builder.put(k, (String)config.get(k));
builder.put(k, (String) config.get(k));
}
configMap = builder.build();
notifyUpdate(configMap);
}

/**
* @param configMap2
*/
private void notifyUpdate(Map<String, String> configMapLocal) {
List<ConfigurationListener> savedListners = Lists.immutableList(listeners.values());
for ( ConfigurationListener listener : savedListners ) {
listener.update(configMapLocal);
}
}

public Map<String, String> getProperties() {
Expand All @@ -257,6 +283,7 @@ public Map<String, String> getProperties() {

/**
* {@inheritDoc}
*
* @see org.sakaiproject.kernel.api.configuration.ConfigurationService#getProperty()
*/
public String getProperty(String key) {
Expand All @@ -265,20 +292,20 @@ public String getProperty(String key) {

/**
* {@inheritDoc}
*
* @see org.sakaiproject.kernel.api.configuration.ConfigurationService#addListener(org.sakaiproject.kernel.api.configuration.ConfigutationListener)
*/
public void addListener(ConfigutationListener listener) {
// TODO Auto-generated method stub

public void addListener(ConfigurationListener listener) {
listeners.put(String.valueOf(listener), listener);
}

/**
* {@inheritDoc}
*
* @see org.sakaiproject.kernel.api.configuration.ConfigurationService#removeListener(org.sakaiproject.kernel.api.configuration.ConfigutationListener)
*/
public void removeListener(ConfigutationListener listener) {
// TODO Auto-generated method stub

public void removeListener(ConfigurationListener listener) {
listeners.remove(String.valueOf(listener));
}

}

0 comments on commit d915170

Please sign in to comment.