hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r693088 - in /httpcomponents/httpcore/trunk: ./ module-main/ module-nio/ module-osgi-bundle/ module-osgi-bundle/src/ module-osgi-bundle/src/main/ module-osgi-bundle/src/main/resources/
Date Mon, 08 Sep 2008 13:25:16 GMT
Author: olegk
Date: Mon Sep  8 06:25:13 2008
New Revision: 693088

URL: http://svn.apache.org/viewvc?rev=693088&view=rev
HTTPCORE-125: OSGi bundle containing HttpCore & HttpCore NIO jars

    httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml   (with props)

Modified: httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?rev=693088&r1=693087&r2=693088&view=diff
--- httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Mon Sep  8 06:25:13 2008
@@ -1,6 +1,9 @@
 Changes since 4.0 Beta 2
+* [HTTPCORE-125] OSGi bundle containing HttpCore & HttpCore NIO jars. 
+  Contributed by Oleg Kalnichevski <olegk at apache.org> 
 * CancelledKeyException thrown in BaseIOReactor#validate() no longer causes 
   a premature I/O reactor shutdown. 
   Contributed by Oleg Kalnichevski <olegk at apache.org> 

Modified: httpcomponents/httpcore/trunk/module-main/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-main/pom.xml?rev=693088&r1=693087&r2=693088&view=diff
--- httpcomponents/httpcore/trunk/module-main/pom.xml (original)
+++ httpcomponents/httpcore/trunk/module-main/pom.xml Mon Sep  8 06:25:13 2008
@@ -111,17 +111,6 @@
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>Apache ${pom.name}</Bundle-Name>
-            <Export-Package>org.apache.http.*</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>

Modified: httpcomponents/httpcore/trunk/module-nio/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/pom.xml?rev=693088&r1=693087&r2=693088&view=diff
--- httpcomponents/httpcore/trunk/module-nio/pom.xml (original)
+++ httpcomponents/httpcore/trunk/module-nio/pom.xml Mon Sep  8 06:25:13 2008
@@ -116,18 +116,6 @@
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>Apache ${pom.name}</Bundle-Name>
-            <Require-Bundle>org.apache.httpcomponents.httpcore</Require-Bundle>
-            <Export-Package>org.apache.http.nio.*, org.apache.http.impl.nio.*</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>

Added: httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml?rev=693088&view=auto
--- httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml (added)
+++ httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml Mon Sep  8 06:25:13 2008
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+   $HeadURL$
+   $Revision$
+   $Date$
+   ====================================================================
+   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
+   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-core</artifactId>
+    <version>4.0-beta3-SNAPSHOT</version>
+  </parent>
+  <artifactId>httpcore-osgi</artifactId>
+  <name>HttpCore OSGi bundle</name>
+  <inceptionYear>2005</inceptionYear>
+  <description>
+   HttpComponents Core (OSGi bundle)
+  </description>
+  <url>http://hc.apache.org/httpcomponents-core/</url>
+  <packaging>bundle</packaging>  
+  <licenses>
+    <license>
+      <name>Apache License</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore-nio</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+  </dependencies>
+  <properties>
+    <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 ${pom.name}</Bundle-Name>
+            <Bundle-SymbolicName>${pomartifactId}</Bundle-SymbolicName>
+            <_exportcontents>org.apache.http.*</_exportcontents>
+            <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+    <finalName>org.apache.httpcore_${pom.version}</finalName>
+  </build>

Propchange: httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml
    svn:keywords = Date Author Id Revision HeadURL

Propchange: httpcomponents/httpcore/trunk/module-osgi-bundle/pom.xml
    svn:mime-type = text/xml

Added: httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/LICENSE
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/LICENSE?rev=693088&view=auto
--- httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/LICENSE (added)
+++ httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/LICENSE Mon Sep  8
06:25:13 2008
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+   1. Definitions.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      implied, including, without limitation, any warranties or conditions
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
\ No newline at end of file

Added: httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/NOTICE
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/NOTICE?rev=693088&view=auto
--- httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/NOTICE (added)
+++ httpcomponents/httpcore/trunk/module-osgi-bundle/src/main/resources/NOTICE Mon Sep  8
06:25:13 2008
@@ -0,0 +1,5 @@
+Apache HttpComponents Core - HttpCore OSGi bundle
+Copyright 2006-2008 The Apache Software Foundation
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=693088&r1=693087&r2=693088&view=diff
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Mon Sep  8 06:25:13 2008
@@ -72,6 +72,7 @@
+    <module>module-osgi-bundle</module>

View raw message