Skip to content

FORGE-874: Proxy settings not used for maven web project #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

FORGE-874: Proxy settings not used for maven web project #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.jboss.forge.shell.plugins.builtin;

import java.io.IOException;
import java.net.ProxySelector;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -70,10 +69,8 @@
import org.jboss.forge.shell.plugins.Plugin;
import org.jboss.forge.shell.plugins.Topic;
import org.jboss.forge.shell.util.Files;
import org.jboss.forge.shell.util.ForgeProxySelector;
import org.jboss.forge.shell.util.PluginRef;
import org.jboss.forge.shell.util.PluginUtil;
import org.jboss.forge.shell.util.ProxySettings;

/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
Expand Down Expand Up @@ -289,8 +286,6 @@ public void installFromGit(
buildDir.mkdir();
}

prepareProxyForJGit();

ShellMessages.info(out, "Checking out plugin source files to [" + buildDir.getFullyQualifiedName()
+ "] via 'git'");
Git repo = GitUtils.clone(buildDir, gitRepo);
Expand Down Expand Up @@ -524,22 +519,6 @@ private void updateForge(Dependency dependency) throws IOException
System.exit(0);
}

private void prepareProxyForJGit()
{
ProxySettings proxySettings = ProxySettings.fromForgeConfiguration(configuration);
if (proxySettings == null)
{
// There is no proxy configured
return;
}
if (!(ProxySelector.getDefault() instanceof ForgeProxySelector))
{
ForgeProxySelector selector = new ForgeProxySelector(ProxySelector.getDefault(),
proxySettings);
ProxySelector.setDefault(selector);
}
}

/*
* Helpers
*/
Expand Down
26 changes: 25 additions & 1 deletion shell/src/main/java/org/jboss/forge/shell/project/ProjectInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
*/
package org.jboss.forge.shell.project;

import java.net.ProxySelector;

import javax.enterprise.event.Event;
import javax.enterprise.event.Observes;
import javax.inject.Inject;

import org.jboss.forge.env.Configuration;
import org.jboss.forge.project.BaseProject;
import org.jboss.forge.project.Project;
import org.jboss.forge.project.facets.MetadataFacet;
Expand All @@ -18,6 +21,8 @@
import org.jboss.forge.shell.Shell;
import org.jboss.forge.shell.events.InitProject;
import org.jboss.forge.shell.events.PostStartup;
import org.jboss.forge.shell.util.ForgeProxySelector;
import org.jboss.forge.shell.util.ProxySettings;

/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
Expand All @@ -29,15 +34,34 @@ public class ProjectInitializer
private final Event<InitProject> init;

private final ProjectFactory projectFactory;
private final Configuration configuration;

@Inject
public ProjectInitializer(final Shell shell, final CurrentProject currentProjectHolder,
final Event<InitProject> init, final ProjectFactory projectFactory)
final Event<InitProject> init, final ProjectFactory projectFactory, final Configuration configuration)
{
this.shell = shell;
this.cp = currentProjectHolder;
this.init = init;
this.projectFactory = projectFactory;
this.configuration = configuration;
setProxy();
}

private void setProxy()
{
ProxySettings proxySettings = ProxySettings.fromForgeConfiguration(configuration);
if (proxySettings == null)
{
// There is no proxy configured
return;
}
if (!(ProxySelector.getDefault() instanceof ForgeProxySelector))
{
ForgeProxySelector selector = new ForgeProxySelector(ProxySelector.getDefault(),
proxySettings);
ProxySelector.setDefault(selector);
}
}

public void postStartupTrigger(@Observes final PostStartup event)
Expand Down