You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2015/01/03 12:59:14 UTC
[05/27] incubator-tamaya git commit: TAMAYA-19: Reorganized dormant
part for better focus of future discussions.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatSpi.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatSpi.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatSpi.java
deleted file mode 100644
index 1c41820..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatSpi.java
+++ /dev/null
@@ -1,61 +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.core.spi;
-
-import org.apache.tamaya.core.properties.ConfigurationFormat;
-import org.apache.tamaya.core.resource.Resource;
-
-import java.util.Collection;
-
-/**
- * Created by Anatole on 17.09.2014.
- */
-public interface ConfigurationFormatSpi {
- /**
- * Access a {@link org.apache.tamaya.core.properties.ConfigurationFormat}.
- *
- * @param formatName the format name
- * @return the corresponding {@link org.apache.tamaya.core.properties.ConfigurationFormat}, or {@code null}, if
- * not available for the given environment.
- */
- ConfigurationFormat getFormat(String formatName);
-
- /**
- * Get a collection current the keys current the registered {@link org.apache.tamaya.core.properties.ConfigurationFormat} instances.
- *
- * @return a collection current the keys current the registered {@link ConfigurationFormat} instances.
- */
- Collection<String> getFormatNames();
-
- /**
- * Evaluate the matching format for a given resource.
- *
- * @param resource The resource
- * @return a matching configuration format, or {@code null} if no matching format could be determined.
- */
- ConfigurationFormat getFormat(Resource resource);
-
- default ConfigurationFormat getPropertiesFormat(){
- return getFormat("properties");
- }
-
- default ConfigurationFormat getXmlPropertiesFormat(){
- return getFormat("xml-properties");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java
deleted file mode 100644
index e60a53d..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java
+++ /dev/null
@@ -1,46 +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.core.spi;
-
-import org.apache.tamaya.Configuration;
-
-/**
-* This configuration provider SPI allows to register the effective factory logic to of and manage a configuration
-* instance. Hereby the qualifiers determine the type current configuration. By default
-*/
-public interface ConfigurationProviderSpi{
-
- /**
- * Returns the name current the configuration provided.
- * @return the name current the configuration provided, not empty.
- */
- String getConfigName();
-
- /**
- * Get the {@link Configuration}, if available.
- * @return according configuration, or null, if none is available for the given environment.
- */
- Configuration getConfiguration();
-
- /**
- * Reloads the provider for the current context.
- */
- void reload();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceComparator.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceComparator.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceComparator.java
deleted file mode 100644
index 2fb719c..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceComparator.java
+++ /dev/null
@@ -1,85 +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.core.spi;
-
-import java.util.*;
-
-/**
- * Simple comparator based on a Collection of {@link OrdinalProvider} instances.
- */
-final class DefaultServiceComparator implements Comparator<Object>{
-
- /**
- * List of ordinal providers loaded.
- */
- private List<OrdinalProvider> ordinalProviders = new ArrayList<>();
-
- DefaultServiceComparator(Collection<? extends OrdinalProvider> providers){
- ordinalProviders.addAll(Objects.requireNonNull(providers));
- ordinalProviders.sort(this::compare);
- }
-
- private int compare(OrdinalProvider provider1, OrdinalProvider provider2){
- int o1 = getOrdinal(provider1);
- int o2 = getOrdinal(provider2);
- int order = o1-o2;
- if(order < 0){
- return -1;
- }
- else if(order > 0){
- return 1;
- }
- return 0;
- }
-
- private int getOrdinal(OrdinalProvider provider){
- if(provider instanceof Orderable){
- return ((Orderable)provider).order();
- }
- return 0;
- }
-
- public int getOrdinal(Object service){
- for(OrdinalProvider provider: ordinalProviders){
- OptionalInt ord = provider.getOrdinal(service.getClass());
- if(ord.isPresent()){
- return ord.getAsInt();
- }
- }
- if(service instanceof Orderable){
- return ((Orderable)service).order();
- }
- return 0;
- }
-
-
- @Override
- public int compare(Object o1, Object o2) {
- int ord1 = getOrdinal(o1);
- int ord2 = getOrdinal(o2);
- int order = ord1-ord2;
- if(order < 0){
- return -1;
- }
- else if(order > 0){
- return 1;
- }
- return 0;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceContextProvider.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceContextProvider.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceContextProvider.java
deleted file mode 100644
index 9a2fb1b..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/DefaultServiceContextProvider.java
+++ /dev/null
@@ -1,112 +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.core.spi;
-
-import org.apache.tamaya.spi.ServiceContext;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * This class implements the (default) {@link org.apache.tamaya.spi.ServiceContext} interface and hereby uses the JDK
- * {@link java.util.ServiceLoader} to load the services required.
- */
-@SuppressWarnings({"rawtypes", "unchecked"})
-class DefaultServiceContextProvider implements ServiceContext {
- /** List current services loaded, per class. */
- private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
- /** Singletons. */
- private final ConcurrentHashMap<Class, Optional<?>> singletons = new ConcurrentHashMap<>();
- /** Comparator for ordering of multiple services found. */
- private DefaultServiceComparator serviceComparator;
-
- public DefaultServiceContextProvider(){
- serviceComparator = new DefaultServiceComparator(getServices(OrdinalProvider.class, Collections.emptyList()));
- }
-
- @Override
- public <T> Optional<T> getService(Class<T> serviceType) {
- Optional<T> cached = (Optional<T>)singletons.get(serviceType);
- if(cached==null) {
- List<? extends T> services = getServices(serviceType, Collections.emptyList());
- if (services.isEmpty()) {
- cached = Optional.empty();
- }
- else{
- cached = Optional.of(services.get(0));
- }
- singletons.put(serviceType, cached);
- }
- return cached;
- }
-
- /**
- * Loads and registers services.
- *
- * @param serviceType
- * The service type.
- * @param <T>
- * the concrete type.
- * @param defaultList
- * the list current items returned, if no services were found.
- * @return the items found, never {@code null}.
- */
- @Override
- public <T> List<? extends T> getServices(final Class<T> serviceType, final List<? extends T> defaultList) {
- List<T> found = (List<T>) servicesLoaded.get(serviceType);
- if (found != null) {
- return found;
- }
- return loadServices(serviceType, defaultList);
- }
-
- /**
- * Loads and registers services.
- *
- * @param serviceType The service type.
- * @param <T> the concrete type.
- * @param defaultList the list current items returned, if no services were found.
- *
- * @return the items found, never {@code null}.
- */
- private <T> List<? extends T> loadServices(final Class<T> serviceType, final List<? extends T> defaultList) {
- try {
- List<T> services = new ArrayList<>();
- for (T t : ServiceLoader.load(serviceType)) {
- services.add(t);
- }
- if(services.isEmpty()){
- services.addAll(defaultList);
- }
- if(!serviceType.equals(OrdinalProvider.class)) {
- services.sort(serviceComparator);
- }
- services = Collections.unmodifiableList(services);
- final List<T> previousServices = (List<T>) servicesLoaded.putIfAbsent(serviceType, (List<Object>)services);
- return previousServices != null ? previousServices : services;
- } catch (Exception e) {
- Logger.getLogger(DefaultServiceContextProvider.class.getName()).log(Level.WARNING,
- "Error loading services current type " + serviceType, e);
- return defaultList;
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionEvaluator.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionEvaluator.java
deleted file mode 100644
index 5baa956..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionEvaluator.java
+++ /dev/null
@@ -1,38 +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.core.spi;
-
-import org.apache.tamaya.Configuration;
-
-/**
- * This interfaces provides a model for expression evaluation. This enables transparently plugin expression languages
- * as needed. In a Java EE context full fledged EL may be used, whereas in ME only simple replacement mechanisms
- * are better suited to the runtime requirements.
- */
-@FunctionalInterface
-public interface ExpressionEvaluator {
- /**
- * Evaluates the given expression.
- * @param expression the expression to be evaluated, not null.
- * @param configurations the configurations to be used for evaluating the values for injection into {@code instance}.
- * If no items are passed, the default configuration is used.
- * @return the evaluated expression.
- */
- String evaluate(String expression, Configuration... configurations);
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java
deleted file mode 100644
index a6ba9bb..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java
+++ /dev/null
@@ -1,55 +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.core.spi;
-
-import org.apache.tamaya.Configuration;
-
-/**
- * This interface defines a small plugin for resolving current expressions within configuration.
- * Resolver expression always have the form current <code>${resolverId:expression}</code>. The
- * {@code resolverId} hereby references the resolver to be used to replace the according
- * {@code expression}. Also it is well possible to mix different resolvers, e.g. using
- * an expression like <code>${ref1:expression1} bla bla ${ref2:expression2}</code>.
- * Finally when no resolver id is passed, the default resolver should be used.
- */
-public interface ExpressionResolver {
-
- /**
- * Get a (unique) resolver id used as a prefix for qualifying the resolver to be used for
- * resolving an expression.
- *
- * @return the (unique) resolver id, never null, not empty.
- */
- String getResolverId();
-
- /**
- * Resolve the expression. The expression should be stripped fromMap any surrounding parts.
- * E.g. <code>${myresolver:blabla to be interpreted AND executed.}</code> should be passed
- * as {@code blabla to be interpreted AND executed.} only.
- *
- * @param expression the stripped expression.
- * @param configurations overriding configurations to be used for evaluating the values for injection into {@code instance}.
- * If no such config is passed, the default configurations provided by the current
- * registered providers are used.
- * @return the resolved expression.
- * @throws org.apache.tamaya.ConfigException when the expression passed is not resolvable, e.g. due to syntax issues
- * or data not present or valid.
- */
- String resolve(String expression, Configuration... configurations);
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/Orderable.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/Orderable.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/Orderable.java
deleted file mode 100644
index 5397776..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/Orderable.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.core.spi;
-
-/**
- * Interface that can be optionally implemented by SPI components to be loaded into
- * the Tamaya's ServiceContext. The ordinal provided will be used to determine
- * priority and precedence, when multiple components implement the same
- * service interface.
- */
-@FunctionalInterface
-public interface Orderable {
- /**
- * Get the ordinal keys for the component, by default 0.
- * @return the ordinal keys
- */
- int order();
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/OrdinalProvider.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/OrdinalProvider.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/OrdinalProvider.java
deleted file mode 100644
index 2d7f057..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/OrdinalProvider.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.core.spi;
-
-import java.util.OptionalInt;
-
-/**
- * The ordinal provider is an optional component that provides an abstraction for ordering/prioritizing
- * services loaded. This can be used to determine, which SPI should be used, if multiple instances are
- * available, or for ordering chain of services.
- * @see org.apache.tamaya.spi.ServiceContext
- */
-public interface OrdinalProvider {
- /**
- * Evaluate the ordinal number for the given type.
- * @param type the target type, not null.
- * @return the ordinal, if not defined, 0 should be returned.
- */
- OptionalInt getOrdinal(Class<?> type);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterProviderSpi.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterProviderSpi.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterProviderSpi.java
deleted file mode 100644
index b8e7122..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterProviderSpi.java
+++ /dev/null
@@ -1,36 +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.core.spi;
-
-import org.apache.tamaya.PropertyAdapter;
-
-/**
- * This service provides different {@link org.apache.tamaya.PropertyAdapter} instances for types.
- */
-public interface PropertyAdapterProviderSpi {
-
- /**
- * Called, when a given {@link org.apache.tamaya.Configuration} has to be evaluated.
- *
- * @return the corresponding {@link java.util.function.Function<String, T>}, or {@code null}, if
- * not available for the given target type.
- */
- <T> PropertyAdapter<T> getPropertyAdapter(Class<T> type);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java b/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java
deleted file mode 100644
index 9270636..0000000
--- a/dormant/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.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.core.spi;
-//
-//import java.io.File;
-//import java.io.InputStream;
-//import java.net.URL;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.Set;
-//
-//import org.apache.tamaya.Codec;
-//
-//@SuppressWarnings("unchecked")
-//public interface PropertyAdapterService{
-//
-// public default Codec<URL> getURLAdapter(){
-// return Codec.class.cast(getClassAdapter(URL.class));
-// }
-//
-// public default Codec<InputStream> getClasspathResourceAdapter(){
-// return Codec.class.cast(getClassAdapter(InputStream.class));
-// }
-//
-// public default Codec<File> getFileAdapter(){
-// return Codec.class.cast(getClassAdapter(File.class));
-// }
-//
-// public default Codec<Set<String>> getSetAdapter(){
-// return Codec.class.cast(getClassAdapter(Set.class));
-// }
-//
-// public default Codec<Map<String, String>> getMapAdapter(){
-// return Codec.class.cast(getClassAdapter(Map.class));
-// }
-//
-// public default Codec<List<String>> getListAdapter(){
-// return Codec.class.cast(getClassAdapter(List.class));
-// }
-//
-// public default <T> Codec<Class<? extends T>> getClassAdapter(Class<T> requiredType){
-// return getClassAdapter(requiredType, Thread.currentThread().getContextClassLoader());
-// }
-//
-// public <T> Codec<Class<? extends T>> getClassAdapter(Class<T> requiredType,
-// ClassLoader... classLoaders);
-//
-//}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/old.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/old.ConfigurationProviderSpi b/dormant/core/src/main/resources/META-INF/services/old.ConfigurationProviderSpi
new file mode 100644
index 0000000..4c964b9
--- /dev/null
+++ b/dormant/core/src/main/resources/META-INF/services/old.ConfigurationProviderSpi
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+old.SystemPropertiesConfigProvider
+old.EnvPropertiesConfigProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.ConfigurationFormat
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.ConfigurationFormat b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.ConfigurationFormat
new file mode 100644
index 0000000..7aa2407
--- /dev/null
+++ b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.ConfigurationFormat
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+org.apache.tamaya.core.internal.format.PropertiesFormat
+org.apache.tamaya.core.internal.format.PropertiesXmlFormat
+org.apache.tamaya.core.internal.format.IniFormat
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.properties.ConfigurationFormat
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.properties.ConfigurationFormat b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.properties.ConfigurationFormat
deleted file mode 100644
index 7aa2407..0000000
--- a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.properties.ConfigurationFormat
+++ /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 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.
-#
-org.apache.tamaya.core.internal.format.PropertiesFormat
-org.apache.tamaya.core.internal.format.PropertiesXmlFormat
-org.apache.tamaya.core.internal.format.IniFormat
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resource.ResourceLoader
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resource.ResourceLoader b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resource.ResourceLoader
deleted file mode 100644
index c245d54..0000000
--- a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resource.ResourceLoader
+++ /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 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.
-#
-org.apache.tamaya.core.internal.resources.DefaultResourceLoader
-
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader
new file mode 100644
index 0000000..c245d54
--- /dev/null
+++ b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+org.apache.tamaya.core.internal.resources.DefaultResourceLoader
+
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
deleted file mode 100644
index 9865949..0000000
--- a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
+++ /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 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.
-#
-org.apache.tamaya.core.internal.config.SystemPropertiesConfigProvider
-org.apache.tamaya.core.internal.config.EnvPropertiesConfigProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationSpi
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationSpi b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationSpi
index 2764092..1c7d005 100644
--- a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationSpi
+++ b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationSpi
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.tamaya.core.internal.config.DefaultConfigurationSpi
\ No newline at end of file
+old.DefaultConfigurationSpi
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdapterSpi
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdapterSpi b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdapterSpi
index 0554453..0f48c84 100644
--- a/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdapterSpi
+++ b/dormant/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdapterSpi
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.tamaya.core.internal.config.DefaultPropertyAdapterSpi
+org.apache.tamaya.core.internal.DefaultPropertyAdapterSpi
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java b/dormant/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
index 2ee83a9..514cda6 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
@@ -25,11 +25,11 @@ import static org.junit.Assert.assertTrue;
import org.apache.tamaya.annotation.ConfiguredProperty;
import org.apache.tamaya.annotation.DefaultValue;
-import org.apache.tamaya.core.internal.config.DefaultConfigurationSpi;
+import old.DefaultConfigurationSpi;
import org.junit.Test;
/**
- * Test class for {@link org.apache.tamaya.core.internal.config.DefaultConfigurationSpi}.
+ * Test class for {@link old.DefaultConfigurationSpi}.
*/
public class DefaultConfigurationManagerSingletonSpiSingletonSpiTest {
@@ -60,7 +60,7 @@ public class DefaultConfigurationManagerSingletonSpiSingletonSpiTest {
@Test
public void testIsConfigurationDefined() {
- assertTrue(Configuration.isAvailable("test"));
+ assertTrue(Configuration.isAvailable("testdata"));
assertFalse(Configuration.isAvailable("sdksajdsajdlkasj dlkjaslkd"));
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java b/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
index 77cbf94..27ae481 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
@@ -44,7 +44,7 @@ public class JavaOneDemo {
@Test
public void testProgrammatixPropertySet() {
- System.out.println(PropertySourceBuilder.of("test").addPaths("test", "classpath:test.properties"));
+ System.out.println(PropertySourceBuilder.of("testdata").addPaths("testdata", "classpath:testdata.properties"));
}
@Test
@@ -54,7 +54,7 @@ public class JavaOneDemo {
cfgMap.put("param1", "value1");
cfgMap.put("a", "Adrian"); // overrides Anatole
Configuration config = Configuration.from(PropertySourceBuilder.of("myTestConfig").addPaths(
- "classpath:test.properties").addPaths("classpath:cfg/test.xml")
+ "classpath:testdata.properties").addPaths("classpath:cfg/testdata.xml")
.addArgs(new String[]{"-arg1", "--fullarg", "fullValue", "-myflag"})
.addMap(cfgMap).build());
System.out.println(config.query(ConfigurationFunctions.getAreas()));
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java b/dormant/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
index b02a58f..644ef0a 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
@@ -28,7 +28,7 @@
//import static org.junit.Assert.assertFalse;
//
///**
-// * Simple test for a mutable Configuration instance.
+// * Simple testdata for a mutable Configuration instance.
// */
//public class MutableConfigTest {
//
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java b/dormant/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
index 5aeeec5..276d16e 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
@@ -15,7 +15,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
+import old.ConfigurationProviderSpi;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java b/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
index 4a846f9..f7e73f3 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
@@ -33,7 +33,7 @@ public class PropertySourceBuilderTest {
@Test
public void testFromEnvironmentProperties(){
- PropertySource prov = PropertySourceBuilder.of("test").addEnvironmentProperties().build();
+ PropertySource prov = PropertySourceBuilder.of("testdata").addEnvironmentProperties().build();
assertNotNull(prov);
for(Map.Entry<String,String> en:System.getenv().entrySet()){
assertEquals(en.getValue(), prov.get(en.getKey()).get());
@@ -42,7 +42,7 @@ public class PropertySourceBuilderTest {
@Test
public void testFromSystemProperties(){
- PropertySource prov = PropertySourceBuilder.of("test").addSystemProperties().build();
+ PropertySource prov = PropertySourceBuilder.of("testdata").addSystemProperties().build();
assertNotNull(prov);
for(Map.Entry<Object,Object> en:System.getProperties().entrySet()){
assertEquals(en.getValue(), prov.get(en.getKey().toString()).get());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java b/dormant/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
index bf8d709..41140ab 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
@@ -24,10 +24,10 @@
//import java.util.concurrent.ConcurrentHashMap;
//
//import org.apache.tamaya.Configuration;
-//import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
+//import old.ConfigurationProviderSpi;
//
///**
-// * Simple test provider that creates a mutable instance of a configuration, just using a simple map instance.
+// * Simple testdata provider that creates a mutable instance of a configuration, just using a simple map instance.
// */
//public class MutableTestConfigProvider implements ConfigurationProviderSpi{
// /** The config name. */
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java b/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
index ddbe4af..e8ec52a 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.internal;
import org.apache.tamaya.PropertySource;
import org.apache.tamaya.core.properties.PropertySourceBuilder;
-import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
+import old.ConfigurationProviderSpi;
import org.apache.tamaya.Configuration;
@@ -48,13 +48,13 @@ public class TestConfigProvider implements ConfigurationProviderSpi{
config.put("BD", "123456789123456789123456789123456789.123456789123456789123456789123456789");
config.put("testProperty", "keys current testProperty");
config.put("runtimeVersion", "${java.version}");
- testConfig = Configuration.from(PropertySourceBuilder.of("test").addMap(
+ testConfig = Configuration.from(PropertySourceBuilder.of("testdata").addMap(
config).build());
}
@Override
public String getConfigName(){
- return "test";
+ return "testdata";
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredClass.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredClass.java b/dormant/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredClass.java
index c01ee63..70e18cf 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredClass.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredClass.java
@@ -39,7 +39,7 @@ public class ConfiguredClass{
@DefaultValue("The current \\${JAVA_HOME} env property is ${env:JAVA_HOME}.")
String value1;
- @ConfiguredProperty(config="test", keys = "foo")
+ @ConfiguredProperty(config="testdata", keys = "foo")
@ConfiguredProperty(keys = "a.b.c.key2")
private String value2;
@@ -55,13 +55,13 @@ public class ConfiguredClass{
@DefaultValue("5")
private Integer int1;
- @ConfiguredProperty(config = "test")
+ @ConfiguredProperty(config = "testdata")
private int int2;
- @ConfiguredProperty(config = "test")
+ @ConfiguredProperty(config = "testdata")
private boolean booleanT;
- @ConfiguredProperty(config="test", keys ="BD")
+ @ConfiguredProperty(config="testdata", keys ="BD")
private BigDecimal bigNumber;
@ObservesConfigChange
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/samples/devops/DeploymentProvider.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/samples/devops/DeploymentProvider.java b/dormant/core/src/test/java/org/apache/tamaya/samples/devops/DeploymentProvider.java
index 18e6705..97371e3 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/samples/devops/DeploymentProvider.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/samples/devops/DeploymentProvider.java
@@ -28,8 +28,8 @@ public class DeploymentProvider {
// System.out.println(service.getCurrentContext());
// // Access default configuration for current environment
// DefaultEnvironment myTarget = new DefaultEnvironment();
- // myTarget.setAttribute("domain", "com.test.mydom:domain1:1.0.1");
- // myTarget.setAttribute("application", "com.test.mydom:app1:1.0.1");
+ // myTarget.setAttribute("domain", "com.testdata.mydom:domain1:1.0.1");
+ // myTarget.setAttribute("application", "com.testdata.mydom:app1:1.0.1");
// myTarget.setAttribute("env", "localTest");
// myTarget.setStage(Stage.UnitTest);
// Configuration deploymentConfig =
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java b/dormant/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
index e0351b2..711ce5f 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
@@ -38,7 +38,7 @@ public class SimplePropertiesAndCLISample {
@Test
public void testProgrammatixPropertySet() {
- System.out.println(PropertySourceBuilder.of("test").addPaths("test", "classpath:test.properties").build());
+ System.out.println(PropertySourceBuilder.of("testdata").addPaths("testdata", "classpath:testdata.properties").build());
}
@Test
@@ -48,7 +48,7 @@ public class SimplePropertiesAndCLISample {
cfgMap.put("param1", "value1");
cfgMap.put("a", "Adrian"); // overrides Anatole
Configuration config = Configuration.from(PropertySourceBuilder.of("myTestConfig").addPaths(
- "classpath:test.properties").addPaths("classpath:cfg/test.xml")
+ "classpath:testdata.properties").addPaths("classpath:cfg/testdata.xml")
.addArgs(new String[]{"-arg1", "--fullarg", "fullValue", "-myflag"}).addMap(cfgMap)
.build());
System.out.println(config.query(ConfigurationFunctions.getAreas()));
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
index e7f2049..423ec94 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
@@ -61,7 +61,7 @@ public class UC1ReadProperties {
@Test
public void example() {
- Configuration config = Configuration.from(PropertySourceBuilder.of("test")
+ Configuration config = Configuration.from(PropertySourceBuilder.of("testdata")
.addPaths("classpath:ucs/UC1ReadProperties/UC1ReadPropertiesTest.properties").build());
// String name = config.get("name").orElse("Anatole");
// BigDecimal bigNum = config.get("num.BD", BigDecimal.class).orElseThrow(() -> new IllegalStateException("Sorry"));
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
index 60ab6ea..76c6132 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* Configuration is organized as key/keys pairs. This basically can be modeled as {@code Map<String,String>}
* Configuration should be as simple as possible. Advanced use cases can often easily implemented by combining
- * multiple property maps and applying hereby some combination policy. This test class demonstrates the different
+ * multiple property maps and applying hereby some combination policy. This testdata class demonstrates the different
* options Tamaya is providing and the according mechanisms.
*/
public class UC2CombineProperties {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/resources/META-INF/services/old.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/resources/META-INF/services/old.ConfigurationProviderSpi b/dormant/core/src/test/resources/META-INF/services/old.ConfigurationProviderSpi
new file mode 100644
index 0000000..c4ba801
--- /dev/null
+++ b/dormant/core/src/test/resources/META-INF/services/old.ConfigurationProviderSpi
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+org.apache.tamaya.internal.TestConfigProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi b/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
deleted file mode 100644
index c4ba801..0000000
--- a/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
+++ /dev/null
@@ -1,19 +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.
-#
-org.apache.tamaya.internal.TestConfigProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/resources/cfg/autoloaded.xml
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/resources/cfg/autoloaded.xml b/dormant/core/src/test/resources/cfg/autoloaded.xml
index b64cb76..07f6c13 100644
--- a/dormant/core/src/test/resources/cfg/autoloaded.xml
+++ b/dormant/core/src/test/resources/cfg/autoloaded.xml
@@ -23,7 +23,7 @@ under the License.
<entry key="b">Bill</entry>
<entry key="a.compound.area.entry">myCompundAreaVlaueFromXml</entry>
<entry key="an.area.entry">myCompundAreaVlaueFromXml2</entry>
- <!-- DirectMapping test -->
+ <!-- DirectMapping testdata -->
<entry key="org.apache.tamaya.samples.annotations.AutoConfiguredClass.value1">This \${JAVA_HOME} is cool!</entry>
<entry key="org.apache.tamaya.samples.annotations.AutoConfiguredClass.value2">Should not be set because @NoConfig !</entry>
<entry key="org.apache.tamaya.samples.annotations.AutoConfiguredClass.testProperty">a test property value</entry>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/core/src/test/resources/cfg/test.xml
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/resources/cfg/test.xml b/dormant/core/src/test/resources/cfg/test.xml
index b64cb76..07f6c13 100644
--- a/dormant/core/src/test/resources/cfg/test.xml
+++ b/dormant/core/src/test/resources/cfg/test.xml
@@ -23,7 +23,7 @@ under the License.
<entry key="b">Bill</entry>
<entry key="a.compound.area.entry">myCompundAreaVlaueFromXml</entry>
<entry key="an.area.entry">myCompundAreaVlaueFromXml2</entry>
- <!-- DirectMapping test -->
+ <!-- DirectMapping testdata -->
<entry key="org.apache.tamaya.samples.annotations.AutoConfiguredClass.value1">This \${JAVA_HOME} is cool!</entry>
<entry key="org.apache.tamaya.samples.annotations.AutoConfiguredClass.value2">Should not be set because @NoConfig !</entry>
<entry key="org.apache.tamaya.samples.annotations.AutoConfiguredClass.testProperty">a test property value</entry>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/dormant/modules/integration/cdi/pom.xml b/dormant/modules/integration/cdi/pom.xml
deleted file mode 100644
index 1909bcc..0000000
--- a/dormant/modules/integration/cdi/pom.xml
+++ /dev/null
@@ -1,178 +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.integration</groupId>
- <artifactId>tamaya-integration-all</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>tamaya-cdi</artifactId>
- <name>Apache Tamaya Modules Integration - CDI</name>
- <packaging>jar</packaging>
-
- <properties>
- <owb.version>1.5.0-SNAPSHOT</owb.version>
- <weld.version>2.2.7.Final</weld.version>
- <geronimo-jcdi-1.1-spec.version>1.0-SNAPSHOT</geronimo-jcdi-1.1-spec.version>
- <geronimo-interceptor-1.2-spec.version>1.0-SNAPSHOT</geronimo-interceptor-1.2-spec.version>
- <geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
- <bval.version>0.5</bval.version>
- <ds.version>1.1.0</ds.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tamaya</groupId>
- <artifactId>tamaya-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- <version>${geronimo-jcdi-1.1-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-test-control-module-api</artifactId>
- <version>${ds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-test-control-module-impl</artifactId>
- <version>${ds.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>OWB</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <!-- OWB specific dependencies-->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo-atinject-1.0-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor-1.2-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>1.0.MR2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${owb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>${owb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <version>${owb.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr303</artifactId>
- <version>${bval.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-owb</artifactId>
- <version>${ds.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>Weld</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <version>${ds.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/ConfiguredClass.java
----------------------------------------------------------------------
diff --git a/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/ConfiguredClass.java b/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/ConfiguredClass.java
index ea47dd6..ba92b3e 100644
--- a/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/ConfiguredClass.java
+++ b/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/ConfiguredClass.java
@@ -35,7 +35,7 @@ import org.apache.tamaya.annotation.ObservesConfigChange;
@Singleton
public class ConfiguredClass{
-// @WithConfig("test")
+// @WithConfig("testdata")
@ConfiguredProperty
private String testProperty;
@@ -45,7 +45,7 @@ public class ConfiguredClass{
@DefaultValue("The current \\${JAVA_HOME} env property is ${env:JAVA_HOME}.")
String value1;
-// @WithConfig("test")
+// @WithConfig("testdata")
@ConfiguredProperty(keys = "foo")
@ConfiguredProperty(keys = "a.b.c.key2")
private String value2;
@@ -62,19 +62,19 @@ public class ConfiguredClass{
@DefaultValue("5")
private Integer int1;
-// @WithConfig("test")
+// @WithConfig("testdata")
@ConfiguredProperty
private int int2;
-// @WithConfig("test")
+// @WithConfig("testdata")
@ConfiguredProperty
private boolean booleanT;
-// @WithConfig("test")
+// @WithConfig("testdata")
@ConfiguredProperty(keys = "BD")
private BigDecimal bigNumber;
-// @WithConfig("test")
+// @WithConfig("testdata")
@ConfiguredProperty(keys = "double1")
private double doubleValue;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/TestConfigProvider.java
----------------------------------------------------------------------
diff --git a/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/TestConfigProvider.java b/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/TestConfigProvider.java
index a0de005..a10422c 100644
--- a/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/TestConfigProvider.java
+++ b/dormant/modules/integration/cdi/src/test/java/org/apache/tamaya/integration/cdi/TestConfigProvider.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.integration.cdi;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.core.properties.PropertySourceBuilder;
-import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
+import old.ConfigurationProviderSpi;
import java.util.HashMap;
import java.util.Map;
@@ -49,12 +49,12 @@ public class TestConfigProvider implements ConfigurationProviderSpi
config.put("BD", "123456789123456789123456789123456789.123456789123456789123456789123456789");
config.put("testProperty", "keys current testProperty");
config.put("runtimeVersion", "${java.version}");
- testConfig = PropertySourceBuilder.of("test").addMap(config).build().toConfiguration();
+ testConfig = PropertySourceBuilder.of("testdata").addMap(config).build().toConfiguration();
}
@Override
public String getConfigName(){
- return "test";
+ return "testdata";
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/integration/managed/pom.xml
----------------------------------------------------------------------
diff --git a/dormant/modules/integration/managed/pom.xml b/dormant/modules/integration/managed/pom.xml
deleted file mode 100644
index 3b4f5bc..0000000
--- a/dormant/modules/integration/managed/pom.xml
+++ /dev/null
@@ -1,71 +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.integration</groupId>
- <artifactId>tamaya-integration-all</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>tamaya-integration-managed</artifactId>
- <name>Apache Tamaya Modules Integration - Java Management Extensions</name>
- <packaging>jar</packaging>
-
- <properties>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tamaya-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tamaya-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/integration/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
----------------------------------------------------------------------
diff --git a/dormant/modules/integration/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java b/dormant/modules/integration/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
index ef3b861..b7cdfc3 100644
--- a/dormant/modules/integration/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
+++ b/dormant/modules/integration/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
@@ -39,7 +39,7 @@ public interface ManagedEnvironmentMBean {
* Get the common environment information in JSON format, which has the following form:
* <pre>
* Environment {
- * id: "system:VM,domain:test",
+ * id: "system:VM,domain:testdata",
* metaInfo {
* a: "aValue",
* b: "bValue"
@@ -74,7 +74,7 @@ public interface ManagedEnvironmentMBean {
* typeHierarchy: {"system", "domain", "ear", "war", "saas-scope", "tenant"}
* environments {
* Environment {
- * id: "system:VM,domain:test",
+ * id: "system:VM,domain:testdata",
* ...
* },
* ...
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/dormant/modules/integration/pom.xml b/dormant/modules/integration/pom.xml
deleted file mode 100644
index 33deee1..0000000
--- a/dormant/modules/integration/pom.xml
+++ /dev/null
@@ -1,40 +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 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">
- <parent>
- <artifactId>tamaya-ext-all</artifactId>
- <groupId>org.apache.tamaya.ext</groupId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <packaging>pom</packaging>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tamaya.integration</groupId>
- <artifactId>tamaya-integration-all</artifactId>
-
- <modules>
- <module>managed</module>
- <module>cdi</module>
- <module>se</module>
- </modules>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/metamodels/environment/pom.xml
----------------------------------------------------------------------
diff --git a/dormant/modules/metamodels/environment/pom.xml b/dormant/modules/metamodels/environment/pom.xml
deleted file mode 100644
index cf8fd91..0000000
--- a/dormant/modules/metamodels/environment/pom.xml
+++ /dev/null
@@ -1,73 +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.metamodels</groupId>
- <artifactId>tamaya-metamodels-all</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>tamaya-metamodel-environment</artifactId>
- <name>Apache Tamaya Modules Metamodels - environment</name>
- <description>Environment Tamaya Metamodel</description>
- <packaging>jar</packaging>
-
- <properties>
- <jdkVersion>1.8</jdkVersion>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.sourceLevel}</source>
- <target>${maven.compile.targetLevel}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/metamodels/environment/src/test/java/org/apache/tamaya/metamodel/environment/EnvironmentManagerTest.java
----------------------------------------------------------------------
diff --git a/dormant/modules/metamodels/environment/src/test/java/org/apache/tamaya/metamodel/environment/EnvironmentManagerTest.java b/dormant/modules/metamodels/environment/src/test/java/org/apache/tamaya/metamodel/environment/EnvironmentManagerTest.java
index 5abdd8e..e9ff31b 100644
--- a/dormant/modules/metamodels/environment/src/test/java/org/apache/tamaya/metamodel/environment/EnvironmentManagerTest.java
+++ b/dormant/modules/metamodels/environment/src/test/java/org/apache/tamaya/metamodel/environment/EnvironmentManagerTest.java
@@ -54,7 +54,7 @@ public class EnvironmentManagerTest {
Environment env2 = Environment.current();
assertNotNull(env1);
assertNotNull(env2);
- // within this test environment these are always the same
+ // within this testdata environment these are always the same
assertEquals(env1, env2);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/metamodels/pom.xml
----------------------------------------------------------------------
diff --git a/dormant/modules/metamodels/pom.xml b/dormant/modules/metamodels/pom.xml
deleted file mode 100644
index 74b338f..0000000
--- a/dormant/modules/metamodels/pom.xml
+++ /dev/null
@@ -1,46 +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-ext-all</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <groupId>org.apache.tamaya.metamodels</groupId>
- <artifactId>tamaya-metamodels-all</artifactId>
- <name>Apache Tamaya Modules Metamodels</name>
- <packaging>pom</packaging>
-
- <properties>
- <github.global.server>github</github.global.server>
- <jdkVersion>1.8</jdkVersion>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
- </properties>
-
- <modules>
- <module>simple</module>
- <module>environment</module>
- </modules>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/metamodels/simple/pom.xml
----------------------------------------------------------------------
diff --git a/dormant/modules/metamodels/simple/pom.xml b/dormant/modules/metamodels/simple/pom.xml
deleted file mode 100644
index 792a045..0000000
--- a/dormant/modules/metamodels/simple/pom.xml
+++ /dev/null
@@ -1,73 +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.
--->
-<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.metamodels</groupId>
- <artifactId>tamaya-metamodels-all</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>tamaya-metamodel-simple</artifactId>
- <name>Apache Tamaya Modules Metamodels - Simple</name>
- <description>Simple Tamaya Metamodel, e.g. feasible for SE commandline tools and simple use cases.</description>
- <packaging>jar</packaging>
-
- <properties>
- <jdkVersion>1.8</jdkVersion>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.sourceLevel}</source>
- <target>${maven.compile.targetLevel}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b56817f7/dormant/modules/metamodels/simple/src/main/resources/META-INF/services/old.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/dormant/modules/metamodels/simple/src/main/resources/META-INF/services/old.ConfigurationProviderSpi b/dormant/modules/metamodels/simple/src/main/resources/META-INF/services/old.ConfigurationProviderSpi
new file mode 100644
index 0000000..b3a2634
--- /dev/null
+++ b/dormant/modules/metamodels/simple/src/main/resources/META-INF/services/old.ConfigurationProviderSpi
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+org.apache.tamaya.metamodel.simple.SimpleConfigProvider
\ No newline at end of file