This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-integration-tests.git
The following commit(s) were added to refs/heads/master by this push:
new 9fa31bf SLING-13117 deprecated repository, ITs are now part of the
impl repository
9fa31bf is described below
commit 9fa31bf23f34cc8b04236309d850e61b5c7ac0e3
Author: Stefan Seifert <[email protected]>
AuthorDate: Mon Feb 16 14:24:18 2026 +0100
SLING-13117 deprecated repository, ITs are now part of the impl repository
---
.asf.yaml | 6 +
CODE_OF_CONDUCT.md | 22 --
CONTRIBUTING.md | 24 --
Jenkinsfile | 20 --
README.md | 8 +-
bnd.bnd | 3 -
pom.xml | 298 ---------------------
.../sling/caconfig/it/example/SimpleConfig.java | 34 ---
.../sling/caconfig/it/example/package-info.java | 21 --
.../sling/caconfig/it/AdaptToConfigClassIT.java | 94 -------
.../sling/caconfig/it/ConfigurationManagerIT.java | 162 -----------
.../it/ConfigurationMetadataProviderIT.java | 43 ---
.../it/ConfigurationResolverConfigClassIT.java | 97 -------
.../it/ConfigurationResolverValueMapIT.java | 95 -------
.../org/apache/sling/caconfig/it/TestUtils.java | 67 -----
.../junit/teleporter/customizers/ITCustomizer.java | 57 ----
src/test/provisioning/sling-caconfig..txt | 45 ----
src/test/provisioning/sling.txt | 40 ---
18 files changed, 9 insertions(+), 1127 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 1da7e03..978246d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,4 +1,10 @@
github:
+ description: "Apache Sling Context-Aware Configuration Integration Tests
(deprecated)"
+ homepage: "https://sling.apache.org/"
+ labels:
+ - "sling"
+ - "java"
+ - "deprecated"
autolink_jira:
- "SLING"
- "OAK"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 0fa18e5..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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.
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Apache Software Foundation Code of Conduct
-====
-
-Being an Apache project, Apache Sling adheres to the Apache Software
Foundation's [Code of
Conduct](https://www.apache.org/foundation/policies/conduct.html).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index ac82a1a..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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.
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Contributing
-====
-
-Thanks for choosing to contribute!
-
-You will find all the necessary details about how you can do this at
https://sling.apache.org/contributing.html.
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index f582519..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * 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.
- */
-
-slingOsgiBundleBuild()
diff --git a/README.md b/README.md
index 45ffaf2..52b7dd1 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
[](https://sling.apache.org)
- [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-caconfig-integration-tests/job/master/) [](https://ci-builds.apache.org/job/Sli
[...]
+# Apache Sling Context-Aware Configuration Integration Tests (deprecated)
-# Apache Sling Context-Aware Configuration Integration Tests
+This module is **obsolete**.
-This module is part of the [Apache Sling](https://sling.apache.org) project.
-
-Documentation: [Apache Sling Context-Aware
Configuration](https://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration.html)
+For reference or potential bugfix releases use branch
[maintenance](https://github.com/apache/sling-org-apache-sling-nosql-generic/tree/maintenance).
\ No newline at end of file
diff --git a/bnd.bnd b/bnd.bnd
deleted file mode 100644
index 230cd3e..0000000
--- a/bnd.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Sling-Test-Regexp: .*Test
-
--plugin.slingcaconfig:
org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 8110b42..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?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
https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-bundle-parent</artifactId>
- <version>46</version>
- <relativePath/>
- </parent>
-
- <artifactId>org.apache.sling.caconfig.integration-tests</artifactId>
- <version>1-SNAPSHOT</version>
-
- <name>Apache Sling Context-Aware Configuration Integration Tests</name>
- <description>Integration tests for the Apache Sling Context-Aware
Configuration Implementation</description>
-
- <properties>
- <sling.java.version>8</sling.java.version>
- <!-- start with -DkeepITServerRunning=true to allow to rerun ITs or
inspect the server after the ITs have been executed there -->
- <keepITServerRunning>false</keepITServerRunning>
-
<project.build.outputTimestamp>2021-12-15T00:00:00Z</project.build.outputTimestamp>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.sling</groupId>
-
<artifactId>org.apache.sling.caconfig.bnd-plugin</artifactId>
- <version>1.0.2</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-baseline-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
- <plugin>
- <!-- Find free ports to run our server -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-server-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <!-- reserved port must be stored in property
because it must be passed to the slingstart-maven-plugin -->
- <portName>http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <!-- the Sling instance is provisioned from the model in
src/main/provisioning/model.txt -->
- <groupId>org.apache.sling</groupId>
- <artifactId>slingstart-maven-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>prepare-launchpad-package</id>
- <goals>
- <goal>prepare-package</goal>
- </goals>
- <phase>pre-integration-test</phase>
- </execution>
- <execution>
- <id>build-launchpad-package</id>
- <goals>
- <goal>package</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <attachArtifact>false</attachArtifact>
- </configuration>
- </execution>
- <execution>
- <id>start-container-before-IT</id>
- <goals>
- <goal>start</goal>
- </goals>
- <configuration>
- </configuration>
- </execution>
- <execution>
- <id>stop-container-after-IT</id>
- <goals>
- <goal>stop</goal>
- </goals>
- <configuration>
-
<shouldBlockUntilKeyIsPressed>${keepITServerRunning}</shouldBlockUntilKeyIsPressed>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <servers>
- <!-- this configuration applies to both 'start' and
'stop' -->
- <server>
- <id>singleinstance</id>
- <port>${http.port}</port>
- <vmOpts>${sling.vm.options}</vmOpts>
- <stdOutFile>sling/logs/stdout.log</stdOutFile>
- </server>
- </servers>
- <!-- this configuration only applies to 'prepare-package'
and 'package' -->
-
<disableExtendingMavenClasspath>true</disableExtendingMavenClasspath>
- <usePomDependencies>true</usePomDependencies>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <systemProperties>
- <http.port>${http.port}</http.port>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
-
<launchpad.http.server.url>http://localhost:${http.port}</launchpad.http.server.url>
-
<server.ready.timeout.seconds>120</server.ready.timeout.seconds>
- <server.ready.path.1>/starter/index.html:Getting
Started</server.ready.path.1>
- </systemPropertyVariables>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>infinitest.filters</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <!-- do not deploy this project into maven repository -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.caconfig.api</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.caconfig.spi</artifactId>
- <version>1.4.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.caconfig.impl</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.16.4</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Additional bundles needed by the Sling instance under test -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.junit.core</artifactId>
- <version>1.0.28</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.junit.teleporter</artifactId>
- <version>1.0.20</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.rules</artifactId>
- <version>1.0.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.tools</artifactId>
- <version>1.0.16</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.resourcebuilder</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/src/main/java/org/apache/sling/caconfig/it/example/SimpleConfig.java
b/src/main/java/org/apache/sling/caconfig/it/example/SimpleConfig.java
deleted file mode 100644
index b388a90..0000000
--- a/src/main/java/org/apache/sling/caconfig/it/example/SimpleConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.caconfig.it.example;
-
-import org.apache.sling.caconfig.annotation.Configuration;
-
-@Configuration
-public @interface SimpleConfig {
-
- String stringParam();
-
- String stringParamDefault() default "defValue";
-
- int intParam();
-
- boolean boolParam();
-
-}
diff --git
a/src/main/java/org/apache/sling/caconfig/it/example/package-info.java
b/src/main/java/org/apache/sling/caconfig/it/example/package-info.java
deleted file mode 100644
index 1217c94..0000000
--- a/src/main/java/org/apache/sling/caconfig/it/example/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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.
- */
-
-@Version("1.0")
-package org.apache.sling.caconfig.it.example;
-
-import org.osgi.annotation.versioning.Version;
diff --git
a/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java
b/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java
deleted file mode 100644
index cdcbe4f..0000000
--- a/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.caconfig.it;
-
-import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.cleanUp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.caconfig.ConfigurationBuilder;
-import org.apache.sling.caconfig.it.example.SimpleConfig;
-import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.resourcebuilder.api.ResourceBuilder;
-import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class AdaptToConfigClassIT {
-
- @Rule
- public TeleporterRule teleporter = TeleporterRule.forClass(getClass(),
"IT");
-
- private ResourceResolver resourceResolver;
- private ResourceBuilder resourceBuilder;
-
- private static final String PAGE_PATH = CONTENT_ROOT_PATH + "/page1";
- private static final String CONFIG_PATH = CONFIG_ROOT_PATH + "/page1";
-
- @Before
- public void setUp() throws Exception {
- resourceResolver =
teleporter.getService(ResourceResolverFactory.class).getServiceResourceResolver(null);
- resourceBuilder =
teleporter.getService(ResourceBuilderFactory.class).forResolver(resourceResolver);
- }
-
- @After
- public void tearDown() {
- cleanUp(resourceResolver);
- resourceResolver.close();
- }
-
- @Test
- @SuppressWarnings("null")
- public void testNonExistingConfig() throws Exception {
- Resource resourcePage1 =
resourceBuilder.resource(PAGE_PATH).getCurrentParent();
-
- SimpleConfig config =
resourcePage1.adaptTo(ConfigurationBuilder.class).as(SimpleConfig.class);
- assertNotNull(config);
-
- assertNull(config.stringParam());
- assertEquals(0, config.intParam());
- assertEquals(false, config.boolParam());
- }
-
- @Test
- @SuppressWarnings("null")
- public void testExistingConfig() throws Exception {
- resourceBuilder.resource(CONFIG_PATH +
"/sling:configs/org.apache.sling.caconfig.it.example.SimpleConfig",
- "stringParam", "value1",
- "intParam", 123,
- "boolParam", true)
- .resource(PAGE_PATH, "sling:configRef", CONFIG_PATH);
-
- Resource resourcePage1 = resourceResolver.getResource(PAGE_PATH);
-
- SimpleConfig config =
resourcePage1.adaptTo(ConfigurationBuilder.class).as(SimpleConfig.class);
- assertNotNull(config);
-
- assertEquals("value1", config.stringParam());
- assertEquals(123, config.intParam());
- assertEquals(true, config.boolParam());
- }
-
-}
diff --git
a/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java
b/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java
deleted file mode 100644
index 354c86c..0000000
--- a/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.caconfig.it;
-
-import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.cleanUp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.caconfig.ConfigurationResolver;
-import org.apache.sling.caconfig.it.example.SimpleConfig;
-import org.apache.sling.caconfig.management.ConfigurationData;
-import org.apache.sling.caconfig.management.ConfigurationManager;
-import org.apache.sling.caconfig.spi.ConfigurationCollectionPersistData;
-import org.apache.sling.caconfig.spi.ConfigurationPersistData;
-import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.resourcebuilder.api.ResourceBuilder;
-import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class ConfigurationManagerIT {
-
- @Rule
- public TeleporterRule teleporter = TeleporterRule.forClass(getClass(),
"IT");
-
- private ResourceResolver resourceResolver;
- private ResourceBuilder resourceBuilder;
- private ConfigurationManager configManager;
- private ConfigurationResolver configResolver;
-
- private static final String PAGE_PATH = CONTENT_ROOT_PATH + "/page1";
- private static final String CONFIG_PATH = CONFIG_ROOT_PATH + "/page1";
- private static final String CONFIG_NAME = SimpleConfig.class.getName();
-
- private Resource resourcePage1;
-
- @Before
- public void setUp() throws Exception {
- resourceResolver =
teleporter.getService(ResourceResolverFactory.class).getServiceResourceResolver(null);
- resourceBuilder =
teleporter.getService(ResourceBuilderFactory.class).forResolver(resourceResolver);
- configManager = teleporter.getService(ConfigurationManager.class);
- configResolver = teleporter.getService(ConfigurationResolver.class);
-
- resourcePage1 = resourceBuilder.resource(PAGE_PATH, "sling:configRef",
CONFIG_PATH).getCurrentParent();
- }
-
- @After
- public void tearDown() {
- cleanUp(resourceResolver);
- resourceResolver.close();
- }
-
- @Test
- public void testNonExistingConfig() throws Exception {
- ConfigurationData config =
configManager.getConfiguration(resourcePage1, CONFIG_NAME);
- assertNotNull(config);
-
- ValueMap props = config.getEffectiveValues();
- assertNull(props.get("stringParam", String.class));
- assertEquals("defValue", props.get("stringParamDefault",
String.class));
- assertEquals(0, (int)props.get("intParam", 0));
- assertEquals(false, props.get("boolParam", false));
- }
-
- @Test
- public void testExistingConfig() throws Exception {
- resourceBuilder.resource(CONFIG_PATH + "/sling:configs/" + CONFIG_NAME,
- "stringParam", "value1",
- "intParam", 123,
- "boolParam", true);
-
- ConfigurationData config =
configManager.getConfiguration(resourcePage1, CONFIG_NAME);
- assertNotNull(config);
-
- ValueMap props = config.getEffectiveValues();
- assertEquals("value1", props.get("stringParam", String.class));
- assertEquals("defValue", props.get("stringParamDefault",
String.class));
- assertEquals(123, (int)props.get("intParam", 0));
- assertEquals(true, props.get("boolParam", false));
- }
-
- @Test
- public void testWriteConfig() throws Exception {
- // write configuration data via configuration manager
- Map<String,Object> values = new HashMap<>();
- values.put("stringParam", "valueA");
- values.put("stringParamDefault", "valueB");
- values.put("intParam", 55);
- values.put("boolParam", true);
- configManager.persistConfiguration(resourcePage1, CONFIG_NAME, new
ConfigurationPersistData(values));
- resourceResolver.commit();
-
- // read config via configuration resolver
- SimpleConfig config =
configResolver.get(resourcePage1).as(SimpleConfig.class);
- assertNotNull(config);
-
- assertEquals("valueA", config.stringParam());
- assertEquals("valueB", config.stringParamDefault());
- assertEquals(55, config.intParam());
- assertEquals(true, config.boolParam());
- }
-
- @Test
- public void testWriteConfigCollection() throws Exception {
- // write configuration data via configuration manager
- Map<String,Object> values1 = new HashMap<>();
- values1.put("stringParam", "valueA");
- values1.put("stringParamDefault", "valueB");
- Map<String,Object> values2 = new HashMap<>();
- values2.put("intParam", 55);
- values2.put("boolParam", true);
- List<ConfigurationPersistData> items = new ArrayList<>();
- items.add(new
ConfigurationPersistData(values1).collectionItemName("item1"));
- items.add(new
ConfigurationPersistData(values2).collectionItemName("item2"));
- configManager.persistConfigurationCollection(resourcePage1,
CONFIG_NAME, new ConfigurationCollectionPersistData(items));
- resourceResolver.commit();
-
- // read config via configuration resolver
- Collection<SimpleConfig> config =
configResolver.get(resourcePage1).asCollection(SimpleConfig.class);
- assertEquals(2, config.size());
-
- Iterator<SimpleConfig> configIterator = config.iterator();
- SimpleConfig config1 = configIterator.next();
- SimpleConfig config2 = configIterator.next();
-
- assertEquals("valueA", config1.stringParam());
- assertEquals("valueB", config1.stringParamDefault());
- assertEquals(55, config2.intParam());
- assertEquals(true, config2.boolParam());
- }
-
-}
diff --git
a/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java
b/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java
deleted file mode 100644
index 294cda4..0000000
---
a/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.caconfig.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.sling.caconfig.it.example.SimpleConfig;
-import org.apache.sling.caconfig.spi.ConfigurationMetadataProvider;
-import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata;
-import org.apache.sling.junit.rules.TeleporterRule;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class ConfigurationMetadataProviderIT {
-
- @Rule
- public TeleporterRule teleporter = TeleporterRule.forClass(getClass(),
"IT");
-
- @Test
- public void testConfigurationMetadata() {
- ConfigurationMetadataProvider underTest =
teleporter.getService(ConfigurationMetadataProvider.class);
-
- ConfigurationMetadata configMetadata =
underTest.getConfigurationMetadata(SimpleConfig.class.getName());
- assertNotNull(configMetadata);
- assertEquals(SimpleConfig.class.getName(), configMetadata.getName());
- }
-
-}
diff --git
a/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java
b/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java
deleted file mode 100644
index 09a69fd..0000000
---
a/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.caconfig.it;
-
-import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.cleanUp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.caconfig.ConfigurationResolver;
-import org.apache.sling.caconfig.it.example.SimpleConfig;
-import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.resourcebuilder.api.ResourceBuilder;
-import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class ConfigurationResolverConfigClassIT {
-
- @Rule
- public TeleporterRule teleporter = TeleporterRule.forClass(getClass(),
"IT");
-
- private ResourceResolver resourceResolver;
- private ResourceBuilder resourceBuilder;
-
- private static final String PAGE_PATH = CONTENT_ROOT_PATH + "/page1";
- private static final String CONFIG_PATH = CONFIG_ROOT_PATH + "/page1";
-
- @Before
- public void setUp() throws Exception {
- resourceResolver =
teleporter.getService(ResourceResolverFactory.class).getServiceResourceResolver(null);
- resourceBuilder =
teleporter.getService(ResourceBuilderFactory.class).forResolver(resourceResolver);
- }
-
- @After
- public void tearDown() {
- cleanUp(resourceResolver);
- resourceResolver.close();
- }
-
- @Test
- public void testNonExistingConfig() throws Exception {
- Resource resourcePage1 =
resourceBuilder.resource(PAGE_PATH).getCurrentParent();
-
- ConfigurationResolver configResolver =
teleporter.getService(ConfigurationResolver.class);
- SimpleConfig config =
configResolver.get(resourcePage1).name("test").as(SimpleConfig.class);
- assertNotNull(config);
-
- assertNull(config.stringParam());
- assertEquals("defValue", config.stringParamDefault());
- assertEquals(0, config.intParam());
- assertEquals(false, config.boolParam());
- }
-
- @Test
- @SuppressWarnings("null")
- public void testExistingConfig() throws Exception {
- resourceBuilder.resource(CONFIG_PATH + "/sling:configs/test",
- "stringParam", "value1",
- "intParam", 123,
- "boolParam", true)
- .resource(PAGE_PATH, "sling:configRef", CONFIG_PATH);
-
- Resource resourcePage1 = resourceResolver.getResource(PAGE_PATH);
-
- ConfigurationResolver configResolver =
teleporter.getService(ConfigurationResolver.class);
- SimpleConfig config =
configResolver.get(resourcePage1).name("test").as(SimpleConfig.class);
- assertNotNull(config);
-
- assertEquals("value1", config.stringParam());
- assertEquals("defValue", config.stringParamDefault());
- assertEquals(123, config.intParam());
- assertEquals(true, config.boolParam());
- }
-
-}
diff --git
a/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java
b/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java
deleted file mode 100644
index 195eb55..0000000
---
a/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.caconfig.it;
-
-import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH;
-import static org.apache.sling.caconfig.it.TestUtils.cleanUp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.caconfig.ConfigurationResolver;
-import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.resourcebuilder.api.ResourceBuilder;
-import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class ConfigurationResolverValueMapIT {
-
- @Rule
- public TeleporterRule teleporter = TeleporterRule.forClass(getClass(),
"IT");
-
- private ResourceResolver resourceResolver;
- private ResourceBuilder resourceBuilder;
-
- private static final String PAGE_PATH = CONTENT_ROOT_PATH + "/page1";
- private static final String CONFIG_PATH = CONFIG_ROOT_PATH + "/page1";
-
- @Before
- public void setUp() throws Exception {
- resourceResolver =
teleporter.getService(ResourceResolverFactory.class).getServiceResourceResolver(null);
- resourceBuilder =
teleporter.getService(ResourceBuilderFactory.class).forResolver(resourceResolver);
- }
-
- @After
- public void tearDown() {
- cleanUp(resourceResolver);
- resourceResolver.close();
- }
-
- @Test
- public void testNonExistingConfig() throws Exception {
- Resource resourcePage1 =
resourceBuilder.resource(PAGE_PATH).getCurrentParent();
-
- ConfigurationResolver configResolver =
teleporter.getService(ConfigurationResolver.class);
- ValueMap props =
configResolver.get(resourcePage1).name("test").asValueMap();
- assertNotNull(props);
-
- assertNull(props.get("stringParam", String.class));
- assertEquals(0, (int)props.get("intParam", 0));
- assertEquals(false, props.get("boolParam", false));
- }
-
- @Test
- @SuppressWarnings("null")
- public void testExistingConfig() throws Exception {
- resourceBuilder.resource(CONFIG_PATH + "/sling:configs/test",
- "stringParam", "value1",
- "intParam", 123,
- "boolParam", true)
- .resource(PAGE_PATH, "sling:configRef", CONFIG_PATH);
-
- Resource resourcePage1 = resourceResolver.getResource(PAGE_PATH);
-
- ConfigurationResolver configResolver =
teleporter.getService(ConfigurationResolver.class);
- ValueMap props =
configResolver.get(resourcePage1).name("test").asValueMap();
- assertNotNull(props);
-
- assertEquals("value1", props.get("stringParam", String.class));
- assertEquals(123, (int)props.get("intParam", 0));
- assertEquals(true, props.get("boolParam", false));
- }
-
-}
diff --git a/src/test/java/org/apache/sling/caconfig/it/TestUtils.java
b/src/test/java/org/apache/sling/caconfig/it/TestUtils.java
deleted file mode 100644
index 6b54c9f..0000000
--- a/src/test/java/org/apache/sling/caconfig/it/TestUtils.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.caconfig.it;
-
-import org.apache.sling.api.resource.PersistenceException;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class TestUtils {
-
- /**
- * Root path for test content
- */
- public static final String CONTENT_ROOT_PATH = "/content/test";
-
- /**
- * Root path for config content
- */
- public static final String CONFIG_ROOT_PATH = "/conf/test";
-
- private static final Logger log = LoggerFactory.getLogger(TestUtils.class);
-
- private TestUtils() {
- // static methods only
- }
-
- public static void cleanUp(ResourceResolver resourceResolver) {
- deletePath(resourceResolver, CONTENT_ROOT_PATH);
- deletePath(resourceResolver, CONFIG_ROOT_PATH);
- try {
- resourceResolver.commit();
- }
- catch (PersistenceException ex) {
- log.error("Unable clean up resources.", ex);
- }
- }
-
- public static void deletePath(ResourceResolver resourceResolver, String
path) {
- Resource resource = resourceResolver.getResource(path);
- if (resource != null) {
- try {
- resourceResolver.delete(resource);
- }
- catch (PersistenceException ex) {
- log.error("Unable to delete resource " + path, ex);
- }
- }
- }
-}
diff --git
a/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
b/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
deleted file mode 100644
index c90081b..0000000
---
a/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.junit.teleporter.customizers;
-
-import java.net.URI;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.sling.caconfig.impl.ConfigurationBuilderAdapterFactory;
-import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.testing.clients.ClientException;
-import org.apache.sling.testing.clients.osgi.OsgiConsoleClient;
-import org.apache.sling.testing.teleporter.client.ClientSideTeleporter;
-import org.apache.sling.testing.tools.sling.SlingTestBase;
-import org.apache.sling.testing.tools.sling.TimeoutsProvider;
-
-public class ITCustomizer implements TeleporterRule.Customizer {
-
- private final static SlingTestBase S = new SlingTestBase();
-
- private static final Class[] EXPECTED_COMPONENTS = new Class[] {
- ConfigurationBuilderAdapterFactory.class
- };
-
- @Override
- public void customize(TeleporterRule t, String options) {
- final ClientSideTeleporter cst = (ClientSideTeleporter)t;
- cst.setBaseUrl(S.getServerBaseUrl());
- cst.setServerCredentials(S.getServerUsername(), S.getServerPassword());
-
cst.setTestReadyTimeoutSeconds(TimeoutsProvider.getInstance().getTimeout(5));
- cst.includeDependencyPrefix("org.apache.sling.caconfig.it");
-
- // additionally check for the registration of mandatory sling models
components
- try {
- OsgiConsoleClient osgiClient = new
OsgiConsoleClient(URI.create(S.getServerBaseUrl()), S.getServerUsername(),
S.getServerPassword());
- for (Class clazz : EXPECTED_COMPONENTS) {
- osgiClient.waitComponentRegistered(clazz.getName(), 20000,
200);
- }
- } catch (ClientException | TimeoutException | InterruptedException ex)
{
- throw new RuntimeException("Error waiting for expected
components.", ex);
- }
- }
-
-}
diff --git a/src/test/provisioning/sling-caconfig..txt
b/src/test/provisioning/sling-caconfig..txt
deleted file mode 100644
index 1505e7e..0000000
--- a/src/test/provisioning/sling-caconfig..txt
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# 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.
-#
-#
-[feature name=sling-caconfig]
-
-[artifacts]
- org.apache.sling/org.apache.sling.caconfig.api
- org.apache.sling/org.apache.sling.caconfig.spi
- org.apache.sling/org.apache.sling.caconfig.impl
-
-[configurations]
- org.apache.sling.commons.log.LogManager.factory.config-slingconfig.log
- org.apache.sling.commons.log.names=["org.apache.sling.caconfig"]
- org.apache.sling.commons.log.file="logs/sling-contextaware-config.log"
- org.apache.sling.commons.log.level="debug"
-
-
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling-caconfig
- user.mapping=[
- "org.apache.sling.caconfig.impl\=sling-caconfig"
- ]
-
-[:repoinit]
- create service user sling-caconfig
-
- create path (sling:Folder) /conf
-
- set ACL for sling-caconfig
- allow jcr:read on /
- end
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
deleted file mode 100644
index ff79119..0000000
--- a/src/test/provisioning/sling.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 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.
-#
-
-# must be the same feature name as the feature defined in slingstart to allow
merging
-[feature name=sling]
-
-[artifacts]
- org.apache.sling/org.apache.sling.starter/11/slingstart
-
- # Additional test bundles
- org.apache.sling/org.apache.sling.junit.core
- org.apache.sling/org.apache.sling.resourcebuilder
- org.apache.sling/org.apache.sling.caconfig.integration-tests
-
-[configurations]
- # configure service user mapping for junit core (being used in the IT
itself)
-
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-junit
- user.mapping=["org.apache.sling.junit.core\=caconfig-it"]
-
-[:repoinit]
- create service user caconfig-it
- set ACL for caconfig-it
- allow jcr:all on /
- end