You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/11/11 15:17:28 UTC
svn commit: r1713847 - in /sling/whiteboard/olli/settings: ./ base/
base/src/main/java/org/apache/sling/settings/base/ launchpad/
launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/
Author: olli
Date: Wed Nov 11 14:17:28 2015
New Revision: 1713847
URL: http://svn.apache.org/viewvc?rev=1713847&view=rev
Log:
add module org.apache.sling.settings.base
Added:
sling/whiteboard/olli/settings/base/pom.xml
Modified:
sling/whiteboard/olli/settings/base/src/main/java/org/apache/sling/settings/base/AbstractSlingSettingsService.java
sling/whiteboard/olli/settings/launchpad/pom.xml
sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java
sling/whiteboard/olli/settings/pom.xml
Added: sling/whiteboard/olli/settings/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/base/pom.xml?rev=1713847&view=auto
==============================================================================
--- sling/whiteboard/olli/settings/base/pom.xml (added)
+++ sling/whiteboard/olli/settings/base/pom.xml Wed Nov 11 14:17:28 2015
@@ -0,0 +1,102 @@
+<?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>25</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>org.apache.sling.settings.base</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.1.0-SNAPSHOT</version>
+
+ <name>Apache Sling Settings Base</name>
+ <description>
+ Settings support including run modes
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings
+ </url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>
+ http://sling.apache.org/documentation/bundles/sling-settings-orgapacheslingsettings.html
+ </Bundle-DocURL>
+ <DynamicImport-Package>
+ org.osgi.service.cm,
+ org.apache.felix.shell
+ </DynamicImport-Package>
+ <Import-Package>
+ org.osgi.service.cm;resolution:=optional,
+ org.apache.felix.shell;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings.api</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <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.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Modified: sling/whiteboard/olli/settings/base/src/main/java/org/apache/sling/settings/base/AbstractSlingSettingsService.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/base/src/main/java/org/apache/sling/settings/base/AbstractSlingSettingsService.java?rev=1713847&r1=1713846&r2=1713847&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/base/src/main/java/org/apache/sling/settings/base/AbstractSlingSettingsService.java (original)
+++ sling/whiteboard/olli/settings/base/src/main/java/org/apache/sling/settings/base/AbstractSlingSettingsService.java Wed Nov 11 14:17:28 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.settings.service;
+package org.apache.sling.settings.base;
import java.io.DataInputStream;
import java.io.DataOutputStream;
Modified: sling/whiteboard/olli/settings/launchpad/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/pom.xml?rev=1713847&r1=1713846&r2=1713847&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/pom.xml (original)
+++ sling/whiteboard/olli/settings/launchpad/pom.xml Wed Nov 11 14:17:28 2015
@@ -85,6 +85,11 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings.base</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings.common</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
Modified: sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java?rev=1713847&r1=1713846&r2=1713847&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java (original)
+++ sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java Wed Nov 11 14:17:28 2015
@@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.sling.launchpad.api.StartupHandler;
import org.apache.sling.launchpad.api.StartupMode;
import org.apache.sling.settings.SlingSettingsService;
-import org.apache.sling.settings.service.AbstractSlingSettingsService;
+import org.apache.sling.settings.base.AbstractSlingSettingsService;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: sling/whiteboard/olli/settings/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/pom.xml?rev=1713847&r1=1713846&r2=1713847&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/pom.xml (original)
+++ sling/whiteboard/olli/settings/pom.xml Wed Nov 11 14:17:28 2015
@@ -42,6 +42,7 @@
<modules>
<module>api</module>
+ <module>base</module>
<module>common</module>
<module>launchpad</module>
</modules>