Merge pull request #11809 from JiriOndrusek/JBEAP-15758_ignore-depend…

…ency-does-not-work [WFLY-11282] ignore-dependency in jboss-web.xml does not work
wildfly · Nov 13, 2018 · 6dff5bd · 6dff5bd
2 parents 31eccfa + ab23ee3
commit 6dff5bd
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/ee/src/main/java/org/jboss/as/ee/component/deployers/ResourceReferenceProcessor.java b/ee/src/main/java/org/jboss/as/ee/component/deployers/ResourceReferenceProcessor.java
@@ -84,6 +84,9 @@ private List<BindingConfiguration> getResourceEnvRefEntries(final DeploymentUnit
             return bindings;
         }
         for (ResourceEnvironmentReferenceMetaData resourceEnvRef : resourceEnvRefs) {
+            if(resourceEnvRef.isDependencyIgnored()) {
+                continue;
+            }
             final String name;
             if (resourceEnvRef.getName().startsWith("java:")) {
                 name = resourceEnvRef.getName();
@@ -139,6 +142,9 @@ private List<BindingConfiguration> getResourceRefEntries(final DeploymentUnit de
             return bindings;
         }
         for (final ResourceReferenceMetaData resourceRef : resourceRefs) {
+            if(resourceRef.isDependencyIgnored()) {
+                continue;
+            }
             final String name;
             if (resourceRef.getName().startsWith("java:")) {
                 name = resourceRef.getName();
@@ -225,6 +231,9 @@ private List<BindingConfiguration> getEnvironmentEntries(final DeploymentDescrip
             return bindings;
         }
         for (final EnvironmentEntryMetaData envEntry : envEntries) {
+            if(envEntry.isDependencyIgnored()) {
+                continue;
+            }
             final String name;
             if (envEntry.getName().startsWith("java:")) {
                 name = envEntry.getName();
@@ -310,6 +319,9 @@ private List<BindingConfiguration> getMessageDestinationRefs(final DeploymentDes
             return bindings;
         }
         for (final MessageDestinationReferenceMetaData messageRef : messageDestinationReferences) {
+            if(messageRef.isDependencyIgnored()) {
+                continue;
+            }
             final String name;
             if (messageRef.getName().startsWith("java:")) {
                 name = messageRef.getName();

diff --git a/.../org/jboss/as/test/integration/ee/injection/resource/resourceref/ResourceRefTestCase.java b/.../org/jboss/as/test/integration/ee/injection/resource/resourceref/ResourceRefTestCase.java
@@ -25,6 +25,7 @@
 import java.net.URL;
 
 import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
@@ -64,6 +65,7 @@ public static Archive<?> deployment() {
 
         WebArchive war = ShrinkWrap.create(WebArchive.class, "managed-bean.war");
         war.addAsWebInfResource(ResourceRefTestCase.class.getPackage(),"web.xml", "web.xml");
+        war.addAsWebInfResource(ResourceRefTestCase.class.getPackage(),"jboss-web.xml", "jboss-web.xml");
         war.addClasses(ResourceRefTestCase.class, DatasourceManagedBean.class, CreateQueueSetupTask.class);
 
         JavaArchive jar = ShrinkWrap.create(JavaArchive.class, "resource-ref-test.jar");
@@ -84,6 +86,12 @@ public void testCorrectBinding() throws NamingException {
         Assert.assertTrue(result instanceof DataSource);
     }
 
+    @Test(expected = NameNotFoundException.class)
+    public void testIgnoredDependency() throws NamingException {
+        InitialContext context = new InitialContext();
+        context.lookup("java:module/env/ds-ignored");
+    }
+
     @Test
     public void testInjection() throws NamingException {
         InitialContext context = new InitialContext();

diff --git a/...c/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/jboss-web.xml b/...c/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/jboss-web.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-web xmlns="http://www.jboss.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-web_7_2.xsd"
+           version="7.2">
+
+    <resource-ref>
+        <res-ref-name>ds-ignored</res-ref-name>
+        <ignore-dependency/>
+    </resource-ref>
+
+</jboss-web>
+
diff --git a/...sic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/web.xml b/...sic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/web.xml
@@ -13,4 +13,9 @@
         </injection-target>
     </resource-ref>
 
+    <resource-ref>
+        <res-ref-name>ds-ignored</res-ref-name>
+        <lookup-name>java:jboss/datasources/ExampleDS</lookup-name>
+    </resource-ref>
+
 </web-app>