Repository: deltaspike Updated Branches: refs/heads/master cd75b04e3 -> c30c6bd06
DELTASPIKE-732 Servlet API module needs beans.xml Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/c30c6bd0 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/c30c6bd0 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/c30c6bd0 Branch: refs/heads/master Commit: c30c6bd0661282f9d8bdaf828aa23b4e315fc843 Parents: cd75b04 Author: Christian Kaltepoth <[email protected]> Authored: Mon Oct 27 12:39:19 2014 +0100 Committer: Christian Kaltepoth <[email protected]> Committed: Mon Oct 27 13:37:37 2014 +0100 ---------------------------------------------------------------------- .../api/src/main/resources/META-INF/beans.xml | 22 ++++++++++++++++++++ .../resourceloader/WebResourceProviderTest.java | 1 - 2 files changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c30c6bd0/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 new file mode 100644 index 0000000..75efca0 --- /dev/null +++ b/deltaspike/modules/servlet/api/src/main/resources/META-INF/beans.xml @@ -0,0 +1,22 @@ +<?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://jboss.org/schema/cdi/beans_1_0.xsd";> +</beans> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c30c6bd0/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java index ac950cc..7cd43ed 100644 --- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java +++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java @@ -48,7 +48,6 @@ public class WebResourceProviderTest public static WebArchive getDeployment() { return ShrinkWrap.create(WebArchive.class, WebResourceProviderTest.class.getSimpleName() + ".war") - .addClass(WebResourceProvider.class) .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndServletModuleArchive()) .addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml") .addAsWebResource(new StringAsset("foobar"), "foobar.txt")
