Make annotations and JNDI wortk with OSGi

11 files changed, 49 insertions, 31 deletions

diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
index 43e496ac68..b8bc0cfc83 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
@@ -47,6 +47,15 @@
           <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
+          <webResources>
+            <resource>
+                <directory>target</directory>
+                <includes>
+                  <include>plugin-context.xml</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+          </webResources>
         </configuration>
       </plugin>
 
@@ -70,10 +79,22 @@
             <configuration>
               <instructions>
                 <Bundle-SymbolicName>org.eclipse.jetty.tests.test-spec-webapp</Bundle-SymbolicName>
-                <Import-Package>javax.servlet.jsp.*;version="[2.2.0, 3.0)",javax.transaction.*;version="[1.1, 2.0)", javax.servlet.*;version="3.0",org.eclipse.jetty.*;version="9.2",*</Import-Package>
-                <Export-Package>!com.acme*</Export-Package>
+                <Bundle-Description>Test Webapp for Servlet 3.1 Features</Bundle-Description>
+                <Import-Package>
+                  javax.servlet.jsp.*;version="[2.2.0, 3.0)",
+                  javax.transaction.*;version="[1.1, 2.0)", 
+                  javax.servlet.*;version="3.0",
+                  javax.sql,
+                  org.eclipse.jetty.webapp;version="9.2",org.eclipse.jetty.plus.jndi;version="9.2",
+                  org.eclipse.jetty.security;version="9.2",
+                  com.acme;version="9.2",
+                  *
+                </Import-Package>
+                <Export-Package>com.acme.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
                 <Web-ContextPath>/</Web-ContextPath>
                 <Bundle-ClassPath>.,WEB-INF/classes,WEB-INF/lib</Bundle-ClassPath>
