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

use new HttpClient api

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-05-09 12:12:20 +02:00
parent 3d46ffc7e4
commit 155b2e11da
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -52,6 +52,8 @@ import sonia.scm.group.GroupManager;
import sonia.scm.group.xml.XmlGroupManager; import sonia.scm.group.xml.XmlGroupManager;
import sonia.scm.io.DefaultFileSystem; import sonia.scm.io.DefaultFileSystem;
import sonia.scm.io.FileSystem; import sonia.scm.io.FileSystem;
import sonia.scm.net.HttpClient;
import sonia.scm.net.URLHttpClient;
import sonia.scm.plugin.DefaultPluginManager; import sonia.scm.plugin.DefaultPluginManager;
import sonia.scm.plugin.Plugin; import sonia.scm.plugin.Plugin;
import sonia.scm.plugin.PluginLoader; import sonia.scm.plugin.PluginLoader;
@@ -86,7 +88,6 @@ import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
import com.sun.jersey.spi.container.servlet.ServletContainer; import com.sun.jersey.spi.container.servlet.ServletContainer;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -94,7 +95,6 @@ import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra
@@ -218,6 +218,9 @@ public class ScmServletModule extends ServletModule
bind(GroupManager.class).to(XmlGroupManager.class); bind(GroupManager.class).to(XmlGroupManager.class);
bind(CGIExecutorFactory.class).to(DefaultCGIExecutorFactory.class); bind(CGIExecutorFactory.class).to(DefaultCGIExecutorFactory.class);
// bind httpclient
bind(HttpClient.class).to(URLHttpClient.class);
/* /*
* filter(PATTERN_PAGE, * filter(PATTERN_PAGE,
* PATTERN_STATIC_RESOURCES).through(StaticResourceFilter.class); * PATTERN_STATIC_RESOURCES).through(StaticResourceFilter.class);

13
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -48,6 +48,7 @@ import sonia.scm.SCMContextProvider;
import sonia.scm.cache.Cache; import sonia.scm.cache.Cache;
import sonia.scm.cache.CacheManager; import sonia.scm.cache.CacheManager;
import sonia.scm.config.ScmConfiguration; import sonia.scm.config.ScmConfiguration;
import sonia.scm.net.HttpClient;
import sonia.scm.security.SecurityContext; import sonia.scm.security.SecurityContext;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
import sonia.scm.util.IOUtil; import sonia.scm.util.IOUtil;
@@ -112,19 +113,21 @@ public class DefaultPluginManager implements PluginManager
* @param configuration * @param configuration
* @param pluginLoader * @param pluginLoader
* @param cacheManager * @param cacheManager
* @param client
*/ */
@Inject @Inject
public DefaultPluginManager( public DefaultPluginManager(
SCMContextProvider context, SCMContextProvider context,
Provider<SecurityContext> securityContextProvicer, Provider<SecurityContext> securityContextProvicer,
ScmConfiguration configuration, PluginLoader pluginLoader, ScmConfiguration configuration, PluginLoader pluginLoader,
CacheManager cacheManager) CacheManager cacheManager, HttpClient client)
{ {
this.context = context; this.context = context;
this.securityContextProvicer = securityContextProvicer; this.securityContextProvicer = securityContextProvicer;
this.configuration = configuration; this.configuration = configuration;
this.cache = cacheManager.getCache(String.class, PluginCenter.class, this.cache = cacheManager.getCache(String.class, PluginCenter.class,
CACHE_NAME); CACHE_NAME);
this.client = client;
installedPlugins = new HashMap<String, Plugin>(); installedPlugins = new HashMap<String, Plugin>();
for (Plugin plugin : pluginLoader.getInstalledPlugins()) for (Plugin plugin : pluginLoader.getInstalledPlugins())
@@ -533,10 +536,7 @@ public class DefaultPluginManager implements PluginManager
try try
{ {
input = client.get(pluginUrl).getContent();
URLConnection connection = new URL(pluginUrl).openConnection();
input = connection.getInputStream();
/* /*
* TODO: add gzip support * TODO: add gzip support
@@ -644,6 +644,9 @@ public class DefaultPluginManager implements PluginManager
/** Field description */ /** Field description */
private Cache<String, PluginCenter> cache; private Cache<String, PluginCenter> cache;
/** Field description */
private HttpClient client;
/** Field description */ /** Field description */
private ScmConfiguration configuration; private ScmConfiguration configuration;