rpms/httpcomponents-client
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Build httpmime module.

Browse Source
This commit is contained in:
Alexander Kurtakov 2011-02-25 20:29:58 +02:00
parent 4c7fbe5cde
commit 913b07b5ca
2 changed files with 155 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
0001-Cleanup-pom.patch
View File

@ -1,110 +1,3 @@
--- pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
+++ pom.xml 2011-02-17 22:03:40.828341546 +0200
@@ -88,21 +88,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-notice-plugin</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- <executions>
- <execution>
- <id>attach-notice-license</id>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <projectTitle>Apache HttpComponents</projectTitle>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -189,49 +174,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <configuration>
- <includes>index.xml</includes>
- <chunkedOutput>true</chunkedOutput>
- <xincludeSupported>true</xincludeSupported>
- <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
- <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
- <htmlStylesheet>css/hc-tutorial.css</htmlStylesheet>
- <entities>
- <entity>
- <name>version</name>
- <value>${project.version}</value>
- </entity>
- </entities>
- <postProcess>
- <copy todir="target/site/tutorial">
- <fileset dir="target/docbkx">
- <include name="**/*.html" />
- <include name="**/*.pdf" />
- </fileset>
- </copy>
- <copy todir="target/site/tutorial/html">
- <fileset dir="src/docbkx/resources">
- <include name="**/*.css" />
- <include name="**/*.png" />
- <include name="**/*.gif" />
- <include name="**/*.jpg" />
- </fileset>
- </copy>
- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
- </postProcess>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -252,14 +194,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>${comparisonVersion}</comparisonVersion>
- </configuration>
- </plugin>
- </plugins>
+ </plugins>
</build>
<reporting>
@@ -280,15 +215,7 @@
</reportSets>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>${comparisonVersion}</comparisonVersion>
- </configuration>
- </plugin>
-
- </plugins>
+ </plugins>
</reporting>
</project>
--- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200 --- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
+++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200 +++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
@ -176,3 +69,140 @@
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
</plugin> </plugin>
--- pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
+++ pom.xml 2011-02-25 20:17:20.519335750 +0200
@@ -81,28 +81,11 @@
<modules>
<module>httpclient</module>
<module>httpmime</module>
- <module>httpclient-cache</module>
- <module>httpclient-osgi</module>
</modules>
<build>
<plugins>
<plugin>
- <artifactId>maven-notice-plugin</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- <executions>
- <execution>
- <id>attach-notice-license</id>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <projectTitle>Apache HttpComponents</projectTitle>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -189,49 +172,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <configuration>
- <includes>index.xml</includes>
- <chunkedOutput>true</chunkedOutput>
- <xincludeSupported>true</xincludeSupported>
- <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
- <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
- <htmlStylesheet>css/hc-tutorial.css</htmlStylesheet>
- <entities>
- <entity>
- <name>version</name>
- <value>${project.version}</value>
- </entity>
- </entities>
- <postProcess>
- <copy todir="target/site/tutorial">
- <fileset dir="target/docbkx">
- <include name="**/*.html" />
- <include name="**/*.pdf" />
- </fileset>
- </copy>
- <copy todir="target/site/tutorial/html">
- <fileset dir="src/docbkx/resources">
- <include name="**/*.css" />
- <include name="**/*.png" />
- <include name="**/*.gif" />
- <include name="**/*.jpg" />
- </fileset>
- </copy>
- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
- </postProcess>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -252,14 +192,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>${comparisonVersion}</comparisonVersion>
- </configuration>
- </plugin>
- </plugins>
+ </plugins>
</build>
<reporting>
@@ -280,15 +213,7 @@
</reportSets>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>${comparisonVersion}</comparisonVersion>
- </configuration>
- </plugin>
-
- </plugins>
+ </plugins>
</reporting>
</project>
--- httpmime/pom.xml.sav 2011-01-17 22:00:44.000000000 +0200
+++ httpmime/pom.xml 2011-02-25 20:19:09.191564653 +0200
@@ -38,7 +38,7 @@
HttpComponents HttpClient - MIME coded entities
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -112,6 +112,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</build>

32
httpcomponents-client.spec
View File

@ -3,7 +3,7 @@
Name: httpcomponents-client Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1 Version: 4.1
Release: 3%{?dist} Release: 4%{?dist}
Group: Development/Libraries Group: Development/Libraries
License: ASL 2.0 License: ASL 2.0
URL: http://hc.apache.org/ URL: http://hc.apache.org/
@ -15,10 +15,12 @@ BuildArch: noarch
BuildRequires: httpcomponents-project BuildRequires: httpcomponents-project
BuildRequires: httpcomponents-core BuildRequires: httpcomponents-core
BuildRequires: apache-mime4j
Requires: java >= 1:1.6.0 Requires: java >= 1:1.6.0
Requires: jpackage-utils Requires: jpackage-utils
Requires: httpcomponents-core Requires: httpcomponents-core
Requires: apache-mime4j
Requires(post): jpackage-utils Requires(post): jpackage-utils
Requires(postun): jpackage-utils Requires(postun): jpackage-utils
@ -45,26 +47,25 @@ API docs for %{name}.
%patch0 -b .sav %patch0 -b .sav
%build %build
# skip httpmime, httpclient only. For httpmime we need org.apache.james:apache-mime4j mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
pushd httpclient
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
popd
%install %install
cd httpclient
# jars # jars
install -D -m 0644 target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar install -D -m 0644 httpclient/target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar
install -D -m 0644 httpmime/target/httpmime-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpmime.jar
# pom
install -D -m 0644 pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom
%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{base_name} httpclient
# main pom # main pom
install -D -m 0644 ../pom.xml \ install -D -m 0644 pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom
%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{base_name} httpcomponents-client %add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{base_name} httpcomponents-client
# pom
install -D -m 0644 httpclient/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom
%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{base_name} httpclient
install -D -m 0644 httpmime/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpmime.pom
%add_to_maven_depmap org.apache.httpcomponents httpmime %{version} JPP/%{base_name} httpmime
# javadocs # javadocs
install -dm 755 %{buildroot}%{_javadocdir}/%{name} install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@ -91,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog %changelog
* Fri Feb 25 2011 Alexander Kurtakov <akurtako@redhat.com> 4.1-4
- Build httpmime module.
* Fri Feb 18 2011 Alexander Kurtakov <akurtako@redhat.com> 4.1-3 * Fri Feb 18 2011 Alexander Kurtakov <akurtako@redhat.com> 4.1-3
- Don't use basename as an identifier. - Don't use basename as an identifier.