Improve and simplify OSGi Boot

[lgpl/argeo-commons.git] / org.argeo.server.jcr / src / org / argeo / jackrabbit / JackrabbitDataModelMigration.java

diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java b/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
index 401b34df626a8438e485384a75a0b5f91cba491c..53f0e4457837cf85820d46d4964d3f47ef207ce7 100644 (file)
--- a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
+++ b/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
@@ -26,7 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.argeo.ArgeoException;
+import org.argeo.jcr.ArgeoJcrException;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrCallback;
 import org.argeo.jcr.JcrUtils;
@@ -91,7 +91,7 @@ public class JackrabbitDataModelMigration implements
                        return true;
                } catch (Exception e) {
                        JcrUtils.discardQuietly(session);
-                       throw new ArgeoException("Migration of data model "
+                       throw new ArgeoJcrException("Migration of data model "
                                        + dataModelNodePath + " to " + targetVersion + " failed.",
                                        e);
                } finally {
@@ -109,11 +109,12 @@ public class JackrabbitDataModelMigration implements
        public static void clearRepositoryCaches(RepositoryConfig repositoryConfig) {
                try {
                        String customeNodeTypesPath = "/nodetypes/custom_nodetypes.xml";
-                       repositoryConfig.getFileSystem().deleteFile(customeNodeTypesPath);
+                       // FIXME causes weird error in Eclipse
+                       //repositoryConfig.getFileSystem().deleteFile(customeNodeTypesPath);
                        if (log.isDebugEnabled())
                                log.debug("Cleared " + customeNodeTypesPath);
                } catch (Exception e) {
-                       throw new ArgeoException("Cannot clear caches", e);
+                       throw new ArgeoJcrException("Cannot clear caches", e);
                }
 
                // File customNodeTypes = new File(home.getPath()