Author: [email protected]
Date: Mon Dec 12 16:23:55 2011
New Revision: 1839
Log:
AMDATU-468 Switched platform release to new tenant mechanism
Modified:
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
trunk/amdatu-release/src/main/resources/config/amdatu-web-config.xml
trunk/amdatu-release/src/main/resources/config/tenant-default.xml
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Mon Dec 12 16:23:55 2011
@@ -42,8 +42,6 @@
<org.amdatu.lib.version>0.3.0-SNAPSHOT</org.amdatu.lib.version>
<org.apache.felix.main.version>4.0.2</org.apache.felix.main.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.scr.version>1.6.0</org.apache.felix.scr.version>
<org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version>
@@ -52,9 +50,6 @@
<org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version>
<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.prefs.version>1.0.4</org.apache.felix.prefs.version>
-
- <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
</properties>
@@ -99,18 +94,6 @@
</dependency>
<dependency>
<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.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${org.apache.felix.configadmin.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>${org.apache.felix.scr.version}</version>
<scope>compile</scope>
@@ -152,12 +135,6 @@
</dependency>
<dependency>
<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.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
<scope>compile</scope>
</dependency>
@@ -191,12 +168,6 @@
<version>${org.apache.felix.shell.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.useradmin</groupId>
- <artifactId>pax-useradmin-service</artifactId>
- <version>${pax.useradmin.version}</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
@@ -221,6 +192,24 @@
</dependency>
<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.tenant</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
@@ -228,24 +217,31 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
+ <artifactId>org.amdatu.core.useradminstore.prefs</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.fs</artifactId>
+ <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.fileinstall.metatype</artifactId>
+ <artifactId>org.amdatu.core.fileinstall.autoconf</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.deployment.tenantconf</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.httpcontext</artifactId>
Modified:
trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
==============================================================================
--- trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
(original)
+++ trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
Mon Dec 12 16:23:55 2011
@@ -78,10 +78,8 @@
# 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.configadmin-${org.apache.felix.configadmin.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.eventadmin-${org.apache.felix.eventadmin.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
\
@@ -89,9 +87,7 @@
reference:file:lib/org.apache.felix.shell-${org.apache.felix.shell.version}.jar
\
reference:file:lib/org.apache.felix.webconsole-${org.apache.felix.webconsole.version}.jar
\
reference:file:lib/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar
\
-
reference:file:lib/org.apache.felix.scr-${org.apache.felix.scr.version}.jar \
-
reference:file:lib/org.apache.felix.prefs-${org.apache.felix.prefs.version}.jar
\
-
reference:file:lib/pax-useradmin-service-${pax.useradmin.version}.jar
+
reference:file:lib/org.apache.felix.scr-${org.apache.felix.scr.version}.jar
# Sets the initial start level of the framework upon startup.
#org.osgi.framework.startlevel.beginning=1
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
Mon Dec 12 16:23:55 2011
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <Designate pid="org.amdatu.core.config.templates" bundle="*">
+ <Designate pid="org.amdatu.core.config.templates">
<Object ocdref="org.amdatu.core.config.templates">
<Attribute adref="workdir">
<Value>config-template-manager</Value>
</Attribute>
</Object>
</Designate>
- <Designate pid="org.amdatu.core.log.console" bundle="*">
+ <Designate pid="org.amdatu.core.log.console">
<Object ocdref="org.amdatu.core.log.console">
<Attribute adref="loglevel">
<Value>INFO</Value>
</Attribute>
</Object>
</Designate>
- <Designate pid="org.amdatu.core.useradminstore.fs" bundle="*">
+ <Designate pid="org.amdatu.core.useradminstore.fs">
<Object ocdref="org.amdatu.core.useradminstore.fs">
<Attribute adref="datadir">
<Value>work/useradminstore</Value>
Modified: trunk/amdatu-release/src/main/resources/config/amdatu-web-config.xml
==============================================================================
--- trunk/amdatu-release/src/main/resources/config/amdatu-web-config.xml
(original)
+++ trunk/amdatu-release/src/main/resources/config/amdatu-web-config.xml
Mon Dec 12 16:23:55 2011
@@ -3,7 +3,7 @@
<OCD name="Apache Felix Http Config" id="org.osgi.service.http">
<AD id="org.osgi.service.http.port" type="STRING" cardinality="0" />
</OCD>
- <Designate pid="org.apache.felix.http" bundle="*">
+ <Designate pid="org.apache.felix.http">
<Object ocdref="org.osgi.service.http">
<Attribute adref="org.osgi.service.http.port">
<Value>8080</Value>
Modified: trunk/amdatu-release/src/main/resources/config/tenant-default.xml
==============================================================================
--- trunk/amdatu-release/src/main/resources/config/tenant-default.xml
(original)
+++ trunk/amdatu-release/src/main/resources/config/tenant-default.xml Mon Dec
12 16:23:55 2011
@@ -1,7 +1,6 @@
<?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"
- bundle="*">
+ <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>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
