You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2013/06/27 12:12:29 UTC

svn commit: r1497284 - in /directmemory/trunk: integrations/ehcache/pom.xml itests/pom.xml

Author: olamy
Date: Thu Jun 27 10:12:29 2013
New Revision: 1497284

URL: http://svn.apache.org/r1497284
Log:
[DIRECTMEMORY-127] ehcache integration OSGI tests no longer work
Submitted by Jeff MAURY

Modified:
    directmemory/trunk/integrations/ehcache/pom.xml
    directmemory/trunk/itests/pom.xml

Modified: directmemory/trunk/integrations/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/directmemory/trunk/integrations/ehcache/pom.xml?rev=1497284&r1=1497283&r2=1497284&view=diff
==============================================================================
--- directmemory/trunk/integrations/ehcache/pom.xml (original)
+++ directmemory/trunk/integrations/ehcache/pom.xml Thu Jun 27 10:12:29 2013
@@ -33,7 +33,6 @@
   <description>EHCache CacheStore Implementation to integrate DirectMemory Cache as OffHeapStore.</description>
 
   <properties>
-    <!--
     <osgi.import>
       org.apache.directmemory*;version="${project.version}",
       org.slf4j*,
@@ -44,12 +43,20 @@
       net.sf.ehcache.store.offheap;version="2.6.0";-noimport:=true,
       net.sf.ehcache;version="2.6.0";-noimport:=true
     </osgi.export>
-    -->
   </properties>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Fragment-Host>org.apache.servicemix.bundles.ehcache</Fragment-Host>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>

Modified: directmemory/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/directmemory/trunk/itests/pom.xml?rev=1497284&r1=1497283&r2=1497284&view=diff
==============================================================================
--- directmemory/trunk/itests/pom.xml (original)
+++ directmemory/trunk/itests/pom.xml Thu Jun 27 10:12:29 2013
@@ -30,11 +30,7 @@ under the License.
   <name>Apache DirectMemory :: Integration Tests</name>
   <description>${project.name}</description>
 
-  <!--
-  olamy: currently this fail as ehcache fail to load the class net.sf.ehcache.EnterpriseFeaturesManager
-  their ClassLoaderUtil use Class.forName maybe one of the reason
   <modules>
     <module>osgi</module>
   </modules>
-  -->
-</project>
\ No newline at end of file
+</project>