CXFJAXRSFilter applied to wrong StandardContext in certain circumstances

With the following EAR structure

test.ear - application id test-app

– test1.war – plain servlet - context-root /test-app

– test2.war -EJB/REST component - /test-rest

The CXFJAXRSFilter will be registered to test1.war and not test2.war as the application id is evaluated against the context as opposed to the webcontext being evaluated against the context path.