Author: mpetria
Date: Wed Feb 3 12:21:10 2016
New Revision: 1728301
URL: http://svn.apache.org/viewvc?rev=1728301&view=rev
Log:
SLING-5479: running distribution its with launchapad 8 (Oak)
Modified:
sling/trunk/contrib/extensions/distribution/it/pom.xml
sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java
Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1728301&r1=1728300&r2=1728301&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Wed Feb 3 12:21:10
2016
@@ -72,18 +72,16 @@
<!-- Change this to use longer or shorter timeouts for testing -->
<sling.testing.timeout.multiplier>1.0</sling.testing.timeout.multiplier>
- <!-- Set this to run the executable jar in a specified filesystem
folder -->
- <jar.executor.work.folder />
-
+
<author.jar.executor.work.folder>${project.build.directory}/author</author.jar.executor.work.folder>
<!-- Options for the jar to execute. $JAREXEC_SERVER_PORT$ is replaced
by the
selected port number -->
- <author.jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$
-Dsling.run.modes=author -Dsling.home=sling/author
+ <author.jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$
-Dsling.run.modes=author
</author.jar.executor.jar.options>
+
+
<publish.jar.executor.work.folder>${project.build.directory}/publish</publish.jar.executor.work.folder>
<publish.jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$
-Dsling.run.modes=publish
- -Dsling.home=sling/publish
</publish.jar.executor.jar.options>
-
<!-- Change this to run selected tests only -->
<tests.to.run>**/**Test.java</tests.to.run>
</properties>
@@ -126,7 +124,6 @@
<configuration>
<excludes>
<exclude>derby.log</exclude>
- <exclude>sling/**</exclude>
<exclude>src/main/resources/SLING-CONTENT/libs/test/install.author/*.json</exclude>
</excludes>
</configuration>
@@ -135,21 +132,26 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
-
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <!-- sling folder is the workdir of the
executable jar that we test -->
- <include>sling/**</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>createFolders</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <mkdir
dir="${project.build.directory}/author"/>
+ <mkdir
dir="${project.build.directory}/publish"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -255,8 +257,10 @@
</author.jar.executor.jar.options>
<publish.jar.executor.jar.options>${publish.jar.executor.jar.options}
</publish.jar.executor.jar.options>
-
-
+
+
<author.jar.executor.work.folder>${author.jar.executor.work.folder}</author.jar.executor.work.folder>
+
<publish.jar.executor.work.folder>${publish.jar.executor.work.folder}</publish.jar.executor.work.folder>
+
<additional.bundles.path>
${project.build.directory},${project.build.directory}/sling/additional-bundles
</additional.bundles.path>
@@ -280,11 +284,6 @@
<sling.additional.bundle.1>httpcore-osgi</sling.additional.bundle.1>
<sling.additional.bundle.2>httpclient-osgi</sling.additional.bundle.2>
-
<sling.additional.bundle.30>org.apache.sling.jcr.resource</sling.additional.bundle.30>
-
<sling.additional.bundle.31>org.apache.sling.discovery.impl</sling.additional.bundle.31>
-
<sling.additional.bundle.32>org.apache.sling.serviceusermapper</sling.additional.bundle.32>
-
<sling.additional.bundle.33>org.apache.sling.jcr.api</sling.additional.bundle.33>
-
<sling.additional.bundle.34>org.apache.sling.jcr.base</sling.additional.bundle.34>
<sling.additional.bundle.35>org.apache.sling.event</sling.additional.bundle.35>
<sling.additional.bundle.4>org.apache.sling.hc.core</sling.additional.bundle.4>
<sling.additional.bundle.5>org.apache.jackrabbit.vault</sling.additional.bundle.5>
@@ -319,28 +318,6 @@
<version>2.2.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.discovery.impl</artifactId>
- <version>1.0.12</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.3.12</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.base</artifactId>
- <version>2.3.0</version>
- </dependency>
<!-- FILEVAULT -->
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
@@ -376,8 +353,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
- <classifier>standalone</classifier>
- <version>7</version>
+ <version>8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified:
sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java?rev=1728301&r1=1728300&r2=1728301&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java
(original)
+++
sling/trunk/contrib/extensions/distribution/sample/src/main/java/org/apache/sling/distribution/test/Init.java
Wed Feb 3 12:21:10 2016
@@ -27,6 +27,8 @@ import org.apache.jackrabbit.api.Jackrab
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
+
+import javax.jcr.RepositoryException;
import javax.jcr.security.Privilege;
import org.apache.jackrabbit.commons.JcrUtils;
@@ -59,18 +61,7 @@ public class Init {
JackrabbitSession jackrabittSession = (JackrabbitSession) session;
UserManager userManager = jackrabittSession.getUserManager();
- Authorizable serviceUser =
userManager.getAuthorizable(serviceUserName);
-
- if (serviceUser == null) {
- try {
- serviceUser =
userManager.createSystemUser(serviceUserName, null);
- log.info("created system user {}", serviceUserName);
-
- } catch (Throwable t) {
- serviceUser = userManager.createUser(serviceUserName,
"123");
- log.info("created regular user {}", serviceUserName);
- }
- }
+ User serviceUser = createOrGetServiceUser(userManager,
serviceUserName);
if (serviceUser != null) {
AccessControlUtils.addAccessControlEntry(session,
"/var/sling/distribution/packages", serviceUser.getPrincipal(), new String[]{
Privilege.JCR_ALL }, true);
@@ -79,12 +70,7 @@ public class Init {
}
- Authorizable distributorUser =
userManager.getAuthorizable(distributorUserName);
-
- if (distributorUser == null) {
- distributorUser = userManager.createUser(distributorUserName,
"123");
- log.info("created regular user {}", distributorUserName);
- }
+ Authorizable distributorUser = createOrGetRegularUser(userManager,
distributorUserName);
JcrUtils.getOrCreateByPath("/content", "sling:Folder", session);
@@ -97,11 +83,9 @@ public class Init {
}
- Authorizable defaultAgentUser =
userManager.getAuthorizable(defaultAgentUserName);
+ User defaultAgentUser = createOrGetServiceUser(userManager,
defaultAgentUserName);
- if (defaultAgentUser == null) {
- defaultAgentUser =
userManager.createUser(defaultAgentUserName, "123");
- log.info("created regular user {}", defaultAgentUserName);
+ if (defaultAgentUser != null) {
((User)
distributorUser).getImpersonation().grantImpersonation(defaultAgentUser.getPrincipal());
((User)
serviceUser).getImpersonation().grantImpersonation(defaultAgentUser.getPrincipal());
}
@@ -114,5 +98,37 @@ public class Init {
}
+ private User createOrGetServiceUser(UserManager userManager, String
serviceUserName) throws RepositoryException {
+ Authorizable serviceUser =
userManager.getAuthorizable(serviceUserName);
+
+ if (serviceUser == null) {
+ try {
+ serviceUser = userManager.createSystemUser(serviceUserName,
null);
+ log.info("created system user {}", serviceUserName);
+
+ } catch (Throwable t) {
+ serviceUser = userManager.createUser(serviceUserName, "123");
+ log.info("created regular user {}", serviceUserName);
+ }
+ }
+
+ return (User) serviceUser;
+
+ }
+
+ private User createOrGetRegularUser(UserManager userManager, String
userName) throws RepositoryException {
+ Authorizable serviceUser = userManager.getAuthorizable(userName);
+
+ if (serviceUser == null) {
+ serviceUser = userManager.createUser(userName, "123");
+ log.info("created regular user {}", userName);
+ }
+
+ return (User) serviceUser;
+
+ }
+
+
+
}
