/*
 * Copyright (C) 2014 Glyptodon LLC
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */

package org.glyptodon.guacamole.net.basic.rest;

import com.google.inject.Scopes;
import com.google.inject.servlet.ServletModule;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
import org.glyptodon.guacamole.net.basic.rest.auth.LoginRESTService;
import org.glyptodon.guacamole.net.basic.rest.connection.ConnectionRESTService;
import org.glyptodon.guacamole.net.basic.rest.connectiongroup.ConnectionGroupRESTService;
import org.glyptodon.guacamole.net.basic.rest.permission.PermissionRESTService;
import org.glyptodon.guacamole.net.basic.rest.protocol.ProtocolRESTService;
import org.glyptodon.guacamole.net.basic.rest.user.UserRESTService;

/**
 * A Guice Module to set up the servlet mappings for the Guacamole REST API.
 * 
 * @author James Muehlner
 */
public class RESTServletModule extends ServletModule {
    
    @Override
    protected void configureServlets() {
        
        // Set up the API endpoints
        bind(ConnectionRESTService.class);
        bind(ConnectionGroupRESTService.class);
        bind(PermissionRESTService.class);
        bind(ProtocolRESTService.class);
        bind(UserRESTService.class);
        bind(LoginRESTService.class);
        
        // Set up the servlet and JSON mappings
        bind(GuiceContainer.class);
        bind(JacksonJsonProvider.class).in(Scopes.SINGLETON);
        serve("/api/*").with(GuiceContainer.class);

    }
    
}

@@ -1408,23 +1408,160 @@
 sic.
-rest.auth.Login
+SessionKeepAlive;%0Aimport org.glyptodon.guacamole.net.basic.rest.auth.LoginRESTService;%0Aimport org.glyptodon.guacamole.net.basic.rest.clipboard.Clipboard
 REST
@@ -2239,16 +2239,58 @@
 dpoints%0A
+        bind(ClipboardRESTService.class);%0A
         
@@ -2448,32 +2448,70 @@
 Service.class);%0A
+        bind(SessionKeepAlive.class);%0A
         bind(Use

Add missing REST servlets.