Author: [email protected]
Date: Tue Jan 24 16:47:34 2012
New Revision: 1990
Log:
AMDATU-527 Refactored server assembly into multiple configurable
profiles/servers
Added:
trunk/amdatu-kitchensink/release-server/README
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/demo-global.xml.xml
- copied, changed from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/demo-global.xml.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1-demo.xml
- copied, changed from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1-demo.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1.xml
- copied, changed from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2-demo.xml
- copied, changed from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2-demo.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2.xml
- copied, changed from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-minimal/
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-minimal/amdatu-core-config.xml
- copied, changed from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/amdatu-core-config.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-multitenant/
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-multitenant/amdatu-core-config.xml
- copied, changed from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/amdatu-core-config.xml
Modified:
trunk/amdatu-kitchensink/release-server/pom.xml
trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.sh
trunk/amdatu-kitchensink/release-server/src/main/resources/conf/amdatu-platform.properties
trunk/amdatu-kitchensink/release-server/src/main/resources/config/amdatu-core-config.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/demo-global.xml.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1-demo.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2-demo.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2.xml
Added: trunk/amdatu-kitchensink/release-server/README
==============================================================================
--- (empty file)
+++ trunk/amdatu-kitchensink/release-server/README Tue Jan 24 16:47:34 2012
@@ -0,0 +1,8 @@
+= Initial version of the Amdatu Platform Kitchensink server
+
+This server support running various demos agains various server
+configurations. Deployment is managed through fileinstall.
+
+Currently HARDCODED in the run script:
+
+-Dfelix.fileinstall.dir=servers/platform-multitenant,servers/demo-multitenant
\ No newline at end of file
Modified: trunk/amdatu-kitchensink/release-server/pom.xml
==============================================================================
--- trunk/amdatu-kitchensink/release-server/pom.xml (original)
+++ trunk/amdatu-kitchensink/release-server/pom.xml Tue Jan 24 16:47:34 2012
@@ -42,6 +42,11 @@
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
<org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version>
+
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
+
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
+ <org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version>
+
<org.apache.felix.deployment.rp.autoconf.version>0.1.0</org.apache.felix.deployment.rp.autoconf.version>
+ <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
</properties>
<dependencies>
@@ -51,7 +56,7 @@
<version>${org.apache.felix.main.version}</version>
<scope>runtime</scope>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -104,70 +109,80 @@
<version>${org.apache.felix.shell.version}</version>
<scope>compile</scope>
</dependency>
-
+
+ <!-- Single Tenant compendium services -->
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.console</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>${org.apache.felix.eventadmin.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.forwarder.jdk</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${org.apache.felix.configadmin.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.eventadmin</artifactId>
- <version>${org.amdatu.core.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.prefs</artifactId>
+ <version>${org.apache.felix.prefs.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.configadmin</artifactId>
- <version>${org.amdatu.core.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.deployment.rp.autoconf</artifactId>
+ <version>${org.apache.felix.deployment.rp.autoconf.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.preferences</artifactId>
- <version>${org.amdatu.core.version}</version>
+ <groupId>org.ops4j.pax.useradmin</groupId>
+ <artifactId>pax-useradmin-service</artifactId>
+ <version>${pax.useradmin.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.useradmin</groupId>
+ <artifactId>pax-useradmin-provider-preferences</artifactId>
+ <version>${pax.useradmin.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant</artifactId>
+ <artifactId>org.amdatu.core.log.console</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant.adaptor</artifactId>
+ <artifactId>org.amdatu.core.log.forwarder.jdk</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
+
+
+ <!-- Multi-Tenancy components -->
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant.factory</artifactId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.useradminstore.prefs</artifactId>
+ <artifactId>org.amdatu.core.tenant.adaptor</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.useradmin</artifactId>
+ <artifactId>org.amdatu.core.tenant.factory</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
<type>bundle</type>
@@ -184,7 +199,42 @@
<version>${org.amdatu.core.version}</version>
<scope>compile</scope>
</dependency>
+
+ <!-- Multi-Tenant compendium component -->
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.eventadmin</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.configadmin</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.preferences</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradmin</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradminstore.prefs</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <!-- Kitchensync demo components -->
<dependency>
<groupId>org.amdatu.kitchensink</groupId>
<artifactId>org.amdatu.kitchensink.demo.tenant.local</artifactId>
@@ -197,7 +247,7 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
-
+
</dependencies>
<build>
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 16:47:34 2012
@@ -6,15 +6,55 @@
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.osgi:org.osgi.compendium</include>
- <include>org.apache.felix:*</include>
+ <include>org.apache.felix:org.apache.felix.main</include>
+ <include>org.apache.felix:org.apache.felix.fileinstall</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
- <outputDirectory>deploy</outputDirectory>
+ <outputDirectory>servers/platform-minimal</outputDirectory>
+ <includes>
+ <include>org.apache.felix:org.apache.felix.configadmin</include>
+ <include>org.apache.felix:org.apache.felix.dependencymanager</include>
+
<include>org.apache.felix:org.apache.felix.dependencymanager.shell</include>
+ <include>org.apache.felix:org.apache.felix.metatype</include>
+ <include>org.apache.felix:org.apache.felix.prefs</include>
+ <include>org.apache.felix:org.apache.felix.shell</include>
+ <include>org.apache.felix:org.apache.felix.shell.tui</include>
+ <include>org.ops4j.pax.useradmin:pax-useradmin-service</include>
+
<include>org.ops4j.pax.useradmin:pax-useradmin-provider-preferences</include>
+ <include>org.amdatu.core:org.amdatu.core.fileinstall.autoconf</include>
+
<include>org.apache.felix:org.apache.felix.deployment.rp.autoconf</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>servers/platform-multitenant</outputDirectory>
+ <includes>
+ <include>org.apache.felix:org.apache.felix.dependencymanager</include>
+
<include>org.apache.felix:org.apache.felix.dependencymanager.shell</include>
+ <include>org.apache.felix:org.apache.felix.metatype</include>
+ <include>org.amdatu.core:org.amdatu.core.tenant</include>
+ <include>org.amdatu.core:org.amdatu.core.tenant.adaptor</include>
+ <include>org.amdatu.core:org.amdatu.core.tenant.factory</include>
+ <include>org.amdatu.core:org.amdatu.core.fileinstall.autoconf</include>
+
<include>org.amdatu.core:org.amdatu.core.deployment.tenantconf</include>
+ <include>org.amdatu.core:org.amdatu.core.configadmin</include>
+ <include>org.amdatu.core:org.amdatu.core.eventadmin</include>
+ <include>org.amdatu.core:org.amdatu.core.preferences</include>
+ <include>org.amdatu.core:org.amdatu.core.useradmin</include>
+ <include>org.amdatu.core:org.amdatu.core.useradminstore.prefs</include>
+ <include>org.apache.felix:org.apache.felix.shell</include>
+ <include>org.apache.felix:org.apache.felix.shell.tui</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>servers/demo-multitenant</outputDirectory>
<includes>
- <include>org.amdatu.core:*</include>
<include>org.amdatu.kitchensink:*</include>
</includes>
<unpack>false</unpack>
@@ -29,6 +69,7 @@
<includes>
<include>LICENSE</include>
<include>NOTICE</include>
+ <include>README</include>
</includes>
</fileSet>
<fileSet>
@@ -42,13 +83,18 @@
<filtered>true</filtered>
</fileSet>
<fileSet>
- <directory>src/main/resources/tenants</directory>
- <outputDirectory>tenants</outputDirectory>
+ <directory>src/main/resources/config/platform-minimal</directory>
+ <outputDirectory>servers/platform-minimal</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/config/platform-multitenant</directory>
+ <outputDirectory>servers/platform-multitenant</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
- <directory>src/main/resources/config</directory>
- <outputDirectory>deploy</outputDirectory>
+ <directory>src/main/resources/config/demo-multitenant</directory>
+ <outputDirectory>servers/platform-multitenant</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
Modified: trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
==============================================================================
--- trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
(original)
+++ trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
Tue Jan 24 16:47:34 2012
@@ -7,7 +7,7 @@
set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
rem Felix property file
-set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
-Dfelix.fileinstall.dir=servers/platform-multitenant,servers/demo-multitenant
rem Set encoding to UTF-8
set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
Modified: trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.sh
==============================================================================
--- trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.sh
(original)
+++ trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.sh
Tue Jan 24 16:47:34 2012
@@ -7,7 +7,7 @@
JAVA_OPTS="$JAVA_OPTS -Xms256m -Xmx1024m -XX:MaxPermSize=256m"
# Felix property file
-JAVA_OPTS="$JAVA_OPTS
-Dfelix.config.properties=file:conf/amdatu-platform.properties"
+JAVA_OPTS="$JAVA_OPTS
-Dfelix.config.properties=file:conf/amdatu-platform.properties
-Dfelix.fileinstall.dir=servers/platform-multitenant,servers/demo-multitenant"
# Set encoding to UTF-8
JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=utf-8"
Modified:
trunk/amdatu-kitchensink/release-server/src/main/resources/conf/amdatu-platform.properties
==============================================================================
---
trunk/amdatu-kitchensink/release-server/src/main/resources/conf/amdatu-platform.properties
(original)
+++
trunk/amdatu-kitchensink/release-server/src/main/resources/conf/amdatu-platform.properties
Tue Jan 24 16:47:34 2012
@@ -68,15 +68,8 @@
# component is the target start level. Any number of these properties
# may be specified for different start levels.
felix.auto.start.1= \
- reference:file:lib/org.osgi.compendium-${org.osgi.version}.jar \
-
reference:file:lib/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar
\
-
reference:file:lib/org.apache.felix.dependencymanager.shell-${org.apache.felix.dependencymanager.version}.jar
\
-
reference:file:lib/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar
\
-
reference:file:lib/org.apache.felix.log-${org.apache.felix.log.version}.jar \
-
reference:file:lib/org.apache.felix.metatype-${org.apache.felix.metatype.version}.jar
\
-
reference:file:lib/org.apache.felix.shell.tui-${org.apache.felix.shell.tui.version}.jar
\
-
reference:file:lib/org.apache.felix.shell-${org.apache.felix.shell.version}.jar
\
- reference:file:lib/org.apache.felix.scr-${org.apache.felix.scr.version}.jar
+ reference:file:lib/org.osgi.compendium-4.2.0.jar \
+ reference:file:lib/org.apache.felix.fileinstall-3.1.10.jar
# Configuration for file install in a local development scenario. It
# should not be deployed and enabled in a real world deployment.
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/demo-global.xml.xml
(from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/demo-global.xml.xml)
==============================================================================
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1-demo.xml
(from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1-demo.xml)
==============================================================================
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant1.xml
(from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant1.xml)
==============================================================================
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2-demo.xml
(from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2-demo.xml)
==============================================================================
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/demo-multitenant/tenant-tenant2.xml
(from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/tenants/tenant-tenant2.xml)
==============================================================================
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-minimal/amdatu-core-config.xml
(from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/amdatu-core-config.xml)
==============================================================================
Copied:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-multitenant/amdatu-core-config.xml
(from r1988,
/trunk/amdatu-kitchensink/release-server/src/main/resources/config/amdatu-core-config.xml)
==============================================================================
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
