Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 17:05:43 +01:00
Code Issues Packages Projects Releases Activity

fix bundle upload

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-12-01 10:00:03 +01:00
parent 2b3e42052f
commit 9cc86f4fb1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java
View File

@@ -51,8 +51,11 @@ import com.sun.jersey.api.client.ClientHandlerException;
import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientRequest;
import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.client.filter.ClientFilter; import com.sun.jersey.api.client.filter.ClientFilter;
import com.sun.jersey.core.util.MultivaluedMapImpl; import com.sun.jersey.core.util.MultivaluedMapImpl;
import com.sun.jersey.multipart.impl.MultiPartWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -122,7 +125,8 @@ public class JerseyClientProvider implements ScmClientProvider
UrlProvider urlProvider = UrlProviderFactory.createUrlProvider(url, UrlProvider urlProvider = UrlProviderFactory.createUrlProvider(url,
UrlProviderFactory.TYPE_RESTAPI_XML); UrlProviderFactory.TYPE_RESTAPI_XML);
Client client = Client.create(); Client client =
Client.create(new DefaultClientConfig(MultiPartWriter.class));
client.addFilter(new CookieClientFilter()); client.addFilter(new CookieClientFilter());

4
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java
View File

@@ -58,6 +58,7 @@ import java.io.InputStream;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import javax.ws.rs.core.MediaType;
/** /**
* *
@@ -125,7 +126,8 @@ public class JerseyRepositoryClientHandler
form.field(PARAM_NAME, request.getName()); form.field(PARAM_NAME, request.getName());
form.bodyPart(new StreamDataBodyPart(PARAM_BUNDLE, stream)); form.bodyPart(new StreamDataBodyPart(PARAM_BUNDLE, stream));
ClientResponse response = r.post(ClientResponse.class); ClientResponse response =
r.type(MediaType.MULTIPART_FORM_DATA).post(ClientResponse.class, form);
ClientUtil.checkResponse(response); ClientUtil.checkResponse(response);