Clean-up from 2.5

Remove deprecated Protocol constants, unecessary "restrictid" annotations
Bumped internal version to 2,6 SNAPSHOT

Author: jlouvel

org.restlet.gwt/org.restlet.gwt/src/main/java/org/restlet/client/data/Protocol.java

@@ -22,12 +22,6 @@ public final class Protocol {
     /** Indicates that the port number is undefined. */
     public static final int UNKNOWN_PORT = -1;
 
-    /**
-     * AJP 1.3 protocol to communicate with Apache HTTP server or Microsoft IIS.
-     */
-    public static final Protocol AJP = new Protocol("ajp", "AJP",
-            "Apache Jakarta Protocol", 8009);
-
     /** All protocols wildcard. */
     public static final Protocol ALL = new Protocol("all", "ALL",
             "Wildcard for all protocols", UNKNOWN_PORT);
@@ -121,9 +115,7 @@ public static Protocol valueOf(String name) {
         Protocol result = null;
 
         if (!StringUtils.isNullOrEmpty(name)) {
-            if (name.equalsIgnoreCase(AJP.getSchemeName())) {
-                result = AJP;
-            } else if (name.equalsIgnoreCase(CLAP.getSchemeName())) {
+            if (name.equalsIgnoreCase(CLAP.getSchemeName())) {
                 result = CLAP;
             } else if (name.equalsIgnoreCase(FILE.getSchemeName())) {
                 result = FILE;

org.restlet.gwt/org.restlet.gwt/src/main/java/org/restlet/client/engine/Engine.java

@@ -372,15 +372,8 @@ public void registerDefaultConnectors() {
     public void registerDefaultProtocols() {
         getRegisteredProtocols().add(
                 new org.restlet.client.engine.connector.HttpProtocolHelper());
-        getRegisteredProtocols().add(
-                new org.restlet.client.engine.connector.WebDavProtocolHelper());
     }
 
-
-
-
-
-
     /**
      * Sets the logger facade to use.
      *

org.restlet.java/org.restlet.example/pom.xml

@@ -38,6 +38,7 @@
             <groupId>org.restlet</groupId>
             <artifactId>org.restlet.ext.fileupload</artifactId>
             <version>${project.version}</version>
+			<type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.restlet</groupId>

org.restlet.java/org.restlet.ext.guice/pom.xml

@@ -20,21 +20,11 @@
 			<artifactId>guice</artifactId>
 			<version>${lib-guice-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${lib-guava-version}</version>
-		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
 			<version>${lib-javax-inject-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>${lib-aopalliance-version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.restlet</groupId>
 			<artifactId>org.restlet</artifactId>

org.restlet.java/org.restlet.ext.jaxb/pom.xml

@@ -25,12 +25,6 @@
 			<artifactId>jaxb-api</artifactId>
 			<version>${lib-jaxb-api-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.istack</groupId>
-			<artifactId>istack-commons-runtime</artifactId>
-			<version>${lib-sun-istack-version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.restlet</groupId>
 			<artifactId>org.restlet</artifactId>

org.restlet.java/org.restlet.ext.velocity/pom.xml

@@ -15,11 +15,6 @@
 	<description>Integration with Apache Velocity.</description>
 
 	<dependencies>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>${lib-commons-collections-version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
 			<artifactId>velocity-engine-core</artifactId>

org.restlet.java/org.restlet/src/main/java/org/restlet/data/Protocol.java

@@ -22,11 +22,6 @@ public final class Protocol {
 	/** Indicates that the port number is undefined. */
 	public static final int UNKNOWN_PORT = -1;
 
-	/**
-	 * AJP 1.3 protocol to communicate with Apache HTTP server or Microsoft IIS.
-	 */
-	public static final Protocol AJP = new Protocol("ajp", "AJP", "Apache Jakarta Protocol", 8009);
-
 	/** All protocols wildcard. */
 	public static final Protocol ALL = new Protocol("all", "ALL", "Wildcard for all protocols", UNKNOWN_PORT);
 
@@ -77,17 +72,6 @@ public final class Protocol {
 	/** JDBC protocol. */
 	public static final Protocol JDBC = new Protocol("jdbc", "JDBC", "Java DataBase Connectivity", UNKNOWN_PORT);
 
-	/**
-	 * OBAP (OSGi Bundle Access Protocol) is a custom scheme to access to
-	 * representations via bundles referenced using their symbolic name. Example
-	 * URI: "obap://org.restlet/org/restlet/Restlet.class".<br>
-	 * <br>
-	 * In order to work, OBAP requires a client connector provided by the extension
-	 * for the OSGi platform.
-	 */
-	public static final Protocol OBAP = new Protocol("obap", "OBAP", "OSGi Bundle Access Protocol",
-			Protocol.UNKNOWN_PORT, true);
-
 	/**
 	 * RIAP (Restlet Internal Access Protocol) is a custom scheme to access
 	 * representations via internal calls to virtual hosts/components. Example URIs:
@@ -124,9 +108,7 @@ public static Protocol valueOf(String name) {
 		Protocol result = null;
 
 		if (!StringUtils.isNullOrEmpty(name)) {
-			if (name.equalsIgnoreCase(AJP.getSchemeName())) {
-				result = AJP;
-			} else if (name.equalsIgnoreCase(CLAP.getSchemeName())) {
+			if (name.equalsIgnoreCase(CLAP.getSchemeName())) {
 				result = CLAP;
 			} else if (name.equalsIgnoreCase(FILE.getSchemeName())) {
 				result = FILE;

org.restlet.java/org.restlet/src/main/java/org/restlet/engine/Engine.java

@@ -87,10 +87,10 @@ public class Engine {
 	public static final String MAJOR_NUMBER = "2";
 
 	/** Minor version number. */
-	public static final String MINOR_NUMBER = "5";
+	public static final String MINOR_NUMBER = "6";
 
 	/** Release number. */
-	public static final String RELEASE_NUMBER = "-RC1";
+	public static final String RELEASE_NUMBER = "-SNAPSHOT";
 
 	/** The org.restlet log level . */
 	private static volatile Level restletLogLevel;

org.restlet.java/org.restlet/src/main/java/org/restlet/engine/connector/HttpExchangeCall.java

@@ -28,7 +28,6 @@
  * 
  * @author Jerome Louvel
  */
-@SuppressWarnings("restriction")
 public class HttpExchangeCall extends ServerCall {
 
 	/** The wrapped HTTP exchange. */

org.restlet.java/org.restlet/src/main/java/org/restlet/engine/connector/HttpServerHelper.java

@@ -25,7 +25,6 @@
  * 
  * @author Jerome Louvel
  */
-@SuppressWarnings("restriction")
 public class HttpServerHelper extends NetServerHelper {
 	/** The underlying HTTP server. */
 	private volatile HttpServer server;