sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1752346 - in /sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning: boot.txt oak.txt sling.txt
Date Tue, 12 Jul 2016 21:12:32 GMT
Author: bdelacretaz
Date: Tue Jul 12 21:12:32 2016
New Revision: 1752346

URL: http://svn.apache.org/viewvc?rev=1752346&view=rev
Log:
SLING-5836 - remove unused items in test provisioning model

Modified:
    sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/boot.txt
    sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt
    sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt

Modified: sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/boot.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/boot.txt?rev=1752346&r1=1752345&r2=1752346&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/boot.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/boot.txt Tue Jul 12 21:12:32
2016
@@ -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

Modified: sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt?rev=1752346&r1=1752345&r2=1752346&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt Tue Jul 12 21:12:32
2016
@@ -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

Modified: sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt?rev=1752346&r1=1752345&r2=1752346&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt Tue Jul 12
21:12:32 2016
@@ -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"



Mime
View raw message