You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:30:09 UTC
[sling-org-apache-sling-distribution-sample] 27/42: SLING-4153 -
fixed transport API to just expose the secret
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.distribution.sample-0.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit c448282c471be831c8ec48b1fac8033501c19a44
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Dec 5 08:08:59 2014 +0000
SLING-4153 - fixed transport API to just expose the secret
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1643180 13f79535-47bb-0310-9956-ffa450edef68
---
...dentialsTransportAuthenticationProviderFactory-publishAdmin.json | 6 ------
...dentialsTransportAuthenticationProviderFactory-publishAdmin.json | 6 ------
...er.RemoteDistributionPackageExporterFactory-publish-reverse.json | 2 +-
...l.importer.RemoteDistributionPackageImporterFactory-publish.json | 2 +-
...l.exporter.RemoteDistributionPackageExporterFactory-pubsync.json | 2 +-
...l.importer.RemoteDistributionPackageImporterFactory-pubsync.json | 2 +-
...ution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json | 1 -
...orter.AdvancedRemoteDistributionPackageImporter-cache-flush.json | 1 -
.../sling/distribution/settings.author/defaults/agents/global.json | 4 ++--
9 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
deleted file mode 100644
index 10fbe4d..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "publishAdmin",
- "username": "admin",
- "password": "admin"
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
deleted file mode 100644
index 10fbe4d..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "publishAdmin",
- "username": "admin",
- "password": "admin"
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-publish-reverse.json
index b4c6670..d9e5834 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-publish-reverse.json
@@ -8,5 +8,5 @@
"http://localhost:4503/libs/sling/distribution/services/exporters/reverse"
],
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "distributionTransportSecretProvider.target" : "(name=publishAdmin)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json
index dd61b19..4ab3f51 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json
@@ -8,5 +8,5 @@
"http://localhost:4503/libs/sling/distribution/services/importers/default"
],
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "distributionTransportSecretProvider.target" : "(name=publishAdmin)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json
index fdebdae..907697c 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json
@@ -13,7 +13,7 @@
"endpoints.strategy": "All",
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "distributionTransportSecretProvider.target" : "(name=publishAdmin)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json
index d95099e..d381879 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json
@@ -15,5 +15,5 @@
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "distributionTransportSecretProvider.target" : "(name=publishAdmin)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json
index ad5ce6e..c3825df 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json
@@ -4,7 +4,6 @@
"enabled" : false,
-
"requestAuthorizationStrategy.target" : "privilegeRead"
}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json
index c1160b6..59c2119 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json
@@ -9,6 +9,5 @@
"delete -> Change : REMOVE" ],
"useCustomBody": true,
"customBody": "",
- "TransportAuthenticationProvider.target": "(name=nop)",
"endpoints": [ "http://localhost:8000/invalidatecache" ]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
index f107e00..2a8a1f3 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
@@ -21,7 +21,7 @@
"name" : "vlt"
},
- "transportAuthenticationProvider" : {
+ "distributionTransportSecretProvider" : {
"kind" : "transportAuthenticator",
"type" : "service",
"name" : "publishAdmin"
@@ -39,7 +39,7 @@
"name" : "vlt"
},
- "transportAuthenticationProvider" : {
+ "distributionTransportSecretProvider" : {
"kind" : "transportAuthenticator",
"type" : "service",
"name" : "publishAdmin"
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.