hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1245034 - in /httpcomponents/httpasyncclient/trunk: httpasyncclient-osgi/ httpasyncclient-osgi/pom.xml httpasyncclient/pom.xml pom.xml src/main/assembly/bin.xml src/main/assembly/osgi-bin.xml
Date Thu, 16 Feb 2012 15:39:40 GMT
Author: olegk
Date: Thu Feb 16 15:39:39 2012
New Revision: 1245034

URL: http://svn.apache.org/viewvc?rev=1245034&view=rev
Log:
Added OSGi package for HttpAsyncClient

Added:
    httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/
    httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml   (with props)
    httpcomponents/httpasyncclient/trunk/src/main/assembly/osgi-bin.xml
      - copied, changed from r1244222, httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml
Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
    httpcomponents/httpasyncclient/trunk/pom.xml
    httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml

Added: httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml?rev=1245034&view=auto
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml (added)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml Thu Feb 16 15:39:39
2012
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   ====================================================================
+
+   This software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org />.
+ -->
+
+<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.apache.httpcomponents</groupId>
+    <artifactId>httpcomponents-asyncclient</artifactId>
+    <version>4.0-alpha4-SNAPSHOT</version>
+  </parent>
+  <artifactId>httpasyncclient-osgi</artifactId>
+  <name>HttpAsyncClient OSGi bundle</name>
+  <description>
+   HttpComponents AsyncClient (OSGi bundle)
+  </description>
+  <url>http://hc.apache.org/httpcomponents-asyncclient</url>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpasyncclient</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compile.source>1.5</maven.compile.source>
+    <maven.compile.target>1.5</maven.compile.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-Name>Apache ${project.name}</Bundle-Name>
+            <Bundle-SymbolicName>${project.groupId}.httpclient</Bundle-SymbolicName>
+            <_exportcontents>
+            org.apache.http.nio.client.*;version=${project.version},
+            org.apache.http.nio.conn.*;version=${project.version},
+            org.apache.http.impl.nio.client.*;version=${project.version},
+            org.apache.http.impl.nio.conn.*;version=${project.version}
+            </_exportcontents>
+            <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
+            <Import-Package>
+            javax.crypto,
+            javax.crypto.spec,
+            javax.net.ssl,
+            javax.security.auth.x500,
+            org.ietf.jgss,
+            org.apache.commons.logging;version=${commons-logging.version},
+            org.apache.http;version=${httpcore.version},
+            org.apache.http.entity;version=${httpcore.version},
+            org.apache.http.concurrent;version=${httpcore.version},
+            org.apache.http.io;version=${httpcore.version},
+            org.apache.http.message;version=${httpcore.version},
+            org.apache.http.params;version=${httpcore.version},
+            org.apache.http.pool;version=${httpcore.version},
+            org.apache.http.protocol;version=${httpcore.version},
+            org.apache.http.util;version=${httpcore.version},
+            org.apache.http.impl;version=${httpcore.version},
+            org.apache.http.nio;version=${httpcore.version},
+            org.apache.http.nio.entity;version=${httpcore.version},
+            org.apache.http.nio.params;version=${httpcore.version},
+            org.apache.http.nio.pool;version=${httpcore.version},
+            org.apache.http.nio.protocol;version=${httpcore.version},
+            org.apache.http.nio.reactor;version=${httpcore.version},
+            org.apache.http.nio.reactor.ssl;version=${httpcore.version},
+            org.apache.http.nio.util;version=${httpcore.version},
+            org.apache.http.impl.nio;version=${httpcore.version},
+            org.apache.http.impl.nio.codec;version=${httpcore.version},
+            org.apache.http.impl.nio.reactor;version=${httpcore.version},
+            org.apache.http.auth;version=${httpclient.version},
+            org.apache.http.cookie;version=${httpclient.version},
+            org.apache.http.conn;version=${httpclient.version},
+            org.apache.http.conn.params;version=${httpclient.version},
+            org.apache.http.conn.routing;version=${httpclient.version},
+            org.apache.http.conn.ssl;version=${httpclient.version},
+            org.apache.http.client;version=${httpclient.version},
+            org.apache.http.client.methods;version=${httpclient.version},
+            org.apache.http.client.params;version=${httpclient.version},
+            org.apache.http.client.protocol;version=${httpclient.version},
+            org.apache.http.client.utils;version=${httpclient.version},
+            org.apache.http.impl.auth;version=${httpclient.version},
+            org.apache.http.impl.cookie;version=${httpclient.version},
+            org.apache.http.impl.conn;version=${httpclient.version},
+            org.apache.http.impl.client;version=${httpclient.version}
+            </Import-Package>
+            <Include-Resource></Include-Resource>
+            <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd
-->
+            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME</_removeheaders>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+    <finalName>org.apache.httpcomponents.httpasyncclient_${project.version}</finalName>
+  </build>
+
+  <reports>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reports>
+</project>

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml?rev=1245034&r1=1245033&r2=1245034&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml Thu Feb 16 15:39:39 2012
@@ -137,6 +137,7 @@
 
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${hc.javadoc.version}</version>
         <configuration>
           <source>1.5</source>
           <links>
