Author: [email protected]
Date: Tue Dec 13 12:45:57 2011
New Revision: 1847
Log:
AMDATU-473 UserAdmin fs storage is no longer managed
Removed:
trunk/amdatu-core/useradminstore-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
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
Tue Dec 13 12:45:57 2011
@@ -21,7 +21,6 @@
import java.util.List;
import java.util.Properties;
-import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfigImpl;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.ProvisionOption;
@@ -70,7 +69,6 @@
public enum Configs {
LOGHANDLER("org.amdatu.core.loghandler", logHandlerCnf(), false),
CONFIGTEMPLATEMANAGER("org.amdatu.core.loghandler",
configTemplateManagerCnf(), false),
- USERADMIN_STORAGE_FS("org.amdatu.core.useradminstore.fs",
userAdminStorageFSCnf(), false),
TENANT("org.amdatu.core.tenant.factory", tenantCnf(), true);
private final String m_pid;
@@ -109,12 +107,6 @@
return properties;
}
-// private static Properties userAdminStorageFSCnf() {
-// Properties properties = new Properties();
-// properties.put(FSUserAdminStorageConfigImpl.DATA_DIRECTORY,
"work/useradminstore");
-// return properties;
-// }
-
private static Properties tenantCnf() {
Properties properties = new Properties();
properties.put("id", "Default");
Modified: trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
==============================================================================
--- trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
(original)
+++ trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
Tue Dec 13 12:45:57 2011
@@ -14,11 +14,4 @@
</Attribute>
</Object>
</Designate>
- <Designate pid="org.amdatu.core.useradminstore.fs">
- <Object ocdref="org.amdatu.core.useradminstore.fs">
- <Attribute adref="datadir">
- <Value>work/useradminstore</Value>
- </Attribute>
- </Object>
- </Designate>
</MetaData>
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
