X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitDataModelMigration.java;h=1247950005909c1647b5442d59569baf82e87a00;hb=d6bb3d3e0643c410ecd3ca1d4d88ae412697f258;hp=8fedcf5217c886acb09ddbb3c70fc86d92e48ed8;hpb=98cb11c643f2f4de160061e64cc93df120130f8d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java index 8fedcf521..124795000 100644 --- a/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java +++ b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java @@ -17,6 +17,7 @@ package org.argeo.jackrabbit; import java.io.InputStreamReader; import java.io.Reader; +import java.net.URL; import javax.jcr.Session; @@ -28,7 +29,6 @@ import org.apache.jackrabbit.core.config.RepositoryConfig; import org.argeo.jcr.ArgeoJcrException; import org.argeo.jcr.JcrCallback; import org.argeo.jcr.JcrUtils; -import org.springframework.core.io.Resource; /** Migrate the data in a Jackrabbit repository. */ @Deprecated @@ -39,7 +39,7 @@ public class JackrabbitDataModelMigration implements private String dataModelNodePath; private String targetVersion; - private Resource migrationCnd; + private URL migrationCnd; private JcrCallback dataModification; /** @@ -72,7 +72,7 @@ public class JackrabbitDataModelMigration implements // apply transitional CND if (migrationCnd != null) { - reader = new InputStreamReader(migrationCnd.getInputStream()); + reader = new InputStreamReader(migrationCnd.openStream()); CndImporter.registerNodeTypes(reader, session, true); session.save(); log.info("Registered migration node types from " + migrationCnd); @@ -163,7 +163,7 @@ public class JackrabbitDataModelMigration implements this.targetVersion = targetVersion; } - public void setMigrationCnd(Resource migrationCnd) { + public void setMigrationCnd(URL migrationCnd) { this.migrationCnd = migrationCnd; }