--- pom.xml.sav	2011-01-17 15:00:53.000000000 -0500
+++ pom.xml	2011-03-10 09:45:01.330282001 -0500
@@ -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>
--- httpclient/pom.xml.sav	2011-01-17 15:00:53.000000000 -0500
+++ httpclient/pom.xml	2011-03-10 09:50:50.829281988 -0500
@@ -38,7 +38,7 @@
    HttpComponents Client (base module)
   </description>
   <url>http://hc.apache.org/httpcomponents-client</url>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
@@ -71,12 +71,6 @@
       <version>${easymock.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymockclassextension</artifactId>
-      <version>${easymock.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <properties>
@@ -122,25 +116,18 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.atlassian.maven.plugins</groupId>
-        <artifactId>maven-clover2-plugin</artifactId>
+      <plugin>   
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
         <configuration>
-          <flushPolicy>threaded</flushPolicy>
-          <flushInterval>100</flushInterval>
-          <targetPercentage>50%</targetPercentage>
+            <instructions>
+                <Export-Package>*</Export-Package>
+                <Private-Package></Private-Package>
+            </instructions>
         </configuration>
-        <executions>
-          <execution>
-            <id>site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>instrument</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
+      </plugin> 
+     </plugins>
   </build>
 
   <reporting>
@@ -165,14 +151,6 @@
       </plugin>
 
       <plugin>
-        <groupId>com.atlassian.maven.plugins</groupId>
-        <artifactId>maven-clover2-plugin</artifactId>
-        <configuration>
-          <jdk>1.5</jdk>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
       </plugin>
 
--- httpmime/pom.xml.sav	2011-01-17 15:00:44.000000000 -0500
+++ httpmime/pom.xml	2011-03-10 09:45:01.330282001 -0500
@@ -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>