You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/10/28 17:30:52 UTC
svn commit: r1634907 - in /sling/trunk/contrib/extensions/replication:
core/src/main/java/org/apache/sling/replication/packaging/
core/src/main/java/org/apache/sling/replication/serialization/impl/
core/src/main/java/org/apache/sling/replication/serial...
Author: tommaso
Date: Tue Oct 28 16:30:52 2014
New Revision: 1634907
URL: http://svn.apache.org/r1634907
Log:
SLING-4106 - minor fixes to javadoc, AL headers
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackageBuilder.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
sling/trunk/contrib/extensions/replication/it/pom.xml
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java?rev=1634907&r1=1634906&r2=1634907&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageImporter.java Tue Oct 28 16:30:52 2014
@@ -44,7 +44,7 @@ public interface ReplicationPackageImpor
* @param resourceResolver - the resource resolver used to read the package
* @param stream the {@link InputStream} of the package to read
* @return a {@link ReplicationPackage} if it can read it from the stream
- * @throws ReplicationPackageReadingException when the stream cannot be read as a {@link ReplicationPackage}
+ * @throws ReplicationPackageUploadException when the stream cannot be read as a {@link ReplicationPackage}
*/
ReplicationPackage uploadPackage(ResourceResolver resourceResolver, InputStream stream) throws ReplicationPackageUploadException;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackage.java?rev=1634907&r1=1634906&r2=1634907&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackage.java Tue Oct 28 16:30:52 2014
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.replication.serialization.impl;
import org.apache.sling.api.resource.ModifiableValueMap;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackageBuilder.java?rev=1634907&r1=1634906&r2=1634907&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/ResourceSharedReplicationPackageBuilder.java Tue Oct 28 16:30:52 2014
@@ -1,6 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sling.replication.serialization.impl;
-
import org.apache.sling.api.resource.*;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.packaging.ReplicationPackage;
@@ -27,8 +44,6 @@ public class ResourceSharedReplicationPa
this.replicationPackageBuilder = replicationPackageExporter;
}
-
-
public ReplicationPackage createPackage(ResourceResolver resourceResolver, ReplicationRequest request) throws ReplicationPackageBuildingException {
ReplicationPackage replicationPackage = replicationPackageBuilder.createPackage(resourceResolver, request);
@@ -38,9 +53,8 @@ public class ResourceSharedReplicationPa
try {
String packagePath = generatePathFromId(resourceResolver, replicationPackage);
- ReplicationPackage sharedReplicationPackage = new ResourceSharedReplicationPackage(resourceResolver, packagePath, replicationPackage);
- return sharedReplicationPackage;
+ return new ResourceSharedReplicationPackage(resourceResolver, packagePath, replicationPackage);
}
catch (PersistenceException e) {
throw new ReplicationPackageBuildingException(e);
@@ -56,9 +70,8 @@ public class ResourceSharedReplicationPa
try {
String packagePath = generatePathFromId(resourceResolver, replicationPackage);
- ReplicationPackage sharedReplicationPackage = new ResourceSharedReplicationPackage(resourceResolver, packagePath, replicationPackage);
- return sharedReplicationPackage;
+ return new ResourceSharedReplicationPackage(resourceResolver, packagePath, replicationPackage);
}
catch (PersistenceException e) {
throw new ReplicationPackageReadingException(e);
@@ -73,9 +86,7 @@ public class ResourceSharedReplicationPa
return null;
}
- ReplicationPackage sharedReplicationPackage = new ResourceSharedReplicationPackage(resourceResolver, replicationPackageId, replicationPackage);
-
- return sharedReplicationPackage;
+ return new ResourceSharedReplicationPackage(resourceResolver, replicationPackageId, replicationPackage);
}
public boolean installPackage(ResourceResolver resourceResolver, ReplicationPackage replicationPackage) throws ReplicationPackageReadingException {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java?rev=1634907&r1=1634906&r2=1634907&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java Tue Oct 28 16:30:52 2014
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.replication.serialization.impl;
import org.apache.sling.replication.packaging.ReplicationPackageInfo;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java?rev=1634907&r1=1634906&r2=1634907&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java Tue Oct 28 16:30:52 2014
@@ -53,6 +53,8 @@ import org.slf4j.LoggerFactory;
public class FileVaultReplicationPackageBuilder extends AbstractReplicationPackageBuilder implements
ReplicationPackageBuilder {
+ private static final String VERSION = "0.0.1";
+
public static String PACKAGING_TYPE = "vlt";
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -87,9 +89,11 @@ public class FileVaultReplicationPackage
props.setProperty(VaultPackage.NAME_GROUP, packageGroup);
String packageName = String.valueOf(request.getTime());
props.setProperty(VaultPackage.NAME_NAME, packageName);
- log.debug("assembling package {}", packageGroup + '/' + packageName);
+ props.setProperty(VaultPackage.NAME_VERSION, VERSION);
inf.setProperties(props);
+ log.debug("assembling package {}", packageGroup + '/' + packageName + "-" + VERSION);
+
opts.setMetaInf(inf);
opts.setRootPath("/");
File tmpFile = File.createTempFile("rp-vlt-create-" + System.nanoTime(), ".zip");
@@ -98,9 +102,9 @@ public class FileVaultReplicationPackage
} catch (Exception e) {
throw new ReplicationPackageBuildingException(e);
} finally {
- if (session != null) {
- session.logout();
- }
+ if (session != null) {
+ session.logout();
+ }
}
}
@@ -166,9 +170,9 @@ public class FileVaultReplicationPackage
log.error("could not read / install the package", e);
throw new ReplicationPackageReadingException(e);
} finally {
- if (session != null) {
- session.logout();
- }
+ if (session != null) {
+ session.logout();
+ }
}
return false;
}
Modified: sling/trunk/contrib/extensions/replication/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/pom.xml?rev=1634907&r1=1634906&r2=1634907&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/replication/it/pom.xml Tue Oct 28 16:30:52 2014
@@ -270,11 +270,12 @@
<sling.additional.bundle.1>httpcore-osgi</sling.additional.bundle.1>
<sling.additional.bundle.2>httpclient-osgi</sling.additional.bundle.2>
- <sling.additional.bundle.3>org.apache.sling.hc.core</sling.additional.bundle.3>
- <sling.additional.bundle.4>org.apache.jackrabbit.vault</sling.additional.bundle.4>
- <sling.additional.bundle.5>org.apache.sling.replication.core</sling.additional.bundle.5>
- <sling.additional.bundle.6>org.apache.sling.replication.sample</sling.additional.bundle.6>
- <sling.additional.bundle.7>${project.build.finalName}.jar</sling.additional.bundle.7>
+ <sling.additional.bundle.3>org.apache.sling.discovery.impl</sling.additional.bundle.3>
+ <sling.additional.bundle.4>org.apache.sling.hc.core</sling.additional.bundle.4>
+ <sling.additional.bundle.5>org.apache.jackrabbit.vault</sling.additional.bundle.5>
+ <sling.additional.bundle.6>org.apache.sling.replication.core</sling.additional.bundle.6>
+ <sling.additional.bundle.7>org.apache.sling.replication.sample</sling.additional.bundle.7>
+ <sling.additional.bundle.8>${project.build.finalName}.jar</sling.additional.bundle.8>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -302,6 +303,12 @@
<version>2.2.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.discovery.impl</artifactId>
+ <version>1.0.12</version>
+ <scope>provided</scope>
+ </dependency>
<!-- FILEVAULT -->
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>