Author: [email protected]
Date: Tue May 1 17:10:13 2012
New Revision: 2300
Log:
[AMDATUAUTH-123] Updated work directory to use new tenant aware bundle data
store
Modified:
trunk/amdatu-auth/auth-stores/fs-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
Modified:
trunk/amdatu-auth/auth-stores/fs-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
==============================================================================
---
trunk/amdatu-auth/auth-stores/fs-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
(original)
+++
trunk/amdatu-auth/auth-stores/fs-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
Tue May 1 17:10:13 2012
@@ -68,7 +68,7 @@
/**
* Invoked since this is a managed service.
- *
+ *
* @param dictionary
* Dictionary holding the configuration properties
* @throws ConfigurationException
@@ -83,16 +83,22 @@
private synchronized void updateConfig() throws ConfigurationException {
if (m_properties != null) {
- // NB: we must read the tenant id from the service properties
instead of injected Tenant, ass the tenant
- // is not yet injected by the dependency manager at this time
- String tenantId = (String) m_tenant.getPID();
String dataDirectoryName = (String)
m_properties.get(DATA_DIRECTORY);
if (dataDirectoryName == null || "".equals(dataDirectoryName)) {
throw new ConfigurationException(DATA_DIRECTORY, "Missing
mandatory data directory configuration");
}
- File dataDirectory = new File(dataDirectoryName +
File.pathSeparator + tenantId);
+ File dir = new File(dataDirectoryName);
+
try {
- setDataDirectory(dataDirectory);
+ if (dir.isAbsolute()) {
+ // If the directory is absolute, use it as is
+ setDataDirectory(dir);
+ }
+ else {
+ // If the directory is relative, make it relative w.r.t.
+ dir = new File(m_context.getDataFile(""),
dataDirectoryName);
+ setDataDirectory(dir);
+ }
}
catch (ConsumerRegistryStorageException e) {
throw new ConfigurationException(DATA_DIRECTORY,
e.getMessage());
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
