[infinispan-commits] Infinispan SVN: r903 - in trunk/core/src: main/resources/xslt and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-10-03 13:09:14 -0400 (Sat, 03 Oct 2009)
New Revision: 903

Modified:
   trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
   trunk/core/src/main/resources/xslt/ehcache16x2infinispan4x.xslt
   trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
Log:
re-enabled tests

Modified: trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java	2009-10-02 17:15:52 UTC (rev 902)
+++ trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java	2009-10-03 17:09:14 UTC (rev 903)
@@ -118,7 +118,7 @@
       Object retVal = invokeNextInterceptor(ctx, command);
       compact(value);
       return processRetVal(retVal);
-   };
+   }
 
    @Override
    public Object visitGetKeyValueCommand(InvocationContext ctx, GetKeyValueCommand command) throws Throwable {

Modified: trunk/core/src/main/resources/xslt/ehcache16x2infinispan4x.xslt
===================================================================
--- trunk/core/src/main/resources/xslt/ehcache16x2infinispan4x.xslt	2009-10-02 17:15:52 UTC (rev 902)
+++ trunk/core/src/main/resources/xslt/ehcache16x2infinispan4x.xslt	2009-10-03 17:09:14 UTC (rev 903)
@@ -13,19 +13,27 @@
          <xsl:element name="global">
 
             <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
-               <property name="threadNamePrefix" value="AsyncTransportThread"/>
+               <properties>
+                  <property name="threadNamePrefix" value="AsyncTransportThread"/>
+               </properties>
             </asyncListenerExecutor>
 
             <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
-               <property name="threadNamePrefix" value="AsyncListenerThread"/>
+               <properties>
+                 <property name="threadNamePrefix" value="AsyncListenerThread"/>
+               </properties>
             </asyncTransportExecutor>
 
             <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
-               <property name="threadNamePrefix" value="EvictionThread"/>
+               <properties>
+                  <property name="threadNamePrefix" value="EvictionThread"/>
+               </properties>
             </evictionScheduledExecutor>
 
             <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
-               <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+               <properties>
+                  <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+               </properties>
             </replicationQueueScheduledExecutor>
 
             <globalJmxStatistics jmxDomain="infinispan" enabled="true"/>

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java	2009-10-02 17:15:52 UTC (rev 902)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java	2009-10-03 17:09:14 UTC (rev 903)
@@ -24,12 +24,11 @@
    private static final String BASE_DIR = "configs/ehcache";
    ConfigFilesConvertor convertor = new ConfigFilesConvertor();
 
-   @Test(enabled=false)
    public void testEhCache16File() throws Exception {
       testAllFile("/ehcache-1.6RC1.xml");
    }
 
-   @Test(enabled=false)
+//   @Test(enabled=false)
    public void testEhCache15File() throws Exception {
       testAllFile("/ehcache-1.5.xml");
    }