Author: tommaso
Date: Fri Oct 3 09:59:17 2014
New Revision: 1629167
URL: http://svn.apache.org/r1629167
Log:
SLING-3994 - adjusted imports and javadocs
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
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/DefaultReplicationComponentProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/GenericReplicationComponentFactory.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/agent/impl/SimpleReplicationAgentFactory.java
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java?rev=1629167&r1=1629166&r2=1629167&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
Fri Oct 3 09:59:17 2014
@@ -18,7 +18,21 @@
*/
package org.apache.sling.replication.agent.impl;
-import org.apache.felix.scr.annotations.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+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.Deactivate;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.agent.ReplicationComponent;
@@ -30,7 +44,6 @@ import org.apache.sling.replication.queu
import org.apache.sling.replication.queue.impl.SingleQueueDistributionStrategy;
import
org.apache.sling.replication.queue.impl.jobhandling.JobHandlingReplicationQueueProvider;
import
org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
-import org.apache.sling.replication.trigger.ReplicationTrigger;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -38,9 +51,6 @@ import org.osgi.framework.ServiceRegistr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
-import java.util.Properties;
-
/**
* An OSGi service factory for {@link
org.apache.sling.replication.agent.ReplicationAgent}s which references already
existing OSGi services.
*/
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=1629167&r1=1629166&r2=1629167&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
Fri Oct 3 09:59:17 2014
@@ -18,10 +18,16 @@
*/
package org.apache.sling.replication.agent.impl;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.felix.scr.annotations.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.vault.packaging.Packaging;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.commons.scheduler.Scheduler;
@@ -47,10 +53,7 @@ import org.apache.sling.replication.trig
import org.apache.sling.replication.trigger.impl.RemoteEventReplicationTrigger;
import
org.apache.sling.replication.trigger.impl.ResourceEventReplicationTrigger;
import org.apache.sling.replication.trigger.impl.ScheduledReplicationTrigger;
-import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,14 +61,15 @@ import org.slf4j.LoggerFactory;
* A generic factory for replication components using a compact configuration,
already existing OSGi services
* for the components to be wired can be used as well as directly instantiated
components (called by type name).
* <p/>
- * Currently supported components are of kind 'agent' and 'trigger'.
+ * Currently supported components are {@link
org.apache.sling.replication.agent.ReplicationAgent}s,
+ * {@link org.apache.sling.replication.trigger.ReplicationTrigger}s and
+ * {@link
org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider}s
*/
@Component(metatype = true,
label = "Generic Replication Components Factory",
description = "OSGi configuration Replication Component factory",
specVersion = "1.1",
immediate = true
-
)
@Service(ReplicationComponentFactory.class)
public class DefaultReplicationComponentFactory implements
ReplicationComponentFactory {
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java?rev=1629167&r1=1629166&r2=1629167&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
Fri Oct 3 09:59:17 2014
@@ -1,14 +1,26 @@
+/*
+ * 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.agent.impl;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
import java.util.Map;
-import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
@@ -16,36 +28,19 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
-import org.apache.jackrabbit.vault.packaging.Packaging;
-import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.agent.ReplicationComponentProvider;
-import org.apache.sling.replication.event.ReplicationEventFactory;
import org.apache.sling.replication.packaging.ReplicationPackageExporter;
import org.apache.sling.replication.packaging.ReplicationPackageImporter;
-import
org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory;
-import
org.apache.sling.replication.packaging.impl.exporter.RemoteReplicationPackageExporter;
-import
org.apache.sling.replication.packaging.impl.exporter.RemoteReplicationPackageExporterFactory;
-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;
-import
org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory;
import
org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
-import
org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProvider;
-import org.apache.sling.replication.trigger.ReplicationTrigger;
-import
org.apache.sling.replication.trigger.impl.ChainReplicateReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.RemoteEventReplicationTrigger;
-import
org.apache.sling.replication.trigger.impl.ResourceEventReplicationTrigger;
-import org.apache.sling.replication.trigger.impl.ScheduledReplicationTrigger;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * default implementation of {@link
org.apache.sling.replication.agent.ReplicationComponentProvider} (as an OSGi
service).
+ */
@Component
@Service(ReplicationComponentProvider.class)
@Property(name = "name", value = "default")
@@ -63,7 +58,6 @@ public class DefaultReplicationComponent
private final Logger log = LoggerFactory.getLogger(getClass());
-
Map<String, ReplicationQueueProvider> replicationQueueProviderMap = new
ConcurrentHashMap<String, ReplicationQueueProvider>();
Map<String, ReplicationQueueDistributionStrategy>
replicationQueueDistributionStrategyMap = new ConcurrentHashMap<String,
ReplicationQueueDistributionStrategy>();
Map<String, TransportAuthenticationProvider>
transportAuthenticationProviderMap = new ConcurrentHashMap<String,
TransportAuthenticationProvider>();
@@ -71,8 +65,6 @@ public class DefaultReplicationComponent
Map<String, ReplicationPackageExporter> replicationPackageExporterMap =
new ConcurrentHashMap<String, ReplicationPackageExporter>();
private BundleContext bundleContext;
-
-
public <ComponentType> ComponentType getComponent(Class<ComponentType>
type, String componentName) {
if (type.isAssignableFrom(ReplicationPackageExporter.class)) {
return (ComponentType)
replicationPackageExporterMap.get(componentName);
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/GenericReplicationComponentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/GenericReplicationComponentFactory.java?rev=1629167&r1=1629166&r2=1629167&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/GenericReplicationComponentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/GenericReplicationComponentFactory.java
Fri Oct 3 09:59:17 2014
@@ -1,6 +1,36 @@
+/*
+ * 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.agent.impl;
-import org.apache.felix.scr.annotations.*;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+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.Deactivate;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.agent.ReplicationComponent;
@@ -15,11 +45,6 @@ import org.osgi.framework.ServiceRegistr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
@Component(metatype = true,
label = "Generic Replication Components Factory",
description = "OSGi configuration factory for generic Replication
Components",
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=1629167&r1=1629166&r2=1629167&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
Fri Oct 3 09:59:17 2014
@@ -18,7 +18,11 @@
*/
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.List;
+import java.util.Properties;
import org.apache.sling.replication.agent.AgentReplicationException;
import org.apache.sling.replication.agent.ReplicationAgent;
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java?rev=1629167&r1=1629166&r2=1629167&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
Fri Oct 3 09:59:17 2014
@@ -18,17 +18,26 @@
*/
package org.apache.sling.replication.agent.impl;
-import java.util.*;
-
-import org.apache.felix.scr.annotations.*;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Random;
+
+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.Deactivate;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
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.event.ReplicationEventFactory;
-import org.apache.sling.replication.packaging.ReplicationPackageExporter;
-import org.apache.sling.replication.packaging.ReplicationPackageImporter;
import org.apache.sling.replication.queue.ReplicationQueueDistributionStrategy;
import org.apache.sling.replication.queue.ReplicationQueueProvider;
import org.apache.sling.replication.queue.impl.SingleQueueDistributionStrategy;
@@ -94,7 +103,6 @@ public class SimpleReplicationAgentFacto
cardinality = ReferenceCardinality.OPTIONAL_UNARY)
private volatile TransportAuthenticationProvider
transportAuthenticationProvider;
-
@Reference
private ReplicationEventFactory replicationEventFactory;
@@ -104,8 +112,6 @@ public class SimpleReplicationAgentFacto
@Reference
private ReplicationComponentFactory componentFactory;
-
-
private ServiceRegistration componentReg;
private BundleContext savedContext;
private Map<String, Object> savedConfig;
@@ -150,7 +156,6 @@ public class SimpleReplicationAgentFacto
// register agent service
componentReg =
context.registerService(ReplicationAgent.class.getName(), agent, props);
-
if (agent instanceof ReplicationComponent) {
((ReplicationComponent) agent).enable();
}
@@ -175,7 +180,6 @@ public class SimpleReplicationAgentFacto
}
-
public <ComponentType> ComponentType getComponent(Class<ComponentType>
type, String componentName) {
if (type.isAssignableFrom(ReplicationQueueProvider.class)) {
return (ComponentType) queueProvider;
@@ -190,7 +194,6 @@ public class SimpleReplicationAgentFacto
return null;
}
-
private void refresh() {
if (savedContext != null && savedConfig != null) {
if (componentReg == null) {