@@ -157,6 +158,7 @@
       <plugin>
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
+        <version>${clover.version}</version>
         <configuration>
           <jdk>1.5</jdk>
         </configuration>
@@ -164,10 +166,12 @@
 
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
+         <version>${hc.jxr.version}</version>
       </plugin>
 
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
+         <version>${hc.surefire-report.version}</version>
       </plugin>
 
     </plugins>

Modified: httpcomponents/httpasyncclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/pom.xml?rev=1245034&r1=1245033&r2=1245034&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/pom.xml Thu Feb 16 15:39:39 2012
@@ -124,6 +124,7 @@
 
   <modules>
     <module>httpasyncclient</module>
+    <module>httpasyncclient-osgi</module>
   </modules>
 
   <build>
@@ -177,8 +178,8 @@
           <source>1.5</source>
           <links>
             <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
+            <link>http://hc.apache.org/httpcomponents-core-dev/httpcore/apidocs/</link>
+            <link>http://hc.apache.org/httpcomponents-client-dev/httpclient/apidocs/</link>
           </links>
         </configuration>
       </plugin>
@@ -190,6 +191,7 @@
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
             <descriptor>src/main/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
@@ -206,6 +208,10 @@
             </ant>
             <ant antfile="src/main/assembly/build.xml">
               <property name="target" value="${project.build.directory}" />
+              <property name="package.name" value="${project.artifactId}-${project.version}-osgi-bin"
/>
+            </ant>
+            <ant antfile="src/main/assembly/build.xml">
+              <property name="target" value="${project.build.directory}" />
               <property name="package.name" value="${project.artifactId}-${project.version}-src"
/>
             </ant>
           </tasks>
@@ -240,12 +246,12 @@
 
        <plugin>
          <artifactId>maven-project-info-reports-plugin</artifactId>
+         <version>${hc.project-info.version}</version>
          <reportSets>
            <reportSet>
              <reports>
                <report>dependencies</report>
                <report>project-team</report>
-               <report>mailing-list</report>
                <report>issue-tracking</report>
                <report>scm</report>
              </reports>

Modified: httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml?rev=1245034&r1=1245033&r2=1245034&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml (original)
+++ httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml Thu Feb 16 15:39:39 2012
@@ -35,6 +35,9 @@
     </formats>
     <moduleSets>
       <moduleSet>
+        <excludes>
+          <exclude>org.apache.httpcomponents:httpasyncclient-osgi</exclude>
+        </excludes>
         <binaries>
           <outputDirectory>lib</outputDirectory>
           <unpack>false</unpack>
@@ -61,7 +64,7 @@
           <directory>target/site/apidocs</directory>
           <outputDirectory>javadoc</outputDirectory>
         </fileSet>
-        <!-- Base module -->
+        <!-- Examples -->
         <fileSet>
           <directory>httpasyncclient/src/examples/</directory>
           <outputDirectory>examples</outputDirectory>

Copied: httpcomponents/httpasyncclient/trunk/src/main/assembly/osgi-bin.xml (from r1244222,
httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/assembly/osgi-bin.xml?p2=httpcomponents/httpasyncclient/trunk/src/main/assembly/osgi-bin.xml&p1=httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml&r1=1244222&r2=1245034&rev=1245034&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/assembly/bin.xml (original)
+++ httpcomponents/httpasyncclient/trunk/src/main/assembly/osgi-bin.xml Thu Feb 16 15:39:39
2012
@@ -1,8 +1,4 @@
-<!--
-   $HeadURL$
-   $Revision$
-   $Date$
-
+<!-- 
    ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -28,25 +24,23 @@
    <http://www.apache.org/>.
  -->
 <assembly>
-    <id>bin</id>
+    <id>osgi-bin</id>
     <formats>
         <format>tar.gz</format>
         <format>zip</format>
     </formats>
-    <moduleSets>
-      <moduleSet>
-        <binaries>
-          <outputDirectory>lib</outputDirectory>
-          <unpack>false</unpack>
-          <dependencySets>
-            <dependencySet>
-            </dependencySet>
-          </dependencySets>
-        </binaries>
-      </moduleSet>
-    </moduleSets>
     <fileSets>
         <fileSet>
+          <directory>httpasyncclient-osgi/target</directory>
+          <outputDirectory></outputDirectory>
+          <includes>
+            <include>*.jar</include>
+          </includes>
+          <excludes>
+            <exclude>*sources.jar</exclude>
+          </excludes>
+        </fileSet>
+        <fileSet>
           <directory></directory>
           <outputDirectory></outputDirectory>
           <includes>
@@ -54,6 +48,7 @@
             <include>LICENSE.txt</include>
             <include>NOTICE.txt</include>
             <include>RELEASE_NOTES.txt</include>
+            <include>NTLM_SUPPORT.txt</include>
           </includes>
         </fileSet>
         <!-- Javadocs -->
@@ -61,7 +56,7 @@
           <directory>target/site/apidocs</directory>
           <outputDirectory>javadoc</outputDirectory>
         </fileSet>
-        <!-- Base module -->
+        <!-- Examples -->
         <fileSet>
           <directory>httpasyncclient/src/examples/</directory>
           <outputDirectory>examples</outputDirectory>



Mime
View raw message