X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitDataModelMigration.java;h=1247950005909c1647b5442d59569baf82e87a00;hb=25e4528153640a2e211e217468f8f5aa01607cf0;hp=53f0e4457837cf85820d46d4964d3f47ef207ce7;hpb=e66b9893b0e511f8ab295e3cee42b7dc966f1597;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 53f0e4457..124795000 100644
--- a/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
+++ b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java
@@ -17,8 +17,8 @@ package org.argeo.jackrabbit;
 
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.URL;
 
-import javax.jcr.Node;
 import javax.jcr.Session;
 
 import org.apache.commons.io.IOUtils;
@@ -27,12 +27,11 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.argeo.jcr.ArgeoJcrException;
-import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrCallback;
 import org.argeo.jcr.JcrUtils;
-import org.springframework.core.io.Resource;
 
 /** Migrate the data in a Jackrabbit repository. */
+@Deprecated
 public class JackrabbitDataModelMigration implements
 		Comparable<JackrabbitDataModelMigration> {
 	private final static Log log = LogFactory
@@ -40,7 +39,7 @@ public class JackrabbitDataModelMigration implements
 
 	private String dataModelNodePath;
 	private String targetVersion;
-	private Resource migrationCnd;
+	private URL migrationCnd;
 	private JcrCallback dataModification;
 
 	/**
@@ -60,20 +59,20 @@ public class JackrabbitDataModelMigration implements
 						+ " does not exist: nothing to migrate.");
 				return false;
 			}
-			Node dataModelNode = session.getNode(dataModelNodePath);
-			if (dataModelNode.hasProperty(ArgeoNames.ARGEO_DATA_MODEL_VERSION)) {
-				String currentVersion = dataModelNode.getProperty(
-						ArgeoNames.ARGEO_DATA_MODEL_VERSION).getString();
-				if (compareVersions(currentVersion, targetVersion) >= 0) {
-					log.info("Data model at version " + currentVersion
-							+ ", no need to migrate.");
-					return false;
-				}
-			}
+//			Node dataModelNode = session.getNode(dataModelNodePath);
+//			if (dataModelNode.hasProperty(ArgeoNames.ARGEO_DATA_MODEL_VERSION)) {
+//				String currentVersion = dataModelNode.getProperty(
+//						ArgeoNames.ARGEO_DATA_MODEL_VERSION).getString();
+//				if (compareVersions(currentVersion, targetVersion) >= 0) {
+//					log.info("Data model at version " + currentVersion
+//							+ ", no need to migrate.");
+//					return false;
+//				}
+//			}
 
 			// 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);
@@ -164,7 +163,7 @@ public class JackrabbitDataModelMigration implements
 		this.targetVersion = targetVersion;
 	}
 
-	public void setMigrationCnd(Resource migrationCnd) {
+	public void setMigrationCnd(URL migrationCnd) {
 		this.migrationCnd = migrationCnd;
 	}