sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1666656 - in /sling/trunk/launchpad/slingstart: pom.xml src/main/provisioning/boot.txt src/main/provisioning/launchpad.txt src/main/provisioning/oak.txt src/main/provisioning/sling.txt src/main/provisioning/standalone.txt
Date Sat, 14 Mar 2015 11:48:37 GMT
Author: cziegeler
Date: Sat Mar 14 11:48:37 2015
New Revision: 1666656

URL: http://svn.apache.org/r1666656
Log:
Update to released slingstart maven plugin and sync with launchpad builder list

Modified:
    sling/trunk/launchpad/slingstart/pom.xml
    sling/trunk/launchpad/slingstart/src/main/provisioning/boot.txt
    sling/trunk/launchpad/slingstart/src/main/provisioning/launchpad.txt
    sling/trunk/launchpad/slingstart/src/main/provisioning/oak.txt
    sling/trunk/launchpad/slingstart/src/main/provisioning/sling.txt
    sling/trunk/launchpad/slingstart/src/main/provisioning/standalone.txt

Modified: sling/trunk/launchpad/slingstart/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/pom.xml?rev=1666656&r1=1666655&r2=1666656&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/pom.xml (original)
+++ sling/trunk/launchpad/slingstart/pom.xml Sat Mar 14 11:48:37 2015
@@ -73,11 +73,21 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>slingstart-maven-plugin</artifactId>
-                <version>0.0.1-SNAPSHOT</version>
+                <version>1.0.4</version>
                 <extensions>true</extensions>
                 <configuration>
                     <createWebapp>true</createWebapp>
                 </configuration>
+<!--
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>start</goal>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                -->
             </plugin>
         </plugins>
     </build>

Modified: sling/trunk/launchpad/slingstart/src/main/provisioning/boot.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/provisioning/boot.txt?rev=1666656&r1=1666655&r2=1666656&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/provisioning/boot.txt Sat Mar 14 11:48:37 2015
@@ -11,17 +11,17 @@
 
 [artifacts]
     org.slf4j/slf4j-api/1.7.6
-    org.apache.sling/org.apache.sling.commons.log/4.0.0
+    org.apache.sling/org.apache.sling.commons.log/4.0.1-SNAPSHOT
     org.apache.sling/org.apache.sling.commons.logservice/1.0.2
     org.slf4j/jcl-over-slf4j/1.7.6
     org.slf4j/log4j-over-slf4j/1.7.6
-    org.apache.sling/org.apache.sling.settings/1.3.2
+    org.apache.sling/org.apache.sling.settings/1.3.6
     org.apache.sling/org.apache.sling.fragment.xml/1.0.2
     org.apache.sling/org.apache.sling.fragment.transaction/1.0.0
     org.apache.sling/org.apache.sling.javax.activation/0.1.0
     org.apache.sling/org.apache.sling.fragment.ws/1.0.2
-    org.apache.sling/org.apache.sling.launchpad.installer/1.2.0
-    org.apache.sling/org.apache.sling.installer.core/3.5.4
+    org.apache.sling/org.apache.sling.launchpad.installer/1.2.2
+    org.apache.sling/org.apache.sling.installer.core/3.6.2
     org.apache.sling/org.apache.sling.installer.provider.file/1.0.4
-    org.apache.felix/org.apache.felix.configadmin/1.6.0
+    org.apache.felix/org.apache.felix.configadmin/1.8.2
     org.apache.felix/org.apache.felix.eventadmin/1.4.2

Modified: sling/trunk/launchpad/slingstart/src/main/provisioning/launchpad.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/provisioning/launchpad.txt?rev=1666656&r1=1666655&r2=1666656&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/provisioning/launchpad.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/provisioning/launchpad.txt Sat Mar 14 11:48:37
2015
@@ -2,4 +2,4 @@
 # Only a single artifact is allowed within this feature.
 #
 [feature name=:launchpad]
-    org.apache.sling/org.apache.sling.launchpad.base/4.6.0-2.5.6
+    org.apache.sling/org.apache.sling.launchpad.base/4.6.1-2.5.9-SNAPSHOT

