You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2016/09/06 17:18:15 UTC
[19/50] [abbrv] incubator-tamaya-sandbox git commit: TAMAYA-135:
Added mutability for configuration sources or mechanisms.
TAMAYA-135: Added mutability for configuration sources or mechanisms.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/570ef041
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/570ef041
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/570ef041
Branch: refs/heads/master
Commit: 570ef0416349ea9377cba0242efa0055834fd48b
Parents: 56f3d99
Author: anatole <an...@apache.org>
Authored: Sat Jan 16 07:39:34 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Sat Jan 16 07:39:34 2016 +0100
----------------------------------------------------------------------
integration/commons/pom.xml | 2 +-
integration/store/pom.xml | 80 -----------
.../org/apache/tamaya/store/PropertyStore.java | 64 ---------
.../tamaya/store/PropertyStoreProvider.java | 78 -----------
.../tamaya/store/WritablePropertySource.java | 66 ---------
.../store/spi/DefaultStoredPropertySource.java | 137 -------------------
.../store/spi/PropertyStoreProviderSpi.java | 34 -----
jodatime/pom.xml | 2 +-
metamodels/pom.xml | 2 +-
mutable-config/pom.xml | 81 -----------
.../tamaya/mutableconfig/ChangeSummary.java | 105 --------------
.../mutableconfig/ConfigChangeProvider.java | 50 -------
.../mutableconfig/ConfigChangeRequest.java | 136 ------------------
.../spi/ConfigurationChangeProviderSpi.java | 37 -----
pom.xml | 2 +-
sysprops/pom.xml | 2 +-
ui/pom.xml | 1 +
17 files changed, 6 insertions(+), 873 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/integration/commons/pom.xml
----------------------------------------------------------------------
diff --git a/integration/commons/pom.xml b/integration/commons/pom.xml
index 65d3203..2b5eda0 100644
--- a/integration/commons/pom.xml
+++ b/integration/commons/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-commons-config</artifactId>
- <name>Apache Tamaya Commons Configuration Integration</name>
+ <name>Apache Tamaya Commons Integration - Apache Commons</name>
<packaging>bundle</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/integration/store/pom.xml
----------------------------------------------------------------------
diff --git a/integration/store/pom.xml b/integration/store/pom.xml
deleted file mode 100644
index 0e8a546..0000000
--- a/integration/store/pom.xml
+++ /dev/null
@@ -1,80 +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 current 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.tamaya.ext</groupId>
- <artifactId>tamaya-integration-sandbox</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>tamaya-store</artifactId>
- <name>Apache Tamaya Storage/Cache/Datagrid Integration</name>
- <description>Integration with a Datagrid backend for distributed configuration.</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tamaya</groupId>
- <artifactId>tamaya-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spisupport</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-events</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.tamaya,
- org.apache.tamaya.spi,
- org.apache.tamaya.events,
- org.apache.tamaya.spisupport
- javax.annotation,
- *
- </Import-Package>
- <Export-Package>
- org.apache.tamaya.integration.store,
- org.apache.tamaya.integration.store.spi,
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/integration/store/src/main/java/org/apache/tamaya/store/PropertyStore.java
----------------------------------------------------------------------
diff --git a/integration/store/src/main/java/org/apache/tamaya/store/PropertyStore.java b/integration/store/src/main/java/org/apache/tamaya/store/PropertyStore.java
deleted file mode 100644
index d1d6adf..0000000
--- a/integration/store/src/main/java/org/apache/tamaya/store/PropertyStore.java
+++ /dev/null
@@ -1,64 +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.tamaya.store;
-
-import org.apache.tamaya.spi.PropertySource;
-
-import java.util.Map;
-
-/**
- * Simple abstraction of a property synchronization backend. Most methods are similar
- * to a {@link org.apache.tamaya.spi.PropertySource}, enhanced with methods for
- * updating the property storage.
- */
-public interface PropertyStore {
-
- /**
- * Get the store's name.
- * @return the name, never null.
- */
- String getName();
-
- /**
- * Stores the given PropertySource into the store.
- * @param propertySource
- */
- void store(PropertySource propertySource);
-
- /**
- * Read all properties.
- * @return the properties from the remote store, never null.
- */
- Map<String,String> read();
-
- /**
- * Reads a single key fromt hthe store.
- * @param key the key, not null.
- * @return the value, or null.
- */
- String read(String key);
-
- /**
- * Determines if {@link #read()} returns all contained properties, or optionally only
- * a subset of the accessible and defined properties are returned.
- * @return true, if this store is scannable.
- */
- boolean isScannable();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/integration/store/src/main/java/org/apache/tamaya/store/PropertyStoreProvider.java
----------------------------------------------------------------------
diff --git a/integration/store/src/main/java/org/apache/tamaya/store/PropertyStoreProvider.java b/integration/store/src/main/java/org/apache/tamaya/store/PropertyStoreProvider.java
deleted file mode 100644
index dceb29a..0000000
--- a/integration/store/src/main/java/org/apache/tamaya/store/PropertyStoreProvider.java
+++ /dev/null
@@ -1,78 +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.tamaya.store;
-
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.ServiceContextManager;
-import org.apache.tamaya.store.spi.PropertyStoreProviderSpi;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- * Simple provider accessor singleton for accessing {@link PropertyStore}
- * instances.
- */
-public final class PropertyStoreProvider {
- /**
- * The logger used.
- */
- private static final Logger LOG = Logger.getLogger(PropertyStoreProvider.class.getName());
-
-
- /**
- * Singleton constructor.
- */
- private PropertyStoreProvider() {
- }
-
-
- /**
- * Access a {@link PropertyStore} using it's id.
- *
- * @param storeId the unique id of the store to use.
- * @return
- */
- public static PropertyStore getPropertyStore(String storeId) {
- for (PropertyStoreProviderSpi propertyStoreProviderSpi : ServiceContextManager.getServiceContext()
- .getServices(PropertyStoreProviderSpi.class)) {
- PropertyStore store = propertyStoreProviderSpi.getPropertyStore(storeId);
- if (store != null) {
- LOG.finest("DataGrid '" + storeId + "' used: " + store);
- return store;
- }
- }
- throw new ConfigException("No such Store: " + storeId);
- }
-
- /**
- * Access a {@link PropertyStore} using it's id, hereby returning the most significant of the configured
- * {@link PropertyStore} instances.
- *
- * @return the default PropertyStore instance.
- */
- public static PropertyStore getDefaultPropertyStore() {
- return getPropertyStore("default");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/integration/store/src/main/java/org/apache/tamaya/store/WritablePropertySource.java
----------------------------------------------------------------------
diff --git a/integration/store/src/main/java/org/apache/tamaya/store/WritablePropertySource.java b/integration/store/src/main/java/org/apache/tamaya/store/WritablePropertySource.java
deleted file mode 100644
index c19fa45..0000000
--- a/integration/store/src/main/java/org/apache/tamaya/store/WritablePropertySource.java
+++ /dev/null
@@ -1,66 +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.tamaya.store;
-
-import org.apache.tamaya.spi.PropertySource;
-
-import java.util.Map;
-
-/**
- * Simple abstraction of a property synchronization backend. Most methods are similar
- * to a {@link org.apache.tamaya.spi.PropertySource}, enhanced with methods for
- * updating the property storage.
- */
-public interface WritablePropertySource extends PropertySource{
-
- /**
- * Loads the property source from its store..
- */
- void load();
-
- /**
- * Sets the store to the given properties, replacing all previous state.
- * @param props the new properties.
- */
- void setAll(Map<String, String> props);
-
- /**
- * Updates/adds all the given entries.
- * @param props the entries to be added/updated.
- */
- void putAll(Map<String, String> props);
-
- /**
- * Writes a single entry.
- * @param key the key, not null.
- * @param value the new value, not null.
- */
- void put(String key, String value);
-
- /**
- * Removes all entries.
- */
- void clear();
-
- /**
- * Synchronize the current state with the remote version.
- */
- void synch();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/integration/store/src/main/java/org/apache/tamaya/store/spi/DefaultStoredPropertySource.java
----------------------------------------------------------------------
diff --git a/integration/store/src/main/java/org/apache/tamaya/store/spi/DefaultStoredPropertySource.java b/integration/store/src/main/java/org/apache/tamaya/store/spi/DefaultStoredPropertySource.java
deleted file mode 100644
index b3fe1ee..0000000
--- a/integration/store/src/main/java/org/apache/tamaya/store/spi/DefaultStoredPropertySource.java
+++ /dev/null
@@ -1,137 +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.tamaya.store.spi;
-
-import org.apache.tamaya.events.ConfigEventManager;
-import org.apache.tamaya.events.FrozenPropertySource;
-import org.apache.tamaya.events.delta.ChangeType;
-import org.apache.tamaya.events.delta.PropertySourceChange;
-import org.apache.tamaya.events.delta.PropertySourceChangeBuilder;
-import org.apache.tamaya.spisupport.BasePropertySource;
-import org.apache.tamaya.store.PropertyStore;
-import org.apache.tamaya.store.WritablePropertySource;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * PropertySource that is connected to a {@link PropertyStore}.
- */
-public class DefaultStoredPropertySource extends BasePropertySource
- implements WritablePropertySource {
-
- /**
- * The store to be used, not null.
- */
- private PropertyStore propertyStore;
-
- /**
- * The last version of stoarge data accessed.
- */
- private String lastVersion;
-
- private Map<String, String> properties = new HashMap<>();
-
-
- private FrozenPropertySource currentConfig;
-
- /**
- * Creates a new property source.
- *
- * @param propertyStore the backend store.
- * @param defaultOrdinal the default ordinal to be used.
- */
- public DefaultStoredPropertySource(PropertyStore propertyStore, int defaultOrdinal) {
- super(defaultOrdinal);
- this.propertyStore = Objects.requireNonNull(propertyStore);
- this.properties.putAll(this.propertyStore.read());
- }
-
- @Override
- public void load() {
- this.properties.clear();
- this.properties.putAll(this.propertyStore.read());
- synch();
- }
-
- @Override
- public String getName() {
- return this.propertyStore.getName();
- }
-
- @Override
- public Map<String, String> getProperties() {
- return properties;
- }
-
- @Override
- public String get(String key) {
- if (!propertyStore.isScannable()) {
- return propertyStore.read(key);
- }
- return properties.get(key);
- }
-
- @Override
- public boolean isScannable() {
- return propertyStore.isScannable();
- }
-
- @Override
- public String toString() {
- return "StoredPropertySource{" +
- "propertyStore=" + propertyStore.getName() +
- '}';
- }
-
- @Override
- public void setAll(Map<String, String> props) {
- this.properties.clear();
- this.properties.putAll(props);
- synch();
- }
-
- @Override
- public void putAll(Map<String, String> props) {
- this.properties.putAll(props);
- synch();
- }
-
- @Override
- public void put(String key, String value) {
- this.properties.put(key, value);
- synch();
- }
-
- @Override
- public void clear() {
- this.properties.clear();
- synch();
- }
-
- @Override
- public void synch() {
- FrozenPropertySource newConfig = FrozenPropertySource.of(this);
- PropertySourceChange change = PropertySourceChangeBuilder.of(currentConfig, ChangeType.UPDATED)
- .addChanges(newConfig).build();
- currentConfig = newConfig;
- ConfigEventManager.fireEvent(change);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/integration/store/src/main/java/org/apache/tamaya/store/spi/PropertyStoreProviderSpi.java
----------------------------------------------------------------------
diff --git a/integration/store/src/main/java/org/apache/tamaya/store/spi/PropertyStoreProviderSpi.java b/integration/store/src/main/java/org/apache/tamaya/store/spi/PropertyStoreProviderSpi.java
deleted file mode 100644
index 1b20fc1..0000000
--- a/integration/store/src/main/java/org/apache/tamaya/store/spi/PropertyStoreProviderSpi.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.tamaya.store.spi;
-
-import org.apache.tamaya.store.PropertyStore;
-
-/**
- * Class, that provides access to PropertyStores to be used.
- */
-public interface PropertyStoreProviderSpi {
-
- /**
- * Access a {@link PropertyStore} using it's id.
- * @param storeId the unique id of the store to use.
- * @return
- */
- PropertyStore getPropertyStore(String storeId);
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/jodatime/pom.xml
----------------------------------------------------------------------
diff --git a/jodatime/pom.xml b/jodatime/pom.xml
index 98b13a6..98f48cf 100644
--- a/jodatime/pom.xml
+++ b/jodatime/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>tamaya-jodatime</artifactId>
- <name>Apache Tamaya Joda-Time Support</name>
+ <name>Apache Tamaya Modules - Joda-Time Support</name>
<packaging>bundle</packaging>
<inceptionYear>2015</inceptionYear>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/metamodels/pom.xml
----------------------------------------------------------------------
diff --git a/metamodels/pom.xml b/metamodels/pom.xml
index 4a05846..79513d2 100644
--- a/metamodels/pom.xml
+++ b/metamodels/pom.xml
@@ -29,7 +29,7 @@ under the License.
<groupId>org.apache.tamaya.ext.metamodels</groupId>
<artifactId>tamaya-metamodels</artifactId>
- <name>Apache Tamaya Extension Modules: Metamodels</name>
+ <name>Apache Tamaya Modules - Metamodels</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/mutable-config/pom.xml
----------------------------------------------------------------------
diff --git a/mutable-config/pom.xml b/mutable-config/pom.xml
deleted file mode 100644
index c20a60a..0000000
--- a/mutable-config/pom.xml
+++ /dev/null
@@ -1,81 +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 current 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.tamaya.ext</groupId>
- <artifactId>tamaya-extensions</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>tamaya-mutable-config</artifactId>
- <name>Apache Tamaya Mutable Configuration Support</name>
- <description>This module provides abstraction, if your scenario needs to actively change configuration entries
- and write changes back to some property sources, files etc.</description>
- <packaging>bundle</packaging>
-
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tamaya</groupId>
- <artifactId>tamaya-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-events</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tamaya</groupId>
- <artifactId>tamaya-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.tamaya.mutableconfig
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangeSummary.java
----------------------------------------------------------------------
diff --git a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangeSummary.java b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangeSummary.java
deleted file mode 100644
index 63d084c..0000000
--- a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangeSummary.java
+++ /dev/null
@@ -1,105 +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.tamaya.mutableconfig;
-
-import org.apache.tamaya.events.delta.ConfigurationChange;
-import org.apache.tamaya.events.delta.PropertySourceChange;
-
-import java.io.Serializable;
-import java.util.*;
-
-/**
- * Summaray class of a configuration change operation.
- * This class is immutable, read-only and thread-safe.
- */
-public final class ChangeSummary implements Serializable{
-
- private static final long serialVersionUID = 1L;
-
- private String changeId;
- private ConfigurationChange configChange;
- private List<PropertySourceChange> sourceChanges = new ArrayList<>();
- private long commitTS;
-
- private ChangeSummary(Builder builder){
- this.changeId = builder.changeId;
- this.commitTS = builder.commitTS;
- this.configChange = Objects.requireNonNull(builder.configChange);
- this.sourceChanges.addAll(builder.sourceChanges);
- }
-
- public String getChangeId(){
- return changeId;
- }
-
- public long getTimestampMillis(){
- return commitTS;
- }
-
- public ConfigurationChange getConfigurationChange(){
- return configChange;
- }
-
- public Collection<PropertySourceChange> getPropertySourceChanges(){
- return Collections.unmodifiableList(this.sourceChanges);
- }
-
-
-
-
-
- public static final class Builder {
-
- private String changeId;
- private ConfigurationChange configChange;
- private List<PropertySourceChange> sourceChanges = new ArrayList<>();
- private long commitTS = System.currentTimeMillis();
-
- public Builder(){
- this(UUID.randomUUID().toString());
- }
-
- public Builder(String changeId){
- this.changeId = Objects.requireNonNull(changeId);
- }
-
- public Builder setConfigChange(ConfigurationChange configChange){
- this.configChange = configChange;
- return this;
- }
-
- public Builder addPropertySourceChange(PropertySourceChange propertyChange){
- this.sourceChanges.add(propertyChange);
- return this;
- }
-
- public Builder setTimestamp(long timestamp){
- this.commitTS = timestamp;
- return this;
- }
-
- public ChangeSummary build(){
- return new ChangeSummary(this);
- }
-
-
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeProvider.java
----------------------------------------------------------------------
diff --git a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeProvider.java b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeProvider.java
deleted file mode 100644
index f8842ea..0000000
--- a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeProvider.java
+++ /dev/null
@@ -1,50 +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.tamaya.mutableconfig;
-
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.mutableconfig.spi.ConfigurationChangeProviderSpi;
-import org.apache.tamaya.spi.ServiceContextManager;
-
-/**
- * Accessor for creating {@link ConfigChangeRequest} instances to change and commite configuration.
- */
-public final class ConfigChangeProvider {
-
- /**
- * Creates a new change request for the given Configuration.
- * @param config the configuration.
- * @return a new ChangeRequest
- * @throws UnsupportedOperationException if no change providers are registered.
- */
- public static ConfigChangeRequest createChangeRequest(Configuration config){
- return ServiceContextManager.getServiceContext().getService(ConfigurationChangeProviderSpi.class)
- .createChangeRequest(config);
- }
-
- /**
- * Creates a new change request for the current Configuration.
- * @return a new ChangeRequest
- */
- public static ConfigChangeRequest createChangeRequest(){
- return createChangeRequest(ConfigurationProvider.getConfiguration());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
----------------------------------------------------------------------
diff --git a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
deleted file mode 100644
index 6d393cf..0000000
--- a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
+++ /dev/null
@@ -1,136 +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.tamaya.mutableconfig;
-
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.Configuration;
-
-import java.util.Collection;
-import java.util.Map;
-
-
-/**
- * This interface extends the Configuration interface hereby adding methods to change configuration entries.
- * Hereby not all configuration entries are necessarily mutable, since some entries may be read from non
- * mutable areas of configuration. Of course, it is always possible to add a mutable shadow layer on top of all
- * configuration to enable whatever changes applied. The exact management and storage persistence algorithm should be
- * transparent.<br/>
- * As a consequence clients should first check, using the corresponding methods, if entries are to edited or removed
- * actually are eligible for change/creation or removal.
- */
-public interface ConfigChangeRequest{
-
- /**
- * Returns the configuration onto which the change should be applied.
- * @return the corresponding configuration, not null.
- */
- Configuration getConfiguration();
-
- /**
- * Checks if a configuration key is writable (or it can be added).
- *
- * @param keyExpression the key to be cheched for write access (including creation), not null. Here this could also
- * be a regulat expression, such "as a.b.c.*".
- */
- boolean isWritable(String keyExpression);
-
- /**
- * Checks if a configuration key is removable. This also implies that it is writable, but there might be writable
- * keys that cannot be removed.
- *
- * @param keyExpression the keyExpression the key to be cheched for write access (including creation), not null. Here this could also
- * be a regulat expression, such "as a.b.c.*".
- */
- boolean isRemovable(String keyExpression);
-
- /**
- * Sets a property.
- *
- * @param key the property's key, not null.
- * @param value the property's value, not null.
- * @return the former property value, or null.
- * @throws ConfigException if the key/value cannot be added.
- */
- String put(String key, String value);
-
- /**
- * Puts all given configuration entries. This method should check that all given properties are
- * basically removable, as defined by #isWritable. If any of the passed keys is not writable during this initial
- * check, the operation should not perform any configuration changes and throw a {@link ConfigException}. If errors
- * occur afterwards, when the properties are effectively written back to the backends, the errors should be
- * collected and returned as part of the ConfigException payload. Nevertheless the operation should in that case
- * remove all entries as far as possible and abort the writing operation.
- *
- * @param properties the properties tobe written, not null.
- * @throws ConfigException if any of the given properties could not be written.
- */
- void putAll(Map<String, String> properties);
-
- /**
- * Removes a configuration entry.
- *
- * @param key the property's key, not null.
- * @throws ConfigException if the given cannot be removed.
- * @return the property's keys.
- */
- void remove(String key);
-
- /**
- * Removes all given configuration entries. This method should check that all given properties are
- * basically removable, as defined by #isRemovable. If any of the passed keys is not removable during this initial
- * check, the operation should not perform any configuration changes and throw a {@link ConfigException}. If errors
- * occur afterwards, when the properties are effectively written back to the backends, the errors should be
- * collected and returned as part of the ConfigException payload. Nevertheless the operation should in that case
- * remove all entries as far as possible and abort the writing operation.
- *
- * @param keys the property's keys to be removed, not null.
- * @throws ConfigException if any of the given keys could not be removed.
- */
- void removeAll(Collection<String> keys);
-
- /**
- * Resets all changes, leaving the request still open for further operations.
- */
- void reset();
-
- /**
- * Closes the request, sby default any uncommitted changes are committed.
- */
- void commit();
-
- /**
- * Closes the request,
- * @param saveChanges flag to control if any uncommitted changes ahould be written (default: yes).
- */
- void commit(boolean saveChanges);
-
- /**
- * Operation to check, if the current request is closed. Closed requests are read-only and can not be used
- * for preparing/submitting any configuration changes.
- * @return true, if this instance is closed.
- */
- boolean isCommitted();
-
- /**
- * Access the summary of the changes applied
- * @return
- */
- ChangeSummary getChangeSummary();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/spi/ConfigurationChangeProviderSpi.java
----------------------------------------------------------------------
diff --git a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/spi/ConfigurationChangeProviderSpi.java b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/spi/ConfigurationChangeProviderSpi.java
deleted file mode 100644
index e378c0d..0000000
--- a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/spi/ConfigurationChangeProviderSpi.java
+++ /dev/null
@@ -1,37 +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.tamaya.mutableconfig.spi;
-
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.mutableconfig.ConfigChangeRequest;
-
-/**
- * Provider SPI for the {@link org.apache.tamaya.mutableconfig.ConfigChangeProvider}.
- */
-public interface ConfigurationChangeProviderSpi {
-
- /**
- * Creates a new change request for the given Configuration.
- * @param config the configuration.
- * @return a new ChangeRequest
- * @throws UnsupportedOperationException if no change providers are registered.
- */
- ConfigChangeRequest createChangeRequest(Configuration config);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8168c47..249c18a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
<artifactId>tamaya-sandbox</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
- <name>Apache Tamaya Sandbox Modules</name>
+ <name>Apache Tamaya Sandbox</name>
<description>This project contains the several extensions that can be used with Tamaya, but are not (yet) ready for
a release.</description>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/sysprops/pom.xml
----------------------------------------------------------------------
diff --git a/sysprops/pom.xml b/sysprops/pom.xml
index 2fe0dd2..96f0cd9 100644
--- a/sysprops/pom.xml
+++ b/sysprops/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-sysprops</artifactId>
- <name>Apache Tamaya - Configured Java SE System Properties</name>
+ <name>Apache Tamaya Modules - Configured Java SE System Properties</name>
<packaging>bundle</packaging>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/570ef041/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index bb524f4..b40563e 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -30,6 +30,7 @@ under the License.
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<artifactId>tamaya-ui</artifactId>
+ <name>Apache Tamaya Modules - UI</name>
<modules>
<module>jsf</module>