You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2016/09/26 08:23:59 UTC
deltaspike git commit: Revert "DELTASPIKE-1206 add for
containers who support this CDI features"
Repository: deltaspike
Updated Branches:
refs/heads/master 39877ce3f -> 2da220a2f
Revert "DELTASPIKE-1206 add <trim/> for containers who support this CDI features"
This reverts commit 39877ce3fc1d583b3857478dfd2278fe5684d3d7.
We blow up in TomEE as beans.xml get scanned with JAXB in strict mode right now.
I gonna fix that and will later re-evaluate again
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2da220a2
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2da220a2
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2da220a2
Branch: refs/heads/master
Commit: 2da220a2fefc7bb421e04c036badf877a4ade381
Parents: 39877ce
Author: Mark Struberg <st...@apache.org>
Authored: Mon Sep 26 10:22:09 2016 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Mon Sep 26 10:22:09 2016 +0200
----------------------------------------------------------------------
deltaspike/buildall.sh | 2 +-
.../cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml | 1 -
.../cdictrl/impl-owb/src/main/resources/META-INF/beans.xml | 1 -
.../cdictrl/impl-weld/src/main/resources/META-INF/beans.xml | 1 -
deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml | 1 -
deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml | 1 -
deltaspike/core/api/src/main/resources/META-INF/beans.xml | 1 -
deltaspike/core/impl/src/main/resources/META-INF/beans.xml | 1 -
deltaspike/core/impl/src/test/resources/META-INF/beans.xml | 1 -
.../examples/jse-examples/src/main/resources/META-INF/beans.xml | 1 -
.../examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml | 1 -
.../jsf-playground/src/main/resources/META-INF/beans.xml | 1 -
.../examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml | 3 +--
.../scheduler-playground/src/main/resources/META-INF/beans.xml | 1 -
.../src/main/webapp/WEB-INF/beans.xml | 1 -
.../src/main/webapp/WEB-INF/beans.xml | 1 -
.../modules/data/impl/src/main/resources/META-INF/beans.xml | 1 -
deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml | 1 -
.../modules/jpa/impl/src/main/resources/META-INF/beans.xml | 1 -
.../modules/jpa/impl/src/test/resources/META-INF/beans.xml | 1 -
deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml | 1 -
.../modules/jsf/impl/src/main/resources/META-INF/beans.xml | 1 -
.../modules/jsf/impl/src/test/resources/META-INF/beans.xml | 1 -
.../partial-bean/api/src/main/resources/META-INF/beans.xml | 4 +---
.../partial-bean/impl/src/main/resources/META-INF/beans.xml | 1 -
.../partial-bean/impl/src/test/resources/META-INF/beans.xml | 1 -
.../modules/proxy/api/src/main/resources/META-INF/beans.xml | 1 -
.../proxy/impl-asm5/src/main/resources/META-INF/beans.xml | 1 -
.../modules/scheduler/api/src/main/resources/META-INF/beans.xml | 1 -
.../modules/scheduler/impl/src/main/resources/META-INF/beans.xml | 1 -
.../modules/scheduler/impl/src/test/resources/META-INF/beans.xml | 1 -
.../modules/security/api/src/main/resources/META-INF/beans.xml | 4 +---
.../modules/security/impl/src/main/resources/META-INF/beans.xml | 1 -
.../modules/security/impl/src/test/resources/META-INF/beans.xml | 1 -
.../modules/servlet/api/src/main/resources/META-INF/beans.xml | 1 -
.../modules/servlet/impl/src/main/resources/META-INF/beans.xml | 1 -
.../test-control/impl/src/main/resources/META-INF/beans.xml | 1 -
37 files changed, 4 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/buildall.sh
----------------------------------------------------------------------
diff --git a/deltaspike/buildall.sh b/deltaspike/buildall.sh
index b45e07a..f98b786 100755
--- a/deltaspike/buildall.sh
+++ b/deltaspike/buildall.sh
@@ -27,7 +27,7 @@ rm mvn-*log
mvn clean install -POWB -Dowb.version=1.1.8 -Dopenejb.owb.version=1.2.6 | tee mvn-owb1_1_8.log
mvn clean install -POWB -Dowb.version=1.2.6 -Dopenejb.owb.version=1.2.6 | tee mvn-owb1_2_6.log
mvn clean install -POWB -Dowb.version=1.2.7 -Dopenejb.owb.version=1.2.6 | tee mvn-owb1_2_7.log
-mvn clean install -POWB15 -Dowb.version=1.7.1-SNAPSHOT -Dopenejb.owb.version=1.2.6 | tee mvn-owb1.7.1.log
+mvn clean install -POWB15 -Dowb.version=1.5.0-SNAPSHOT -Dopenejb.owb.version=1.2.6 | tee mvn-owb1.5.0.log
mvn clean install -PWeld1 -Dweld.version=1.1.10.Final | tee mvn-weld1_1_10.log
mvn clean install -PWeld1 -Dweld.version=1.1.28.Final | tee mvn-weld1_1_28.log
mvn clean install -Ptomee-build-managed -Dtomee.version=1.7.0 -Dopenejb.version=4.7.0 -Dopenejb.owb.version=1.2.6 | tee mvn-tomee_1_7_0.log
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml b/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml b/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/cdictrl/impl-weld/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/src/main/resources/META-INF/beans.xml b/deltaspike/cdictrl/impl-weld/src/main/resources/META-INF/beans.xml
index 7de0d38..7046896 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/cdictrl/impl-weld/src/main/resources/META-INF/beans.xml
@@ -21,7 +21,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:weld="http://jboss.org/schema/weld/beans"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<weld:scan>
<weld:exclude name="org.apache.deltaspike.cdise.weld.WeldContainerControl"/>
</weld:scan>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml b/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml b/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/core/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/resources/META-INF/beans.xml b/deltaspike/core/api/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/core/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/core/api/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/core/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/resources/META-INF/beans.xml b/deltaspike/core/impl/src/main/resources/META-INF/beans.xml
index 282a3ba..5d96bf1 100644
--- a/deltaspike/core/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/core/impl/src/main/resources/META-INF/beans.xml
@@ -20,7 +20,6 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<interceptors>
<class>org.apache.deltaspike.core.impl.throttling.ThrottledInterceptor</class>
<class>org.apache.deltaspike.core.impl.lock.LockedInterceptor</class>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/core/impl/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/resources/META-INF/beans.xml b/deltaspike/core/impl/src/test/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/core/impl/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/core/impl/src/test/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml b/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml
index 5ec0dc6..e9f29b3 100644
--- a/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml
+++ b/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml b/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml
index a786d3c..e9f29b3 100644
--- a/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml
+++ b/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
-</beans>
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml b/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml
index 4eb27e3..3baf2b1 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml
@@ -21,7 +21,6 @@
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<interceptors>
<class>org.apache.deltaspike.security.impl.extension.SecurityInterceptor</class>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml
index d9f0020..a08d5bb 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml
@@ -20,7 +20,6 @@
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<interceptors>
<class>org.apache.deltaspike.security.impl.extension.SecurityInterceptor</class>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml
index 536e3ea..b8919a5 100644
--- a/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml
@@ -23,5 +23,4 @@
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd
http://jboss.org/schema/weld/beans http://jboss.org/schema/weld/beans_1_1.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml
index 102176e..be82047 100644
--- a/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml
@@ -20,7 +20,6 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<interceptors>
<class>org.apache.deltaspike.jpa.impl.transaction.TransactionalInterceptor</class>
</interceptors>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml
index a4f1271..3de29a5 100644
--- a/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml
@@ -20,6 +20,5 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan -->
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml
index 7959cb9..1ef3594 100644
--- a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml
@@ -20,7 +20,6 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<interceptors>
<class>org.apache.deltaspike.jsf.impl.config.view.navigation.NavigationParameterInterceptor</class>
<class>org.apache.deltaspike.jsf.impl.config.view.navigation.NavigationParameterListInterceptor</class>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml
index a4f1271..3de29a5 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml
@@ -20,6 +20,5 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan -->
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml
index a786d3c..9d341e0 100644
--- a/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml
@@ -19,6 +19,4 @@
-->
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
-</beans>
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml
index a4f1271..3de29a5 100644
--- a/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml
@@ -20,6 +20,5 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan -->
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml
index dce54ef..0d2c152 100644
--- a/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml
@@ -20,7 +20,6 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<interceptors>
<class>org.apache.deltaspike.proxy.util.EnableInterceptorsInterceptor</class>
</interceptors>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/proxy/impl-asm5/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/impl-asm5/src/main/resources/META-INF/beans.xml b/deltaspike/modules/proxy/impl-asm5/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/modules/proxy/impl-asm5/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/proxy/impl-asm5/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml
index a786d3c..a2308ff 100644
--- a/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,4 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml
index a4f1271..3de29a5 100644
--- a/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml
@@ -20,6 +20,5 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan -->
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml
index a786d3c..9d341e0 100644
--- a/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml
@@ -19,6 +19,4 @@
-->
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
-</beans>
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml
index 38616f2..a6d764b 100644
--- a/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml
@@ -20,7 +20,6 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<interceptors>
<class>org.apache.deltaspike.security.impl.extension.SecurityInterceptor</class>
</interceptors>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml
index 269f9d1..3de29a5 100644
--- a/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml
+++ b/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml
@@ -21,5 +21,4 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
<!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan -->
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/servlet/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/servlet/api/src/main/resources/META-INF/beans.xml
index 3e57a96..29140b6 100644
--- a/deltaspike/modules/servlet/api/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/servlet/api/src/main/resources/META-INF/beans.xml
@@ -19,5 +19,4 @@
-->
<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">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/servlet/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/servlet/impl/src/main/resources/META-INF/beans.xml
index 3e57a96..29140b6 100644
--- a/deltaspike/modules/servlet/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/servlet/impl/src/main/resources/META-INF/beans.xml
@@ -19,5 +19,4 @@
-->
<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">
- <trim/>
</beans>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2da220a2/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml
index feb0e0d..38c9786 100644
--- a/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml
+++ b/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml
@@ -20,7 +20,6 @@
<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://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <trim/>
<decorators>
<class>org.apache.deltaspike.testcontrol.impl.request.ContextControlDecorator</class>