Author: [email protected]
Date: Mon Jul 25 16:57:28 2011
New Revision: 1228
Log:
AMDATU-401 Changed PID for tenantstore and useradminstore fs implementations so
that file install does not think these are factories
Added:
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.tenantstore.fs.cfg
- copied unchanged from r1226,
/trunk/amdatu-release/src/main/resources/config/org.amdatu.core.tenantstore-fs.cfg
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.useradminstore.fs.cfg
- copied unchanged from r1226,
/trunk/amdatu-release/src/main/resources/config/org.amdatu.core.useradminstore-fs.cfg
Removed:
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.tenantstore-fs.cfg
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.useradminstore-fs.cfg
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageConfigImpl.java
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
==============================================================================
---
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
(original)
+++
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
Mon Jul 25 16:57:28 2011
@@ -24,6 +24,7 @@
import org.amdatu.core.loghandler.service.ConsoleLogHandler;
import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.core.tenant.TenantStorageProvider;
+import org.amdatu.core.tenantstore.fs.service.FSTenantStorageProvider;
import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfigImpl;
import org.ops4j.pax.exam.Option;
@@ -92,12 +93,12 @@
}
public String tenantStorageProviderPID() {
- return TenantStorageProvider.CONFIGURATION_PID;
+ return FSTenantStorageProvider.CONFIGURATION_PID;
}
public Properties tenantStorageProviderCnf() {
Properties properties = new Properties();
- properties.put(TenantStorageProvider.DATA_DIRECTORY,
"work/tenantstore");
+ properties.put(FSTenantStorageProvider.DATA_DIRECTORY,
"work/tenantstore");
return properties;
}
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/CoreServicesTest.java
Mon Jul 25 16:57:28 2011
@@ -77,7 +77,7 @@
}
/**
- * Test availablility of core non tenant aware services that shoudl always
be available.
+ * Test availablility of core non tenant aware services that should always
be available.
*
* @param bundleContext the injected context
* @throws Exception when things go bad
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
Mon Jul 25 16:57:28 2011
@@ -25,15 +25,6 @@
* All methods are allowed to throw a {@link TenantStorageException} when
storage or retrieval fails.
*/
public interface TenantStorageProvider {
- /**
- * The PID of the configuration of this bundle.
- */
- public static final String CONFIGURATION_PID =
"org.amdatu.core.tenantstore-fs";
-
- /**
- * The configuration entry of this bundle that provides the storage
directory.
- */
- public final static String DATA_DIRECTORY = "datadir";
/**
* Stores a tenant. If a tenant with this ID already exists, update it.
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
Mon Jul 25 16:57:28 2011
@@ -34,7 +34,8 @@
createComponent()
.setImplementation(new FSTenantStorageProvider())
.setInterface(TenantStorageProvider.class.getName(), null)
-
.add(createConfigurationDependency().setPid(FSTenantStorageProvider.CONFIGURATION_PID))
+ .add(createConfigurationDependency()
+
.setPid(FSTenantStorageProvider.CONFIGURATION_PID).setPropagate(true))
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
}
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
Mon Jul 25 16:57:28 2011
@@ -32,8 +32,17 @@
/**
* Filesystem backed implementation of the <code>TenantStorageProvider</code>
service interface.
*/
-public class FSTenantStorageProvider implements
- TenantStorageProvider {
+public class FSTenantStorageProvider implements TenantStorageProvider {
+
+ /**
+ * The PID of the configuration of this bundle.
+ */
+ public static final String CONFIGURATION_PID =
"org.amdatu.core.tenantstore.fs";
+
+ /**
+ * The configuration entry of this bundle that provides the storage
directory.
+ */
+ public final static String DATA_DIRECTORY = "datadir";
private volatile LogService m_logService;
private FSTenantStorage m_storage;
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
Mon Jul 25 16:57:28 2011
@@ -41,7 +41,8 @@
createComponent()
.setImplementation(FSUserAdminStorageConfigImpl.class)
.setInterface(new
String[]{FSUserAdminStorageConfig.class.getName(),
ManagedService.class.getName()}, null)
-
.add(createConfigurationDependency().setPid(FSUserAdminStorageConfigImpl.CONFIGURATION_PID)));
+ .add(createConfigurationDependency()
+
.setPid(FSUserAdminStorageConfigImpl.CONFIGURATION_PID).setPropagate(true)));
// We register the FS tenant store as an adapter service for tenant,
which makes it tenant aware.
// An instance of this store will be available for each tenant.
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageConfigImpl.java
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageConfigImpl.java
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageConfigImpl.java
Mon Jul 25 16:57:28 2011
@@ -29,8 +29,8 @@
*/
public class FSUserAdminStorageConfigImpl implements ManagedService,
FSUserAdminStorageConfig {
// The PID and configuration properties
- public static final String CONFIGURATION_PID =
"org.amdatu.core.useradminstore-fs";
- public final static String DATA_DIRECTORY = "datadir";
+ public static final String CONFIGURATION_PID =
"org.amdatu.core.useradminstore.fs";
+ public static final String DATA_DIRECTORY = "datadir";
private String m_dataDirectoryName;
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
