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 2018/01/30 09:42:30 UTC
[sling-org-apache-sling-repoinit-it] 15/30: SLING-5836 - remove
unused items in test provisioning model
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-it.git
commit bee65e8b23fe28196cc211a32a73dba192582bb0
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Jul 12 21:12:32 2016 +0000
SLING-5836 - remove unused items in test provisioning model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1752346 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/provisioning/boot.txt | 9 +-------
src/main/provisioning/oak.txt | 24 ++-------------------
src/main/provisioning/sling.txt | 48 -----------------------------------------
3 files changed, 3 insertions(+), 78 deletions(-)
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index b08d1f9..a7050a1 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -43,11 +43,4 @@
org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
org.apache.felix/org.apache.felix.configadmin/1.8.8
- org.apache.felix/org.apache.felix.eventadmin/1.4.4
- org.apache.aries/org.apache.aries.util/1.1.1
- org.apache.felix/org.apache.felix.coordinator/1.0.2
- org.eclipse.equinox/org.eclipse.equinox.region/1.2.101.v20150831-1342
- org.apache.aries.subsystem/org.apache.aries.subsystem.api/2.0.6
- org.apache.aries.subsystem/org.apache.aries.subsystem.core/2.0.6
- # dependency with javax.inject - required for Sling Models (SLING-4710)
- org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
+ org.apache.felix/org.apache.felix.eventadmin/1.4.4
\ No newline at end of file
diff --git a/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt
index e301a08..f230836 100644
--- a/src/main/provisioning/oak.txt
+++ b/src/main/provisioning/oak.txt
@@ -36,29 +36,17 @@
[artifacts startLevel=15 runModes=oak_tar]
org.apache.jackrabbit/oak-segment/${oak.version}
-[artifacts startLevel=15 runModes=oak_mongo]
- org.mongodb/mongo-java-driver/2.14.0
-
# start the Oak server instance after all components have been configured
# and started to avoid restarting that component ( see SLING-4556 )
[artifacts startLevel=16]
+ # TODO replace with 1.0.2 once that's released
org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
[configurations]
- org.apache.felix.jaas.Configuration.factory-GuestLoginModule
- jaas.controlFlag="optional"
- jaas.classname="org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule"
- jaas.ranking=I"300"
-
org.apache.felix.jaas.Configuration.factory-LoginModuleImpl
jaas.controlFlag="required"
jaas.classname="org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl"
- org.apache.felix.jaas.Configuration.factory-TokenLoginModule
- jaas.controlFlag="sufficient"
- jaas.classname="org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule"
- jaas.ranking=I"200"
-
org.apache.felix.jaas.ConfigurationSpi
jaas.defaultRealmName="jackrabbit.oak"
jaas.configProviderName="FelixJaasProvider"
@@ -77,15 +65,7 @@
userPrivilegeNames=["jcr:all"]
groupPrivilegeNames=["jcr:read"]
- org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService
- localIndexDir="sling/repository/index"
-
[configurations runModes=oak_tar]
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
name="Default\ NodeStore"
- repository.home="sling/repository"
-
-[configurations runModes=oak_mongo]
- org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService
- mongouri="mongodb://localhost:27017"
- db="sling"
+ repository.home="sling/repository"
\ No newline at end of file
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 2eecde5..8af59d8 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -37,21 +37,16 @@
org.apache.sling/org.apache.sling.api/2.11.0
org.apache.sling/org.apache.sling.auth.core/1.3.14
org.apache.sling/org.apache.sling.auth.form/1.0.8
- org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
org.apache.sling/org.apache.sling.commons.classloader/1.3.2
org.apache.sling/org.apache.sling.commons.compiler/2.3.0
org.apache.sling/org.apache.sling.commons.mime/2.1.8
org.apache.sling/org.apache.sling.commons.osgi/2.4.0
org.apache.sling/org.apache.sling.commons.scheduler/2.4.14
org.apache.sling/org.apache.sling.commons.threads/3.2.4
- org.apache.sling/org.apache.sling.discovery.api/1.0.2
org.apache.sling/org.apache.sling.engine/2.4.6
org.apache.sling/org.apache.sling.event/4.0.0
org.apache.sling/org.apache.sling.event.dea/1.0.4
- org.apache.sling/org.apache.sling.fsresource/1.1.4
- org.apache.sling/org.apache.sling.i18n/2.4.6
org.apache.sling/org.apache.sling.jcr.resource/2.7.4
- org.apache.sling/org.apache.sling.launchpad.content/2.0.8
org.apache.sling/org.apache.sling.resourceresolver/1.4.12
org.apache.sling/org.apache.sling.scripting.api/2.1.8
org.apache.sling/org.apache.sling.scripting.core/2.0.36
@@ -65,13 +60,9 @@
[artifacts startLevel=5]
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0
- org.apache.felix/org.apache.felix.inventory/1.0.4
- org.apache.felix/org.apache.felix.prefs/1.0.6
org.apache.felix/org.apache.felix.webconsole/4.2.14
org.apache.geronimo.bundles/json/20090211_1
org.apache.sling/org.apache.sling.commons.json/2.0.16
- org.apache.felix/org.apache.felix.bundlerepository/1.6.4
- org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0
org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1
org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.0.0
@@ -79,7 +70,6 @@
commons-fileupload/commons-fileupload/1.3.1
[artifacts startLevel=10]
- org.apache.felix/org.apache.felix.http.sslfilter/1.0.4
org.apache.felix/org.apache.felix.scr/2.0.2
org.apache.felix/org.apache.felix.metatype/1.1.2
org.apache.tika/tika-core/1.11
@@ -97,51 +87,13 @@
org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-rmi/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
- org.apache.sling/org.apache.sling.jcr.webdav/2.3.4
- org.apache.sling/org.apache.sling.jcr.davex/1.3.2
org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.4
org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2
- org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
[configurations]
- org.apache.sling.engine.impl.log.RequestLogger
- access.log.enabled=B"true"
- request.log.outputtype=I"0"
- access.log.output="log.access"
- request.log.output="log.request"
- request.log.enabled=B"true"
- access.log.outputtype=I"0"
-
org.apache.sling.commons.log.LogManager
org.apache.sling.commons.log.pattern="%d{dd.MM.yyyy HH:mm:ss.SSS}\ *%level*\ [%thread]\ %logger\ %msg%n"
org.apache.sling.commons.log.file="logs/error.log"
org.apache.sling.commons.log.level="info"
org.apache.sling.commons.log.file.size="'.'yyyy-MM-dd"
org.apache.sling.commons.log.file.number=I"7"
-
- org.apache.sling.commons.log.LogManager.factory.config-access.log
- org.apache.sling.commons.log.pattern="%msg%n"
- org.apache.sling.commons.log.names=["log.access"]
- org.apache.sling.commons.log.file="logs/access.log"
- org.apache.sling.commons.log.level="info"
-
- org.apache.sling.commons.log.LogManager.factory.config-request.log
- org.apache.sling.commons.log.pattern="%msg%n"
- org.apache.sling.commons.log.names=["log.request"]
- org.apache.sling.commons.log.file="logs/request.log"
- org.apache.sling.commons.log.level="info"
-
- # configure the ScriptCache for scripts used by org.apache.sling.scripting.sightly.js.provider
- org.apache.sling.scripting.core.impl.ScriptCacheImpl
- org.apache.sling.scripting.cache.additional_extensions=["js"]
-
- # WebDAV servlet requires config now
- org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet
- dav.root="/dav"
-
- # DavEx servlet requires config now
- org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet
- alias="/server"
-
- org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge
- enabled=B"true"
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.