Merge branch '473-additional-aop.xml'

Author: nebhale

docs/framework-aspectj_weaver_agent.md

@@ -4,7 +4,7 @@ The AspectJ Weaver Agent Framework configures the AspectJ Runtime Weaving Agent
 <table>
   <tr>
     <td><strong>Detection Criterion</strong></td>
-    <td><tt>aspectjweaver-*.jar</tt> existing and <tt>BOOT-INF/classes/META-INF/aop.xml</tt>, <tt>BOOT-INF/classes/org/aspectj/aop.xml</tt>, or <tt>META-INF/aop.xml</tt> existing.</td>
+    <td><tt>aspectjweaver-*.jar</tt> existing and <tt>BOOT-INF/classes/META-INF/aop.xml</tt>, <tt>BOOT-INF/classes/org/aspectj/aop.xml</tt>, <tt>META-INF/aop.xml</tt>, or <tt>org/aspectj/aop.xml</tt> existing.</td>
   </tr>
   <tr>
     <td><strong>Tags</strong></td>

lib/java_buildpack/framework/aspectj_weaver_agent.rb

@@ -54,7 +54,8 @@ def release
       def aop_xml_exist?
         (@application.root + 'BOOT-INF/classes/META-INF/aop.xml').exist? ||
           (@application.root + 'BOOT-INF/classes/org/aspectj/aop.xml').exist? ||
-          (@application.root + 'META-INF/aop.xml').exist?
+          (@application.root + 'META-INF/aop.xml').exist? ||
+          (@application.root + 'org/aspectj/aop.xml').exist?
       end
 
       def enabled?

…ses/BOOT-INF/classes/org/aspectj/aop.xml …ses/BOOT-INF/classes/org/aspectj/aop.xmlspec/fixtures/framework_aspectj_weaver_classes/BOOT-INF/classes/org/aspectj/aop.xml renamed to spec/fixtures/framework_aspectj_weaver_boot_inf_classes/BOOT-INF/classes/org/aspectj/aop.xml spec/fixtures/framework_aspectj_weaver_classes/BOOT-INF/classes/org/aspectj/aop.xml renamed to spec/fixtures/framework_aspectj_weaver_boot_inf_classes/BOOT-INF/classes/org/aspectj/aop.xml

@@ -33,14 +33,14 @@
       expect(component.detect).to be_nil
     end
 
-    it 'detects when aop.xml in classes',
-       app_fixture: 'framework_aspectj_weaver_classes' do
+    it 'detects when aop.xml in BOOT-INF classes',
+       app_fixture: 'framework_aspectj_weaver_boot_inf_classes' do
 
       expect(component.detect).to eq('aspectj-weaver-agent=1.8.10')
     end
 
-    it 'detects when aop.xml in classes/META-INF',
-       app_fixture: 'framework_aspectj_weaver_classes_meta_inf' do
+    it 'detects when aop.xml in BOOT-INF/classes/META-INF',
+       app_fixture: 'framework_aspectj_weaver_boot_inf_classes_meta_inf' do
 
       expect(component.detect).to eq('aspectj-weaver-agent=1.8.10')
     end
@@ -57,9 +57,15 @@
       expect(component.detect).to eq('aspectj-weaver-agent=1.8.10')
     end
 
-    it 'adds java agent',
+    it 'detects when aop.xml in classes',
        app_fixture: 'framework_aspectj_weaver_classes' do
 
+      expect(component.detect).to eq('aspectj-weaver-agent=1.8.10')
+    end
+
+    it 'adds java agent',
+       app_fixture: 'framework_aspectj_weaver_boot_inf_classes' do
+
       component.release
       expect(java_opts).to include('-javaagent:$PWD/BOOT-INF/lib/aspectjweaver-1.8.10.jar')
     end