You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2018/03/19 20:30:43 UTC
[1/2] incubator-tamaya-extensions git commit: TAMAYA-332: Move
beans.xml file into META-INF directory
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/master c0572c1ce -> adda37f21
TAMAYA-332: Move beans.xml file into META-INF directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/4cfe24dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4cfe24dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4cfe24dd
Branch: refs/heads/master
Commit: 4cfe24dd374abd408fc262c37f29e87f8b8007e7
Parents: 23f1c2e
Author: Aaron Coburn <ac...@apache.org>
Authored: Tue Mar 6 08:54:10 2018 -0500
Committer: Aaron Coburn <ac...@apache.org>
Committed: Tue Mar 6 08:57:18 2018 -0500
----------------------------------------------------------------------
.../src/main/resources/META-INF/beans.xml | 25 ++++++++++++++++++++
.../microprofile/src/main/resources/beans.xml | 25 --------------------
2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4cfe24dd/modules/microprofile/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/modules/microprofile/src/main/resources/META-INF/beans.xml b/modules/microprofile/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..9b07802
--- /dev/null
+++ b/modules/microprofile/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,25 @@
+<?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-extensions/blob/4cfe24dd/modules/microprofile/src/main/resources/beans.xml
----------------------------------------------------------------------
diff --git a/modules/microprofile/src/main/resources/beans.xml b/modules/microprofile/src/main/resources/beans.xml
deleted file mode 100644
index 9b07802..0000000
--- a/modules/microprofile/src/main/resources/beans.xml
+++ /dev/null
@@ -1,25 +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>
-
[2/2] incubator-tamaya-extensions git commit: Merge branch
'TAMAYA-332' of https://github.com/acoburn/incubator-tamaya-extensions
Posted by po...@apache.org.
Merge branch 'TAMAYA-332' of https://github.com/acoburn/incubator-tamaya-extensions
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/adda37f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/adda37f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/adda37f2
Branch: refs/heads/master
Commit: adda37f2159fe42ed49aa42210425e7f63864c8c
Parents: c0572c1 4cfe24d
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Mar 19 21:30:33 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Mar 19 21:30:33 2018 +0100
----------------------------------------------------------------------
.../src/main/resources/META-INF/beans.xml | 25 ++++++++++++++++++++
.../microprofile/src/main/resources/beans.xml | 25 --------------------
2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------