directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068469 - in /directory/apacheds/branches/m1: core-integ/pom.xml server-integ/pom.xml test-framework/pom.xml
Date Tue, 08 Feb 2011 16:34:37 GMT
Author: akarasulu
Date: Tue Feb  8 16:34:36 2011
New Revision: 1068469

URL: http://svn.apache.org/viewvc?rev=1068469&view=rev
Log:
fixing various issues with Felix cache locking in concurrent tests

Modified:
    directory/apacheds/branches/m1/core-integ/pom.xml
    directory/apacheds/branches/m1/server-integ/pom.xml
    directory/apacheds/branches/m1/test-framework/pom.xml

Modified: directory/apacheds/branches/m1/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/pom.xml?rev=1068469&r1=1068468&r2=1068469&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/pom.xml (original)
+++ directory/apacheds/branches/m1/core-integ/pom.xml Tue Feb  8 16:34:36 2011
@@ -146,6 +146,21 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
+              <systemPropertyVariables>
+                <felix.cache.rootdir>
+                  ${project.build.directory}
+                </felix.cache.rootdir>
+                <felix.cache.locking>
+                  false
+                </felix.cache.locking>
+                <org.osgi.framework.storage.clean>
+                  onFirstInit
+                </org.osgi.framework.storage.clean>
+                <org.osgi.framework.storage>
+                  ${project.build.directory}/osgi-cache
+                </org.osgi.framework.storage>
+                <apacheds.partition.factory>org.apache.directory.server.core.factory.JdbmPartitionFactory</apacheds.partition.factory>
+              </systemPropertyVariables>
               <includes>
                 <include>**/*ISuite.java</include>
               </includes>
@@ -178,6 +193,18 @@
                 <exclude>**/ReferralIT.java</exclude>
               </excludes>
               <systemPropertyVariables>
+	            <felix.cache.rootdir>
+	              ${project.build.directory}
+	            </felix.cache.rootdir>
+	            <felix.cache.locking>
+	              false
+	            </felix.cache.locking>
+	            <org.osgi.framework.storage.clean>
+	              onFirstInit
+	            </org.osgi.framework.storage.clean>
+	            <org.osgi.framework.storage>
+	              ${project.build.directory}/osgi-cache
+	            </org.osgi.framework.storage>
                 <apacheds.partition.factory>org.apache.directory.server.core.factory.JdbmPartitionFactory</apacheds.partition.factory>
               </systemPropertyVariables>
             </configuration>
@@ -191,6 +218,18 @@
                 <configuration>
                   <systemPropertyVariables>
                     <apacheds.partition.factory>org.apache.directory.server.core.factory.AvlPartitionFactory</apacheds.partition.factory>
+	                <felix.cache.rootdir>
+	                  ${project.build.directory}
+	                </felix.cache.rootdir>
+	                <felix.cache.locking>
+	                  false
+	                </felix.cache.locking>
+	                <org.osgi.framework.storage.clean>
+	                  onFirstInit
+	                </org.osgi.framework.storage.clean>
+	                <org.osgi.framework.storage>
+	                  ${project.build.directory}/osgi-cache
+	                </org.osgi.framework.storage>
                   </systemPropertyVariables>
                 </configuration>
               </execution>
@@ -203,6 +242,18 @@
                 <configuration>
                   <systemPropertyVariables>
                     <apacheds.partition.factory>org.apache.directory.server.core.factory.LdifPartitionFactory</apacheds.partition.factory>
+	                <felix.cache.rootdir>
+	                  ${project.build.directory}
+	                </felix.cache.rootdir>
+	                <felix.cache.locking>
+	                  false
+	                </felix.cache.locking>
+	                <org.osgi.framework.storage.clean>
+	                  onFirstInit
+	                </org.osgi.framework.storage.clean>
+	                <org.osgi.framework.storage>
+	                  ${project.build.directory}/osgi-cache
+	                </org.osgi.framework.storage>
                   </systemPropertyVariables>
                 </configuration>
               </execution>
@@ -226,6 +277,21 @@
                 <exclude>**/*PerfTest.java</exclude>
                 <exclude>**/*ITest.java</exclude>
               </excludes>
