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-karaf-launchpad-oak-tar-integration-tests.git

commit a01873c82cc60ba5210d89a8c46ae418abed3fd0
Author: Oliver Lietz <[email protected]>
AuthorDate: Sun Jul 24 14:39:33 2016 +0000

    move karaf into root
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1753930 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                            | 299 +++++++++++++++++++++
 .../SlingLaunchpadOakTarConfiguration.java         |  79 ++++++
 2 files changed, 378 insertions(+)

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..2f3e424
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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/xsd/maven-4.0.0.xsd";>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.sling</groupId>
+    <artifactId>sling</artifactId>
+    <version>27</version>
+    <relativePath/>
+  </parent>
+
+  
<artifactId>org.apache.sling.karaf-launchpad-oak-tar-integration-tests</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+
+  <name>Apache Sling - Karaf Launchpad Integration Tests (Oak Tar)</name>
+  <description>Launchpad Integration Tests for Apache Sling with Oak Tar on 
Karaf</description>
+
+  <properties>
+    <org.apache.karaf.version>4.0.5</org.apache.karaf.version>
+    <org.ops4j.pax.exam.version>4.9.1</org.ops4j.pax.exam.version>
+  </properties>
+
+  <dependencies>
+    <!-- javax -->
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- OSGi -->
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.cmpn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- Apache Karaf -->
+    <dependency>
+      <groupId>org.apache.karaf</groupId>
+      <artifactId>apache-karaf</artifactId>
+      <type>tar.gz</type>
+      <version>${org.apache.karaf.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.karaf</groupId>
+          <artifactId>org.apache.karaf.client</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!-- Apache Sling -->
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.karaf-features</artifactId>
+      <version>0.1.1-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.servlets.compat</artifactId>
+      <version>1.0.2</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- bnd -->
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bndlib</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- testing -->
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.karaf-integration-tests</artifactId>
+      <version>0.1.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam</artifactId>
+      <version>${org.ops4j.pax.exam.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-karaf</artifactId>
+      <version>${org.ops4j.pax.exam.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <version>${org.ops4j.pax.exam.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
+      <version>1.0.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.junit.core</artifactId>
+      <version>1.0.16</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.junit.remote</artifactId>
+      <version>1.0.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.junit.scriptable</artifactId>
+      <version>1.0.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.launchpad.test-services</artifactId>
+      <version>2.0.10</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- TODO no release
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.launchpad.test-fragment</artifactId>
+      <version>2.0.9-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    -->
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.testing.tools</artifactId>
+      <version>1.0.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore-osgi</artifactId>
+      <version>4.4.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient-osgi</artifactId>
+      <version>4.5.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.ops4j.pax.exam</groupId>
+          <artifactId>exam-maven-plugin</artifactId>
+          <version>${org.ops4j.pax.exam.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.18.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>it</id>
+      <activation>
+        <jdk>[1.7,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>exam-maven-plugin</artifactId>
+            <configuration>
+              
<configClass>org.apache.sling.karaf.tests.configuration.SlingLaunchpadOakTarConfiguration</configClass>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>start-container</goal>
+                  <goal>stop-container</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.servicemix.tooling</groupId>
+            <artifactId>depends-maven-plugin</artifactId>
+            <version>1.2</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>generate-depends-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <systemPropertyVariables>
+                <jar.executor.server.port>8888</jar.executor.server.port>
+                <server.ready.path.1>/:script 
src="/system/sling.js"</server.ready.path.1>
+                
<server.ready.path.2>/.explorer.html:href="/libs/sling/explorer/css/explorer.css"</server.ready.path.2>
+                <server.ready.path.3>/sling-test/sling/sling-test.html:Sling 
client library tests</server.ready.path.3>
+                
<server.ready.timeout.seconds>120</server.ready.timeout.seconds>
+              </systemPropertyVariables>
+              <dependenciesToScan>
+                
<dependency>org.apache.sling:org.apache.sling.launchpad.integration-tests</dependency>
+              </dependenciesToScan>
+              <includes>
+                <include>**/*Test.class</include>
+              </includes>
+              <excludes>
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.*</exclude>
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/WarSelectorServletTest.*</exclude>
+                <!-- TODO PAXWEB-935 -->
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.*</exclude>
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.*</exclude>
+                <!-- TODO -->
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.*</exclude>
+                <!-- TODO OakAccess0000: Access denied -->
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.*</exclude>
+                <!-- TODO testWithJspForward: 404 -->
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.*</exclude>
+                <!-- SLING-5414 Launchpad/Provisioning Model only -->
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.*</exclude>
+                <!-- TODO -->
+                
<exclude>org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.*</exclude>
+                <!-- TODO repoinit -->
+                <exclude>**/RepoinitPathTest.*</exclude>
+                <exclude>**/SystemUsersTest.*</exclude>
+                <!-- TODO no release of 
org.apache.sling.launchpad.test-fragment -->
+                <exclude>**/ExportedPackagesTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
diff --git 
a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
 
b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
new file mode 100644
index 0000000..773bb50
--- /dev/null
+++ 
b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+package org.apache.sling.karaf.tests.configuration;
+
+import org.apache.sling.karaf.testing.KarafTestSupport;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+
+import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
+public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport {
+
+    @Configuration
+    public Option[] configuration() {
+        final int httpPort = 8888; // TODO findFreePort();
+        return OptionUtils.combine(baseConfiguration(),
+            cleanCaches(true),
+            editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", 
"log4j.rootLogger", "ERROR, out, sift, osgi:*"),
+            // configurations for tests
+            editConfigurationFilePut("etc/custom.properties", 
"sling.run.modes", "oak_tar"),
+            editConfigurationFilePut("etc/users.properties", "admin", 
"admin,_g_:admingroup"), // Sling’s default admin credentials used in tests
+            editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", 
"org.osgi.service.http.port", Integer.toString(httpPort)),
+            editConfigurationFilePut("etc/integrationTestsConfig.cfg", 
"message", "This test config should be loaded at startup"),
+            
editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.cfg",
 "servletresolver.cacheSize", "0"),
+            // TODO PAXWEB-935 
editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.cfg",
 "dav.root", "/dav"),
+            
editConfigurationFilePut("etc/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet.cfg",
 "alias", "/server"),
+            
editConfigurationFilePut("etc/org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge.cfg",
 "enabled", "true"),
+            addSlingFeatures(
+                "sling-launchpad-oak-tar",
+                "sling-extension-discovery-standalone",
+                "sling-extension-event",
+                "sling-extension-healthcheck",
+                "sling-launchpad-content",
+                "sling-auth-form",
+                "sling-auth-openid",
+                "sling-auth-selector",
+                "sling-scripting-groovy",
+                "sling-scripting-javascript",
+                "sling-scripting-jsp",
+                "sling-installer-provider-jcr",
+                "sling-jcr-jackrabbit-security",
+                "sling-jcr-repoinit"
+            ),
+            // misc (legacy, snapshots, ...) stuff
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").versionAsInProject(),
+            // test support
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.core").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.remote").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.scriptable").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-services").versionAsInProject(),
+            // TODO no release 
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(),
+            // TODO PAXWEB-935
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webdav").version("2.2.2")
+        );
+    }
+
+}

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to