Author: [email protected]
Date: Tue Jan 24 10:22:10 2012
New Revision: 1977
Log:
AMDATU-526 Added two sample tenant files to the kitchensync release
Added:
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1.xml
- copied, changed from r1973,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/tenant-default.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2.xml
- copied, changed from r1973,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/tenant-default.xml
Modified:
trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/tenant-default.xml
Modified:
trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
Tue Jan 24 10:22:10 2012
@@ -42,6 +42,11 @@
<filtered>true</filtered>
</fileSet>
<fileSet>
+ <directory>src/main/resources/tenants</directory>
+ <outputDirectory>tenants</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
<directory>src/main/resources/config</directory>
<outputDirectory>deploy</outputDirectory>
<filtered>true</filtered>
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1.xml
(from r1973,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/tenant-default.xml)
==============================================================================
---
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/tenant-default.xml
(original)
+++
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1.xml
Tue Jan 24 10:22:10 2012
@@ -3,10 +3,10 @@
<Designate pid="org.amdatu.core.tenant.factory.1"
factoryPid="org.amdatu.core.tenant.factory">
<Object ocdref="org.amdatu.core.tenant">
<Attribute adref="id">
- <Value>default</Value>
+ <Value>tenant1</Value>
</Attribute>
<Attribute adref="name">
- <Value>Default Tenant</Value>
+ <Value>Tenant 1</Value>
</Attribute>
<Attribute adref="host">
<Value>localhost</Value>
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2.xml
(from r1973,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/tenant-default.xml)
==============================================================================
---
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/tenant-default.xml
(original)
+++
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2.xml
Tue Jan 24 10:22:10 2012
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
+ <Designate pid="org.amdatu.core.tenant.factory.2"
factoryPid="org.amdatu.core.tenant.factory">
<Object ocdref="org.amdatu.core.tenant">
<Attribute adref="id">
- <Value>default</Value>
+ <Value>tenant2</Value>
</Attribute>
<Attribute adref="name">
- <Value>Default Tenant</Value>
+ <Value>Tenant 2</Value>
</Attribute>
<Attribute adref="host">
- <Value>localhost</Value>
+ <Value>127.0.0.1</Value>
</Attribute>
</Object>
</Designate>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
