You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ie...@apache.org on 2013/04/30 03:17:26 UTC

svn commit: r1477437 - in /sling/whiteboard/ieb/oak: ./ launchpad-compat/ launchpad-testing/ launchpad/ launchpad/src/main/resources/resources/config/

Author: ieb
Date: Tue Apr 30 01:17:26 2013
New Revision: 1477437

URL: http://svn.apache.org/r1477437
Log:
SLING-2788 Added compat, server starts. Added login modules. Added testing pom which doesnt quite start yet.

Added:
    sling/whiteboard/ieb/oak/launchpad-compat/
    sling/whiteboard/ieb/oak/launchpad-compat/pom.xml   (with props)
    sling/whiteboard/ieb/oak/launchpad-testing/
    sling/whiteboard/ieb/oak/launchpad-testing/pom.xml   (with props)
    sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.13f8d0ec-8a64-47d0-a99a-69fc6a9efd7b.config
    sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.b5448908-9b87-40f4-9129-630faa4b1d92.config
    sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.c2e6cfe6-ebce-43b4-880b-93b48dd22104.config
    sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.factory.config
Modified:
    sling/whiteboard/ieb/oak/launchpad/pom.xml
    sling/whiteboard/ieb/oak/pom.xml

Added: sling/whiteboard/ieb/oak/launchpad-compat/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad-compat/pom.xml?rev=1477437&view=auto
==============================================================================
--- sling/whiteboard/ieb/oak/launchpad-compat/pom.xml (added)
+++ sling/whiteboard/ieb/oak/launchpad-compat/pom.xml Tue Apr 30 01:17:26 2013
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>15</version>
+        <relativePath>../../../parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.apache.sling.oak.launchpad-compat</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>Apache Sling Oak Integration Testing Compatability bundle.</name>
+    <description>
+        This bundle provides a Compatability interfaces that allows the Sling Jackrabbit integration bundle to start without modification.
+        It does not, and should not attempt to fix tests that break once the integration tests are running.
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/whiteboard/ieb/oak/launchpad-compat</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/whiteboard/ieb/oak/launchpad-compat</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad-compat</url>
+    </scm>
+    <properties>
+        <sling.java.version>6</sling.java.version>
+    </properties>
+    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <!--  Just export the packages that are required to 
+                        make the integration bundles work and make any of their dependencies
+                        optional. If the tests are executed they will fail with a ClassDefNotFound exception.
+                        Or a class not found exception, but the testing bundles should start.  -->
+                        <Export-Package>
+                          org.apache.jackrabbit.server.io;version="1.5",
+                          org.apache.jackrabbit.webdav;version="1.5"
+                        </Export-Package>
+                        <Import-Package>
+                          org.apache.jackrabbit.*;resolution:=optional,
+                          org.apache.tika.*;resolution:=optional,
+                          *
+                        </Import-Package>
+                    </instructions>
+                </configuration>                
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <!-- OSGi Libraries not included here -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-jcr-server</artifactId>
+            <version>2.7-SNAPSHOT</version>
+        </dependency>
+        
+        <!-- servlet API for the web console plugin -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute</groupId>
+            <artifactId>bndlib</artifactId>
+        </dependency>
+ 
+        <dependency>
+        	<groupId>org.slf4j</groupId>
+        	<artifactId>slf4j-simple</artifactId>
+  		<scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
+</project>

