X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.server.jcr%2Fsrc%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitDataModelMigration.java;h=53f0e4457837cf85820d46d4964d3f47ef207ce7;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=56fffcbea4794483465e8d31efd652c02d39e521;hpb=ab00fbbc07ce09d1abb8b220c9bb883961844bfb;p=lgpl%2Fargeo-commons.git 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 56fffcbea..53f0e4457 100644 --- 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 { @@ -114,7 +114,7 @@ public class JackrabbitDataModelMigration implements 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()