Author: tommaso
Date: Mon Sep 29 13:31:47 2014
New Revision: 1628179
URL: http://svn.apache.org/r1628179
Log:
SLING-3978 - added 'sample' replication bundle
Added:
sling/trunk/contrib/extensions/replication/sample/ (with props)
sling/trunk/contrib/extensions/replication/sample/pom.xml (with props)
sling/trunk/contrib/extensions/replication/sample/src/
sling/trunk/contrib/extensions/replication/sample/src/main/
sling/trunk/contrib/extensions/replication/sample/src/main/resources/
- copied from r1628146,
sling/trunk/contrib/extensions/replication/core/src/main/resources/
Removed:
sling/trunk/contrib/extensions/replication/core/src/main/resources/
Modified:
sling/trunk/contrib/extensions/replication/core/pom.xml
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationEndpoint.java
sling/trunk/contrib/extensions/replication/it/pom.xml
sling/trunk/contrib/pom.xml
Modified: sling/trunk/contrib/extensions/replication/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/pom.xml?rev=1628179&r1=1628178&r2=1628179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/replication/core/pom.xml Mon Sep 29 13:31:47
2014
@@ -43,10 +43,9 @@
</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication
- </developerConnection>
-
<url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/core</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/core</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core</url>
</scm>
<!--
======================================================================= -->
@@ -68,7 +67,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>org.apache.sling.replication</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.sling.replication.core</Bundle-SymbolicName>
<Sling-Initial-Content>
SLING-CONTENT/libs/sling/replication;path:=/libs/sling/replication;overwrite:=true
</Sling-Initial-Content>
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationEndpoint.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationEndpoint.java?rev=1628179&r1=1628178&r2=1628179&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationEndpoint.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationEndpoint.java
Mon Sep 29 13:31:47 2014
@@ -39,4 +39,24 @@ public class ReplicationEndpoint {
return uri;
}
+ @Override
+ public String toString() {
+ return uri.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ReplicationEndpoint that = (ReplicationEndpoint) o;
+
+ return uri.equals(that.uri);
+
+ }
+
+ @Override
+ public int hashCode() {
+ return uri.hashCode();
+ }
}
Modified: sling/trunk/contrib/extensions/replication/it/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/pom.xml?rev=1628179&r1=1628178&r2=1628179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/replication/it/pom.xml Mon Sep 29 13:31:47
2014
@@ -90,8 +90,7 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it
- </developerConnection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it</url>
</scm>
@@ -274,6 +273,7 @@
<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>
</systemPropertyVariables>
</configuration>
@@ -387,5 +387,10 @@
<artifactId>org.apache.sling.replication.core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.replication.sample</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Propchange: sling/trunk/contrib/extensions/replication/sample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 29 13:31:47 2014
@@ -0,0 +1 @@
+target
Added: sling/trunk/contrib/extensions/replication/sample/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample/pom.xml?rev=1628179&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/pom.xml (added)
+++ sling/trunk/contrib/extensions/replication/sample/pom.xml Mon Sep 29
13:31:47 2014
@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <!--
======================================================================= -->
+ <!-- P A R E N T P R O J E C T
-->
+ <!--
======================================================================= -->
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>20</version>
+ </parent>
+
+ <!--
======================================================================= -->
+ <!-- P R O J E C T
-->
+ <!--
======================================================================= -->
+ <artifactId>org.apache.sling.replication.sample</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Replication Sample</name>
+ <description>
+ The Apache Sling Replication sample bundle provides a set of sample
configurations and custom component implementations.
+ </description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample</url>
+ </scm>
+
+ <!--
======================================================================= -->
+ <!-- B U I L D
-->
+ <!--
======================================================================= -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>org.apache.sling.replication.sample</Bundle-SymbolicName>
+ <Sling-Initial-Content>
+
SLING-CONTENT/libs/sling/replication;path:=/libs/sling/replication;overwrite:=true
+ </Sling-Initial-Content>
+ <Export-Package>
+ </Export-Package>
+ <Embed-Dependency>httpasyncclient</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!--
======================================================================= -->
+ <!-- D E P E N D E N C I E S
-->
+ <!--
======================================================================= -->
+ <dependencies>
+ <!-- TESTING -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- SLING -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.replication.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.scheduler</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.event</artifactId>
+ <version>3.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
+ <version>1.0.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- LOGGING -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- SPECs -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <!-- FILEVAULT -->
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <!-- HTTP -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ <version>4.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpasyncclient</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.3.4</version>
+ </dependency>
+ <!-- JACKRABBIT -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>2.6.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- COMMONS -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.3</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: sling/trunk/contrib/extensions/replication/sample/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: sling/trunk/contrib/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=1628179&r1=1628178&r2=1628179&view=diff
==============================================================================
--- sling/trunk/contrib/pom.xml (original)
+++ sling/trunk/contrib/pom.xml Mon Sep 29 13:31:47 2014
@@ -111,6 +111,7 @@
<module>extensions/rewriter</module>
<module>extensions/tenant</module>
<module>extensions/replication/core</module>
+ <module>extensions/replication/sample</module>
<module>extensions/replication/it</module>
<module>extensions/sling-query</module>
<module>jcr/compiler</module>