Propchange: sling/whiteboard/ieb/oak/launchpad-compat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/whiteboard/ieb/oak/launchpad-compat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: sling/whiteboard/ieb/oak/launchpad-testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad-testing/pom.xml?rev=1477437&view=auto
==============================================================================
--- sling/whiteboard/ieb/oak/launchpad-testing/pom.xml (added)
+++ sling/whiteboard/ieb/oak/launchpad-testing/pom.xml Tue Apr 30 01:17:26 2013
@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>15</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.apache.sling.launchpad.oak-testing</artifactId>
+    <packaging>jar</packaging>
+    <version>7-SNAPSHOT</version>
+
+    <name>Apache Sling Launchpad Testing on Oak</name>
+    <description>
+        Sling Launchpad Testing module using Oak as a Repository, contains integration tests that
+        were previously in the launchpad webapp module.
+        
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/whiteboard/ieb/oak/launchpad/oak-testing</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/whiteboard/ieb/oak/launchpad/oak-testing</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad/oak-testing</url>
+    </scm>
+
+    <properties>
+        <!-- HTTP port to use when running mvn launchpad:run -->
+        <run.http.port>8888</run.http.port>
+
+        <!-- Timeout when checking for Sling readyness before starting tests -->
+        <HttpTestBase.readyTimeoutSeconds>62</HttpTestBase.readyTimeoutSeconds>
+
+        <!-- path suffix for HTTP access to Sling -->
+        <http.base.path />
+
+        <!-- path suffix for WebDAV access to the repository -->
+        <webdav.workspace.path />
+
+        <!-- hostname for integration tests -->
+        <test.host>localhost</test.host>
+
+        <!-- Defines which tests are for the "integration-testing" phase -->
+        <integration.test.code.path>
+            **/launchpad/webapp/integrationtest
+        </integration.test.code.path>
+
+        <!-- Set this to true to stop mvn once the integration test Jetty 
+            instance is started. Useful to manually test the integration testing webapp. -->
+        <integration.test.wait>false</integration.test.wait>
+
+        <resources.bundles.path>${project.build.directory}/launchpad-bundles/resources/bundles</resources.bundles.path>
+
+        <slf4j.version>1.5.11</slf4j.version>
+        <logback.version>0.9.20</logback.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${basedir}</directory>
+                            <includes>
+                                <include>derby.log</include>
+                                <include>cachedir</include>
+                                <include>sling</include>
+                                <include>jackrabbit</include>
+                                <include>coverage.ec</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>reserve-network-port</id>
+                        <goals>
+                            <goal>reserve-network-port</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <portNames>
+                                <portName>http.port</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifest>
+                            <addDefaultImplementationEntries>
+                                true
+                            </addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>maven-launchpad-plugin</artifactId>
+                <version>2.1.2</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>prepare-package</id>
+                        <goals>
+                            <goal>prepare-package</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-cli</id>
+                        <configuration>
+                            <httpPort>${run.http.port}</httpPort>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>attach-bundle-list</id>
+                        <goals>
+                            <goal>attach-bundle-list</goal>
+                        </goals>
+                        <configuration>
+                            <ignoreBundleListConfig>true</ignoreBundleListConfig>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <defaultBundleList>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>org.apache.sling.launchpad.oak</artifactId>
+                        <version>7-SNAPSHOT</version>
+                    </defaultBundleList>
+                    <additionalBundles>
+                        <bundle>
+                            <groupId>org.apache.sling</groupId>
+                            <artifactId>org.apache.sling.oak.launchpad-compat</artifactId>
+                            <version>0.0.1-SNAPSHOT</version>
+                        </bundle>
+                    </additionalBundles>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>org.apache.sling.launchpad.oak</artifactId>
+                        <version>7-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>emma-maven-plugin</artifactId>
+                <configuration>
+                    <filters>
+                        <filter>-*</filter>
+                    </filters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <!-- No javadocs -->
+                    <excludePackageNames>
+                        org.apache.sling
+                    </excludePackageNames>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <profiles>
+        <profile>
+            <!-- Run the integration tests. -->
+            <id>integrationTesting</id>
+            <activation>
+                <property>
+                    <name>!maven.test.skip</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>surefire-integration-test</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <!-- needed to make it possible to scan 
+                                        the jar -->
+                                    <useManifestOnlyJar>false</useManifestOnlyJar>
+
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>
+                                            **/launchpad/testing/TestAll.java
+                                        </include>
+                                    </includes>
+                                    <systemProperties>
+                                        <!-- WARNING: make sure these URLs 
+                                            are consistent with the maven-launchpad-plugin settings below. -->
+                                        <property>
+                                            <name>
+                                                launchpad.http.server.url
+                                            </name>
+                                            <value>
+                                                http://${test.host}:${http.port}/
+                                            </value>
+                                        </property>
+                                        <property>
+                                            <name>
+                                                launchpad.webdav.server.url
+                                            </name>
+                                            <value>
+                                                http://${test.host}:${http.port}/${webdav.workspace.path}
+                                            </value>
+                                        </property>
+                                        <property>
+                                            <name>HttpTestBase.readyTimeoutSeconds</name>
+                                            <value>
+                                                ${HttpTestBase.readyTimeoutSeconds}
+                                            </value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>maven-launchpad-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>start-container</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-container</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <httpPort>${http.port}</httpPort>
+                            <controlHost>${test.host}</controlHost>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <!-- By default, do not run the integration tests in the test 
+                phase, as they have no Sling instance to talk to. -->
+            <id>disableIntegrationTestsInTestPhase</id>
+            <activation>
+                <property>
+                    <name>!maven.test.skip</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>
+                                    ${integration.test.code.path}/**/*.java
+                                </exclude>
+                                <exclude>
+                                    **/launchpad/testing/TestAll.java
+                                </exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>pax-web</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>maven-launchpad-plugin</artifactId>
+                        <configuration>
+                            <jarWebSupport>
+                                <groupId>org.ops4j.pax.web</groupId>
+                                <artifactId>pax-web-service</artifactId>
+                                <version>0.6.0</version>
+                            </jarWebSupport>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>exclude-initial-content</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>maven-launchpad-plugin</artifactId>
+                        <configuration>
+                            <bundleExclusions>
+                                <bundle>
+                                    <groupId>org.apache.sling</groupId>
+                                    <artifactId>org.apache.sling.launchpad.content</artifactId>
+                                </bundle>
+                            </bundleExclusions>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>test-reactor-sling-bundles</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>maven-launchpad-plugin</artifactId>
+                        <configuration>
+                            <rewriteRuleFiles>
+                                <rewriteRuleFile>
+                                    ${basedir}/src/test/rules/reactor.drl
+                                </rewriteRuleFile>
+                            </rewriteRuleFiles>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>emma</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>maven-launchpad-plugin</artifactId>
+                        <configuration>
+                            <rewriteRuleFiles
+                                combine.children="append">
+                                <rewriteRuleFile>
+                                    ${basedir}/src/test/rules/emma.drl
+                                </rewriteRuleFile>
+                            </rewriteRuleFiles>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>emma</groupId>
+                                <artifactId>emma</artifactId>
+                                <version>2.0.5312</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>emma-report</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>emma-report</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>emma</mainClass>
+                                    <arguments>
+                                        <argument>report</argument>
+                                        <argument>-r</argument>
+                                        <argument>html</argument>
+                                        <argument>-in</argument>
+                                        <argument>${user.dir}/coverage.em,${user.dir}/coverage.ec</argument>
+                                        <argument>-sp</argument>
+                                        <argument>${sourceDirs}</argument>
+                                    </arguments>
+                                    <includePluginDependencies>true</includePluginDependencies>
+                                    <includeProjectDependencies>false</includeProjectDependencies>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>emma</groupId>
+                                <artifactId>emma</artifactId>
+                                <version>2.0.5312</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+
+        <!-- The integration tests -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
+            <version>1.0.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- The test services bundles -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
+
+        <!-- The basic Sling Oak App -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.oak</artifactId>
+            <version>7-SNAPSHOT</version>
+        </dependency>
+
+
+        <!-- Dependencies for the Test Build and Run -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.testing</artifactId>
+            <version>7-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+</project>