Modified: sling/trunk/launchpad/slingstart/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/provisioning/oak.txt?rev=1666656&r1=1666655&r2=1666656&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/provisioning/oak.txt Sat Mar 14 11:48:37 2015
@@ -1,19 +1,55 @@
 # This is the OAK feature.
 [feature name=oak]
-# All bundles are defined to be started at start level 15
+
+[variables]
+    oak.version=1.0.9
+
 # The segment node store is used via a configuration
+[artifacts startLevel=1 runModes=oak]
+    org.apache.felix/org.apache.felix.jaas/0.0.2
+
 [artifacts startLevel=15 runModes=oak]
     org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT
     com.google.guava/guava/15.0
-    org.apache.jackrabbit/oak-core/1.0.0
-    org.apache.jackrabbit/oak-commons/1.0.0
-    org.apache.jackrabbit/oak-mk/1.0.0
-    org.apache.jackrabbit/oak-mk-api/1.0.0
-    org.apache.jackrabbit/oak-mk-remote/1.0.0
-    org.apache.jackrabbit/oak-lucene/1.0.0
-    org.apache.jackrabbit/oak-blob/1.0.0
+    org.apache.jackrabbit/oak-core/${oak.version}
+    org.apache.jackrabbit/oak-commons/${oak.version}
+    org.apache.jackrabbit/oak-mk-api/${oak.version}
+    org.apache.jackrabbit/oak-lucene/${oak.version}
+    org.apache.jackrabbit/oak-blob/${oak.version}
 
 [configurations runModes=oak]
+  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"
+  
   org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
     name="Default\ NodeStore"
     repository.home="sling/oak/repository"
+
+  org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl
+    org.apache.jackrabbit.oak.authentication.configSpiName="FelixJaasProvider"
+
+  org.apache.jackrabbit.oak.security.user.UserConfigurationImpl
+    groupsPath="/home/groups"
+    usersPath="/home/users"
+    defaultDepth="1"
+    importBehavior="besteffort"  
+
+  org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider
+    enabledActions=["org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction"]
+    userPrivilegeNames=["jcr:all"]
+    groupPrivilegeNames=["jcr:read"]
\ No newline at end of file

Modified: sling/trunk/launchpad/slingstart/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/provisioning/sling.txt?rev=1666656&r1=1666655&r2=1666656&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/provisioning/sling.txt Sat Mar 14 11:48:37 2015
@@ -2,7 +2,6 @@
 [feature name=sling]
 
 [artifacts]
-    commons-io/commons-io/1.4
     commons-fileupload/commons-fileupload/1.3.1
     commons-collections/commons-collections/3.2.1
     commons-codec/commons-codec/1.9
@@ -15,24 +14,24 @@
     org.apache.sling/org.apache.sling.commons.mime/2.1.8
     org.apache.sling/org.apache.sling.commons.classloader/1.3.2
     org.apache.sling/org.apache.sling.commons.compiler/2.2.0
-    org.apache.sling/org.apache.sling.commons.scheduler/2.4.4
+    org.apache.sling/org.apache.sling.commons.scheduler/2.4.6
     org.apache.sling/org.apache.sling.commons.threads/3.2.0
-    org.apache.sling/org.apache.sling.discovery.api/1.0.0
+    org.apache.sling/org.apache.sling.discovery.api/1.0.2
     org.apache.sling/org.apache.sling.discovery.support/1.0.0
