Author: tommaso Date: Wed Oct 15 14:49:14 2014 New Revision: 1632066 URL: http://svn.apache.org/r1632066 Log: SLING-4052 - cleaned up jcr pacakges
Removed: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilderFactory.java sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporter.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporterFactory.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/LocalReplicationPackageExporterFactory.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/DefaultReplicationPackageExporterStrategy.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/PrivilegeReplicationPackageExporterStrategy.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/LocalReplicationPackageImporterFactory.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTriggerRequestHandler.java Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java Wed Oct 15 14:49:14 2014 @@ -40,13 +40,13 @@ import org.apache.sling.replication.even import org.apache.sling.replication.packaging.ReplicationPackageExporter; import org.apache.sling.replication.packaging.ReplicationPackageExporterStrategy; import org.apache.sling.replication.packaging.ReplicationPackageImporter; -import org.apache.sling.replication.packaging.impl.exporter.*; +import org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporter; +import org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporter; +import org.apache.sling.replication.packaging.impl.exporter.RemoteReplicationPackageExporter; import org.apache.sling.replication.packaging.impl.exporter.strategy.DefaultReplicationPackageExporterStrategy; import org.apache.sling.replication.packaging.impl.exporter.strategy.PrivilegeReplicationPackageExporterStrategy; import org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporter; -import org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory; import org.apache.sling.replication.packaging.impl.importer.RemoteReplicationPackageImporter; -import org.apache.sling.replication.packaging.impl.importer.RemoteReplicationPackageImporterFactory; import org.apache.sling.replication.queue.ReplicationQueueDistributionStrategy; import org.apache.sling.replication.queue.ReplicationQueueProvider; import org.apache.sling.replication.serialization.ReplicationPackageBuilder; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java Wed Oct 15 14:49:14 2014 @@ -18,7 +18,13 @@ */ package org.apache.sling.replication.agent.impl; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Dictionary; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.ResourceResolver; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporter.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporter.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporter.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporter.java Wed Oct 15 14:49:14 2014 @@ -22,13 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.felix.scr.annotations.Activate; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.ConfigurationPolicy; -import org.apache.felix.scr.annotations.Property; -import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.ReferencePolicy; -import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.commons.osgi.PropertiesUtil; import org.apache.sling.replication.agent.ReplicationAgent; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporterFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporterFactory.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporterFactory.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/AgentReplicationPackageExporterFactory.java Wed Oct 15 14:49:14 2014 @@ -18,7 +18,6 @@ */ package org.apache.sling.replication.packaging.impl.exporter; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -30,17 +29,12 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.commons.osgi.PropertiesUtil; import org.apache.sling.replication.agent.ReplicationAgent; -import org.apache.sling.replication.agent.ReplicationComponent; import org.apache.sling.replication.agent.ReplicationComponentFactory; import org.apache.sling.replication.agent.ReplicationComponentProvider; import org.apache.sling.replication.communication.ReplicationRequest; import org.apache.sling.replication.packaging.ReplicationPackage; import org.apache.sling.replication.packaging.ReplicationPackageExporter; -import org.apache.sling.replication.queue.ReplicationQueue; -import org.apache.sling.replication.queue.ReplicationQueueItem; -import org.apache.sling.replication.serialization.ReplicationPackageBuilder; import org.apache.sling.replication.serialization.ReplicationPackageBuildingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/LocalReplicationPackageExporterFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/LocalReplicationPackageExporterFactory.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/LocalReplicationPackageExporterFactory.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/LocalReplicationPackageExporterFactory.java Wed Oct 15 14:49:14 2014 @@ -26,14 +26,12 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.replication.agent.ReplicationComponentFactory; import org.apache.sling.replication.communication.ReplicationRequest; import org.apache.sling.replication.packaging.ReplicationPackage; import org.apache.sling.replication.packaging.ReplicationPackageExporter; -import org.apache.sling.replication.serialization.ReplicationPackageBuilder; import org.apache.sling.replication.serialization.ReplicationPackageBuildingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java Wed Oct 15 14:49:14 2014 @@ -18,7 +18,6 @@ */ package org.apache.sling.replication.packaging.impl.exporter; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,17 +31,14 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.commons.osgi.PropertiesUtil; import org.apache.sling.replication.agent.ReplicationComponentFactory; import org.apache.sling.replication.agent.ReplicationComponentProvider; import org.apache.sling.replication.communication.ReplicationRequest; import org.apache.sling.replication.packaging.ReplicationPackage; import org.apache.sling.replication.packaging.ReplicationPackageExporter; -import org.apache.sling.replication.serialization.ReplicationPackageBuilder; import org.apache.sling.replication.serialization.ReplicationPackageBuildingException; import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider; import org.apache.sling.replication.transport.impl.ReplicationTransportConstants; -import org.apache.sling.replication.transport.impl.TransportEndpointStrategyType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/DefaultReplicationPackageExporterStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/DefaultReplicationPackageExporterStrategy.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/DefaultReplicationPackageExporterStrategy.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/DefaultReplicationPackageExporterStrategy.java Wed Oct 15 14:49:14 2014 @@ -20,6 +20,8 @@ package org.apache.sling.replication.packaging.impl.exporter.strategy; +import java.util.List; + import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.replication.communication.ReplicationRequest; import org.apache.sling.replication.packaging.ReplicationPackage; @@ -27,8 +29,6 @@ import org.apache.sling.replication.pack import org.apache.sling.replication.packaging.ReplicationPackageExporterStrategy; import org.apache.sling.replication.serialization.ReplicationPackageBuildingException; -import java.util.List; - public class DefaultReplicationPackageExporterStrategy implements ReplicationPackageExporterStrategy { public static final String NAME = "default"; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/PrivilegeReplicationPackageExporterStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/PrivilegeReplicationPackageExporterStrategy.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/PrivilegeReplicationPackageExporterStrategy.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/strategy/PrivilegeReplicationPackageExporterStrategy.java Wed Oct 15 14:49:14 2014 @@ -18,6 +18,13 @@ */ package org.apache.sling.replication.packaging.impl.exporter.strategy; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.jcr.security.AccessControlManager; +import javax.jcr.security.Privilege; +import java.util.List; +import java.util.Map; + import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.commons.osgi.PropertiesUtil; import org.apache.sling.replication.communication.ReplicationActionType; @@ -27,13 +34,6 @@ import org.apache.sling.replication.pack import org.apache.sling.replication.packaging.ReplicationPackageExporterStrategy; import org.apache.sling.replication.serialization.ReplicationPackageBuildingException; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.jcr.security.AccessControlManager; -import javax.jcr.security.Privilege; -import java.util.List; -import java.util.Map; - public class PrivilegeReplicationPackageExporterStrategy implements ReplicationPackageExporterStrategy { public static final String NAME = "privilege"; public static final String JCR_PRIVILEGE = "jcrPrivilege"; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/LocalReplicationPackageImporterFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/LocalReplicationPackageImporterFactory.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/LocalReplicationPackageImporterFactory.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/LocalReplicationPackageImporterFactory.java Wed Oct 15 14:49:14 2014 @@ -26,15 +26,11 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.replication.agent.ReplicationComponentFactory; -import org.apache.sling.replication.event.ReplicationEventFactory; import org.apache.sling.replication.packaging.ReplicationPackage; import org.apache.sling.replication.packaging.ReplicationPackageImporter; -import org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporter; -import org.apache.sling.replication.serialization.ReplicationPackageBuilder; import org.apache.sling.replication.serialization.ReplicationPackageReadingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java Wed Oct 15 14:49:14 2014 @@ -30,15 +30,12 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.commons.osgi.PropertiesUtil; -import org.apache.sling.replication.event.ReplicationEventFactory; import org.apache.sling.replication.packaging.ReplicationPackage; import org.apache.sling.replication.packaging.ReplicationPackageImporter; import org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporter; import org.apache.sling.replication.serialization.ReplicationPackageReadingException; import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider; import org.apache.sling.replication.transport.impl.ReplicationTransportConstants; -import org.apache.sling.replication.transport.impl.TransportEndpointStrategyType; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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=1632066&r1=1632065&r2=1632066&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 Wed Oct 15 14:49:14 2014 @@ -18,7 +18,6 @@ */ package org.apache.sling.replication.serialization.impl.vlt; -import javax.jcr.RepositoryException; import javax.jcr.Session; import java.io.File; import java.io.FileOutputStream; @@ -31,11 +30,9 @@ import org.apache.jackrabbit.vault.fs.co import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter; import org.apache.jackrabbit.vault.fs.io.ImportOptions; import org.apache.jackrabbit.vault.packaging.ExportOptions; -import org.apache.jackrabbit.vault.packaging.JcrPackage; import org.apache.jackrabbit.vault.packaging.Packaging; import org.apache.jackrabbit.vault.packaging.VaultPackage; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.replication.communication.ReplicationRequest; import org.apache.sling.replication.event.ReplicationEventFactory; import org.apache.sling.replication.packaging.ReplicationPackage; @@ -43,7 +40,6 @@ import org.apache.sling.replication.seri import org.apache.sling.replication.serialization.ReplicationPackageBuildingException; import org.apache.sling.replication.serialization.ReplicationPackageReadingException; import org.apache.sling.replication.serialization.impl.AbstractReplicationPackageBuilder; -import org.apache.sling.replication.util.ReplicationJcrUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTriggerRequestHandler.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTriggerRequestHandler.java?rev=1632066&r1=1632065&r2=1632066&view=diff ============================================================================== --- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTriggerRequestHandler.java (original) +++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTriggerRequestHandler.java Wed Oct 15 14:49:14 2014 @@ -18,7 +18,6 @@ */ package org.apache.sling.replication.trigger; -import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.replication.communication.ReplicationRequest; /**