Skip to content

Commit

Permalink
511226: Use native HttpClient SPNEGO/Kerberos support for Windows
Browse files Browse the repository at this point in the history
- Configure native SPNEGO/Kerberos support if available
- Use HttpClient 4.5 API to simplify client configuration
- Include dependencies on our site
- Remove dependencies from main feature, but keep them on update site

Bug: 511226
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511226
  • Loading branch information
creckord committed May 11, 2017
1 parent a632abd commit 9742c73
Show file tree
Hide file tree
Showing 53 changed files with 1,944 additions and 633 deletions.
73 changes: 38 additions & 35 deletions org.eclipse.epp.mpc-target/staging.target
@@ -1,35 +1,38 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="MPC Target Platform - Staging" sequenceNumber="7">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.7-I-builds"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.hamcrest.core" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.userstorage.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/usssdk/updates/latest"/>
</location>
</locations>
</target>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="MPC Target Platform - Staging" sequenceNumber="7">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.7-I-builds"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.junit" version="0.0.0"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.hamcrest.core" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170411114559/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.epp.mpc.apache.httpclient.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.apache.httpclient.feature.source.feature.group" version="0.0.0"/>
<repository location="https://hudson.eclipse.org/mpc/job/epp-mpc-httpclient-feature/lastSuccessfulBuild/artifact/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.userstorage.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/usssdk/updates/latest"/>
</location>
</locations>
</target>
7 changes: 7 additions & 0 deletions org.eclipse.epp.mpc.core.win32/.classpath
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 2 additions & 0 deletions org.eclipse.epp.mpc.core.win32/.gitignore
@@ -0,0 +1,2 @@
bin
target
38 changes: 38 additions & 0 deletions org.eclipse.epp.mpc.core.win32/.options
@@ -0,0 +1,38 @@
# Debugging options for the org.eclipse.epp.mpc.core plugin.

org.eclipse.epp.mpc.core/debug=false

# Fake values for client environment detection
org.eclipse.epp.mpc.core/client/fakeVersion=false
org.eclipse.epp.mpc.core/client/client=org.eclipse.epp.mpc.core
org.eclipse.epp.mpc.core/client/client.version=
org.eclipse.epp.mpc.core/client/os=
org.eclipse.epp.mpc.core/client/ws=
org.eclipse.epp.mpc.core/client/java.version=
org.eclipse.epp.mpc.core/client/product=
org.eclipse.epp.mpc.core/client/product.version=
org.eclipse.epp.mpc.core/client/runtime.version=
org.eclipse.epp.mpc.core/client/platform.version=

# Mars:
#org.eclipse.epp.mpc.core/client/product=epp.package.java
#org.eclipse.epp.mpc.core/client/product.version=4.5.0.20150326-0704
#org.eclipse.epp.mpc.core/client/runtime.version=3.8.0.v20120521-2346
#org.eclipse.epp.mpc.core/client/platform.version=4.5.0.v20150203-1300

# Luna:
#org.eclipse.epp.mpc.core/client/product=epp.package.java
#org.eclipse.epp.mpc.core/client/product.version=4.4.0.20140612-0500
#org.eclipse.epp.mpc.core/client/runtime.version=3.10.0.v20140318-22146
#org.eclipse.epp.mpc.core/client/platform.version=4.4.0.v20140606-1215

# Kepler:
#org.eclipse.epp.mpc.core/client/product=epp.package.java
#org.eclipse.epp.mpc.core/client/product.version=2.0.0.20130613-0530
#org.eclipse.epp.mpc.core/client/runtime.version=3.9.0.v20130326-1255
#org.eclipse.epp.mpc.core/client/platform.version=4.3.0.v20130605-2000

# Juno:
#org.eclipse.epp.mpc.core/client/product=epp.package.java
#org.eclipse.epp.mpc.core/client/product.version=1.5.0.20120131-1544
#org.eclipse.epp.mpc.core/client/runtime.version=3.8.0.v20120521-2346
39 changes: 39 additions & 0 deletions org.eclipse.epp.mpc.core.win32/.project
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.epp.mpc.core.win32</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>

0 comments on commit 9742c73

Please sign in to comment.