-    org.apache.sling/org.apache.sling.discovery.impl/1.0.10
-    org.apache.sling/org.apache.sling.event/3.3.14
-    org.apache.sling/org.apache.sling.api/2.8.0
-    org.apache.sling/org.apache.sling.serviceusermapper/1.0.2
-    org.apache.sling/org.apache.sling.resourceresolver/1.1.4
-    org.apache.sling/org.apache.sling.auth.core/1.3.0
-    org.apache.sling/org.apache.sling.engine/2.3.6
-    org.apache.sling/org.apache.sling.auth.form/1.0.6
-    org.apache.sling/org.apache.sling.adapter/2.1.2
-    org.apache.sling/org.apache.sling.servlets.resolver/2.3.2
-    org.apache.sling/org.apache.sling.servlets.get/2.1.10
-    org.apache.sling/org.apache.sling.servlets.post/2.3.6
+    org.apache.sling/org.apache.sling.discovery.impl/1.0.12
+    org.apache.sling/org.apache.sling.event/3.5.4
+    org.apache.sling/org.apache.sling.api/2.9.0
+    org.apache.sling/org.apache.sling.serviceusermapper/1.2.1-SNAPSHOT
+    org.apache.sling/org.apache.sling.resourceresolver/1.2.3-SNAPSHOT
+    org.apache.sling/org.apache.sling.auth.core/1.3.6
+    org.apache.sling/org.apache.sling.engine/2.4.0
+    org.apache.sling/org.apache.sling.auth.form/1.0.7-SNAPSHOT
+    org.apache.sling/org.apache.sling.adapter/2.1.5-SNAPSHOT
+    org.apache.sling/org.apache.sling.servlets.resolver/2.3.6
+    org.apache.sling/org.apache.sling.servlets.get/2.1.11-SNAPSHOT
+    org.apache.sling/org.apache.sling.servlets.post/2.3.7-SNAPSHOT
     org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10
-    org.apache.sling/org.apache.sling.jcr.resource/2.3.8
+    org.apache.sling/org.apache.sling.jcr.resource/2.5.0
     org.apache.sling/org.apache.sling.jcr.classloader/3.2.2
     org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
     org.apache.sling/org.apache.sling.fsresource/1.1.4
@@ -43,11 +42,11 @@
     org.apache.sling/org.apache.sling.scripting.jsp/2.1.4
     org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4
     org.apache.geronimo.bundles/jstl/1.2_1
-    org.apache.sling/org.apache.sling.models.api/1.1.0
-    org.apache.sling/org.apache.sling.models.impl/1.1.0
-    org.apache.felix/org.apache.felix.http.whiteboard/2.2.0
+    org.apache.sling/org.apache.sling.models.api/1.1.1-SNAPSHOT
+    org.apache.sling/org.apache.sling.models.impl/1.1.1-SNAPSHOT
+    org.apache.felix/org.apache.felix.http.whiteboard/2.3.2
     org.apache.sling/org.apache.sling.installer.console/1.0.0
-    org.apache.sling/org.apache.sling.installer.factory.configuration/1.0.14
+    org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
     org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.8
 
 [artifacts startLevel=5]
@@ -62,7 +61,7 @@
     org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.0
     org.apache.felix/org.apache.felix.webconsole.plugins.event/1.0.2
     org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.4
-    org.apache.sling/org.apache.sling.commons.json/2.0.8
+    org.apache.sling/org.apache.sling.commons.json/2.0.11-SNAPSHOT
     org.apache.felix/org.apache.felix.bundlerepository/1.6.4
     org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
     org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
@@ -79,6 +78,7 @@
     org.apache.tika/tika-bundle/1.2
 
 [artifacts startLevel=15]
+    commons-io/commons-io/1.4
     org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
     org.apache.sling/org.apache.sling.jcr.api/2.2.0
     org.apache.sling/org.apache.sling.jcr.base/2.2.2
@@ -91,7 +91,7 @@
     org.apache.jackrabbit/jackrabbit-jcr-rmi/2.7.1
     org.apache.sling/org.apache.sling.jcr.webdav/2.2.2
     org.apache.sling/org.apache.sling.jcr.davex/1.2.2
-    org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.2
+    org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.3-SNAPSHOT
     org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2
 
 

Modified: sling/trunk/launchpad/slingstart/src/main/provisioning/standalone.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/provisioning/standalone.txt?rev=1666656&r1=1666655&r2=1666656&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/provisioning/standalone.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/provisioning/standalone.txt Sat Mar 14 11:48:37
2015
@@ -4,6 +4,6 @@
 
 # Add a servlet implementation for the standalone case
 [artifacts startLevel=5 runModes=:standalone]
-    org.apache.felix/org.apache.felix.http.api/2.3.0
-    org.apache.felix/org.apache.felix.http.servlet-api/1.0.0
-    org.apache.felix/org.apache.felix.http.jetty/2.3.0
+    org.apache.felix/org.apache.felix.http.api/2.3.2
+    org.apache.felix/org.apache.felix.http.servlet-api/1.1.0
+    org.apache.felix/org.apache.felix.http.jetty/3.0.2



Mime
View raw message