Enable annotations by default (because they are needed by servlet 3.0)

VERSION.txt

@@ -4,6 +4,7 @@ jetty-7.5.0-SNAPSHOT
 
 jetty-8.0.0.RC0
  + Merge from jetty-7.4.3
+ + Enable annotations by default
 
 jetty-8.0.0.M3
  + 324505 Implement API login

jetty-annotations/pom.xml

@@ -13,6 +13,23 @@
   </properties>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>config</descriptorRef>
+              </descriptorRefs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

jetty-annotations/src/main/config/etc/jetty-annotations.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+    <!-- ================================================================= -->
+    <!-- Enable annotations - configure deployment steps for every web app -->
+    <!-- ================================================================= -->
+    <Call name="setAttribute">
+      <Arg>org.eclipse.jetty.webapp.configuration</Arg>
+      <Arg>
+          <Array type="java.lang.String">
+               <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
+               <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
+               <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
+               <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
+               <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item>
+               <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
+               <Item>org.eclipse.jetty.annotations.ContainerInitializerConfiguration</Item>
+          </Array>
+      </Arg>
+    </Call>
+
+</Configure>

jetty-distribution/pom.xml

@@ -86,6 +86,8 @@
 
                 <!-- ${jetty.home}/lib/ -->
                 <mkdir dir="${assembly-directory}/lib" />
+                <copy file="${orbit-cache}/javax.servlet_${orbit-javax-servlet-version}.jar" tofile="${assembly-directory}/lib/servlet-api-3.0.jar" />
+
                
                 <!-- ${jetty.home}/lib/annotations/ -->
                 <mkdir dir="${assembly-directory}/lib/annotations" />
@@ -282,6 +284,16 @@
                   <includes>**</includes>
                   <outputDirectory>${assembly-directory}</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty</groupId>
+                  <artifactId>jetty-annotations</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>config</classifier>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <includes>**</includes>
+                  <outputDirectory>${assembly-directory}</outputDirectory>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -485,16 +497,6 @@
                   <outputDirectory>${assembly-directory}</outputDirectory>
                   <destFileName>start.jar</destFileName>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>${servlet.spec.groupId}</groupId>
-                  <artifactId>${servlet.spec.artifactId}</artifactId>
-                  <version>${servlet.spec.version}</version>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <includes>**</includes>
-                  <outputDirectory>${assembly-directory}/lib</outputDirectory>
-                  <destFileName>servlet-api-3.0.jar</destFileName>
-                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-overlay-deployer</artifactId>

jetty-distribution/src/main/resources/start.ini

@@ -45,7 +45,7 @@
 # for a full listing do
 #   java -jar start.jar --list-options
 #-----------------------------------------------------------
-OPTIONS=Server,jsp,jmx,resources,websocket,ext
+OPTIONS=Server,jsp,jmx,resources,websocket,ext,plus,annotations
 #-----------------------------------------------------------
 
 
@@ -56,6 +56,7 @@ OPTIONS=Server,jsp,jmx,resources,websocket,ext
 #-----------------------------------------------------------
 #etc/jetty-jmx.xml
 etc/jetty.xml
+etc/jetty-annotations.xml
 # etc/jetty-ssl.xml
 # etc/jetty-requestlog.xml
 etc/jetty-deploy.xml