Author: [email protected]
Date: Mon Dec 12 16:23:47 2011
New Revision: 1838
Log:
AMDATU-468 Switched core itest base to new multi tenant mechanism. Tests succeed
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
trunk/amdatu-core/itest/pom.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
Mon Dec 12 16:23:47 2011
@@ -32,14 +32,14 @@
public final class CoreFixture {
public enum Bundles {
- CONFIGADMIN("org.apache.felix", "org.apache.felix.configadmin"),
DEPENDENCYMANAGER("org.apache.felix",
"org.apache.felix.dependencymanager"),
- EVENTADMIN("org.apache.felix", "org.apache.felix.eventadmin"),
LOG("org.apache.felix", "org.apache.felix.log"),
- PREFS("org.apache.felix", "org.apache.felix.prefs"),
- USERADMIN("org.ops4j.pax.useradmin", "pax-useradmin-service"),
+ CONFIGADMIN("org.amdatu.core", "org.amdatu.core.configadmin"),
+ EVENTADMIN("org.amdatu.core", "org.amdatu.core.eventadmin"),
+ PREFS("org.amdatu.core", "org.amdatu.core.preferences"),
+ USERADMIN("org.amdatu.core", "org.amdatu.core.useradmin"),
USERADMINSTORE_FS("org.amdatu.core",
"org.amdatu.core.useradminstore.fs"),
- TENANTUSERADMINDECORATOR("org.amdatu.core",
"org.amdatu.core.tenantuseradmindecorator"),
+ USERADMINSTORE_PREFS("org.amdatu.core",
"org.amdatu.core.useradminstore.prefs"),
ITEST_BASE("org.amdatu.core", "org.amdatu.core.itest.base"),
CONFIG_TEMPLATES("org.amdatu.core",
"org.amdatu.core.config.templates"),
LOG_CONSOLE("org.amdatu.core", "org.amdatu.core.log.console"),
@@ -159,7 +159,7 @@
* @return the option
*/
public static Option provision() {
- return provision((Bundles) null);
+ return provision(Bundles.USERADMINSTORE_FS);
}
/**
Modified: trunk/amdatu-core/itest/pom.xml
==============================================================================
--- trunk/amdatu-core/itest/pom.xml (original)
+++ trunk/amdatu-core/itest/pom.xml Mon Dec 12 16:23:47 2011
@@ -174,6 +174,41 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.configadmin</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.eventadmin</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.preferences</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradmin</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradminstore.prefs</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
<artifactId>org.amdatu.core.useradminstore.fs</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
@@ -292,6 +327,36 @@
<groupId>org.ops4j.pax.useradmin</groupId>
<artifactId>pax-useradmin-service</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.configadmin</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.eventadmin</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.preferences</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradmin</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradminstore.prefs</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradminstore.fs</artifactId>
+ <type>bundle</type>
+ </dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>org.amdatu.core.useradminstore.fs</artifactId>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
