Merge branch '63-8.12.x' of https://github.com/vhalbert/teiid into 63…

…-8.12.x
teiid · Apr 22, 2016 · f03a85a · f03a85a
2 parents 0e6a517 + 5a48fac
commit f03a85a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/...sl/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/dsl/main/module.xml b/...sl/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/dsl/main/module.xml
@@ -15,13 +15,13 @@
         <module name="javax.resource.api" />
         <module name="org.jboss.teiid.common-core" />
         <module name="org.jboss.teiid.api" />    
-		<module name="org.jboss.teiid.translator.infinispan.dsl" />
+		<module name="org.jboss.teiid.translator.infinispan.dsl" export="true" />
 
 		<!--  the JDG dependencies can be found in the translator-infinispan-dsl module -->
 
- 	  	<module name="org.infinispan.commons" slot="${jdg.slot}" optional="true" export="true" />
-   		<module name="org.infinispan.client.hotrod" slot="${jdg.slot}" optional="true" export="true" />
-   		<module name="org.infinispan.query" slot="${jdg.slot}" optional="true" export="true" services="true" />   
+ 	  	<module name="org.infinispan.commons" slot="${jdg.slot}" optional="true" services="export"/>
+   		<module name="org.infinispan.client.hotrod" slot="${jdg.slot}" optional="true" services="export"/>
+   		<module name="org.jboss.remoting3"  />   
 
       <!--
         The "your.pojo.module" name needs to be replaced with the module name that has

diff --git a/connectors/connector-infinispan-dsl/src/main/rar/META-INF/MANIFEST.MF b/connectors/connector-infinispan-dsl/src/main/rar/META-INF/MANIFEST.MF
@@ -1 +1 @@
-Dependencies: org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api,org.jboss.teiid.translator.infinispan.dsl,org.infinispan export,org.infinispan.client.hotrod,org.infinispan.cachestore.remote,org.jboss.as.clustering.infinispan,org.jboss.modules	
+Dependencies: org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api,org.jboss.teiid.translator.infinispan.dsl,org.infinispan.commons export,org.infinispan.client.hotrod export,org.infinispan.query.dsl export,org.jboss.remoting3	
diff --git a/...test/java/org/teiid/resource/adapter/infinispan/dsl/TesttInfinispanConnectionFactory.java b/...test/java/org/teiid/resource/adapter/infinispan/dsl/TesttInfinispanConnectionFactory.java
@@ -35,17 +35,24 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.teiid.translator.ExecutionContext;
 
 
 @SuppressWarnings("nls")
 public class TesttInfinispanConnectionFactory  {
 	protected static final String JNDI_NAME = "java/MyCacheManager";
 
-
+	@Mock
+	private static RemoteCacheManager REMOTE_CACHE_MGR;
+
 	private static InfinispanManagedConnectionFactory afactory;
 
 	@Before
-    public void beforeEach() throws Exception {  
+    public void beforeEach() throws Exception {  		
+
+		MockitoAnnotations.initMocks(this);
 
         afactory = new InfinispanManagedConnectionFactory() {
 			/**
@@ -62,14 +69,14 @@ protected SerializationContext getContext() {
 			protected RemoteCacheManager createRemoteCacheFromProperties(
 					ClassLoader classLoader) throws ResourceException {
 				// TODO Auto-generated method stub
-				return null;
+				return REMOTE_CACHE_MGR;
 			}
 
 			@Override
 			protected RemoteCacheManager createRemoteCacheFromServerList(
 					ClassLoader classLoader) throws ResourceException {
 				// TODO Auto-generated method stub
-				return null;
+				return REMOTE_CACHE_MGR;
 			}
 
 			@Override