+              <systemPropertyVariables>
+                <apacheds.partition.factory>org.apache.directory.server.core.factory.LdifPartitionFactory</apacheds.partition.factory>
+                <felix.cache.rootdir>
+                  ${project.build.directory}
+                </felix.cache.rootdir>
+                <felix.cache.locking>
+                  false
+                </felix.cache.locking>
+                <org.osgi.framework.storage.clean>
+                  onFirstInit
+                </org.osgi.framework.storage.clean>
+                <org.osgi.framework.storage>
+                  ${project.build.directory}/osgi-cache
+                </org.osgi.framework.storage>
+              </systemPropertyVariables>
             </configuration>
           </plugin>
 

Modified: directory/apacheds/branches/m1/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/pom.xml?rev=1068469&r1=1068468&r2=1068469&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/pom.xml (original)
+++ directory/apacheds/branches/m1/server-integ/pom.xml Tue Feb  8 16:34:36 2011
@@ -172,6 +172,20 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
+              <systemPropertyVariables>
+                <felix.cache.rootdir>
+                  ${project.build.directory}
+                </felix.cache.rootdir>
+                <felix.cache.locking>
+                  false
+                </felix.cache.locking>
+                <org.osgi.framework.storage.clean>
+                  onFirstInit
+                </org.osgi.framework.storage.clean>
+                <org.osgi.framework.storage>
+                  ${project.build.directory}/osgi-cache
+                </org.osgi.framework.storage>
+              </systemPropertyVariables>
               <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
               <includes>
                 <include>**/*ISuite.java</include>
@@ -212,6 +226,18 @@
               </includes>
               <systemPropertyVariables>
                 <apacheds.partition.factory>org.apache.directory.server.core.factory.JdbmPartitionFactory</apacheds.partition.factory>
+                <felix.cache.rootdir>
+                  ${project.build.directory}
+                </felix.cache.rootdir>
+                <felix.cache.locking>
+                  false
+                </felix.cache.locking>
+                <org.osgi.framework.storage.clean>
+                  onFirstInit
+                </org.osgi.framework.storage.clean>
+                <org.osgi.framework.storage>
+                  ${project.build.directory}/osgi-cache
+                </org.osgi.framework.storage>
               </systemPropertyVariables>              
             </configuration>
             <executions>
@@ -224,6 +250,18 @@
                 <configuration>
                   <systemPropertyVariables>
                     <apacheds.partition.factory>org.apache.directory.server.core.factory.AvlPartitionFactory</apacheds.partition.factory>
+	                <felix.cache.rootdir>
+	                  ${project.build.directory}
+	                </felix.cache.rootdir>
+	                <felix.cache.locking>
+	                  false
+	                </felix.cache.locking>
+	                <org.osgi.framework.storage.clean>
+	                  onFirstInit
+	                </org.osgi.framework.storage.clean>
+	                <org.osgi.framework.storage>
+	                  ${project.build.directory}/osgi-cache
+	                </org.osgi.framework.storage>
                   </systemPropertyVariables>
                 </configuration>
               </execution>
@@ -236,6 +274,18 @@
                 <configuration>
                   <systemPropertyVariables>
                     <apacheds.partition.factory>org.apache.directory.server.core.factory.LdifPartitionFactory</apacheds.partition.factory>
+	                <felix.cache.rootdir>
+	                  ${project.build.directory}
+	                </felix.cache.rootdir>
+	                <felix.cache.locking>
+	                  false
+	                </felix.cache.locking>
+	                <org.osgi.framework.storage.clean>
+	                  onFirstInit
+	                </org.osgi.framework.storage.clean>
+	                <org.osgi.framework.storage>
+	                  ${project.build.directory}/osgi-cache
+	                </org.osgi.framework.storage>
                   </systemPropertyVariables>
                 </configuration>
               </execution>

Modified: directory/apacheds/branches/m1/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/test-framework/pom.xml?rev=1068469&r1=1068468&r2=1068469&view=diff
==============================================================================
--- directory/apacheds/branches/m1/test-framework/pom.xml (original)
+++ directory/apacheds/branches/m1/test-framework/pom.xml Tue Feb  8 16:34:36 2011
@@ -68,4 +68,29 @@
       <artifactId>commons-io</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <configuration>
+          <systemPropertyVariables>
+            <felix.cache.rootdir>
+              ${project.build.directory}
+            </felix.cache.rootdir>
+            <felix.cache.locking>
+              false
+            </felix.cache.locking>
+            <org.osgi.framework.storage.clean>
+              onFirstInit
+            </org.osgi.framework.storage.clean>
+            <org.osgi.framework.storage>
+              ${project.build.directory}/osgi-cache
+            </org.osgi.framework.storage>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>  
 </project>



Mime
View raw message