Fix content import for latest ebean versions and include this feature…

… into integration tests - merge resolve
mgoellnitz · Feb 26, 2019 · fb2803f · fb2803f
1 parent 61e65f2
commit fb2803f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ebean/test/org/tangram/ebean/test/EbeanContentTest.java b/ebean/test/org/tangram/ebean/test/EbeanContentTest.java
@@ -26,6 +26,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tangram.ebean.Code;
 import org.tangram.ebean.test.content.BaseClass;
 import org.tangram.ebean.test.content.SubClass;

diff --git a/mutable/test/org/tangram/mutable/test/BaseContentTest.java b/mutable/test/org/tangram/mutable/test/BaseContentTest.java
@@ -34,8 +34,8 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockHttpSession;
-import org.tangram.content.ChangeListener;
 import org.tangram.components.mutable.ToolHandler;
+import org.tangram.content.ChangeListener;
 import org.tangram.content.Content;
 import org.tangram.content.TransientCode;
 import org.tangram.logic.ClassRepository;
@@ -195,7 +195,7 @@ public String getRealPath(String path) {
     protected abstract <T extends Object> T getInstance(Class<T> type) throws Exception;
 
 
-    private MutableBeanFactory<M, Q> getMutableBeanFactory() throws Exception {
+    protected MutableBeanFactory<M, Q> getMutableBeanFactory() throws Exception {
         MutableBeanFactory<M, Q> beanFactory = SystemUtils.convert(getInstance(MutableBeanFactory.class));
         beanFactory.addListener(changeListener);
         return beanFactory;