You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ra...@apache.org on 2015/05/04 20:29:28 UTC
deltaspike git commit: DELTASPIKE-882 - Fix Tests for Partial Bean
and JSF Impl
Repository: deltaspike
Updated Branches:
refs/heads/master d7210631b -> 888e2fe18
DELTASPIKE-882 - Fix Tests for Partial Bean and JSF Impl
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/888e2fe1
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/888e2fe1
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/888e2fe1
Branch: refs/heads/master
Commit: 888e2fe18eddd382a95317ee7b33cd0804c0f86a
Parents: d721063
Author: Rafael Benevides <ra...@gmail.com>
Authored: Mon May 4 14:28:51 2015 -0400
Committer: Rafael Benevides <ra...@gmail.com>
Committed: Mon May 4 14:28:51 2015 -0400
----------------------------------------------------------------------
.../test/jsf/impl/util/ArchiveUtils.java | 7 +++---
.../core/api/partialbean/util/ArchiveUtils.java | 3 ++-
.../api/src/main/resources/META-INF/beans.xml | 23 ++++++++++++++++++++
3 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/888e2fe1/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
index acbdf26..3fe2bf9 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
@@ -57,10 +57,11 @@ public class ArchiveUtils
JavaArchive[] coreArchives = ShrinkWrapArchiveUtil.getArchives(null
, "META-INF/beans.xml"
- , new String[]{ "org.apache.deltaspike.core"
- , "org.apache.deltaspike.jsf" }
+ , new String[]{ "org.apache.deltaspike.core",
+ "org.apache.deltaspike.proxy",
+ "org.apache.deltaspike.jsf" }
, excludedFiles,
- "ds-core_and_jsf");
+ "ds-core_proxy_jsf");
List<JavaArchive> archives = new ArrayList<JavaArchive>(Arrays.asList(coreArchives));
archives.add(grapheneJar);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/888e2fe1/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/util/ArchiveUtils.java b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/util/ArchiveUtils.java
index 2b760d5..446ded4 100644
--- a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/util/ArchiveUtils.java
+++ b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/util/ArchiveUtils.java
@@ -38,10 +38,11 @@ public abstract class ArchiveUtils
temp = ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
new String[] { "org.apache.deltaspike.core",
+ "org.apache.deltaspike.proxy",
"org.apache.deltaspike.test.category",
"org.apache.deltaspike.partialbean" },
new String[] { "META-INF.apache-deltaspike.properties" },
- "ds-core_and_partial-bean");
+ "ds-core_proxy_and_partial-bean");
result.addAll(Arrays.asList(temp));
return result.toArray(new JavaArchive[result.size()]);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/888e2fe1/deltaspike/modules/proxy-utils/api/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy-utils/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/proxy-utils/api/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..4070730
--- /dev/null
+++ b/deltaspike/modules/proxy-utils/api/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,23 @@
+<?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 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.
+-->
+<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">
+</beans>