Improve JCR mapper

git-svn-id: https://svn.argeo.org/commons/trunk@3381 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/BeanNodeMapper.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/BeanNodeMapper.java
index 94a644bddb9452d990e490c24009a30f28ea283f..d05af407f33e3996e696c871bf0d146746868588 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/BeanNodeMapper.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/BeanNodeMapper.java
@@ -28,8 +28,6 @@ import org.argeo.ArgeoException;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 
-//import org.springframework.beans.BeanWrapperImpl;
-
 public class BeanNodeMapper {
        private final static Log log = LogFactory.getLog(BeanNodeMapper.class);
 
@@ -104,7 +102,7 @@ public class BeanNodeMapper {
                String clssName = node.getProperty(classProperty).getValue()
                                .getString();
 
-               if (log.isDebugEnabled())
+               if (log.isTraceEnabled())
                        log.debug("Map node " + node.getPath() + " to bean " + clssName);
 
                BeanWrapper beanWrapper = createBeanWrapper(loadClass(clssName));
@@ -147,8 +145,6 @@ public class BeanNodeMapper {
                        PropertyDescriptor pd = beanWrapper.getPropertyDescriptor(name);
                        Class propClass = pd.getPropertyType();
 
-                       log.debug(childNode.getName() + "=" + propClass);
-
                        if (propClass != null && List.class.isAssignableFrom(propClass)) {
                                String lstClass = childNode.getProperty(classProperty)
                                                .getString();
@@ -223,7 +219,7 @@ public class BeanNodeMapper {
 
        protected void beanToNode(BeanWrapper beanWrapper, Node node)
                        throws RepositoryException {
-               if (log.isDebugEnabled())
+               if (log.isTraceEnabled())
                        log.debug("Map bean to node " + node.getPath());
 
                properties: for (PropertyDescriptor pd : beanWrapper
@@ -477,6 +473,7 @@ public class BeanNodeMapper {
        }
 
        protected Class<?> loadClass(String name) {
+               //log.debug("Class loader: " + classLoader);
                try {
                        return classLoader.loadClass(name);
                } catch (ClassNotFoundException e) {

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
index 2d22caae6658a1ddce8409d27413be49d01e127c..21209b51120065e564853ac3a4d167393606d188 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
@@ -50,6 +50,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
                if (repository != null) {
                        if (repository instanceof RepositoryImpl)
                                ((RepositoryImpl) repository).shutdown();
+                       else if (repository instanceof TransientRepository)
+                               ((TransientRepository) repository).shutdown();
                }
 
                if (inMemory)