svn commit: r1628183 - in /sling/trunk/contrib/extensions/replication: core/src/main/java/org/apache/sling/replication/communication/ core/src/main/java/org/apache/sling/replication/trigger/impl/ sample/src/main/resources/SLING-CONTENT/libs/sling/repli...

[tommaso]

Author: tommaso
Date: Mon Sep 29 13:53:35 2014
New Revision: 1628183

URL: http://svn.apache.org/r1628183
Log:
SLING-3978 - adjusted service user mapping to match the core sybmolic name

Modified:
    
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationEndpoint.java
    
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
    
sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json

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=1628183&r1=1628182&r2=1628183&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:53:35 2014
@@ -41,7 +41,7 @@ public class ReplicationEndpoint {
 
     @Override
     public String toString() {
-        return uri.toString();
+        return uri.toASCIIString();
     }
 
     @Override

Modified: 
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java?rev=1628183&r1=1628182&r2=1628183&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
 (original)
+++ 
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
 Mon Sep 29 13:53:35 2014
@@ -198,7 +198,7 @@ public class RemoteEventReplicationTrigg
                     futureResponse.get();
 
                 } catch (Exception e) {
-                    log.warn("cannot communicate with {} - {}", endpoint, e);
+                    log.warn("cannot communicate with {}", endpoint, e);
                 }
                 httpClient.close();
                 log.debug("request finished");

Modified: 
sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json?rev=1628183&r1=1628182&r2=1628183&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
 (original)
+++ 
sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
 Mon Sep 29 13:53:35 2014
@@ -1,5 +1,5 @@
 {
     "jcr:primaryType": "sling:OsgiConfig",
     "user.default": "",
-    "user.mapping": "org.apache.sling.replication:replicationService=admin"
+    "user.mapping": 
"org.apache.sling.replication.core:replicationService=admin"
 }