Propchange: sling/whiteboard/ieb/oak/launchpad-testing/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/whiteboard/ieb/oak/launchpad-testing/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: sling/whiteboard/ieb/oak/launchpad/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad/pom.xml?rev=1477437&r1=1477436&r2=1477437&view=diff
==============================================================================
--- sling/whiteboard/ieb/oak/launchpad/pom.xml (original)
+++ sling/whiteboard/ieb/oak/launchpad/pom.xml Tue Apr 30 01:17:26 2013
@@ -68,6 +68,12 @@
                             <packaging>jar</packaging>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>attach-bundle-list</id>
+                        <goals>
+                            <goal>attach-bundle-list</goal>
+                        </goals>
+                    </execution>
                 </executions>
                 <!-- Bind to the launchpad bundle list this jar should be 
                     based on. -->
@@ -130,7 +136,7 @@
                     </bundleExclusions>
                     <additionalBundles>
                         <bundle>
-                            <!--  required for SLING-2773 fix -->
+                            <!-- required for SLING-2773 fix -->
                             <groupId>org.apache.sling</groupId>
                             <artifactId>org.apache.sling.jcr.resource</artifactId>
                             <version>2.2.5-SNAPSHOT</version>
@@ -185,6 +191,11 @@
                             <artifactId>h2</artifactId>
                             <version>1.3.170</version>
                         </bundle>
