Merge pull request #92 from apache/isolate-felix-cache
Move common Felix Cache Dir to a property
diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index 5e83a72..ce53f55 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -119,7 +119,7 @@
<configuration>
<systemPropertyVariables>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
diff --git a/core-integ/pom.xml b/core-integ/pom.xml
index 7d2cb0b..14efe17 100644
--- a/core-integ/pom.xml
+++ b/core-integ/pom.xml
@@ -265,7 +265,7 @@
</excludes>
<systemPropertyVariables>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
@@ -290,7 +290,7 @@
<systemPropertyVariables>
<apacheds.partition.factory>org.apache.directory.server.core.factory.AvlPartitionFactory</apacheds.partition.factory>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
@@ -314,7 +314,7 @@
<systemPropertyVariables>
<apacheds.partition.factory>org.apache.directory.server.core.factory.LdifPartitionFactory</apacheds.partition.factory>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
diff --git a/ldap-client-test/pom.xml b/ldap-client-test/pom.xml
index 4661574..23387e0 100644
--- a/ldap-client-test/pom.xml
+++ b/ldap-client-test/pom.xml
@@ -136,7 +136,7 @@
</excludes>
<systemPropertyVariables>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
@@ -174,7 +174,7 @@
</excludes>
<systemPropertyVariables>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
diff --git a/pom.xml b/pom.xml
index ad63334..e047e44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,9 @@
<wagon.ssh.version>3.5.3</wagon.ssh.version>
<wagon.ssh.external.version>3.5.3</wagon.ssh.external.version>
<wrapper.version>3.2.3</wrapper.version>
+
+ <!-- properties used in tests -->
+ <felix.cache.dir>${project.build.directory}/felix-root</felix.cache.dir>
</properties>
<url>https://directory.apache.org/apacheds/1.5</url>
diff --git a/server-annotations/pom.xml b/server-annotations/pom.xml
index 59b1cb5..9354239 100644
--- a/server-annotations/pom.xml
+++ b/server-annotations/pom.xml
@@ -93,7 +93,7 @@
<configuration>
<systemPropertyVariables>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
diff --git a/server-integ/pom.xml b/server-integ/pom.xml
index c25a8c8..cf82b65 100644
--- a/server-integ/pom.xml
+++ b/server-integ/pom.xml
@@ -270,7 +270,7 @@
<configuration>
<systemPropertyVariables>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
@@ -327,7 +327,7 @@
<systemPropertyVariables>
<apacheds.partition.factory>org.apache.directory.server.core.factory.JdbmPartitionFactory</apacheds.partition.factory>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
@@ -355,7 +355,7 @@
<systemPropertyVariables>
<apacheds.partition.factory>org.apache.directory.server.core.factory.AvlPartitionFactory</apacheds.partition.factory>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
@@ -383,7 +383,7 @@
<systemPropertyVariables>
<apacheds.partition.factory>org.apache.directory.server.core.factory.LdifPartitionFactory</apacheds.partition.factory>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 4aabdea..6af46ac 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -88,7 +88,7 @@
<configuration>
<systemPropertyVariables>
<felix.cache.rootdir>
- ${project.build.directory}
+ ${felix.cache.dir}
</felix.cache.rootdir>
<felix.cache.locking>
false
