Author: [email protected] Date: Mon Jan 30 16:43:53 2012 New Revision: 2028
Log: AMDATU-529 Alligned factory metatype and kitchensink multitenant demo to new config keys Modified: trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/metatype/metatype.xml trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1.xml trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2.xml Modified: trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/metatype/metatype.xml ============================================================================== --- trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/metatype/metatype.xml (original) +++ trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/metatype/metatype.xml Mon Jan 30 16:43:53 2012 @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.0.0";> <OCD name="Amdatu Tenant Configuration" id="org.amdatu.core.tenant"> - <AD id="id" type="STRING" cardinality="0" /> - <AD id="name" type="STRING" cardinality="0" /> - <AD id="host" type="STRING" cardinality="0" /> + <AD id="org.amdatu.tenant.pid" type="STRING" cardinality="0" /> + <AD id="org.amdatu.tenant.name" type="STRING" cardinality="0" /> </OCD> <Designate pid="org.amdatu.core.tenant.factory" factoryPid="org.amdatu.core.tenant.factory"> <Object ocdref="org.amdatu.core.tenant" /> Modified: trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1.xml ============================================================================== --- trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1.xml (original) +++ trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1.xml Mon Jan 30 16:43:53 2012 @@ -2,15 +2,12 @@ <MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";> <Designate pid="org.amdatu.core.tenant.factory.1" factoryPid="org.amdatu.core.tenant.factory"> <Object ocdref="org.amdatu.core.tenant"> - <Attribute adref="id"> + <Attribute adref="org.amdatu.tenant.pid"> <Value>tenant1</Value> </Attribute> - <Attribute adref="name"> + <Attribute adref="org.amdatu.tenant.name"> <Value>Tenant 1</Value> </Attribute> - <Attribute adref="host"> - <Value>localhost</Value> - </Attribute> </Object> </Designate> </MetaData> \ No newline at end of file Modified: trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2.xml ============================================================================== --- trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2.xml (original) +++ trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2.xml Mon Jan 30 16:43:53 2012 @@ -2,15 +2,12 @@ <MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";> <Designate pid="org.amdatu.core.tenant.factory.2" factoryPid="org.amdatu.core.tenant.factory"> <Object ocdref="org.amdatu.core.tenant"> - <Attribute adref="id"> + <Attribute adref="org.amdatu.tenant.pid"> <Value>tenant2</Value> </Attribute> - <Attribute adref="name"> + <Attribute adref="org.amdatu.tenant.name"> <Value>Tenant 2</Value> </Attribute> - <Attribute adref="host"> - <Value>127.0.0.1</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
