added ui form to install plugin packages

scm-webapp/src/main/java/sonia/scm/api/rest/RestActionResultMessageWriter.java

@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.api.rest;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.common.base.Charsets;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Provider
+public class RestActionResultMessageWriter
+  implements MessageBodyWriter<RestActionResult>
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param result
+   * @param type
+   * @param genericType
+   * @param annotations
+   * @param mediaType
+   * @param httpHeaders
+   * @param entityStream
+   *
+   * @throws IOException
+   * @throws WebApplicationException
+   */
+  @Override
+  public void writeTo(RestActionResult result, Class<?> type, Type genericType,
+    Annotation[] annotations, MediaType mediaType,
+    MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+    throws IOException, WebApplicationException
+  {
+    String v =
+      "{\"success\": ".concat(String.valueOf(result.isSuccess())).concat("}");
+
+    entityStream.write(v.getBytes(Charsets.UTF_8));
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param result
+   * @param type
+   * @param genericType
+   * @param annotations
+   * @param mediaType
+   *
+   * @return
+   */
+  @Override
+  public long getSize(RestActionResult result, Class<?> type, Type genericType,
+    Annotation[] annotations, MediaType mediaType)
+  {
+    return -1;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param type
+   * @param genericType
+   * @param annotations
+   * @param mediaType
+   *
+   * @return
+   */
+  @Override
+  public boolean isWriteable(Class<?> type, Type genericType,
+    Annotation[] annotations, MediaType mediaType)
+  {
+    return RestActionResult.class.isAssignableFrom(type);
+  }
+}

scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java

@@ -44,6 +44,7 @@ import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import sonia.scm.api.rest.RestActionResult;
 import sonia.scm.plugin.DefaultPluginManager;
 import sonia.scm.plugin.OverviewPluginFilter;
 import sonia.scm.plugin.PluginConditionFailedException;
@@ -113,8 +114,6 @@ public class PluginResource
    *   <li>500 internal server error</li>
    * </ul>
    *
-   *
-   *
    * @param uploadedInputStream
    * @return
    *
@@ -123,6 +122,7 @@ public class PluginResource
   @POST
   @Path("install-package")
   @Consumes(MediaType.MULTIPART_FORM_DATA)
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
   public Response install(
     @FormDataParam("package") InputStream uploadedInputStream)
     throws IOException
@@ -132,13 +132,20 @@ public class PluginResource
     try
     {
       pluginManager.installPackage(uploadedInputStream);
-      response = Response.ok().build();
+      response = Response.ok(new RestActionResult(true)).build();
     }
     catch (PluginConditionFailedException ex)
     {
       logger.warn(
         "could not install plugin package, because the condition failed", ex);
-      response = Response.status(Status.CONFLICT).build();
+      response = Response.status(Status.CONFLICT).entity(
+        new RestActionResult(false)).build();
+    }
+    catch (Exception ex)
+    {
+      logger.warn("plugin installation failed", ex);
+      response =
+        Response.serverError().entity(new RestActionResult(false)).build();
     }
 
     return response;
@@ -165,6 +172,32 @@ public class PluginResource
     return Response.ok().build();
   }
 
+  /**
+   * Installs a plugin from a package. This method is a workaround for ExtJS 
+   * file upload, which requires text/html as content-type.<br />
+   * <br />
+   * <ul>
+   *   <li>200 success</li>
+   *   <li>412 conflict</li>
+   *   <li>500 internal server error</li>
+   * </ul>
+   *
+   * @param uploadedInputStream
+   * @return
+   *
+   * @throws IOException
+   */
+  @POST
+  @Path("install-package.html")
+  @Consumes(MediaType.MULTIPART_FORM_DATA)
+  @Produces(MediaType.TEXT_HTML)
+  public Response installFromUI(
+    @FormDataParam("package") InputStream uploadedInputStream)
+    throws IOException
+  {
+    return install(uploadedInputStream);
+  }
+
   /**
    * Uninstalls a plugin.<br />
    * <br />