svn commit: r1725302 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt: JcrVaultDistributionPackage.java JcrVaultDistributionPackageBuilder.java

[tommaso]

Author: tommaso
Date: Mon Jan 18 16:34:18 2016
New Revision: 1725302

URL: http://svn.apache.org/viewvc?rev=1725302&view=rev
Log:
SLING-5438 - using the internal JcrPackage during installation

Modified:
    
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java
    
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java?rev=1725302&r1=1725301&r2=1725302&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java
 Mon Jan 18 16:34:18 2016
@@ -95,4 +95,8 @@ public class JcrVaultDistributionPackage
             log.error("Cannot delete package", e);
         }
     }
+
+    JcrPackage getJcrPackage() {
+        return jcrPackage;
+    }
 }

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1725302&r1=1725301&r2=1725302&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java
 Mon Jan 18 16:34:18 2016
@@ -150,8 +150,7 @@ public class JcrVaultDistributionPackage
         try {
             session = getSession(resourceResolver);
 
-            String packageName = distributionPackage.getId();
-            JcrPackage jcrPackage = openPackage(session, packageName);
+            JcrPackage jcrPackage = ((JcrVaultDistributionPackage) 
distributionPackage).getJcrPackage();
 
             ImportOptions importOptions = 
VltUtils.getImportOptions(aclHandling, importMode);
             jcrPackage.extract(importOptions);
@@ -212,7 +211,6 @@ public class JcrVaultDistributionPackage
     private JcrPackage openPackage(Session session, String packageName) throws 
RepositoryException {
         JcrPackageManager packageManager = 
packaging.getPackageManager(session);
 
-
         Node packageRoot = getPackageRoot(session);
         PackageId packageId = new PackageId(PACKAGE_GROUP, packageName, 
VERSION);