tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [1/2] incubator-tamaya git commit: TAMAYA-4: Removed compile scope for log4j in core module. TAMAYA-19: Modularized aspects in project build.
Date Fri, 12 Dec 2014 13:05:52 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 5d1a1fa13 -> 1391fa85e


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java
----------------------------------------------------------------------
diff --git a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java
b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java
deleted file mode 100644
index 381d43a..0000000
--- a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java
+++ /dev/null
@@ -1,176 +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.management;
-
-
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.AggregationPolicy;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Managed bean interface for accessing environment data.
- */
-public interface ManagedConfigMBean {
-    /**
-     * Get the names current the configuration's defined.
-     *
-     * @return the names current the configuration's defined.
-     */
-    public Set<String> getConfigurationNames();
-
-    /**
-     * Get a general configuration info descriptor in JSON format for a configuration
-     * type in the following form:
-     * <pre>
-     *     tbd
-     * </pre>
-     *
-     * @param configName the configuration name, not null.
-     * @return a JSON formatted meta-information.
-     */
-    public String getConfigurationInfo(String configName);
-
-    /**
-     * Allows to determine if a configuration current a given type is available (accessible)
in the
-     * given environment context.
-     *
-     * @param configName the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return true, if such a configuration is accessible.
-     */
-    public boolean isConfigurationAvailable(String configName, String envType, String envContext);
-
-    /**
-     * Allows to determine if a configuration current a given type is loaded in the
-     * given environment context.
-     *
-     * @param configName the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return true, if such a configuration is accessible.
-     */
-    public boolean isConfigurationLoaded(String configName, String envType, String envContext);
-
-    /**
-     * Accesses a configuration current a given type as Map.
-     *
-     * @param configName the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return true, if such a configuration is accessible.
-     * @throws org.apache.tamaya.ConfigException If the configuration is not yet loaded.
-     */
-    public Map<String, String> getConfiguration(String configName, String envType,
String envContext)
-            throws ConfigException;
-
-    /**
-     * Accesses a configuration values for current a given config area as Map.
-     * @param area the target area key, not null.
-     * @param configName the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return the key/values found, including the recursive child values.
-     * @throws org.apache.tamaya.ConfigException If the configuration is not yet loaded.
-     */
-    public Map<String, String> getRecursiveConfigValues(String area, String configName,
String envType, String envContext)
-            throws ConfigException;
-
-    /**
-     * Accesses a configuration values for current a given config area as Map.
-     * @param area the target area key, not null.
-     * @param configName the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return the key/values found, not transitive.
-     * @throws org.apache.tamaya.ConfigException If the configuration is not yet loaded.
-     */
-    public Map<String, String> getConfigValues(String area, String configName, String
envType, String envContext)
-            throws ConfigException;
-
-    /**
-     * Updates a configuration current a given type.
-     *
-     * @param configName        the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @param values            the values to be changed.
-     * @param aggregationPolicy the aggregation Policy to be used.
-     * @return the configuration after the changesd have been applied.
-     * @throws org.apache.tamaya.ConfigException If the configuration is not yet loaded,
or not
-     *                                           mutable.
-     */
-    public Map<String, String> updateConfiguration(String configName, String envType,
String envContext, Map<String, String> values, AggregationPolicy aggregationPolicy)
-            throws ConfigException;
-
-    /**
-     * Access a JSON formatted info on a configuration loaded in the form as
-     * <pre>
-     *     tbd
-     * </pre>
-     * @param configName        the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return the JSON formatted info, never null.
-     * @throws org.apache.tamaya.ConfigException If the configuration is not yet loaded
-     */
-    public String getConfigurationInfo(String configName, String envType, String envContext);
-
-    /**
-     * Access the defined areas for a given configuration.
-     * @param configName        the configuration name, not null.
-     * @param envContext        the environment context, not null.
-     * @return the areas defined (only returning the areas that contain properties).
-     * @throws org.apache.tamaya.ConfigException If the configuration is not yet loaded
-     */
-    public Set<String> getAreas(String configName, String envType, String envContext);
-
-    /**
-     * Access the transitive areas for a given configuration.
-     * @param configName        the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return the transitive areas defined.
-     * @throws org.apache.tamaya.ConfigException If the configuration is not yet loaded
-     */
-    public Set<String> getTransitiveAreas(String configName, String envType, String
envContext);
-
-    /**
-     * Allows to determine if an area is existing.
-     * @param area the target area key, not null.
-     * @param configName        the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return true, if such an area exists (the area may be empty).
-     */
-    public boolean isAreaExisting(String area, String configName, String envType, String
envContext);
-
-    /**
-     * Allows to determine if an area is empty.
-     * @param area the target area key, not null.
-     * @param configName        the configuration name, not null.
-     * @param envType        the environment context, not null.
-     * @param envContext        the environment context, not null.
-     * @return true, if such an area exists and is not empty.
-     */
-    public boolean isAreaEmpty(String area, String configName, String envType, String envContext);
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java
----------------------------------------------------------------------
diff --git a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java
b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java
deleted file mode 100644
index 7caff90..0000000
--- a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java
+++ /dev/null
@@ -1,69 +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.management;
-
-import org.apache.tamaya.Environment;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * MBean implementation for accessing environment data.
- * Created by Anatole on 24.11.2014.
- */
-public class ManagedEnvironment implements ManagedEnvironmentMBean{
-
-    @Override
-    public List<String> getEnvironmentHierarchy() {
-        return Environment.getEnvironmentHierarchy();
-    }
-
-    @Override
-    public String getEnvironmentInfo(String environmentContext) {
-        try {
-            // TODO
-            return "EnvironmentInfo {}";
-        }
-        catch(Exception e){
-            // TODO logging
-            return "EnvironmentInfo{}";
-        }
-    }
-
-    @Override
-    public Map<String, String> getEnvironment(String environmentType, String context)
{
-        try {
-            Optional<Environment> env = Environment.getInstance(environmentType, context);
-            if (env.isPresent()) {
-                return env.get().toMap();
-            }
-        } catch (Exception e) {
-            // TODO logging
-        }
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public String getEnvironmentInfo() {
-        // TODO
-        return "EnvironmentInfo {}";
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
----------------------------------------------------------------------
diff --git a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
deleted file mode 100644
index 5d86700..0000000
--- a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java
+++ /dev/null
@@ -1,89 +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.management;
-
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Managed bean interface for accessing environment data.
- */
-public interface ManagedEnvironmentMBean {
-
-    /**
-     * Returns the current environment hierarchy defined.
-     * @see org.apache.tamaya.Environment#getEnvironmentType()
-     * @see org.apache.tamaya.Environment#getEnvironmentHierarchy()
-     * @return the current environment type hierarchy defined, never null.
-     */
-    public List<String> getEnvironmentHierarchy();
-
-    /**
-     * Get the common environment information in JSON format, which has the following form:
-     * <pre>
-     * Environment {
-     *     id: "system:VM,domain:test",
-     *     metaInfo {
-     *         a: "aValue",
-     *         b: "bValue"
-     *     }
-     *     entries{
-     *         val1: "value1",
-     *         val2: "value2",
-     *     }
-     * }
-     * </pre>
-     * @see org.apache.tamaya.Environment
-     * @param environmentContext the identifier to access the environment instance
-     * @return the environment JSON info, or null, if no such environment is accessible.
-     */
-    public String getEnvironmentInfo(String environmentContext);
-
-    /**
-     * Access the given environment as Map. the {@code environmentContext} is added to the
-     * map using the key {@code __environmentId}.
-     * @param environmentContext the identifier to access the environment instance
-     * @param context the context, not null.
-     * @return a map with the currently defined environment keys and values.
-     */
-    public Map<String,String> getEnvironment(String environmentContext, String context);
-
-    /**
-     * Get a general JSON info on the currently available environments current the form:
-     * <pre>
-     *     EnvironmentInfo{
-     *         host: "hostName",
-     *         ipAddress: "111.112.123.123",
-     *         typeHierarchy: {"system", "domain", "ear", "war", "saas-scope", "tenant"}
-     *         environments {
-     *             Environment {
-     *                 id: "system:VM,domain:test",
-     *                 ...
-     *             },
-     *             ...
-     *         }
-     *     }
-     * </pre>
-     * @return
-     */
-    public String getEnvironmentInfo();
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/managed/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/modules/managed/src/main/resources/META-INF/beans.xml b/modules/managed/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index adee378..0000000
--- a/modules/managed/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
-
-</beans>
-

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/managed/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/modules/managed/src/test/resources/META-INF/beans.xml b/modules/managed/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index adee378..0000000
--- a/modules/managed/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
-
-</beans>
-

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/modules/metamodel/pom.xml b/modules/metamodel/pom.xml
deleted file mode 100644
index 6bd6002..0000000
--- a/modules/metamodel/pom.xml
+++ /dev/null
@@ -1,101 +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</groupId>
-        <artifactId>tamaya-modules</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>tamaya-ext-metamodel</artifactId>
-    <name>Apache Tamaya Module - Configuration Metamodels</name>
-    <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>
-            <plugin>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctor-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>output-html</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>process-asciidoc</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/docs</outputDirectory>
-                            <sourceHighlighter>highlightjs</sourceHighlighter>
-                            <!-- coderay -->
-                            <backend>html</backend>
-                        </configuration>
-                    </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/1391fa85/modules/metamodel/src/main/java/metamodel/DefaultConfigProvider.java
----------------------------------------------------------------------
diff --git a/modules/metamodel/src/main/java/metamodel/DefaultConfigProvider.java b/modules/metamodel/src/main/java/metamodel/DefaultConfigProvider.java
deleted file mode 100644
index cef6408..0000000
--- a/modules/metamodel/src/main/java/metamodel/DefaultConfigProvider.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 main.java.metamodel;
-
-import org.apache.tamaya.core.experimental.ConfigurationBuilder;
-import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
-
-/**
- * Created by Anatole on 30.09.2014.
- */
-public class DefaultConfigProvider implements ConfigurationProviderSpi{
-
-    private Configuration config;
-
-    @Override
-    public String getConfigName(){
-        return "default";
-    }
-
-    @Override
-    public Configuration getConfiguration(){
-        if(config == null){
-            config = ConfigBuilder.create(getConfigName()
-                            .addPaths(
-                                    "classpath*:META-INF/config/**/*.xml", "classpath*:META-INF/config/**/*.properties",
-                                    "classpath*:META-INF/config/**/*.init")
-                            .addPaths("classpath*:META-INF/config/**/*.xml", "classpath*:META-INF/config/**/*.properties",
-                                    "classpath*:META-INF/config/**/*.init")
-                    addConfig(AggregationPolicy.IGNORE_DUPLICATES(),
-                            ConfigBuilder.create("Default Configuration")
-                                    .addPaths("classpath*:META-INF/config/**/*.xml",
-                                            "classpath*:META-INF/config/**/*" + ".properties",
-                                            "classpath*:META-INF/config/**/*.ini").build())
-                            .addConfig(AggregationPolicy.IGNORE_DUPLICATES(), Configuration.fromEnvironmentProperties(),
-                                    Configuration.fromSystemProperties()).build();
-        }
-        return config;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/modules/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
b/modules/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
deleted file mode 100644
index 5865575..0000000
--- a/modules/metamodel/src/main/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.ext.metamodel.DefaultConfigProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/metamodels/pom.xml
----------------------------------------------------------------------
diff --git a/modules/metamodels/pom.xml b/modules/metamodels/pom.xml
new file mode 100644
index 0000000..23e2339
--- /dev/null
+++ b/modules/metamodels/pom.xml
@@ -0,0 +1,45 @@
+<!-- 
+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>
+    </modules>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/metamodels/simple/pom.xml
----------------------------------------------------------------------
diff --git a/modules/metamodels/simple/pom.xml b/modules/metamodels/simple/pom.xml
new file mode 100644
index 0000000..792a045
--- /dev/null
+++ b/modules/metamodels/simple/pom.xml
@@ -0,0 +1,73 @@
+<!-- 
+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/1391fa85/modules/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/modules/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
b/modules/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
new file mode 100644
index 0000000..5865575
--- /dev/null
+++ b/modules/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.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.ext.metamodel.DefaultConfigProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1391fa85/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 978bc81..695dc59 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -26,8 +26,9 @@ under the License.
         <version>0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
-    <artifactId>tamaya-modules</artifactId>
-    <name>Apache Tamaya - Modules</name>
+    <artifactId>tamaya-ext-all</artifactId>
+    <groupId>org.apache.tamaya.ext</groupId>
+    <name>Apache Tamaya Modules</name>
     <packaging>pom</packaging>
 
     <properties>
@@ -51,8 +52,8 @@ under the License.
     </dependencies>
 
     <modules>
-        <module>cdi</module>
-        <module>managed</module>
+        <module>metamodels</module>
+        <module>integration</module>
     </modules>
 
 </project>


Mime
View raw message