Author: [email protected]
Date: Fri Apr 6 10:00:57 2012
New Revision: 2190
Log:
[AMDATUOPENSOCIAL-206] Fixed incorrect artifact id
Modified:
trunk/amdatu-opensocial/opensocial-shindig/pom.xml
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/config/ShindigConfigurationServiceImpl.java
trunk/amdatu-opensocial/pom.xml
Modified: trunk/amdatu-opensocial/opensocial-shindig/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-shindig/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-shindig/pom.xml Fri Apr 6 10:00:57 2012
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.config.tools</artifactId>
+ <artifactId>org.amdatu.auth.tools.config</artifactId>
<type>jar</type>
</dependency>
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/config/ShindigConfigurationServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/config/ShindigConfigurationServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/config/ShindigConfigurationServiceImpl.java
Fri Apr 6 10:00:57 2012
@@ -15,9 +15,8 @@
*/
package org.amdatu.opensocial.shindig.config;
-
-import org.amdatu.auth.config.tools.ConfigTools;
-import org.amdatu.auth.config.tools.ConfigTools.ConfigProperty;
+import org.amdatu.auth.tools.config.ConfigTools;
+import org.amdatu.auth.tools.config.ConfigTools.ConfigProperty;
import java.io.File;
import java.util.ArrayList;
@@ -29,8 +28,10 @@
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
+
/**
* Implements the shared configuration service for this bundle.
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
@SuppressWarnings("rawtypes")
@@ -42,20 +43,20 @@
new ConfigProperty(WORKDIR, File.class, new File("work/shindig")),
new ConfigProperty(SECRETKEY, String.class, "")
};
-
+
// Injected service dependencies
private volatile LogService m_logService;
-
+
// Array of listeners to invoke once the configuration has changed
private List<Listener> m_listeners = new ArrayList<Listener>();
-
+
private ConfigTools m_configTools;
private Dictionary m_dictionary;
-
+
public void addListener(Listener listener) {
m_listeners.add(listener);
}
-
+
public void removeListener(Listener listener) {
m_listeners.remove(listener);
}
@@ -63,7 +64,7 @@
public void start() {
initConfigTools();
}
-
+
public void updated(Dictionary properties) throws ConfigurationException {
m_dictionary = properties;
initConfigTools();
@@ -71,7 +72,7 @@
listener.onConfigUpdate(properties);
}
}
-
+
private void initConfigTools() {
if (m_dictionary != null && m_logService != null) {
if (m_configTools == null) {
@@ -80,15 +81,15 @@
m_configTools.init(CONFIG_PROPERTIES, m_dictionary);
}
}
-
+
public <T> T get(String key, Class<T> clazz) {
return m_configTools.get(key, clazz);
}
-
+
public Dictionary getDictionary() {
return m_dictionary;
}
-
+
public Properties getProperties() {
Properties properties = new Properties();
Enumeration keys = m_dictionary.keys();
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Fri Apr 6 10:00:57 2012
@@ -262,7 +262,7 @@
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.config.tools</artifactId>
+ <artifactId>org.amdatu.auth.tools.config</artifactId>
<version>${amdatu.auth.version}</version>
<scope>compile</scope>
<type>jar</type>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