+                        <bundle>
+                            <groupId>org.apache.felix</groupId>
+                            <artifactId>org.apache.felix.jaas</artifactId>
+                            <version>0.0.1-SNAPSHOT</version>
+                        </bundle>
                     </additionalBundles>
                 </configuration>
             </plugin>
@@ -250,5 +261,11 @@
             <artifactId>jackrabbit-jcr-commons</artifactId>
             <version>2.7-SNAPSHOT</version>
         </dependency>
+        <!-- Available from http://svn.apache.org/repos/asf/felix/trunk/jaas/ -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.jaas</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>

Added: sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.13f8d0ec-8a64-47d0-a99a-69fc6a9efd7b.config
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.13f8d0ec-8a64-47d0-a99a-69fc6a9efd7b.config?rev=1477437&view=auto
==============================================================================
--- sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.13f8d0ec-8a64-47d0-a99a-69fc6a9efd7b.config (added)
+++ sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.13f8d0ec-8a64-47d0-a99a-69fc6a9efd7b.config Tue Apr 30 01:17:26 2013
@@ -0,0 +1,7 @@
+service.pid="org.apache.felix.jaas.Configuration.factory.13f8d0ec-8a64-47d0-a99a-69fc6a9efd7b"
+jaas.classname="org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl"
+jaas.controlFlag="optional"
+jaas.ranking=I"0"
+service.factoryPid="org.apache.felix.jaas.Configuration.factory"
+jaas.realmName=""
+jaas.options=[""]

Added: sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.b5448908-9b87-40f4-9129-630faa4b1d92.config
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.b5448908-9b87-40f4-9129-630faa4b1d92.config?rev=1477437&view=auto
==============================================================================
--- sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.b5448908-9b87-40f4-9129-630faa4b1d92.config (added)
+++ sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.b5448908-9b87-40f4-9129-630faa4b1d92.config Tue Apr 30 01:17:26 2013
@@ -0,0 +1,7 @@
+service.pid="org.apache.felix.jaas.Configuration.factory.b5448908-9b87-40f4-9129-630faa4b1d92"
+jaas.classname="org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule"
+jaas.controlFlag="optional"
+jaas.ranking=I"0"
+service.factoryPid="org.apache.felix.jaas.Configuration.factory"
+jaas.realmName=""
+jaas.options=[""]

Added: sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.c2e6cfe6-ebce-43b4-880b-93b48dd22104.config
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.c2e6cfe6-ebce-43b4-880b-93b48dd22104.config?rev=1477437&view=auto
==============================================================================
--- sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.c2e6cfe6-ebce-43b4-880b-93b48dd22104.config (added)
+++ sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.c2e6cfe6-ebce-43b4-880b-93b48dd22104.config Tue Apr 30 01:17:26 2013
@@ -0,0 +1,7 @@
+service.pid="org.apache.felix.jaas.Configuration.factory.c2e6cfe6-ebce-43b4-880b-93b48dd22104"
+jaas.classname="org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule"
+jaas.controlFlag="optional"
+jaas.ranking=I"0"
+service.factoryPid="org.apache.felix.jaas.Configuration.factory"
+jaas.realmName=""
+jaas.options=[""]

Added: sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.factory.config
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.factory.config?rev=1477437&view=auto
==============================================================================
--- sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.factory.config (added)
+++ sling/whiteboard/ieb/oak/launchpad/src/main/resources/resources/config/org.apache.felix.jaas.Configuration.factory.factory.config Tue Apr 30 01:17:26 2013
@@ -0,0 +1,2 @@
+factory.pid="org.apache.felix.jaas.Configuration.factory"
+factory.pidList=["org.apache.felix.jaas.Configuration.factory.b5448908-9b87-40f4-9129-630faa4b1d92","org.apache.felix.jaas.Configuration.factory.13f8d0ec-8a64-47d0-a99a-69fc6a9efd7b","org.apache.felix.jaas.Configuration.factory.c2e6cfe6-ebce-43b4-880b-93b48dd22104"]

Modified: sling/whiteboard/ieb/oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/pom.xml?rev=1477437&r1=1477436&r2=1477437&view=diff
==============================================================================
--- sling/whiteboard/ieb/oak/pom.xml (original)
+++ sling/whiteboard/ieb/oak/pom.xml Tue Apr 30 01:17:26 2013
@@ -37,6 +37,7 @@
     <modules>
        <module>server</module>
        <module>launchpad</module>
+       <module>launchpad-compat</module>
     </modules>
 
 </project>