You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2015/10/22 10:11:34 UTC

svn commit: r1709958 [3/3] - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/ core/src/main/java/org/apache/sling/distribution/agent/impl/ core/src/main/java/org/apache/sling/distribution/impl/ co...

Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java?rev=1709958&r1=1709957&r2=1709958&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java Thu Oct 22 08:11:33 2015
@@ -28,8 +28,8 @@ import javax.jcr.security.Privilege;
 
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.distribution.impl.DistributionException;
 import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImportException;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.junit.Test;
 
@@ -57,7 +57,7 @@ public class RepositoryDistributionPacka
             when(distributionPackage.getId()).thenReturn("someid");
             repositoryDistributionPackageImporter.importPackage(resourceResolver, distributionPackage);
             fail("import cannot succeed if service is user is unable to obtain a session");
-        } catch (DistributionPackageImportException e) {
+        } catch (DistributionException e) {
             // expected to fail
         }
     }
@@ -82,7 +82,7 @@ public class RepositoryDistributionPacka
             when(distributionPackage.getId()).thenReturn("someid");
             repositoryDistributionPackageImporter.importPackage(resourceResolver, distributionPackage);
             fail("import cannot succeed if privileges are not sufficient");
-        } catch (DistributionPackageImportException e) {
+        } catch (DistributionException e) {
             // expected to fail
         }
     }

Modified: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java?rev=1709958&r1=1709957&r2=1709958&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java Thu Oct 22 08:11:33 2015
@@ -82,7 +82,7 @@ public abstract class DistributionIntegr
             {
                 assertExists(authorClient, authorAgentConfigUrl("publish-multiple"));
                 setArrayProperties(author, authorAgentConfigUrl("publish-multiple"),
-                        "packageImporter.endpoints", remoteImporterUrl, remoteImporterUrl + "badaddress");
+                        "packageImporter.endpoints", "endpoint1=" + remoteImporterUrl, "endpoint2=" + remoteImporterUrl + "badaddress");
 
 
                 Thread.sleep(1000);