511226: Use native HttpClient SPNEGO/Kerberos support for Windows

Wrapper feature for target platform inclusion of httpclient-win Bug: 511226 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511226
eclipse-mpc · Apr 18, 2017 · 9aa203b · 9aa203b
1 parent 07f9600
commit 9aa203b
Show file tree

Hide file tree

Showing 16 changed files with 315 additions and 0 deletions.
diff --git a/httpclient-target-site/.gitignore b/httpclient-target-site/.gitignore
@@ -0,0 +1,2 @@
+/.project
+/.settings/
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/.gitignore b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/.gitignore
@@ -0,0 +1,2 @@
+/target
+/.settings/org.eclipse.m2e.core.prefs
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/.project b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epp.mpc.apache.httpclient.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/build.properties b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/feature.properties b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/feature.properties
@@ -0,0 +1,11 @@
+featureName=Apache HttpClient (SEE DESRIPTION)
+providerName=Eclipse MPC Project
+
+description=Apache HttpClient Feature for use in target platforms ONLY.\n\
+DO NOT INCLUDE IN YOUR ACTUAL PRODUCTS OR FEATURES!
+
+copyright=\
+Copyright (c) 2017 Eclipse contributors and others.
+
+license=\
+See the individual bundles.
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/feature.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/feature.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.epp.mpc.apache.httpclient.feature"
+      label="%featureName"
+      version="4.5.2.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseUrl">
+      %license
+   </license>
+
+   <plugin
+         id="org.apache.httpcomponents.httpcore"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.httpcomponents.httpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.httpcomponents.httpclient.win"
+         os="win32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.jna"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.jna.platform"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/pom.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+   	<groupId>org.eclipse.epp.mpc.apache.httpclient</groupId>
+   	<artifactId>org.eclipse.epp.mpc.apache.httpclient.parent</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+   <artifactId>org.eclipse.epp.mpc.apache.httpclient.feature</artifactId>
+   <name>HttpClient Wrapper Feature</name>
+   <version>4.5.2-SNAPSHOT</version>
+   <packaging>eclipse-feature</packaging>
+</project>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/.gitignore b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/.settings/
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/.project b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epp.mpc.apache.httpclient.site</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/category.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/category.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.epp.mpc.apache.httpclient.feature" version="0.0.0">
+   </feature>
+</site>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/pom.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+   <parent>
+   	<groupId>org.eclipse.epp.mpc.apache.httpclient</groupId>
+   	<artifactId>org.eclipse.epp.mpc.apache.httpclient.parent</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+
+	<name>HttpClient Feature Site</name>
+	<artifactId>org.eclipse.epp.mpc.apache.httpclient.site</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<properties>
+		<qualifier>${project.unqualifiedVersion}</qualifier>
+   </properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<configuration>
+					<includeAllDependencies>false</includeAllDependencies>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/.gitignore b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/.settings/
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/.project b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epp.mpc-target</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/httpclient-target.target b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/httpclient-target.target
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="HttpClient Target Platform" sequenceNumber="7">
+<locations>
+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" 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.apache.httpcomponents.httpclient.win" version="4.5.2.v20170410-1149"/>
+<unit id="com.sun.jna" version="4.1.0.v20170410-1117"/>
+<unit id="com.sun.jna.platform" version="4.1.0.v20170410-1117"/>
+<unit id="org.apache.commons.codec" version="0.0.0"/>
+<unit id="org.apache.commons.logging" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170411114559/repository/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" 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>
+</locations>
+</target>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/pom.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+   	<groupId>org.eclipse.epp.mpc.apache.httpclient</groupId>
+   	<artifactId>org.eclipse.epp.mpc.apache.httpclient.parent</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+   <artifactId>httpclient-target</artifactId>
+   <name>HttpClient Target Definition</name>
+   <packaging>eclipse-target-definition</packaging>
+</project>
diff --git a/httpclient-target-site/pom.xml b/httpclient-target-site/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.epp.mpc.apache.httpclient</groupId>
+	<artifactId>org.eclipse.epp.mpc.apache.httpclient.parent</artifactId>
+	<name>HttpClient Wrapper Feature Parent</name>
+   <version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<properties>
+      <tycho.version>0.24.0</tycho.version>
+   </properties>
+
+   <modules>
+      <module>org.eclipse.epp.mpc.apache.httpclient.target</module>
+      <module>org.eclipse.epp.mpc.apache.httpclient.feature</module>
+      <module>org.eclipse.epp.mpc.apache.httpclient.site</module>
+   </modules>
+
+	<build>
+		<plugins>
+         <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-maven-plugin</artifactId>
+         </plugin>
+		</plugins>
+      <pluginManagement>
+         <plugins>
+            <plugin>
+               <groupId>org.eclipse.tycho</groupId>
+               <artifactId>tycho-maven-plugin</artifactId>
+               <version>${tycho.version}</version>
+               <extensions>true</extensions>
+            </plugin>
+            <plugin>
+               <groupId>org.eclipse.tycho</groupId>
+               <artifactId>target-platform-configuration</artifactId>
+               <version>${tycho.version}</version>
+               <configuration>
+                  <resolver>p2</resolver>
+                  <target>
+						<artifact>
+							<groupId>org.eclipse.epp.mpc.apache.httpclient</groupId>
+							<artifactId>httpclient-target</artifactId>
+							<version>1.0.0-SNAPSHOT</version>
+						</artifact>
+					</target>
+          <environments>
+            <environment>
+              <os>*</os>
+              <ws>*</ws>
+              <arch>*</arch>
+            </environment>
+            <environment>
+              <!-- This is needed to make the build work properly with 
+                   our (osgi.os=win32) platform filter -->
+              <os>win32</os>
+              <ws>*</ws>
+              <arch>*</arch>
+            </environment>
+          </environments>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.eclipse.tycho</groupId>
+               <artifactId>tycho-packaging-plugin</artifactId>
+               <version>${tycho.version}</version>
+               <configuration>
+                  <format>${qualifier-format}</format>
+                  <archiveSite>true</archiveSite>
+                  <timestampProvider>jgit</timestampProvider>
+                  <!-- Changed back to "error" in the "release" profile. -->
+                  <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
+               </configuration>
+               <dependencies>
+                  <!-- Required by sourceReferences/generate configuration. -->
+                  <dependency>
+                     <groupId>org.eclipse.tycho.extras</groupId>
+                     <artifactId>tycho-sourceref-jgit</artifactId>
+                     <version>${tycho.version}</version>
+                  </dependency>
+                  <!-- Required by timestampProvider configuration. -->
+                  <dependency>
+                     <groupId>org.eclipse.tycho.extras</groupId>
+                     <artifactId>tycho-buildtimestamp-jgit</artifactId>
+                     <version>${tycho.version}</version>
+                  </dependency>
+               </dependencies>
+            </plugin>
+            <plugin>
+               <groupId>org.eclipse.tycho</groupId>
+               <artifactId>tycho-p2-repository-plugin</artifactId>
+               <version>${tycho.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.eclipse.tycho</groupId>
+               <artifactId>tycho-p2-director-plugin</artifactId>
+               <version>${tycho.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.eclipse.tycho</groupId>
+               <artifactId>tycho-p2-plugin</artifactId>
+               <version>${tycho.version}</version>
+            </plugin>
+         </plugins>
+      </pluginManagement>
+	</build>
+</project>