You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2016/08/10 14:14:18 UTC
svn commit: r1755751 - in /jackrabbit/commons/filevault/trunk:
vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/
vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/
vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/...
Author: tripod
Date: Wed Aug 10 14:14:18 2016
New Revision: 1755751
URL: http://svn.apache.org/viewvc?rev=1755751&view=rev
Log:
JCRVLT-122 Avoid deprecated Item.save()
Modified:
jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdSave.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/GenericAggregator.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/NodeTypeAggregator.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrWorkspaceFilter.java
jackrabbit/commons/filevault/trunk/vault-hook-example/src/main/java/org/apache/jackrabbit/vault/packaging/hooks/ExampleHook.java
Modified: jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdSave.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdSave.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdSave.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdSave.java Wed Aug 10 14:14:18 2016
@@ -45,7 +45,7 @@ public class CmdSave extends AbstractJcr
if (wo instanceof RepositoryCFile) {
Node node = (Node) wo.unwrap();
try {
- node.save();
+ node.getSession().save();
System.out.println("Modifications persisted.");
} catch (RepositoryException e) {
throw new ExecutionException("Error while saving: " + e);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java Wed Aug 10 14:14:18 2016
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.vault.fs.i
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.Value;
import org.apache.jackrabbit.vault.fs.DirectoryArtifact;
@@ -249,10 +250,10 @@ public class FileAggregator implements A
throws RepositoryException {
ImportInfo info = new ImportInfoImpl();
info.onDeleted(node.getPath());
- Node parent = node.getParent();
+ Session s = node.getSession();
node.remove();
if (trySave) {
- parent.save();
+ s.save();
}
return info;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/GenericAggregator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/GenericAggregator.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/GenericAggregator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/GenericAggregator.java Wed Aug 10 14:14:18 2016
@@ -253,7 +253,7 @@ public class GenericAggregator implement
node.remove();
}
if (trySave) {
- parent.save();
+ parent.getSession().save();
}
return info;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/NodeTypeAggregator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/NodeTypeAggregator.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/NodeTypeAggregator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/NodeTypeAggregator.java Wed Aug 10 14:14:18 2016
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.vault.fs.i
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.jackrabbit.vault.fs.api.ArtifactType;
import org.apache.jackrabbit.vault.fs.api.DumpContext;
@@ -77,10 +78,10 @@ public class NodeTypeAggregator extends
public ImportInfo remove(Node node, boolean recursive, boolean trySave) throws RepositoryException {
ImportInfo info = new ImportInfoImpl();
info.onDeleted(node.getPath());
- Node parent = node.getParent();
+ Session s = node.getSession();
node.remove();
if (trySave) {
- parent.save();
+ s.save();
}
return info;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java Wed Aug 10 14:14:18 2016
@@ -86,7 +86,7 @@ public class JcrExporter extends Abstrac
}
}
}
- localParent.save();
+ localParent.getSession().save();
}
private void scan(Node dir) throws RepositoryException {
@@ -94,7 +94,7 @@ public class JcrExporter extends Abstrac
while (iter.hasNext()) {
Node child = iter.nextNode();
String name = child.getName();
- if (name.equals(".svn") || name.equals(".vlt")) {
+ if (".svn".equals(name) || ".vlt".equals(name)) {
continue;
}
if (child.isNodeType(JcrConstants.NT_FOLDER)) {
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java Wed Aug 10 14:14:18 2016
@@ -233,7 +233,7 @@ public class JcrPackageDefinitionImpl im
defNode.setProperty("unwrapped", (Value) null);
defNode.setProperty(PN_LAST_UNWRAPPED, Calendar.getInstance());
if (autoSave) {
- defNode.save();
+ defNode.getSession().save();
}
}
@@ -292,7 +292,7 @@ public class JcrPackageDefinitionImpl im
defNode.setProperty(PN_LAST_UNPACKED_BY, lastUnpackedBy);
}
if (autoSave) {
- defNode.save();
+ defNode.getSession().save();
}
} catch (Exception e) {
log.error("Unable to extract definition: {}", e.toString());
@@ -423,7 +423,7 @@ public class JcrPackageDefinitionImpl im
defNode.setProperty(PN_CND_PATTERN, props.getProperty(VaultPackage.NAME_CND_PATTERN));
defNode.setProperty(PN_DISABLE_INTERMEDIATE_SAVE, props.getProperty(VaultPackage.NAME_DISABLE_INTERMEDIATE_SAVE));
if (autoSave) {
- defNode.save();
+ defNode.getSession().save();
}
} catch (RepositoryException e) {
log.error("error while saving properties.", e);
@@ -546,7 +546,7 @@ public class JcrPackageDefinitionImpl im
now == null ? Calendar.getInstance() : now);
defNode.setProperty(PN_LASTMODIFIED_BY, getUserId());
if (autoSave) {
- defNode.save();
+ defNode.getSession().save();
}
} catch (RepositoryException e) {
log.error("Error during touch()", e);
@@ -621,7 +621,7 @@ public class JcrPackageDefinitionImpl im
defNode.setProperty("unwrapped", (Value) null);
touch(now, false);
if (autoSave) {
- defNode.save();
+ defNode.getSession().save();
}
} catch (RepositoryException e) {
log.error("Error during sealForRewrap()", e);
@@ -639,7 +639,7 @@ public class JcrPackageDefinitionImpl im
now == null ? Calendar.getInstance() : now);
defNode.setProperty(PN_LAST_UNPACKED_BY, getUserId());
if (autoSave) {
- defNode.save();
+ defNode.getSession().save();
}
} catch (RepositoryException e) {
log.error("Error during touchLastUnpacked()", e);
@@ -659,7 +659,7 @@ public class JcrPackageDefinitionImpl im
defNode.getProperty(PN_LAST_UNPACKED_BY).remove();
}
if (autoSave) {
- defNode.save();
+ defNode.getSession().save();
}
} catch (RepositoryException e) {
log.error("Error during clearLastUnpacked()", e);
@@ -822,7 +822,7 @@ public class JcrPackageDefinitionImpl im
}
/**
- * Returns a export processor that add the inlines definition package to
+ * Returns a export processor that adds the inline definition package to
* the exporter.
* @return the export processor for this definition
*/
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java Wed Aug 10 14:14:18 2016
@@ -221,7 +221,7 @@ public class JcrPackageImpl implements J
def.unwrap(pack, true, false);
}
if (autoSave) {
- parent.save();
+ parent.getSession().save();
}
} finally {
IOUtils.closeQuietly(in);
@@ -304,12 +304,12 @@ public class JcrPackageImpl implements J
Node defNode = content.addNode(NN_VLT_DEFINITION);
JcrPackageDefinition def = new JcrPackageDefinitionImpl(defNode);
def.unwrap(pack, true, false);
- node.save();
+ node.getSession().save();
ok = true;
} finally {
if (!ok) {
try {
- node.refresh(false);
+ node.getSession().refresh(false);
} catch (RepositoryException e) {
// ignore
}
@@ -527,7 +527,7 @@ public class JcrPackageImpl implements J
// register sub packages in snapshot for uninstall
if (snap != null) {
snap.getDefinition().getNode().setProperty(JcrPackageDefinition.PN_SUB_PACKAGES, subIds.toArray(new String[subIds.size()]));
- snap.getDefinition().getNode().save();
+ s.save();
}
}
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImpl.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImpl.java Wed Aug 10 14:14:18 2016
@@ -483,7 +483,7 @@ public class JcrPackageManagerImpl exten
contentNode.setProperty(JcrConstants.JCR_DATA, in);
contentNode.setProperty(JcrConstants.JCR_LASTMODIFIED, now);
contentNode.setProperty(JcrConstants.JCR_MIMETYPE, JcrPackage.MIME_TYPE);
- packNode.save();
+ packNode.getSession().save();
pack.close();
}
@@ -557,7 +557,7 @@ public class JcrPackageManagerImpl exten
contentNode.setProperty(JcrConstants.JCR_DATA, in);
contentNode.setProperty(JcrConstants.JCR_LASTMODIFIED, now);
contentNode.setProperty(JcrConstants.JCR_MIMETYPE, JcrPackage.MIME_TYPE);
- packNode.save();
+ packNode.getSession().save();
dst.close();
}
@@ -598,7 +598,7 @@ public class JcrPackageManagerImpl exten
throw lastError;
}
if (autoSave) {
- parent.save();
+ parent.getSession().save();
}
return node;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrWorkspaceFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrWorkspaceFilter.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrWorkspaceFilter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrWorkspaceFilter.java Wed Aug 10 14:14:18 2016
@@ -69,7 +69,7 @@ public class JcrWorkspaceFilter {
String type = idx > 0 ? rule.substring(0, idx) : "include";
String patt = idx > 0 ? rule.substring(idx + 1) : "";
DefaultPathFilter pf = new DefaultPathFilter(patt);
- if (type.equals("include")) {
+ if ("include".equals(type)) {
set.addInclude(pf);
} else {
set.addExclude(pf);
@@ -81,7 +81,7 @@ public class JcrWorkspaceFilter {
String type = rule.getProperty(JcrPackageDefinitionImpl.PN_TYPE).getString();
String pattern = rule.getProperty(JcrPackageDefinitionImpl.PN_PATTERN).getString();
DefaultPathFilter pf = new DefaultPathFilter(pattern);
- if (type.equals("include")) {
+ if ("include".equals(type)) {
set.addInclude(pf);
} else {
set.addExclude(pf);
@@ -117,7 +117,7 @@ public class JcrWorkspaceFilter {
nr++;
}
if (save) {
- defNode.save();
+ defNode.getSession().save();
}
}
@@ -147,7 +147,7 @@ public class JcrWorkspaceFilter {
nr++;
}
if (save) {
- defNode.save();
+ defNode.getSession().save();
}
}
Modified: jackrabbit/commons/filevault/trunk/vault-hook-example/src/main/java/org/apache/jackrabbit/vault/packaging/hooks/ExampleHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-hook-example/src/main/java/org/apache/jackrabbit/vault/packaging/hooks/ExampleHook.java?rev=1755751&r1=1755750&r2=1755751&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-hook-example/src/main/java/org/apache/jackrabbit/vault/packaging/hooks/ExampleHook.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-hook-example/src/main/java/org/apache/jackrabbit/vault/packaging/hooks/ExampleHook.java Wed Aug 10 14:14:18 2016
@@ -105,7 +105,7 @@ public class ExampleHook implements Inst
// update a property in the install
Node testNode = ctx.getSession().getNode(testNodePath);
testNode.setProperty("hook-example", Calendar.getInstance());
- testNode.save();
+ ctx.getSession().save();
}
private void doInstallFailed(InstallContext ctx) {