+                <Jetty-ContextFilePath>./META-INF/plugin-context.xml</Jetty-ContextFilePath>
+                <_nouses>true</_nouses>
               </instructions>
             </configuration>
            </execution>
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AnnotatedListener.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotatedListener.java
index 2a5caf276a..0b05fa7af4 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AnnotatedListener.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotatedListener.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 
 import javax.annotation.Resource;
 import javax.servlet.ServletContextAttributeEvent;
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AnnotationTest.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotationTest.java
index 502e4b1c48..7ec4c8f413 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AnnotationTest.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotationTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -110,7 +110,7 @@ public class AnnotationTest extends HttpServlet
        try
        {
            InitialContext ic = new InitialContext();
-           envLookupResult = "java:comp/env/com.acme.AnnotationTest/maxAmount="+ic.lookup("java:comp/env/com.acme.AnnotationTest/maxAmount");
+           envLookupResult = "java:comp/env/com.acme.test.AnnotationTest/maxAmount="+ic.lookup("java:comp/env/com.acme.test.AnnotationTest/maxAmount");
        }
        catch (Exception e)
        {
@@ -131,7 +131,7 @@ public class AnnotationTest extends HttpServlet
       try
       {
           InitialContext ic = new InitialContext();
-          envLookupResult3 = "java:comp/env/com.acme.AnnotationTest/avgAmount="+ic.lookup("java:comp/env/com.acme.AnnotationTest/avgAmount");
+          envLookupResult3 = "java:comp/env/com.acme.test.AnnotationTest/avgAmount="+ic.lookup("java:comp/env/com.acme.test.AnnotationTest/avgAmount");
       }
       catch (Exception e)
       {
@@ -143,7 +143,7 @@ public class AnnotationTest extends HttpServlet
        try
        {
            InitialContext ic = new InitialContext();
-           dsLookupResult = "java:comp/env/com.acme.AnnotationTest/myDatasource="+ic.lookup("java:comp/env/com.acme.AnnotationTest/myDatasource");
+           dsLookupResult = "java:comp/env/com.acme.test.AnnotationTest/myDatasource="+ic.lookup("java:comp/env/com.acme.test.AnnotationTest/myDatasource");
        }
        catch (Exception e)
        {
@@ -154,7 +154,7 @@ public class AnnotationTest extends HttpServlet
        try
        {
            InitialContext ic = new InitialContext();
-           txLookupResult = "java:comp/env/com.acme.AnnotationTest/myUserTransaction="+ic.lookup("java:comp/env/com.acme.AnnotationTest/myUserTransaction");
+           txLookupResult = "java:comp/env/com.acme.test.AnnotationTest/myUserTransaction="+ic.lookup("java:comp/env/com.acme.test.AnnotationTest/myUserTransaction");
        }
        catch (Exception e)
        {
@@ -209,14 +209,14 @@ public class AnnotationTest extends HttpServlet
 
              __HandlesTypes = Arrays.asList( "javax.servlet.GenericServlet", 
                                              "javax.servlet.http.HttpServlet", 
-                                             "com.acme.AsyncListenerServlet",
-                                             "com.acme.AnnotationTest", 
-                                             "com.acme.RoleAnnotationTest", 
-                                             "com.acme.MultiPartTest", 
-                                             "com.acme.FragmentServlet", 
-                                             "com.acme.TestListener",
-                                             "com.acme.SecuredServlet",
-                                             "com.acme.Bar");
+                                             "com.acme.test.AsyncListenerServlet",
+                                             "com.acme.test.AnnotationTest", 
+                                             "com.acme.test.RoleAnnotationTest", 
+                                             "com.acme.test.MultiPartTest", 
+                                             "com.acme.fragment.FragmentServlet", 
+                                             "com.acme.test.TestListener",
+                                             "com.acme.test.SecuredServlet",
+                                             "com.acme.test.Bar");
              out.println("<h2>@ContainerInitializer</h2>");
              out.println("<pre>");
              out.println("@HandlesTypes({javax.servlet.Servlet.class, Foo.class})");
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AsyncListenerServlet.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AsyncListenerServlet.java
index 4f78352109..e89378c524 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AsyncListenerServlet.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AsyncListenerServlet.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/Bar.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/Bar.java
index bbb083fb08..f3bf8beda0 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/Bar.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/Bar.java
@@ -16,12 +16,12 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 
 
 public class Bar {
         
-        @Foo(2)
+        @com.acme.initializer.Foo(2)
         public void someMethod () {
         }
 
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/MultiPartTest.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/MultiPartTest.java
index 12cbee865d..ba3f4ab3e6 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/MultiPartTest.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/MultiPartTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/RoleAnnotationTest.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/RoleAnnotationTest.java
index 0958f61015..5e87c6da5a 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/RoleAnnotationTest.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/RoleAnnotationTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 
 import java.io.IOException;
 
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/SecuredServlet.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/SecuredServlet.java
index d542615d35..82b187022e 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/SecuredServlet.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/SecuredServlet.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/TestListener.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/TestListener.java
index e92f449138..c3107dce9e 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/TestListener.java
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/TestListener.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package com.acme;
+package com.acme.test;
 import java.util.EventListener;
 
 import javax.annotation.PostConstruct;
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpSessionIdListener;
 import javax.servlet.http.HttpSessionListener;
 
 
-@Foo(1)
+@com.acme.initializer.Foo(1)
 @WebListener
 public class TestListener implements HttpSessionListener,  HttpSessionAttributeListener, HttpSessionActivationListener, ServletContextListener, ServletContextAttributeListener, ServletRequestListener, ServletRequestAttributeListener
 {
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/META-INF/MANIFEST.MF b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e9495128c..0000000000
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0

-Class-Path: 

-

diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/web.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/web.xml
index e81ecc1ab4..c03d5c83d4 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/web.xml
@@ -9,7 +9,7 @@
   <display-name>Test Annotations WebApp</display-name>
   
   <listener>
-    <listener-class>com.acme.TestListener</listener-class>
+    <listener-class>com.acme.test.TestListener</listener-class>
   </listener>
 
 
@@ -25,7 +25,7 @@
   
   <servlet>
     <servlet-name>RoleAnnotationTest</servlet-name>
-    <servlet-class>com.acme.RoleAnnotationTest</servlet-class>
+    <servlet-class>com.acme.test.RoleAnnotationTest</servlet-class>
     <load-on-startup>1</load-on-startup>
     <security-role-ref>
       <role-name>manager</role-name>
@@ -40,7 +40,7 @@
   
   <servlet>
     <servlet-name>Multi</servlet-name>
-    <servlet-class>com.acme.MultiPartTest</servlet-class>
+    <servlet-class>com.acme.test.MultiPartTest</servlet-class>
     <load-on-startup>2</load-on-startup>
   </servlet>
 
@@ -50,7 +50,7 @@
   </servlet-mapping>
 
   <env-entry>
-    <env-entry-name>com.acme.AnnotationTest/avgAmount</env-entry-name>
+    <env-entry-name>com.acme.test.AnnotationTest/avgAmount</env-entry-name>
     <env-entry-type>java.lang.Double</env-entry-type>
     <env-entry-value>1.25</env-entry-value>
   </env-entry>